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
8#ifndef SCSI_BSG_FC_H8#ifndef SCSI_BSG_FC_H
9#define SCSI_BSG_FC_H9#define SCSI_BSG_FC_H
10 10
11#include <linux/types.h>
12
11/*13/*
12 * This file intended to be included by both kernel and user space14 * This file intended to be included by both kernel and user space
13 */15 */
@@ -66,10 +68,10 @@ · 52 unmodified lines
66 * with the transport upon completion of the login.68 * with the transport upon completion of the login.
67 */69 */
68struct fc_bsg_host_add_rport {70struct fc_bsg_host_add_rport {
69 uint8_t reserved;71 __u8 reserved;
70 72
71 /* FC Address Identier of the remote port to login to */73 /* FC Address Identier of the remote port to login to */
72 uint8_t port_id[3];74 __u8 port_id[3];
73};75};
74 76
75/* Response:77/* Response:
@@ -87,10 +89,10 @@ struct fc_bsg_host_add_rport { · 11 unmodified lines
87 * remain logged in with the remote port.89 * remain logged in with the remote port.
88 */90 */
89struct fc_bsg_host_del_rport {91struct fc_bsg_host_del_rport {
90 uint8_t reserved;92 __u8 reserved;
91 93
92 /* FC Address Identier of the remote port to logout of */94 /* FC Address Identier of the remote port to logout of */
93 uint8_t port_id[3];95 __u8 port_id[3];
94};96};
95 97
96/* Response:98/* Response:
@@ -111,10 +113,10 @@ struct fc_bsg_host_els { · 14 unmodified lines
111 * ELS Command Code being sent (must be the same as byte 0113 * ELS Command Code being sent (must be the same as byte 0
112 * of the payload)114 * of the payload)
113 */115 */
114 uint8_t command_code;116 __u8 command_code;
115 117
116 /* FC Address Identier of the remote port to send the ELS to */118 /* FC Address Identier of the remote port to send the ELS to */
117 uint8_t port_id[3];119 __u8 port_id[3];
118};120};
119 121
120/* Response:122/* Response:
@@ -151,14 +153,14 @@ struct fc_bsg_ctels_reply { · 30 unmodified lines
151 * Note: x_RJT/BSY status will indicae that the rjt_data field153 * Note: x_RJT/BSY status will indicae that the rjt_data field
152 * is valid and contains the reason/explanation values.154 * is valid and contains the reason/explanation values.
153 */155 */
154 uint32_t status; /* See FC_CTELS_STATUS_xxx */156 __u32 status; /* See FC_CTELS_STATUS_xxx */
155 157
156 /* valid if status is not FC_CTELS_STATUS_OK */158 /* valid if status is not FC_CTELS_STATUS_OK */
157 struct {159 struct {
158 uint8_t action; /* fragment_id for CT REJECT */160 __u8 action; /* fragment_id for CT REJECT */
159 uint8_t reason_code;161 __u8 reason_code;
160 uint8_t reason_explanation;162 __u8 reason_explanation;
161 uint8_t vendor_unique;163 __u8 vendor_unique;
162 } rjt_data;164 } rjt_data;
163};165};
164 166
@@ -174,17 +176,17 @@ struct fc_bsg_ctels_reply { · 9 unmodified lines
174 * and whether to tear it down after the request.176 * and whether to tear it down after the request.
175 */177 */
176struct fc_bsg_host_ct {178struct fc_bsg_host_ct {
177 uint8_t reserved;179 __u8 reserved;
178 180
179 /* FC Address Identier of the remote port to send the ELS to */181 /* FC Address Identier of the remote port to send the ELS to */
180 uint8_t port_id[3];182 __u8 port_id[3];
181 183
182 /*184 /*
183 * We need words 0-2 of the generic preamble for the LLD's185 * We need words 0-2 of the generic preamble for the LLD's
184 */186 */
185 uint32_t preamble_word0; /* revision & IN_ID */187 __u32 preamble_word0; /* revision & IN_ID */
186 uint32_t preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */188 __u32 preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
187 uint32_t preamble_word2; /* Cmd Code, Max Size */189 __u32 preamble_word2; /* Cmd Code, Max Size */
188 190
189};191};
190/* Response:192/* Response:
@@ -204,17 +206,17 @@ struct fc_bsg_host_vendor { · 13 unmodified lines
204 * Identifies the vendor that the message is formatted for. This206 * Identifies the vendor that the message is formatted for. This
205 * should be the recipient of the message.207 * should be the recipient of the message.
206 */208 */
207 uint64_t vendor_id;209 __u64 vendor_id;
208 210
209 /* start of vendor command area */211 /* start of vendor command area */
210 uint32_t vendor_cmd[0];212 __u32 vendor_cmd[0];
211};213};
212 214
213/* Response:215/* Response:
214 */216 */
215struct fc_bsg_host_vendor_reply {217struct fc_bsg_host_vendor_reply {
216 /* start of vendor response area */218 /* start of vendor response area */
217 uint32_t vendor_rsp[0];219 __u32 vendor_rsp[0];
218};220};
219 221
220 222
@@ -233,7 +235,7 @@ struct fc_bsg_rport_els { · 12 unmodified lines
233 * ELS Command Code being sent (must be the same as235 * ELS Command Code being sent (must be the same as
234 * byte 0 of the payload)236 * byte 0 of the payload)
235 */237 */
236 uint8_t els_code;238 __u8 els_code;
237};239};
238 240
239/* Response:241/* Response:
@@ -251,9 +253,9 @@ struct fc_bsg_rport_ct { · 11 unmodified lines
251 /*253 /*
252 * We need words 0-2 of the generic preamble for the LLD's254 * We need words 0-2 of the generic preamble for the LLD's
253 */255 */
254 uint32_t preamble_word0; /* revision & IN_ID */256 __u32 preamble_word0; /* revision & IN_ID */
255 uint32_t preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */257 __u32 preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
256 uint32_t preamble_word2; /* Cmd Code, Max Size */258 __u32 preamble_word2; /* Cmd Code, Max Size */
257};259};
258/* Response:260/* Response:
259 *261 *
@@ -265,7 +267,7 @@ struct fc_bsg_rport_ct { · 5 unmodified lines
265 267
266/* request (CDB) structure of the sg_io_v4 */268/* request (CDB) structure of the sg_io_v4 */
267struct fc_bsg_request {269struct fc_bsg_request {
268 uint32_t msgcode;270 __u32 msgcode;
269 union {271 union {
270 struct fc_bsg_host_add_rport h_addrport;272 struct fc_bsg_host_add_rport h_addrport;
271 struct fc_bsg_host_del_rport h_delrport;273 struct fc_bsg_host_del_rport h_delrport;
@@ -289,10 +291,10 @@ struct fc_bsg_reply { · 17 unmodified lines
289 * msg and status fields. The per-msgcode reply structure291 * msg and status fields. The per-msgcode reply structure
290 * will contain valid data.292 * will contain valid data.
291 */293 */
292 uint32_t result;294 __u32 result;
293 295
294 /* If there was reply_payload, how much was recevied ? */296 /* If there was reply_payload, how much was recevied ? */
295 uint32_t reply_payload_rcv_len;297 __u32 reply_payload_rcv_len;
296 298
297 union {299 union {
298 struct fc_bsg_host_vendor_reply vendor_reply;300 struct fc_bsg_host_vendor_reply vendor_reply;
include/uapi/scsi/scsi_netlink.h+10−10
@@ -26,12 +26,12 @@ · 25 unmodified lines
26 26
27/* SCSI_TRANSPORT_MSG event message header */27/* SCSI_TRANSPORT_MSG event message header */
28struct scsi_nl_hdr {28struct scsi_nl_hdr {
29 uint8_t version;29 __u8 version;
30 uint8_t transport;30 __u8 transport;
31 uint16_t magic;31 __u16 magic;
32 uint16_t msgtype;32 __u16 msgtype;
33 uint16_t msglen;33 __u16 msglen;
34} __attribute__((aligned(sizeof(uint64_t))));34} __attribute__((aligned(sizeof(__u64))));
35 35
36/* scsi_nl_hdr->version value */36/* scsi_nl_hdr->version value */
37#define SCSI_NL_VERSION 137#define SCSI_NL_VERSION 1
@@ -75,10 +75,10 @@ struct scsi_nl_hdr { · 37 unmodified lines
75 */75 */
76struct scsi_nl_host_vendor_msg {76struct scsi_nl_host_vendor_msg {
77 struct scsi_nl_hdr snlh; /* must be 1st element ! */77 struct scsi_nl_hdr snlh; /* must be 1st element ! */
78 uint64_t vendor_id;78 __u64 vendor_id;
79 uint16_t host_no;79 __u16 host_no;
80 uint16_t vmsg_datalen;80 __u16 vmsg_datalen;
81} __attribute__((aligned(sizeof(uint64_t))));81} __attribute__((aligned(sizeof(__u64))));
82 82
83 83
84/*84/*
include/uapi/scsi/scsi_netlink_fc.h+9−8
@@ -7,6 +7,7 @@ · 6 unmodified lines
7#ifndef SCSI_NETLINK_FC_H7#ifndef SCSI_NETLINK_FC_H
8#define SCSI_NETLINK_FC_H8#define SCSI_NETLINK_FC_H
9 9
10#include <linux/types.h>
10#include <scsi/scsi_netlink.h>11#include <scsi/scsi_netlink.h>
11 12
12/*13/*
@@ -43,14 +44,14 @@ · 30 unmodified lines
43 */44 */
44struct fc_nl_event {45struct fc_nl_event {
45 struct scsi_nl_hdr snlh; /* must be 1st element ! */46 struct scsi_nl_hdr snlh; /* must be 1st element ! */
46 uint64_t seconds;47 __u64 seconds;
47 uint64_t vendor_id;48 __u64 vendor_id;
48 uint16_t host_no;49 __u16 host_no;
49 uint16_t event_datalen;50 __u16 event_datalen;
50 uint32_t event_num;51 __u32 event_num;
51 uint32_t event_code;52 __u32 event_code;
52 uint32_t event_data;53 __u32 event_data;
53} __attribute__((aligned(sizeof(uint64_t))));54} __attribute__((aligned(sizeof(__u64))));
54 55
55 56
56#endif /* SCSI_NETLINK_FC_H */57#endif /* SCSI_NETLINK_FC_H */