diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-03-01 04:08:44 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-03-01 04:08:44 -0500 |
| commit | c157750a901d767ecb95f1dbabd0972dee396b1e (patch) | |
| tree | c60874bc22cbcea6fb2ef32f71251a1771527169 /include/scsi | |
| parent | e0eca63e342124cff4307eafb43908cab5b3cf88 (diff) | |
| parent | ee7afd717c26299c85675d84c7ff89a9c989f4fa (diff) | |
Merge tag 'uapi-20121219' into for-linus
UAPI Disintegration 2012-12-19
This is the remaining SCSI part of the UAPI
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/Kbuild | 3 | ||||
| -rw-r--r-- | include/scsi/scsi_bsg_fc.h | 320 | ||||
| -rw-r--r-- | include/scsi/scsi_netlink.h | 123 | ||||
| -rw-r--r-- | include/scsi/scsi_netlink_fc.h | 71 |
4 files changed, 0 insertions, 517 deletions
diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild index f2b94918994d..562ff9d591b8 100644 --- a/include/scsi/Kbuild +++ b/include/scsi/Kbuild | |||
| @@ -1,4 +1 @@ | |||
| 1 | header-y += scsi_netlink.h | ||
| 2 | header-y += scsi_netlink_fc.h | ||
| 3 | header-y += scsi_bsg_fc.h | ||
| 4 | header-y += fc/ | header-y += fc/ | |
diff --git a/include/scsi/scsi_bsg_fc.h b/include/scsi/scsi_bsg_fc.h deleted file mode 100644 index 3031b900b087..000000000000 --- a/include/scsi/scsi_bsg_fc.h +++ /dev/null | |||
| @@ -1,320 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * FC Transport BSG Interface | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 James Smart, Emulex Corporation | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License as published by | ||
| 8 | * the Free Software Foundation; either version 2 of the License, or | ||
| 9 | * (at your option) any later version. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 17 | * along with this program; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 19 | * | ||
| 20 | */ | ||
| 21 | |||
| 22 | #ifndef SCSI_BSG_FC_H | ||
| 23 | #define SCSI_BSG_FC_H | ||
| 24 | |||
| 25 | /* | ||
| 26 | * This file intended to be included by both kernel and user space | ||
| 27 | */ | ||
| 28 | |||
| 29 | /* | ||
| 30 | * FC Transport SGIO v4 BSG Message Support | ||
| 31 | */ | ||
| 32 | |||
| 33 | /* Default BSG request timeout (in seconds) */ | ||
| 34 | #define FC_DEFAULT_BSG_TIMEOUT (10 * HZ) | ||
| 35 | |||
| 36 | |||
| 37 | /* | ||
| 38 | * Request Message Codes supported by the FC Transport | ||
| 39 | */ | ||
| 40 | |||
| 41 | /* define the class masks for the message codes */ | ||
| 42 | #define FC_BSG_CLS_MASK 0xF0000000 /* find object class */ | ||
| 43 | #define FC_BSG_HST_MASK 0x80000000 /* fc host class */ | ||
| 44 | #define FC_BSG_RPT_MASK 0x40000000 /* fc rport class */ | ||
| 45 | |||
| 46 | /* fc_host Message Codes */ | ||
| 47 | #define FC_BSG_HST_ADD_RPORT (FC_BSG_HST_MASK | 0x00000001) | ||
| 48 | #define FC_BSG_HST_DEL_RPORT (FC_BSG_HST_MASK | 0x00000002) | ||
| 49 | #define FC_BSG_HST_ELS_NOLOGIN (FC_BSG_HST_MASK | 0x00000003) | ||
| 50 | #define FC_BSG_HST_CT (FC_BSG_HST_MASK | 0x00000004) | ||
| 51 | #define FC_BSG_HST_VENDOR (FC_BSG_HST_MASK | 0x000000FF) | ||
| 52 | |||
| 53 | /* fc_rport Message Codes */ | ||
| 54 | #define FC_BSG_RPT_ELS (FC_BSG_RPT_MASK | 0x00000001) | ||
| 55 | #define FC_BSG_RPT_CT (FC_BSG_RPT_MASK | 0x00000002) | ||
| 56 | |||
| 57 | |||
| 58 | |||
| 59 | /* | ||
| 60 | * FC Address Identifiers in Message Structures : | ||
| 61 | * | ||
| 62 | * Whenever a command payload contains a FC Address Identifier | ||
| 63 | * (aka port_id), the value is effectively in big-endian | ||
| 64 | * order, thus the array elements are decoded as follows: | ||
| 65 | * element [0] is bits 23:16 of the FC Address Identifier | ||
| 66 | * element [1] is bits 15:8 of the FC Address Identifier | ||
| 67 | * element [2] is bits 7:0 of the FC Address Identifier | ||
| 68 | */ | ||
| 69 | |||
| 70 | |||
| 71 | /* | ||
| 72 | * FC Host Messages | ||
| 73 | */ | ||
| 74 | |||
| 75 | /* FC_BSG_HST_ADDR_PORT : */ | ||
| 76 | |||
| 77 | /* Request: | ||
| 78 | * This message requests the FC host to login to the remote port | ||
| 79 | * at the specified N_Port_Id. The remote port is to be enumerated | ||
| 80 | * with the transport upon completion of the login. | ||
| 81 | */ | ||
| 82 | struct fc_bsg_host_add_rport { | ||
| 83 | uint8_t reserved; | ||
| 84 | |||
| 85 | /* FC Address Identier of the remote port to login to */ | ||
| 86 | uint8_t port_id[3]; | ||
| 87 | }; | ||
| 88 | |||
| 89 | /* Response: | ||
| 90 | * There is no additional response data - fc_bsg_reply->result is sufficient | ||
| 91 | */ | ||
| 92 | |||
| 93 | |||
| 94 | /* FC_BSG_HST_DEL_RPORT : */ | ||
| 95 | |||
| 96 | /* Request: | ||
| 97 | * This message requests the FC host to remove an enumerated | ||
| 98 | * remote port and to terminate the login to it. | ||
| 99 | * | ||
| 100 | * Note: The driver is free to reject this request if it desires to | ||
| 101 | * remain logged in with the remote port. | ||
| 102 | */ | ||
| 103 | struct fc_bsg_host_del_rport { | ||
| 104 | uint8_t reserved; | ||
| 105 | |||
| 106 | /* FC Address Identier of the remote port to logout of */ | ||
| 107 | uint8_t port_id[3]; | ||
| 108 | }; | ||
| 109 | |||
| 110 | /* Response: | ||
| 111 | * There is no additional response data - fc_bsg_reply->result is sufficient | ||
| 112 | */ | ||
| 113 | |||
| 114 | |||
| 115 | /* FC_BSG_HST_ELS_NOLOGIN : */ | ||
| 116 | |||
| 117 | /* Request: | ||
| 118 | * This message requests the FC_Host to send an ELS to a specific | ||
| 119 | * N_Port_ID. The host does not need to log into the remote port, | ||
| 120 | * nor does it need to enumerate the rport for further traffic | ||
| 121 | * (although, the FC host is free to do so if it desires). | ||
| 122 | */ | ||
| 123 | struct fc_bsg_host_els { | ||
| 124 | /* | ||
| 125 | * ELS Command Code being sent (must be the same as byte 0 | ||
| 126 | * of the payload) | ||
| 127 | */ | ||
| 128 | uint8_t command_code; | ||
| 129 | |||
| 130 | /* FC Address Identier of the remote port to send the ELS to */ | ||
| 131 | uint8_t port_id[3]; | ||
| 132 | }; | ||
| 133 | |||
| 134 | /* Response: | ||
| 135 | */ | ||
| 136 | /* fc_bsg_ctels_reply->status values */ | ||
| 137 | #define FC_CTELS_STATUS_OK 0x00000000 | ||
| 138 | #define FC_CTELS_STATUS_REJECT 0x00000001 | ||
| 139 | #define FC_CTELS_STATUS_P_RJT 0x00000002 | ||
| 140 | #define FC_CTELS_STATUS_F_RJT 0x00000003 | ||
| 141 | #define FC_CTELS_STATUS_P_BSY 0x00000004 | ||
| 142 | #define FC_CTELS_STATUS_F_BSY 0x00000006 | ||
| 143 | struct fc_bsg_ctels_reply { | ||
| 144 | /* | ||
| 145 | * Note: An ELS LS_RJT may be reported in 2 ways: | ||
| 146 | * a) A status of FC_CTELS_STATUS_OK is returned. The caller | ||
| 147 | * is to look into the ELS receive payload to determine | ||
| 148 | * LS_ACC or LS_RJT (by contents of word 0). The reject | ||
| 149 | * data will be in word 1. | ||
| 150 | * b) A status of FC_CTELS_STATUS_REJECT is returned, The | ||
| 151 | * rjt_data field will contain valid data. | ||
| 152 | * | ||
| 153 | * Note: ELS LS_ACC is determined by an FC_CTELS_STATUS_OK, and | ||
| 154 | * the receive payload word 0 indicates LS_ACC | ||
| 155 | * (e.g. value is 0x02xxxxxx). | ||
| 156 | * | ||
| 157 | * Note: Similarly, a CT Reject may be reported in 2 ways: | ||
| 158 | * a) A status of FC_CTELS_STATUS_OK is returned. The caller | ||
| 159 | * is to look into the CT receive payload to determine | ||
| 160 | * Accept or Reject (by contents of word 2). The reject | ||
| 161 | * data will be in word 3. | ||
| 162 | * b) A status of FC_CTELS_STATUS_REJECT is returned, The | ||
| 163 | * rjt_data field will contain valid data. | ||
| 164 | * | ||
| 165 | * Note: x_RJT/BSY status will indicae that the rjt_data field | ||
| 166 | * is valid and contains the reason/explanation values. | ||
| 167 | */ | ||
| 168 | uint32_t status; /* See FC_CTELS_STATUS_xxx */ | ||
| 169 | |||
| 170 | /* valid if status is not FC_CTELS_STATUS_OK */ | ||
| 171 | struct { | ||
| 172 | uint8_t action; /* fragment_id for CT REJECT */ | ||
| 173 | uint8_t reason_code; | ||
| 174 | uint8_t reason_explanation; | ||
| 175 | uint8_t vendor_unique; | ||
| 176 | } rjt_data; | ||
| 177 | }; | ||
| 178 | |||
| 179 | |||
| 180 | /* FC_BSG_HST_CT : */ | ||
| 181 | |||
| 182 | /* Request: | ||
| 183 | * This message requests that a CT Request be performed with the | ||
| 184 | * indicated N_Port_ID. The driver is responsible for logging in with | ||
| 185 | |||
