mpt2sas: MPI2 Rev Y (2.00.17) and Rev Z (2.00.18) specifications
PATCH RESEND 2/10 mpt2sas: MPI2 Rev Y (2.00.17) and Rev Z (2.00.18) specifications
Below is the change set in MPI2 Rev Y specification and in 2.00.17 header files
1) Added SCSIStatusQualifier to SCSI IO Error Reply message.
2) Added ATA Security Freeze Lock to IO Unit Page 1 Flags field.
Below is the change set in MPI2 Rev Z specification and in 2.00.19 header files
1) Added reserved fields to IO Unit Page 7 for future use.
2) Added optional functionality to IOCInit Request so that
the host may specify a separate base address for each
Reply Descriptor Post Queue. IOC support for this is
indicated using a new IOCCapabilities bit in the IOCFacts Reply.
3) Added Toolbox Console Text Display Tool
The host uses the Console Text Display Tool to send a string to
IOC's Console using different console types (eg: UART serial terminal or Ethernet terminal).
The copyright in the mpi files is updated for year 2014
Signed-off-by Sreekanth Reddy <[email protected]>
--- drivers/scsi/mpt2sas/mpi/mpi2.h | 12 ++++- drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 29 ++++++++++---- drivers/scsi/mpt2sas/mpi/mpi2_init.h | 8 ++- drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 74 +++++++++++++++++++++++++++++----- drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 8 +++- drivers/scsi/mpt2sas/mpi/mpi2_sas.h | 2 +- drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 44 +++++++++++++++++++- drivers/scsi/mpt2sas/mpi/mpi2_type.h | 2 +- 8 files changed, 148 insertions(+), 31 deletions(-)
drivers/scsi/mpt2sas/mpi/mpi2.h +9 -3
@@ -1,5 +1,5 @@/* -* Copyright (c) 2000-2013 LSI Corporation. +* Copyright (c) 2000-2014 LSI Corporation. * * * Name: mpi2.h
@@ -8,7 +8,7 @@* scatter/gather formats. * Creation Date: June 21, 2006 * -* mpi2.h Version: 02.00.28 +* mpi2.h Version: 02.00.32 * * Version History * ---------------
@@ -78,6 +78,11 @@* 07-10-12 02.00.26 Bumped MPI2_HEADER_VERSION_UNIT. * 07-26-12 02.00.27 Bumped MPI2_HEADER_VERSION_UNIT. * 11-27-12 02.00.28 Bumped MPI2_HEADER_VERSION_UNIT. +* 12-20-12 02.00.29 Bumped MPI2_HEADER_VERSION_UNIT. +* Added MPI25_SUP_REPLY_POST_HOST_INDEX_OFFSET. +* 04-09-13 02.00.30 Bumped MPI2_HEADER_VERSION_UNIT. +* 04-17-13 02.00.31 Bumped MPI2_HEADER_VERSION_UNIT. +* 08-19-13 02.00.32 Bumped MPI2_HEADER_VERSION_UNIT. * -------------------------------------------------------------------------- */
@@ -103,7 +108,7 @@#define MPI2_VERSION_02_00 (0x0200)/* versioning for this MPI header set */ -#define MPI2_HEADER_VERSION_UNIT (0x1C) +#define MPI2_HEADER_VERSION_UNIT (0x20)#define MPI2_HEADER_VERSION_DEV (0x00)#define MPI2_HEADER_VERSION_UNIT_MASK (0xFF00)#define MPI2_HEADER_VERSION_UNIT_SHIFT (8)
@@ -263,6 +268,7 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS#define MPI2_REPLY_POST_HOST_INDEX_MASK (0x00FFFFFF)#define MPI2_RPHI_MSIX_INDEX_MASK (0xFF000000)#define MPI2_RPHI_MSIX_INDEX_SHIFT (24) +#define MPI25_SUP_REPLY_POST_HOST_INDEX_OFFSET (0x0000030C)/* MPI v2.5 only */ /* * Defines for the HCBSize and address
drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h +21 -8
@@ -1,12 +1,12 @@/* -* Copyright (c) 2000-2013 LSI Corporation. +* Copyright (c) 2000-2014 LSI Corporation. * * * Name: mpi2_cnfg.h * Title: MPI Configuration messages and pages * Creation Date: November 10, 2006 * -* mpi2_cnfg.h Version: 02.00.23 +* mpi2_cnfg.h Version: 02.00.26 * * Version History * ---------------
@@ -150,7 +150,13 @@* Added UEFIVersion field to BIOS Page 1 and defined new * BiosOptions bits. * 11-27-12 02.00.23 Added MPI2_MANPAGE7_FLAG_EVENTREPLAY_SLOT_ORDER. -* Added MPI2_BIOSPAGE1_OPTIONS_MASK_OEM_ID. +* Added MPI2_BIOSPAGE1_OPTIONS_MASK_OEM_ID. +* 12-20-12 02.00.24 Marked MPI2_SASIOUNIT1_CONTROL_CLEAR_AFFILIATION as +* obsolete for MPI v2.5 and later. +* Added some defines for 12G SAS speeds. +* 04-09-13 02.00.25 Added MPI2_IOUNITPAGE1_ATA_SECURITY_FREEZE_LOCK. +* Fixed MPI2_IOUNITPAGE5_DMA_CAP_MASK_MAX_REQUESTS to +* match the specification. * -------------------------------------------------------------------------- */
@@ -773,6 +779,7 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_1#define MPI2_IOUNITPAGE1_PAGEVERSION (0x04)/* IO Unit Page 1 Flags defines */ +#define MPI2_IOUNITPAGE1_ATA_SECURITY_FREEZE_LOCK (0x00004000)#define MPI2_IOUNITPAGE1_ENABLE_HOST_BASED_DISCOVERY (0x00000800)#define MPI2_IOUNITPAGE1_MASK_SATA_WRITE_CACHE (0x00000600)#define MPI2_IOUNITPAGE1_SATA_WRITE_CACHE_SHIFT (9)
@@ -844,7 +851,7 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_5 {#define MPI2_IOUNITPAGE5_PAGEVERSION (0x00)/* defines for IO Unit Page 5 DmaEngineCapabilities field */ -#define MPI2_IOUNITPAGE5_DMA_CAP_MASK_MAX_REQUESTS (0xFF00) +#define MPI2_IOUNITPAGE5_DMA_CAP_MASK_MAX_REQUESTS (0xFFFF0000)#define MPI2_IOUNITPAGE5_DMA_CAP_SHIFT_MAX_REQUESTS (16)#define MPI2_IOUNITPAGE5_DMA_CAP_EEDP (0x0008)
@@ -885,13 +892,17 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 {U16 IOCTemperature;/* 0x10 */ U8 IOCTemperatureUnits;/* 0x12 */ U8 IOCSpeed;/* 0x13 */ -U16 BoardTemperature;/* 0x14 */ -U8 BoardTemperatureUnits;/* 0x16 */ -U8 Reserved3;/* 0x17 */ +U16 BoardTemperature;/* 0x14 */ +U8 BoardTemperatureUnits;/* 0x16 */ +U8 Reserved3;/* 0x17 */ +U32 Reserved4;/* 0x18 */ +U32 Reserved5;/* 0x1C */ +U32 Reserved6;/* 0x20 */ +U32 Reserved7;/* 0x24 */ } MPI2_CONFIG_PAGE_IO_UNIT_7, MPI2_POINTER PTR_MPI2_CONFIG_PAGE_IO_UNIT_7, Mpi2IOUnitPage7_t, MPI2_POINTER pMpi2IOUnitPage7_t; -#define MPI2_IOUNITPAGE7_PAGEVERSION (0x02) +#define MPI2_IOUNITPAGE7_PAGEVERSION (0x04)/* defines for IO Unit Page 7 PCIeWidth field */ #define MPI2_IOUNITPAGE7_PCIE_WIDTH_X1 (0x01)
@@ -1801,6 +1812,7 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1#define MPI2_SAS_PRATE_MAX_RATE_1_5 (0x80)#define MPI2_SAS_PRATE_MAX_RATE_3_0 (0x90)#define MPI2_SAS_PRATE_MAX_RATE_6_0 (0xA0) +#define MPI25_SAS_PRATE_MAX_RATE_12_0 (0xB0)#define MPI2_SAS_PRATE_MIN_RATE_MASK (0x0F)#define MPI2_SAS_PRATE_MIN_RATE_NOT_PROGRAMMABLE (0x00)#define MPI2_SAS_PRATE_MIN_RATE_1_5 (0x08)
@@ -1813,6 +1825,7 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1#define MPI2_SAS_HWRATE_MAX_RATE_1_5 (0x80)#define MPI2_SAS_HWRATE_MAX_RATE_3_0 (0x90)#define MPI2_SAS_HWRATE_MAX_RATE_6_0 (0xA0) +#define MPI25_SAS_HWRATE_MAX_RATE_12_0 (0xB0)#define MPI2_SAS_HWRATE_MIN_RATE_MASK (0x0F)#define MPI2_SAS_HWRATE_MIN_RATE_1_5 (0x08)#define MPI2_SAS_HWRATE_MIN_RATE_3_0 (0x09)
drivers/scsi/mpt2sas/mpi/mpi2_init.h +5 -3
@@ -1,12 +1,12 @@/* -* Copyright (c) 2000-2013 LSI Corporation. +* Copyright (c) 2000-2014 LSI Corporation. * * * Name: mpi2_init.h * Title: MPI SCSI initiator mode messages and structures * Creation Date: June 23, 2006 * -* mpi2_init.h Version: 02.00.14 +* mpi2_init.h Version: 02.00.15 * * Version History * ---------------
@@ -37,6 +37,8 @@* 02-06-12 02.00.13 Added alternate defines for Task Priority / Command * Priority to match SAM-4. * 07-10-12 02.00.14 Added MPI2_SCSIIO_CONTROL_SHIFT_DATADIRECTION. +* 04-09-13 02.00.15 Added SCSIStatusQualifier field to MPI2_SCSI_IO_REPLY, +* replacing the Reserved4 field. * -------------------------------------------------------------------------- */
@@ -234,7 +236,7 @@ typedef struct _MPI2_SCSI_IO_REPLYU32 SenseCount;/* 0x18 */ U32 ResponseInfo;/* 0x1C */ U16 TaskTag;/* 0x20 */ -U16 Reserved4;/* 0x22 */ +U16 SCSIStatusQualifier;/* 0x22 */ U32 BidirectionalTransferCount;/* 0x24 */ U32 Reserved5;/* 0x28 */ U32 Reserved6;/* 0x2C */
drivers/scsi/mpt2sas/mpi/mpi2_ioc.h +63 -11
128 lines not on this page · raw message
drivers/scsi/mpt2sas/mpi/mpi2_raid.h +6 -2
@@ -1,12 +1,12 @@/* -* Copyright (c) 2000-2013 LSI Corporation. +* Copyright (c) 2000-2014 LSI Corporation. * * * Name: mpi2_raid.h * Title: MPI Integrated RAID messages and structures * Creation Date: April 26, 2007 * -* mpi2_raid.h Version: 02.00.09 +* mpi2_raid.h Version: 02.00.10 * * Version History * ---------------
@@ -29,6 +29,7 @@* 02-06-12 02.00.08 Added MPI2_RAID_ACTION_PHYSDISK_HIDDEN. * 07-26-12 02.00.09 Added ElapsedSeconds field to MPI2_RAID_VOL_INDICATOR. * Added MPI2_RAID_VOL_FLAGS_ELAPSED_SECONDS_VALID define. +* 04-17-13 02.00.10 Added MPI25_RAID_ACTION_ADATA_ALLOW_PI. * -------------------------------------------------------------------------- */
@@ -45,6 +46,9 @@* RAID Action messages ****************************************************************************/ +/* ActionDataWord defines for use with MPI2_RAID_ACTION_CREATE_VOLUME action */ +#define MPI25_RAID_ACTION_ADATA_ALLOW_PI (0x80000000) +/* ActionDataWord defines for use with MPI2_RAID_ACTION_DELETE_VOLUME action */ #define MPI2_RAID_ACTION_ADATA_KEEP_LBA0 (0x00000000)#define MPI2_RAID_ACTION_ADATA_ZERO_LBA0 (0x00000001)
drivers/scsi/mpt2sas/mpi/mpi2_sas.h +1 -1
@@ -1,5 +1,5 @@/* -* Copyright (c) 2000-2013 LSI Corporation. +* Copyright (c) 2000-2014 LSI Corporation. * * * Name: mpi2_sas.h
drivers/scsi/mpt2sas/mpi/mpi2_tool.h +42 -2
72 lines not on this page · raw message
drivers/scsi/mpt2sas/mpi/mpi2_type.h +1 -1
@@ -1,5 +1,5 @@/* -* Copyright (c) 2000-2013 LSI Corporation. +* Copyright (c) 2000-2014 LSI Corporation. * * * Name: mpi2_type.h
Signature · 1 line
1.7.1
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Sreekanth" == Reddy, Sreekanth <[email protected]> writes:
Sreekanth> Below is the change set in MPI2 Rev Y specification and in Sreekanth> 2.00.17 header files
Sreekanth> 1) Added SCSIStatusQualifier to SCSI IO Error Reply message. Sreekanth> 2) Added ATA Security Freeze Lock to IO Unit Page 1 Flags
Sreekanth> field.
Sreekanth> Below is the change set in MPI2 Rev Z specification and in Sreekanth> 2.00.19 header files
Sreekanth> 1) Added reserved fields to IO Unit Page 7 for future use. Sreekanth> 2) Added optional functionality to IOCInit Request so that
Sreekanth> the host may specify a separate base address for each Sreekanth> Reply Descriptor Post Queue. IOC support for this is Sreekanth> indicated using a new IOCCapabilities bit in the IOCFacts Sreekanth> Reply. Sreekanth> 3) Added Toolbox Console Text Display Tool Sreekanth> The host uses the Console Text Display Tool to send a Sreekanth> string to IOC's Console using different console types (eg: Sreekanth> UART serial terminal or Ethernet terminal).
Sreekanth> The copyright in the mpi files is updated for year 2014
Reviewed-by Martin K. Petersen <[email protected]>
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering