Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 861ff736 authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by Christoph Hellwig
Browse files

mpt3sas: MPI2.5 Rev G (2.5.2) specifications 



Below is the change set in MPI2.5 Rev G specification and 2.00.31 header files
1) Added SCSIStatusQualifier to SCSI IO Error Reply message.
2) Added ATA Security Freeze Lock to IO Unit Page 1 Flags field.
3) Added Allow Protection Information bit for IR Volume Create.

Signed-off-by: default avatarSreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 9b2dcba3

drivers/scsi/mpt3sas/mpi/mpi2.h

+4 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *                 scatter/gather formats.

 * Creation Date:  June 21, 2006

 *

 * mpi2.h Version:  02.00.29

 * mpi2.h Version:  02.00.31

 *

 * NOTE: Names (typedefs, defines, etc.) beginning with an MPI25 or Mpi25

 *       prefix are for use only on MPI v2.5 products, and must not be used
@@ -86,6 +86,8 @@ 
 * 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.

 * --------------------------------------------------------------------------

 */
@@ -119,7 +121,7 @@ 
#define MPI2_VERSION_02_05                  (0x0205)



/*Unit and Dev versioning for this MPI header set */

#define MPI2_HEADER_VERSION_UNIT            (0x1D)

#define MPI2_HEADER_VERSION_UNIT            (0x1F)

#define MPI2_HEADER_VERSION_DEV             (0x00)

#define MPI2_HEADER_VERSION_UNIT_MASK       (0xFF00)

#define MPI2_HEADER_VERSION_UNIT_SHIFT      (8)

drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h

+6 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *         Title:  MPI Configuration messages and pages

 * Creation Date:  November 10, 2006

 *

 *   mpi2_cnfg.h Version:  02.00.24

 *   mpi2_cnfg.h Version:  02.00.25

 *

 * NOTE: Names (typedefs, defines, etc.) beginning with an MPI25 or Mpi25

 *       prefix are for use only on MPI v2.5 products, and must not be used
@@ -160,6 +160,9 @@ 
 * 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.

 * --------------------------------------------------------------------------

 */
@@ -792,6 +795,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 MPI25_IOUNITPAGE1_NEW_DEVICE_FAST_PATH_DISABLE  (0x00002000)

#define MPI25_IOUNITPAGE1_DISABLE_FAST_PATH             (0x00001000)

#define MPI2_IOUNITPAGE1_ENABLE_HOST_BASED_DISCOVERY    (0x00000800)
@@ -870,7 +874,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)

drivers/scsi/mpt3sas/mpi/mpi2_init.h

+4 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *         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

 *

 * NOTE: Names (typedefs, defines, etc.) beginning with an MPI25 or Mpi25

 *       prefix are for use only on MPI v2.5 products, and must not be used
@@ -44,6 +44,8 @@ 
 *                     Priority to match SAM-4.

 *                     Added EEDPErrorOffset to MPI2_SCSI_IO_REPLY.

 * 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.

 * --------------------------------------------------------------------------

 */
@@ -347,7 +349,7 @@ typedef struct _MPI2_SCSI_IO_REPLY { 
	U32 SenseCount;		/*0x18 */

	U32 ResponseInfo;	/*0x1C */

	U16 TaskTag;		/*0x20 */

	U16 Reserved4;		/*0x22 */

	U16 SCSIStatusQualifier; /* 0x22 */

	U32 BidirectionalTransferCount;	/*0x24 */

	U32 EEDPErrorOffset;	/*0x28 *//*MPI 2.5 only; Reserved in MPI 2.0*/

	U32 Reserved6;		/*0x2C */

drivers/scsi/mpt3sas/mpi/mpi2_raid.h

+5 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *         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

 * ---------------
@@ -30,6 +30,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.

 * --------------------------------------------------------------------------

 */
@@ -46,6 +47,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)