History

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley: "This is mostly update of the usual drivers: qla2xxx, ufs, smartpqi, lpfc, hisi_sas, qedf, mpt3sas; plus a whole load of minor updates. The only core change this time around is the addition of request batching for virtio. Since batching requires an additional flag to use, it should be invisible to the rest of the drivers" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (264 commits) scsi: hisi_sas: Fix the conflict between device gone and host reset scsi: hisi_sas: Add BIST support for phy loopback scsi: hisi_sas: Add hisi_sas_debugfs_alloc() to centralise allocation scsi: hisi_sas: Remove some unused function arguments scsi: hisi_sas: Remove redundant work declaration scsi: hisi_sas: Remove hisi_sas_hw.slot_complete scsi: hisi_sas: Assign NCQ tag for all NCQ commands scsi: hisi_sas: Update all the registers after suspend and resume scsi: hisi_sas: Retry 3 times TMF IO for SAS disks when init device scsi: hisi_sas: Remove sleep after issue phy reset if sas_smp_phy_control() fails scsi: hisi_sas: Directly return when running I_T_nexus reset if phy disabled scsi: hisi_sas: Use true/false as input parameter of sas_phy_reset() scsi: hisi_sas: add debugfs auto-trigger for internal abort time out scsi: virtio_scsi: unplug LUNs when events missed scsi: scsi_dh_rdac: zero cdb in send_mode_select() scsi: fcoe: fix null-ptr-deref Read in fc_release_transport scsi: ufs-hisi: use devm_platform_ioremap_resource() to simplify code scsi: ufshcd: use devm_platform_ioremap_resource() to simplify code scsi: hisi_sas: use devm_platform_ioremap_resource() to simplify code scsi: ufs: Use kmemdup in ufshcd_read_string_desc() ...

Linus Torvalds committed 7 years ago

Commit 10fd7172 parents 3e414b5 e74006e130 files · +5755 −3679Browse files

Showing the changes to include/uapi (3 of 130 files). Show all

Unified · Split

3 files
  1. include/uapi/scsi/scsi_bsg_fc.h +28 −26
  2. include/uapi/scsi/scsi_netlink.h +10 −10
  3. include/uapi/scsi/scsi_netlink_fc.h +9 −8
include/uapi/scsi/scsi_bsg_fc.h+28−26
@@ -8,6 +8,8 @@ · 7 unmodified lines
88 #ifndef SCSI_BSG_FC_H
99 #define SCSI_BSG_FC_H
1010
11+#include <linux/types.h>
12+
1113 /*
1214 * This file intended to be included by both kernel and user space
1315 */
@@ -66,10 +68,10 @@ · 52 unmodified lines
6668 * with the transport upon completion of the login.
6769 */
6870 struct fc_bsg_host_add_rport {
69− uint8_t reserved;
71+ __u8 reserved;
7072
7173 /* FC Address Identier of the remote port to login to */
72− uint8_t port_id[3];
74+ __u8 port_id[3];
7375 };
7476
7577 /* Response:
@@ -87,10 +89,10 @@ struct fc_bsg_host_add_rport { · 11 unmodified lines
8789 * remain logged in with the remote port.
8890 */
8991 struct fc_bsg_host_del_rport {
90− uint8_t reserved;
92+ __u8 reserved;
9193
9294 /* FC Address Identier of the remote port to logout of */
93− uint8_t port_id[3];
95+ __u8 port_id[3];
9496 };
9597
9698 /* Response:
@@ -111,10 +113,10 @@ struct fc_bsg_host_els { · 14 unmodified lines
111113 * ELS Command Code being sent (must be the same as byte 0
112114 * of the payload)
113115 */
114− uint8_t command_code;
116+ __u8 command_code;
115117
116118 /* FC Address Identier of the remote port to send the ELS to */
117− uint8_t port_id[3];
119+ __u8 port_id[3];
118120 };
119121
120122 /* Response:
@@ -151,14 +153,14 @@ struct fc_bsg_ctels_reply { · 30 unmodified lines
151153 * Note: x_RJT/BSY status will indicae that the rjt_data field
152154 * is valid and contains the reason/explanation values.
153155 */
154− uint32_t status; /* See FC_CTELS_STATUS_xxx */
156+ __u32 status; /* See FC_CTELS_STATUS_xxx */
155157
156158 /* valid if status is not FC_CTELS_STATUS_OK */
157159 struct {
158− uint8_t action; /* fragment_id for CT REJECT */
159− uint8_t reason_code;
160− uint8_t reason_explanation;
161− uint8_t vendor_unique;
160+ __u8 action; /* fragment_id for CT REJECT */
161+ __u8 reason_code;
162+ __u8 reason_explanation;
163+ __u8 vendor_unique;
162164 } rjt_data;
163165 };
164166
@@ -174,17 +176,17 @@ struct fc_bsg_ctels_reply { · 9 unmodified lines
174176 * and whether to tear it down after the request.
175177 */
176178 struct fc_bsg_host_ct {
177− uint8_t reserved;
179+ __u8 reserved;
178180
179181 /* FC Address Identier of the remote port to send the ELS to */
180− uint8_t port_id[3];
182+ __u8 port_id[3];
181183
182184 /*
183185 * We need words 0-2 of the generic preamble for the LLD's
184186 */
185− uint32_t preamble_word0; /* revision & IN_ID */
186− uint32_t preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
187− uint32_t preamble_word2; /* Cmd Code, Max Size */
187+ __u32 preamble_word0; /* revision & IN_ID */
188+ __u32 preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
189+ __u32 preamble_word2; /* Cmd Code, Max Size */
188190
189191 };
190192 /* Response:
@@ -204,17 +206,17 @@ struct fc_bsg_host_vendor { · 13 unmodified lines
204206 * Identifies the vendor that the message is formatted for. This
205207 * should be the recipient of the message.
206208 */
207− uint64_t vendor_id;
209+ __u64 vendor_id;
208210
209211 /* start of vendor command area */
210− uint32_t vendor_cmd[0];
212+ __u32 vendor_cmd[0];
211213 };
212214
213215 /* Response:
214216 */
215217 struct fc_bsg_host_vendor_reply {
216218 /* start of vendor response area */
217− uint32_t vendor_rsp[0];
219+ __u32 vendor_rsp[0];
218220 };
219221
220222
@@ -233,7 +235,7 @@ struct fc_bsg_rport_els { · 12 unmodified lines
233235 * ELS Command Code being sent (must be the same as
234236 * byte 0 of the payload)
235237 */
236− uint8_t els_code;
238+ __u8 els_code;
237239 };
238240
239241 /* Response:
@@ -251,9 +253,9 @@ struct fc_bsg_rport_ct { · 11 unmodified lines
251253 /*
252254 * We need words 0-2 of the generic preamble for the LLD's
253255 */
254− uint32_t preamble_word0; /* revision & IN_ID */
255− uint32_t preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
256− uint32_t preamble_word2; /* Cmd Code, Max Size */
256+ __u32 preamble_word0; /* revision & IN_ID */
257+ __u32 preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
258+ __u32 preamble_word2; /* Cmd Code, Max Size */
257259 };
258260 /* Response:
259261 *
@@ -265,7 +267,7 @@ struct fc_bsg_rport_ct { · 5 unmodified lines
265267
266268 /* request (CDB) structure of the sg_io_v4 */
267269 struct fc_bsg_request {
268− uint32_t msgcode;
270+ __u32 msgcode;
269271 union {
270272 struct fc_bsg_host_add_rport h_addrport;
271273 struct fc_bsg_host_del_rport h_delrport;
@@ -289,10 +291,10 @@ struct fc_bsg_reply { · 17 unmodified lines
289291 * msg and status fields. The per-msgcode reply structure
290292 * will contain valid data.
291293 */
292− uint32_t result;
294+ __u32 result;
293295
294296 /* If there was reply_payload, how much was recevied ? */
295− uint32_t reply_payload_rcv_len;
297+ __u32 reply_payload_rcv_len;
296298
297299 union {
298300 struct fc_bsg_host_vendor_reply vendor_reply;
include/uapi/scsi/scsi_netlink.h+10−10
@@ -26,12 +26,12 @@ · 25 unmodified lines
2626
2727 /* SCSI_TRANSPORT_MSG event message header */
2828 struct scsi_nl_hdr {
29− uint8_t version;
30− uint8_t transport;
31− uint16_t magic;
32− uint16_t msgtype;
33− uint16_t msglen;
34−} __attribute__((aligned(sizeof(uint64_t))));
29+ __u8 version;
30+ __u8 transport;
31+ __u16 magic;
32+ __u16 msgtype;
33+ __u16 msglen;
34+} __attribute__((aligned(sizeof(__u64))));
3535
3636 /* scsi_nl_hdr->version value */
3737 #define SCSI_NL_VERSION 1
@@ -75,10 +75,10 @@ struct scsi_nl_hdr { · 37 unmodified lines
7575 */
7676 struct scsi_nl_host_vendor_msg {
7777 struct scsi_nl_hdr snlh; /* must be 1st element ! */
78− uint64_t vendor_id;
79− uint16_t host_no;
80− uint16_t vmsg_datalen;
81−} __attribute__((aligned(sizeof(uint64_t))));
78+ __u64 vendor_id;
79+ __u16 host_no;
80+ __u16 vmsg_datalen;
81+} __attribute__((aligned(sizeof(__u64))));
8282
8383
8484 /*
include/uapi/scsi/scsi_netlink_fc.h+9−8
@@ -7,6 +7,7 @@ · 6 unmodified lines
77 #ifndef SCSI_NETLINK_FC_H
88 #define SCSI_NETLINK_FC_H
99
10+#include <linux/types.h>
1011 #include <scsi/scsi_netlink.h>
1112
1213 /*
@@ -43,14 +44,14 @@ · 30 unmodified lines
4344 */
4445 struct fc_nl_event {
4546 struct scsi_nl_hdr snlh; /* must be 1st element ! */
46− uint64_t seconds;
47− uint64_t vendor_id;
48− uint16_t host_no;
49− uint16_t event_datalen;
50− uint32_t event_num;
51− uint32_t event_code;
52− uint32_t event_data;
53−} __attribute__((aligned(sizeof(uint64_t))));
47+ __u64 seconds;
48+ __u64 vendor_id;
49+ __u16 host_no;
50+ __u16 event_datalen;
51+ __u32 event_num;
52+ __u32 event_code;
53+ __u32 event_data;
54+} __attribute__((aligned(sizeof(__u64))));
5455
5556
5657 #endif /* SCSI_NETLINK_FC_H */