diff options
author | Kashyap, Desai <kashyap.desai@lsi.com> | 2011-01-04 01:05:41 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2011-01-24 10:32:18 -0500 |
commit | 9af05d90e91026838330a2bf86a6692c86f3c4e7 (patch) | |
tree | d9fe5df20b7ea32c477875f9b8afaea926573d3c /drivers/scsi/mpt2sas | |
parent | d315777b32a4696feb86f2a0c9e9f39c94683649 (diff) |
[SCSI] mpt2sas: Revision P MPI Header Update
Revision P MPI Header Update:
a) Added enable/disable SATA NCQ operations to SAS IO Unit Control
Request.
b) Modified Host Based Discovery Action Request message format.
c) Removed Device Path bit from IO Unit Page 1 Flags field.
d) Added description of ChainOffset field for Diagnostic Data Upload
Tool.Chaining is not allowed.
Removed mpi2_history.txt file
Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/mpt2sas')
-rw-r--r-- | drivers/scsi/mpt2sas/mpi/mpi2.h | 5 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 6 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 384 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpi/mpi2_sas.h | 7 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 8 |
5 files changed, 18 insertions, 392 deletions
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2.h b/drivers/scsi/mpt2sas/mpi/mpi2.h index 8be75e65f763..a3e60385787f 100644 --- a/drivers/scsi/mpt2sas/mpi/mpi2.h +++ b/drivers/scsi/mpt2sas/mpi/mpi2.h | |||
@@ -8,7 +8,7 @@ | |||
8 | * scatter/gather formats. | 8 | * scatter/gather formats. |
9 | * Creation Date: June 21, 2006 | 9 | * Creation Date: June 21, 2006 |
10 | * | 10 | * |
11 | * mpi2.h Version: 02.00.16 | 11 | * mpi2.h Version: 02.00.17 |
12 | * | 12 | * |
13 | * Version History | 13 | * Version History |
14 | * --------------- | 14 | * --------------- |
@@ -63,6 +63,7 @@ | |||
63 | * function codes, 0xF0 to 0xFF. | 63 | * function codes, 0xF0 to 0xFF. |
64 | * 05-12-10 02.00.16 Bumped MPI2_HEADER_VERSION_UNIT. | 64 | * 05-12-10 02.00.16 Bumped MPI2_HEADER_VERSION_UNIT. |
65 | * Added alternative defines for the SGE Direction bit. | 65 | * Added alternative defines for the SGE Direction bit. |
66 | * 08-11-10 02.00.17 Bumped MPI2_HEADER_VERSION_UNIT. | ||
66 | * -------------------------------------------------------------------------- | 67 | * -------------------------------------------------------------------------- |
67 | */ | 68 | */ |
68 | 69 | ||
@@ -88,7 +89,7 @@ | |||
88 | #define MPI2_VERSION_02_00 (0x0200) | 89 | #define MPI2_VERSION_02_00 (0x0200) |
89 | 90 | ||
90 | /* versioning for this MPI header set */ | 91 | /* versioning for this MPI header set */ |
91 | #define MPI2_HEADER_VERSION_UNIT (0x10) | 92 | #define MPI2_HEADER_VERSION_UNIT (0x11) |
92 | #define MPI2_HEADER_VERSION_DEV (0x00) | 93 | #define MPI2_HEADER_VERSION_DEV (0x00) |
93 | #define MPI2_HEADER_VERSION_UNIT_MASK (0xFF00) | 94 | #define MPI2_HEADER_VERSION_UNIT_MASK (0xFF00) |
94 | #define MPI2_HEADER_VERSION_UNIT_SHIFT (8) | 95 | #define MPI2_HEADER_VERSION_UNIT_SHIFT (8) |
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h index d76a65847603..f5b9c766e28f 100644 --- a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h +++ b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | |||
@@ -6,7 +6,7 @@ | |||
6 | * Title: MPI Configuration messages and pages | 6 | * Title: MPI Configuration messages and pages |
7 | * Creation Date: November 10, 2006 | 7 | * Creation Date: November 10, 2006 |
8 | * | 8 | * |
9 | * mpi2_cnfg.h Version: 02.00.15 | 9 | * mpi2_cnfg.h Version: 02.00.16 |
10 | * | 10 | * |
11 | * Version History | 11 | * Version History |
12 | * --------------- | 12 | * --------------- |
@@ -125,6 +125,8 @@ | |||
125 | * define. | 125 | * define. |
126 | * Added MPI2_PHYSDISK0_INCOMPATIBLE_MEDIA_TYPE define. | 126 | * Added MPI2_PHYSDISK0_INCOMPATIBLE_MEDIA_TYPE define. |
127 | * Added MPI2_SAS_NEG_LINK_RATE_UNSUPPORTED_PHY define. | 127 | * Added MPI2_SAS_NEG_LINK_RATE_UNSUPPORTED_PHY define. |
128 | * 08-11-10 02.00.16 Removed IO Unit Page 1 device path (multi-pathing) | ||
129 | * defines. | ||
128 | * -------------------------------------------------------------------------- | 130 | * -------------------------------------------------------------------------- |
129 | */ | 131 | */ |
130 | 132 | ||
@@ -745,8 +747,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_1 | |||
745 | #define MPI2_IOUNITPAGE1_DISABLE_IR (0x00000040) | 747 | #define MPI2_IOUNITPAGE1_DISABLE_IR (0x00000040) |
746 | #define MPI2_IOUNITPAGE1_DISABLE_TASK_SET_FULL_HANDLING (0x00000020) | 748 | #define MPI2_IOUNITPAGE1_DISABLE_TASK_SET_FULL_HANDLING (0x00000020) |
747 | #define MPI2_IOUNITPAGE1_IR_USE_STATIC_VOLUME_ID (0x00000004) | 749 | #define MPI2_IOUNITPAGE1_IR_USE_STATIC_VOLUME_ID (0x00000004) |
748 | #define MPI2_IOUNITPAGE1_MULTI_PATHING (0x00000002) | ||
749 | #define MPI2_IOUNITPAGE1_SINGLE_PATHING (0x00000000) | ||
750 | 750 | ||
751 | 751 | ||
752 | /* IO Unit Page 3 */ | 752 | /* IO Unit Page 3 */ |
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_history.txt b/drivers/scsi/mpt2sas/mpi/mpi2_history.txt deleted file mode 100644 index b1e88f26b748..000000000000 --- a/drivers/scsi/mpt2sas/mpi/mpi2_history.txt +++ /dev/null | |||
@@ -1,384 +0,0 @@ | |||
1 | ============================== | ||
2 | Fusion-MPT MPI 2.0 Header File Change History | ||
3 | ============================== | ||
4 | |||
5 | Copyright (c) 2000-2010 LSI Corporation. | ||
6 | |||
7 | --------------------------------------- | ||
8 | Header Set Release Version: 02.00.14 | ||
9 | Header Set Release Date: 10-28-09 | ||
10 | --------------------------------------- | ||
11 | |||
12 | Filename Current version Prior version | ||
13 | ---------- --------------- ------------- | ||
14 | mpi2.h 02.00.14 02.00.13 | ||
15 | mpi2_cnfg.h 02.00.13 02.00.12 | ||
16 | mpi2_init.h 02.00.08 02.00.07 | ||
17 | mpi2_ioc.h 02.00.13 02.00.12 | ||
18 | mpi2_raid.h 02.00.04 02.00.04 | ||
19 | mpi2_sas.h 02.00.03 02.00.02 | ||
20 | mpi2_targ.h 02.00.03 02.00.03 | ||
21 | mpi2_tool.h 02.00.04 02.00.04 | ||
22 | mpi2_type.h 02.00.00 02.00.00 | ||
23 | mpi2_ra.h 02.00.00 02.00.00 | ||
24 | mpi2_hbd.h 02.00.00 | ||
25 | mpi2_history.txt 02.00.14 02.00.13 | ||
26 | |||
27 | |||
28 | * Date Version Description | ||
29 | * -------- -------- ------------------------------------------------------ | ||
30 | |||
31 | mpi2.h | ||
32 | * 04-30-07 02.00.00 Corresponds to Fusion-MPT MPI Specification Rev A. | ||
33 | * 06-04-07 02.00.01 Bumped MPI2_HEADER_VERSION_UNIT. | ||
34 | * 06-26-07 02.00.02 Bumped MPI2_HEADER_VERSION_UNIT. | ||
35 | * 08-31-07 02.00.03 Bumped MPI2_HEADER_VERSION_UNIT. | ||
36 | * Moved ReplyPostHostIndex register to offset 0x6C of the | ||
37 | * MPI2_SYSTEM_INTERFACE_REGS and modified the define for | ||
38 | * MPI2_REPLY_POST_HOST_INDEX_OFFSET. | ||
39 | * Added union of request descriptors. | ||
40 | * Added union of reply descriptors. | ||
41 | * 10-31-07 02.00.04 Bumped MPI2_HEADER_VERSION_UNIT. | ||
42 | * Added define for MPI2_VERSION_02_00. | ||
43 | * Fixed the size of the FunctionDependent5 field in the | ||
44 | * MPI2_DEFAULT_REPLY structure. | ||
45 | * 12-18-07 02.00.05 Bumped MPI2_HEADER_VERSION_UNIT. | ||
46 | * Removed the MPI-defined Fault Codes and extended the | ||
47 | * product specific codes up to 0xEFFF. | ||
48 | * Added a sixth key value for the WriteSequence register | ||
49 | * and changed the flush value to 0x0. | ||
50 | * Added message function codes for Diagnostic Buffer Post | ||
51 | * and Diagnsotic Release. | ||
52 | * New IOCStatus define: MPI2_IOCSTATUS_DIAGNOSTIC_RELEASED | ||
53 | * Moved MPI2_VERSION_UNION from mpi2_ioc.h. | ||
54 | * 02-29-08 02.00.06 Bumped MPI2_HEADER_VERSION_UNIT. | ||
55 | * 03-03-08 02.00.07 Bumped MPI2_HEADER_VERSION_UNIT. | ||
56 | * 05-21-08 02.00.08 Bumped MPI2_HEADER_VERSION_UNIT. | ||
57 | * Added #defines for marking a reply descriptor as unused. | ||
58 | * 06-27-08 02.00.09 Bumped MPI2_HEADER_VERSION_UNIT. | ||
59 | * 10-02-08 02.00.10 Bumped MPI2_HEADER_VERSION_UNIT. | ||
60 | * Moved LUN field defines from mpi2_init.h. | ||
61 | * 01-19-09 02.00.11 Bumped MPI2_HEADER_VERSION_UNIT. | ||
62 | * 05-06-09 02.00.12 Bumped MPI2_HEADER_VERSION_UNIT. | ||
63 | * In all request and reply descriptors, replaced VF_ID | ||
64 | * field with MSIxIndex field. | ||
65 | * Removed DevHandle field from | ||
66 | * MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR and made those | ||
67 | * bytes reserved. | ||
68 | * Added RAID Accelerator functionality. | ||
69 | * 07-30-09 02.00.13 Bumped MPI2_HEADER_VERSION_UNIT. | ||
70 | * 10-28-09 02.00.14 Bumped MPI2_HEADER_VERSION_UNIT. | ||
71 | * Added MSI-x index mask and shift for Reply Post Host | ||
72 | * Index register. | ||
73 | * Added function code for Host Based Discovery Action. | ||
74 | * -------------------------------------------------------------------------- | ||
75 | |||
76 | mpi2_cnfg.h | ||
77 | * 04-30-07 02.00.00 Corresponds to Fusion-MPT MPI Specification Rev A. | ||
78 | * 06-04-07 02.00.01 Added defines for SAS IO Unit Page 2 PhyFlags. | ||
79 | * Added Manufacturing Page 11. | ||
80 | * Added MPI2_SAS_EXPANDER0_FLAGS_CONNECTOR_END_DEVICE | ||
81 | * define. | ||
82 | * 06-26-07 02.00.02 Adding generic structure for product-specific | ||
83 | * Manufacturing pages: MPI2_CONFIG_PAGE_MANUFACTURING_PS. | ||
84 | * Rework of BIOS Page 2 configuration page. | ||
85 | * Fixed MPI2_BIOSPAGE2_BOOT_DEVICE to be a union of the | ||
86 | * forms. | ||
87 | * Added configuration pages IOC Page 8 and Driver | ||
88 | * Persistent Mapping Page 0. | ||
89 | * 08-31-07 02.00.03 Modified configuration pages dealing with Integrated | ||
90 | * RAID (Manufacturing Page 4, RAID Volume Pages 0 and 1, | ||
91 | * RAID Physical Disk Pages 0 and 1, RAID Configuration | ||
92 | * Page 0). | ||
93 | * Added new value for AccessStatus field of SAS Device | ||
94 | * Page 0 (_SATA_NEEDS_INITIALIZATION). | ||
95 | * 10-31-07 02.00.04 Added missing SEPDevHandle field to | ||
96 | * MPI2_CONFIG_PAGE_SAS_ENCLOSURE_0. | ||
97 | * 12-18-07 02.00.05 Modified IO Unit Page 0 to use 32-bit version fields for | ||
98 | * NVDATA. | ||
99 | * Modified IOC Page 7 to use masks and added field for | ||
100 | * SASBroadcastPrimitiveMasks. | ||
101 | * Added MPI2_CONFIG_PAGE_BIOS_4. | ||
102 | * Added MPI2_CONFIG_PAGE_LOG_0. | ||
103 | * 02-29-08 02.00.06 Modified various names to make them 32-character unique. | ||
104 | * Added SAS Device IDs. | ||
105 | * Updated Integrated RAID configuration pages including | ||
106 | * Manufacturing Page 4, IOC Page 6, and RAID Configuration | ||
107 | * Page 0. | ||
108 | * 05-21-08 02.00.07 Added define MPI2_MANPAGE4_MIX_SSD_SAS_SATA. | ||
109 | * Added define MPI2_MANPAGE4_PHYSDISK_128MB_COERCION. | ||
110 | * Fixed define MPI2_IOCPAGE8_FLAGS_ENCLOSURE_SLOT_MAPPING. | ||
111 | * Added missing MaxNumRoutedSasAddresses field to | ||
112 | * MPI2_CONFIG_PAGE_EXPANDER_0. | ||
113 | * Added SAS Port Page 0. | ||
114 | * Modified structure layout for | ||
115 | * MPI2_CONFIG_PAGE_DRIVER_MAPPING_0. | ||
116 | * 06-27-08 02.00.08 Changed MPI2_CONFIG_PAGE_RD_PDISK_1 to use | ||
117 | * MPI2_RAID_PHYS_DISK1_PATH_MAX to size the array. | ||
118 | * 10-02-08 02.00.09 Changed MPI2_RAID_PGAD_CONFIGNUM_MASK from 0x0000FFFF | ||
119 | * to 0x000000FF. | ||
120 | * Added two new values for the Physical Disk Coercion Size | ||
121 | * bits in the Flags field of Manufacturing Page 4. | ||
122 | * Added product-specific Manufacturing pages 16 to 31. | ||
123 | * Modified Flags bits for controlling write cache on SATA | ||
124 | * drives in IO Unit Page 1. | ||
125 | * Added new bit to AdditionalControlFlags of SAS IO Unit | ||
126 | * Page 1 to control Invalid Topology Correction. | ||
127 | * Added SupportedPhysDisks field to RAID Volume Page 1 and | ||
128 | * added related defines. | ||
129 | * Added additional defines for RAID Volume Page 0 | ||
130 | * VolumeStatusFlags field. | ||
131 | * Modified meaning of RAID Volume Page 0 VolumeSettings | ||
132 | * define for auto-configure of hot-swap drives. | ||
133 | * Added PhysDiskAttributes field (and related defines) to | ||
134 | * RAID Physical Disk Page 0. | ||
135 | * Added MPI2_SAS_PHYINFO_PHY_VACANT define. | ||
136 | * Added three new DiscoveryStatus bits for SAS IO Unit | ||
137 | * Page 0 and SAS Expander Page 0. | ||
138 | * Removed multiplexing information from SAS IO Unit pages. | ||
139 | * Added BootDeviceWaitTime field to SAS IO Unit Page 4. | ||
140 | * Removed Zone Address Resolved bit from PhyInfo and from | ||
141 | * Expander Page 0 Flags field. | ||
142 | * Added two new AccessStatus values to SAS Device Page 0 | ||
143 | * for indicating routing problems. Added 3 reserved words | ||
144 | * to this page. | ||
145 | * 01-19-09 02.00.10 Fixed defines for GPIOVal field of IO Unit Page 3. | ||
146 | * Inserted missing reserved field into structure for IOC | ||
147 | * Page 6. | ||
148 | * Added more pending task bits to RAID Volume Page 0 | ||
149 | * VolumeStatusFlags defines. | ||
150 | * Added MPI2_PHYSDISK0_STATUS_FLAG_NOT_CERTIFIED define. | ||
151 | * Added a new DiscoveryStatus bit for SAS IO Unit Page 0 | ||
152 | * and SAS Expander Page 0 to flag a downstream initiator | ||
153 | * when in simplified routing mode. | ||
154 | * Removed SATA Init Failure defines for DiscoveryStatus | ||
155 | * fields of SAS IO Unit Page 0 and SAS Expander Page 0. | ||
156 | * Added MPI2_SAS_DEVICE0_ASTATUS_DEVICE_BLOCKED define. | ||
157 | * Added PortGroups, DmaGroup, and ControlGroup fields to | ||
158 | * SAS Device Page 0. | ||
159 | * 05-06-09 02.00.11 Added structures and defines for IO Unit Page 5 and IO | ||
160 | * Unit Page 6. | ||
161 | * Added expander reduced functionality data to SAS | ||
162 | * Expander Page 0. | ||
163 | * Added SAS PHY Page 2 and SAS PHY Page 3. | ||
164 | * 07-30-09 02.00.12 Added IO Unit Page 7. | ||
165 | * Added new device ids. | ||
166 | * Added SAS IO Unit Page 5. | ||
167 | * Added partial and slumber power management capable flags | ||
168 | * to SAS Device Page 0 Flags field. | ||
169 | * Added PhyInfo defines for power condition. | ||
170 | * Added Ethernet configuration pages. | ||
171 | * 10-28-09 02.00.13 Added MPI2_IOUNITPAGE1_ENABLE_HOST_BASED_DISCOVERY. | ||
172 | * Added SAS PHY Page 4 structure and defines. | ||
173 | * -------------------------------------------------------------------------- | ||
174 | |||
175 | mpi2_init.h | ||
176 | * 04-30-07 02.00.00 Corresponds to Fusion-MPT MPI Specification Rev A. | ||
177 | * 10-31-07 02.00.01 Fixed name for pMpi2SCSITaskManagementRequest_t. | ||
178 | * 12-18-07 02.00.02 Modified Task Management Target Reset Method defines. | ||
179 | * 02-29-08 02.00.03 Added Query Task Set and Query Unit Attention. | ||
180 | * 03-03-08 02.00.04 Fixed name of struct _MPI2_SCSI_TASK_MANAGE_REPLY. | ||
181 | * 05-21-08 02.00.05 Fixed typo in name of Mpi2SepRequest_t. | ||
182 | * 10-02-08 02.00.06 Removed Untagged and No Disconnect values from SCSI IO | ||
183 | * Control field Task Attribute flags. | ||
184 | * Moved LUN field defines to mpi2.h becasue they are | ||
185 | * common to many structures. | ||
186 | * 05-06-09 02.00.07 Changed task management type of Query Unit Attention to | ||
187 | * Query Asynchronous Event. | ||
188 | * Defined two new bits in the SlotStatus field of the SCSI | ||
189 | * Enclosure Processor Request and Reply. | ||
190 | * 10-28-09 02.00.08 Added defines for decoding the ResponseInfo bytes for | ||
191 | * both SCSI IO Error Reply and SCSI Task Management Reply. | ||
192 | * Added ResponseInfo field to MPI2_SCSI_TASK_MANAGE_REPLY. | ||
193 | * Added MPI2_SCSITASKMGMT_RSP_TM_OVERLAPPED_TAG define. | ||
194 | * -------------------------------------------------------------------------- | ||
195 | |||
196 | mpi2_ioc.h | ||
197 | * 04-30-07 02.00.00 Corresponds to Fusion-MPT MPI Specification Rev A. | ||
198 | * 06-04-07 02.00.01 In IOCFacts Reply structure, renamed MaxDevices to | ||
199 | * MaxTargets. | ||
200 | * Added TotalImageSize field to FWDownload Request. | ||
201 | * Added reserved words to FWUpload Request. | ||
202 | * 06-26-07 02.00.02 Added IR Configuration Change List Event. | ||
203 | * 08-31-07 02.00.03 Removed SystemReplyQueueDepth field from the IOCInit | ||
204 | * request and replaced it with | ||
205 | * ReplyDescriptorPostQueueDepth and ReplyFreeQueueDepth. | ||
206 | * Replaced the MinReplyQueueDepth field of the IOCFacts | ||
207 | * reply with MaxReplyDescriptorPostQueueDepth. | ||
208 | * Added MPI2_RDPQ_DEPTH_MIN define to specify the minimum | ||
209 | * depth for the Reply Descriptor Post Queue. | ||
210 | * Added SASAddress field to Initiator Device Table | ||
211 | * Overflow Event data. | ||
212 | * 10-31-07 02.00.04 Added ReasonCode MPI2_EVENT_SAS_INIT_RC_NOT_RESPONDING | ||
213 | * for SAS Initiator Device Status Change Event data. | ||
214 | * Modified Reason Code defines for SAS Topology Change | ||
215 | * List Event data, including adding a bit for PHY Vacant | ||
216 | * status, and adding a mask for the Reason Code. | ||
217 | * Added define for | ||
218 | * MPI2_EVENT_SAS_TOPO_ES_DELAY_NOT_RESPONDING. | ||
219 | * Added define for MPI2_EXT_IMAGE_TYPE_MEGARAID. | ||
220 | * 12-18-07 02.00.05 Added Boot Status defines for the IOCExceptions field of | ||
221 | * the IOCFacts Reply. | ||
222 | * Removed MPI2_IOCFACTS_CAPABILITY_EXTENDED_BUFFER define. | ||
223 | * Moved MPI2_VERSION_UNION to mpi2.h. | ||
224 | * Changed MPI2_EVENT_NOTIFICATION_REQUEST to use masks | ||
225 | * instead of enables, and added SASBroadcastPrimitiveMasks | ||
226 | * field. | ||
227 | * Added Log Entry Added Event and related structure. | ||
228 | * 02-29-08 02.00.06 Added define MPI2_IOCFACTS_CAPABILITY_INTEGRATED_RAID. | ||
229 | * Removed define MPI2_IOCFACTS_PROTOCOL_SMP_TARGET. | ||
230 | * Added MaxVolumes and MaxPersistentEntries fields to | ||
231 | * IOCFacts reply. | ||
232 | * Added ProtocalFlags and IOCCapabilities fields to | ||
233 | * MPI2_FW_IMAGE_HEADER. | ||
234 | * Removed MPI2_PORTENABLE_FLAGS_ENABLE_SINGLE_PORT. | ||
235 | * 03-03-08 02.00.07 Fixed MPI2_FW_IMAGE_HEADER by changing Reserved26 to | ||
236 | * a U16 (from a U32). | ||
237 | * Removed extra 's' from EventMasks name. | ||
238 | * 06-27-08 02.00.08 Fixed an offset in a comment. | ||
239 | * 10-02-08 02.00.09 Removed SystemReplyFrameSize from MPI2_IOC_INIT_REQUEST. | ||
240 | * Removed CurReplyFrameSize from MPI2_IOC_FACTS_REPLY and | ||
241 | * renamed MinReplyFrameSize to ReplyFrameSize. | ||
242 | * Added MPI2_IOCFACTS_EXCEPT_IR_FOREIGN_CONFIG_MAX. | ||
243 | * Added two new RAIDOperation values for Integrated RAID | ||
244 | * Operations Status Event data. | ||
245 | * Added four new IR Configuration Change List Event data | ||
246 | * ReasonCode values. | ||
247 | * Added two new ReasonCode defines for SAS Device Status | ||
248 | * Change Event data. | ||
249 | * Added three new DiscoveryStatus bits for the SAS | ||
250 | * Discovery event data. | ||
251 | * Added Multiplexing Status Change bit to the PhyStatus | ||
252 | * field of the SAS Topology Change List event data. | ||
253 | * Removed define for MPI2_INIT_IMAGE_BOOTFLAGS_XMEMCOPY. | ||
254 | * BootFlags are now product-specific. | ||
255 | * Added defines for the indivdual signature bytes | ||
256 | * for MPI2_INIT_IMAGE_FOOTER. | ||
257 | * 01-19-09 02.00.10 Added MPI2_IOCFACTS_CAPABILITY_EVENT_REPLAY define. | ||
258 | * Added MPI2_EVENT_SAS_DISC_DS_DOWNSTREAM_INITIATOR | ||
259 | * define. | ||
260 | * Added MPI2_EVENT_SAS_DEV_STAT_RC_SATA_INIT_FAILURE | ||
261 | * define. | ||
262 | * Removed MPI2_EVENT_SAS_DISC_DS_SATA_INIT_FAILURE define. | ||
263 | * 05-06-09 02.00.11 Added MPI2_IOCFACTS_CAPABILITY_RAID_ACCELERATOR define. | ||
264 | * Added MPI2_IOCFACTS_CAPABILITY_MSI_X_INDEX define. | ||
265 | * Added two new reason codes for SAS Device Status Change | ||
266 | * Event. | ||
267 | * Added new event: SAS PHY Counter. | ||
268 | * 07-30-09 02.00.12 Added GPIO Interrupt event define and structure. | ||
269 | * Added MPI2_IOCFACTS_CAPABILITY_EXTENDED_BUFFER define. | ||
270 | * Added new product id family for 2208. | ||
271 | * 10-28-09 02.00.13 Added HostMSIxVectors field to MPI2_IOC_INIT_REQUEST. | ||
272 | * Added MaxMSIxVectors field to MPI2_IOC_FACTS_REPLY. | ||
273 | * Added MinDevHandle field to MPI2_IOC_FACTS_REPLY. | ||
274 | * Added MPI2_IOCFACTS_CAPABILITY_HOST_BASED_DISCOVERY. | ||
275 | * Added MPI2_EVENT_HOST_BASED_DISCOVERY_PHY define. | ||
276 | * Added MPI2_EVENT_SAS_TOPO_ES_NO_EXPANDER define. | ||
277 | * Added Host Based Discovery Phy Event data. | ||
278 | * Added defines for ProductID Product field | ||
279 | * (MPI2_FW_HEADER_PID_). | ||
280 | * Modified values for SAS ProductID Family | ||
281 | * (MPI2_FW_HEADER_PID_FAMILY_). | ||
282 | * -------------------------------------------------------------------------- | ||
283 | |||
284 | mpi2_raid.h | ||
285 | * 04-30-07 02.00.00 Corresponds to Fusion-MPT MPI Specification Rev A. | ||
286 | * 08-31-07 02.00.01 Modifications to RAID Action request and reply, | ||
287 | * including the Actions and ActionData. | ||
288 | * 02-29-08 02.00.02 Added MPI2_RAID_ACTION_ADATA_DISABL_FULL_REBUILD. | ||
289 | * 05-21-08 02.00.03 Added MPI2_RAID_VOL_CREATION_NUM_PHYSDISKS so that | ||
290 | * the PhysDisk array in MPI2_RAID_VOLUME_CREATION_STRUCT | ||
291 | * can be sized by the build environment. | ||
292 | * 07-30-09 02.00.04 Added proper define for the Use Default Settings bit of | ||
293 | * VolumeCreationFlags and marked the old one as obsolete. | ||
294 | * 05-12-10 02.00.05 Added MPI2_RAID_VOL_FLAGS_OP_MDC define. | ||
295 | * -------------------------------------------------------------------------- | ||
296 | |||
297 | mpi2_sas.h | ||
298 | * 04-30-07 02.00.00 Corresponds to Fusion-MPT MPI Specification Rev A. | ||
299 | * 06-26-07 02.00.01 Added Clear All Persistent Operation to SAS IO Unit | ||
300 | * Control Request. | ||
301 | * 10-02-08 02.00.02 Added Set IOC Parameter Operation to SAS IO Unit Control | ||
302 | * Request. | ||
303 | * 10-28-09 02.00.03 Changed the type of SGL in MPI2_SATA_PASSTHROUGH_REQUEST | ||
304 | * to MPI2_SGE_IO_UNION since it supports chained SGLs. | ||
305 | * 05-12-10 02.00.04 Modified some comments. | ||
306 | * -------------------------------------------------------------------------- | ||
307 | |||
308 | mpi2_targ.h | ||
309 | * 04-30-07 02.00.00 Corresponds to Fusion-MPT MPI Specification Rev A. | ||
310 | * 08-31-07 02.00.01 Added Command Buffer Data Location Address Space bits to | ||
311 | * BufferPostFlags field of CommandBufferPostBase Request. | ||
312 | * 02-29-08 02.00.02 Modified various names to make them 32-character unique. | ||
313 | * 10-02-08 02.00.03 Removed NextCmdBufferOffset from | ||
314 | * MPI2_TARGET_CMD_BUF_POST_BASE_REQUEST. | ||
315 | * Target Status Send Request only takes a single SGE for | ||
316 | * response data. | ||
317 | * -------------------------------------------------------------------------- | ||
318 | |||
319 | mpi2_tool.h | ||
320 | * 04-30-07 02.00.00 Corresponds to Fusion-MPT MPI Specification Rev A. | ||
321 | * 12-18-07 02.00.01 Added Diagnostic Buffer Post and Diagnostic Release | ||
322 | * structures and defines. | ||
323 | * 02-29-08 02.00.02 Modified various names to make them 32-character unique. | ||
324 | * 05-06-09 02.00.03 Added ISTWI Read Write Tool and Diagnostic CLI Tool. | ||
325 | * 07-30-09 02.00.04 Added ExtendedType field to DiagnosticBufferPost request | ||
326 | * and reply messages. | ||
327 | * Added MPI2_DIAG_BUF_TYPE_EXTENDED. | ||
328 | * Incremented MPI2_DIAG_BUF_TYPE_COUNT. | ||
329 | * 05-12-10 02.00.05 Added Diagnostic Data Upload tool. | ||
330 | * -------------------------------------------------------------------------- | ||
331 | |||
332 | mpi2_type.h | ||
333 | * 04-30-07 02.00.00 Corresponds to Fusion-MPT MPI Specification Rev A. | ||
334 | * -------------------------------------------------------------------------- | ||
335 | |||
336 | mpi2_ra.h | ||
337 | * 05-06-09 02.00.00 Initial version. | ||
338 | * -------------------------------------------------------------------------- | ||
339 | |||
340 | mpi2_hbd.h | ||
341 | * 10-28-09 02.00.00 Initial version. | ||
342 | * -------------------------------------------------------------------------- | ||
343 | |||
344 | |||
345 | mpi2_history.txt Parts list history | ||
346 | |||
347 | Filename 02.00.14 02.00.13 02.00.12 | ||
348 | ---------- -------- -------- -------- | ||
349 | mpi2.h 02.00.14 02.00.13 02.00.12 | ||
350 | mpi2_cnfg.h 02.00.13 02.00.12 02.00.11 | ||
351 | mpi2_init.h 02.00.08 02.00.07 02.00.07 | ||
352 | mpi2_ioc.h 02.00.13 02.00.12 02.00.11 | ||
353 | mpi2_raid.h 02.00.04 02.00.04 02.00.03 | ||
354 | mpi2_sas.h 02.00.03 02.00.02 02.00.02 | ||
355 | mpi2_targ.h 02.00.03 02.00.03 02.00.03 | ||
356 | mpi2_tool.h 02.00.04 02.00.04 02.00.03 | ||
357 | mpi2_type.h 02.00.00 02.00.00 02.00.00 | ||
358 | mpi2_ra.h 02.00.00 02.00.00 02.00.00 | ||
359 | mpi2_hbd.h 02.00.00 | ||
360 | |||
361 | Filename 02.00.11 02.00.10 02.00.09 02.00.08 02.00.07 02.00.06 | ||
362 | ---------- -------- -------- -------- -------- -------- -------- | ||
363 | mpi2.h 02.00.11 02.00.10 02.00.09 02.00.08 02.00.07 02.00.06 | ||
364 | mpi2_cnfg.h 02.00.10 02.00.09 02.00.08 02.00.07 02.00.06 02.00.06 | ||
365 | mpi2_init.h 02.00.06 02.00.06 02.00.05 02.00.05 02.00.04 02.00.03 | ||
366 | mpi2_ioc.h 02.00.10 02.00.09 02.00.08 02.00.07 02.00.07 02.00.06 | ||
367 | mpi2_raid.h 02.00.03 02.00.03 02.00.03 02.00.03 02.00.02 02.00.02 | ||
368 | mpi2_sas.h 02.00.02 02.00.02 02.00.01 02.00.01 02.00.01 02.00.01 | ||
369 | mpi2_targ.h 02.00.03 02.00.03 02.00.02 02.00.02 02.00.02 02.00.02 | ||
370 | mpi2_tool.h 02.00.02 02.00.02 02.00.02 02.00.02 02.00.02 02.00.02 | ||
371 | mpi2_type.h 02.00.00 02.00.00 02.00.00 02.00.00 02.00.00 02.00.00 | ||
372 | |||
373 | Filename 02.00.05 02.00.04 02.00.03 02.00.02 02.00.01 02.00.00 | ||
374 | ---------- -------- -------- -------- -------- -------- -------- | ||
375 | mpi2.h 02.00.05 02.00.04 02.00.03 02.00.02 02.00.01 02.00.00 | ||
376 | mpi2_cnfg.h 02.00.05 02.00.04 02.00.03 02.00.02 02.00.01 02.00.00 | ||
377 | mpi2_init.h 02.00.02 02.00.01 02.00.00 02.00.00 02.00.00 02.00.00 | ||
378 | mpi2_ioc.h 02.00.05 02.00.04 02.00.03 02.00.02 02.00.01 02.00.00 | ||
379 | mpi2_raid.h 02.00.01 02.00.01 02.00.01 02.00.00 02.00.00 02.00.00 | ||
380 | mpi2_sas.h 02.00.01 02.00.01 02.00.01 02.00.01 02.00.00 02.00.00 | ||
381 | mpi2_targ.h 02.00.01 02.00.01 02.00.01 02.00.00 02.00.00 02.00.00 | ||
382 | mpi2_tool.h 02.00.01 02.00.00 02.00.00 02.00.00 02.00.00 02.00.00 | ||
383 | mpi2_type.h 02.00.00 02.00.00 02.00.00 02.00.00 02.00.00 02.00.00 | ||
384 | |||
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_sas.h b/drivers/scsi/mpt2sas/mpi/mpi2_sas.h index 608f6d6e6fca..fdffde1ebc0f 100644 --- a/drivers/scsi/mpt2sas/mpi/mpi2_sas.h +++ b/drivers/scsi/mpt2sas/mpi/mpi2_sas.h | |||
@@ -6,7 +6,7 @@ | |||
6 | * Title: MPI Serial Attached SCSI structures and definitions | 6 | * Title: MPI Serial Attached SCSI structures and definitions |
7 | * Creation Date: February 9, 2007 | 7 | * Creation Date: February 9, 2007 |
8 | * | 8 | * |
9 | * mpi2_sas.h Version: 02.00.04 | 9 | * mpi2_sas.h Version: 02.00.05 |
10 | * | 10 | * |
11 | * Version History | 11 | * Version History |
12 | * --------------- | 12 | * --------------- |
@@ -21,6 +21,7 @@ | |||
21 | * 10-28-09 02.00.03 Changed the type of SGL in MPI2_SATA_PASSTHROUGH_REQUEST | 21 | * 10-28-09 02.00.03 Changed the type of SGL in MPI2_SATA_PASSTHROUGH_REQUEST |
22 | * to MPI2_SGE_IO_UNION since it supports chained SGLs. | 22 | * to MPI2_SGE_IO_UNION since it supports chained SGLs. |
23 | * 05-12-10 02.00.04 Modified some comments. | 23 | * 05-12-10 02.00.04 Modified some comments. |
24 | * 08-11-10 02.00.05 Added NCQ operations to SAS IO Unit Control. | ||
24 | * -------------------------------------------------------------------------- | 25 | * -------------------------------------------------------------------------- |
25 | */ | 26 | */ |
26 | 27 | ||
@@ -163,7 +164,7 @@ typedef struct _MPI2_SATA_PASSTHROUGH_REQUEST | |||
163 | U32 Reserved4; /* 0x14 */ | 164 | U32 Reserved4; /* 0x14 */ |
164 | U32 DataLength; /* 0x18 */ | 165 | U32 DataLength; /* 0x18 */ |
165 | U8 CommandFIS[20]; /* 0x1C */ | 166 | U8 CommandFIS[20]; /* 0x1C */ |
166 | MPI2_SGE_IO_UNION SGL; /* 0x20 */ | 167 | MPI2_SGE_IO_UNION SGL; /* 0x30 */ |
167 | } MPI2_SATA_PASSTHROUGH_REQUEST, MPI2_POINTER PTR_MPI2_SATA_PASSTHROUGH_REQUEST, | 168 | } MPI2_SATA_PASSTHROUGH_REQUEST, MPI2_POINTER PTR_MPI2_SATA_PASSTHROUGH_REQUEST, |
168 | Mpi2SataPassthroughRequest_t, MPI2_POINTER pMpi2SataPassthroughRequest_t; | 169 | Mpi2SataPassthroughRequest_t, MPI2_POINTER pMpi2SataPassthroughRequest_t; |
169 | 170 | ||
@@ -246,6 +247,8 @@ typedef struct _MPI2_SAS_IOUNIT_CONTROL_REQUEST | |||
246 | #define MPI2_SAS_OP_REMOVE_DEVICE (0x0D) | 247 | #define MPI2_SAS_OP_REMOVE_DEVICE (0x0D) |
247 | #define MPI2_SAS_OP_LOOKUP_MAPPING (0x0E) | 248 | #define MPI2_SAS_OP_LOOKUP_MAPPING (0x0E) |
248 | #define MPI2_SAS_OP_SET_IOC_PARAMETER (0x0F) | 249 | #define MPI2_SAS_OP_SET_IOC_PARAMETER (0x0F) |
250 | #define MPI2_SAS_OP_DEV_ENABLE_NCQ (0x14) | ||
251 | #define MPI2_SAS_OP_DEV_DISABLE_NCQ (0x15) | ||
249 | #define MPI2_SAS_OP_PRODUCT_SPECIFIC_MIN (0x80) | 252 | #define MPI2_SAS_OP_PRODUCT_SPECIFIC_MIN (0x80) |
250 | 253 | ||
251 | /* values for the PrimFlags field */ | 254 | /* values for the PrimFlags field */ |
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_tool.h b/drivers/scsi/mpt2sas/mpi/mpi2_tool.h index 5c6e3a67bb94..2a4bceda364b 100644 --- a/drivers/scsi/mpt2sas/mpi/mpi2_tool.h +++ b/drivers/scsi/mpt2sas/mpi/mpi2_tool.h | |||
@@ -6,7 +6,7 @@ | |||
6 | * Title: MPI diagnostic tool structures and definitions | 6 | * Title: MPI diagnostic tool structures and definitions |
7 | * Creation Date: March 26, 2007 | 7 | * Creation Date: March 26, 2007 |
8 | * | 8 | * |
9 | * mpi2_tool.h Version: 02.00.05 | 9 | * mpi2_tool.h Version: 02.00.06 |
10 | * | 10 | * |
11 | * Version History | 11 | * Version History |
12 | * --------------- | 12 | * --------------- |
@@ -23,6 +23,8 @@ | |||
23 | * Added MPI2_DIAG_BUF_TYPE_EXTENDED. | 23 | * Added MPI2_DIAG_BUF_TYPE_EXTENDED. |
24 | * Incremented MPI2_DIAG_BUF_TYPE_COUNT. | 24 | * Incremented MPI2_DIAG_BUF_TYPE_COUNT. |
25 | * 05-12-10 02.00.05 Added Diagnostic Data Upload tool. | 25 | * 05-12-10 02.00.05 Added Diagnostic Data Upload tool. |
26 | * 08-11-10 02.00.06 Added defines that were missing for Diagnostic Buffer | ||
27 | * Post Request. | ||
26 | * -------------------------------------------------------------------------- | 28 | * -------------------------------------------------------------------------- |
27 | */ | 29 | */ |
28 | 30 | ||
@@ -354,6 +356,10 @@ typedef struct _MPI2_DIAG_BUFFER_POST_REQUEST | |||
354 | /* count of the number of buffer types */ | 356 | /* count of the number of buffer types */ |
355 | #define MPI2_DIAG_BUF_TYPE_COUNT (0x03) | 357 | #define MPI2_DIAG_BUF_TYPE_COUNT (0x03) |
356 | 358 | ||
359 | /* values for the Flags field */ | ||
360 | #define MPI2_DIAG_BUF_FLAG_RELEASE_ON_FULL (0x00000002) | ||
361 | #define MPI2_DIAG_BUF_FLAG_IMMEDIATE_RELEASE (0x00000001) | ||
362 | |||
357 | 363 | ||
358 | /**************************************************************************** | 364 | /**************************************************************************** |
359 | * Diagnostic Buffer Post reply | 365 | * Diagnostic Buffer Post reply |