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

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

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: 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 4e1f20ae

drivers/scsi/mpt2sas/mpi/mpi2.h

+9 −3
Original line number Diff line number Diff line 
/*

 *  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
Original line number Diff line number Diff line 
/*

 *  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

 *  ---------------
@@ -151,6 +151,12 @@ 
 *                      BiosOptions bits.

 *  11-27-12  02.00.23  Added MPI2_MANPAGE7_FLAG_EVENTREPLAY_SLOT_ORDER.

 *			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)
@@ -888,10 +895,14 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 { 
	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
Original line number Diff line number Diff line 
/*

 *  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_REPLY 
    U32                     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
Original line number Diff line number Diff line 
/*

 *  Copyright (c) 2000-2013 LSI Corporation.

 *  Copyright (c) 2000-2014 LSI Corporation.

 *

 *

 *           Name:  mpi2_ioc.h

 *          Title:  MPI IOC, Port, Event, FW Download, and FW Upload messages

 *  Creation Date:  October 11, 2006

 *

 *  mpi2_ioc.h Version:  02.00.22

 *  mpi2_ioc.h Version:  02.00.23

 *

 *  Version History

 *  ---------------
@@ -121,6 +121,11 @@ 
 *  07-26-12  02.00.22  Added MPI2_IOCFACTS_EXCEPT_PARTIAL_MEMORY_FAILURE.

 *                      Added ElapsedSeconds field to

 *                      MPI2_EVENT_DATA_IR_OPERATION_STATUS.

 *  08-19-13  02.00.23  For IOCInit, added MPI2_IOCINIT_MSGFLAG_RDPQ_ARRAY_MODE

 *                      and MPI2_IOC_INIT_RDPQ_ARRAY_ENTRY.

 *                      Added MPI2_IOCFACTS_CAPABILITY_RDPQ_ARRAY_CAPABLE.

 *                      Added MPI2_FW_DOWNLOAD_ITYPE_PUBLIC_KEY.

 *                      Added Encrypted Hash Extended Image.

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

 */
@@ -177,6 +182,9 @@ typedef struct _MPI2_IOC_INIT_REQUEST 
#define MPI2_WHOINIT_HOST_DRIVER                (0x04)

#define MPI2_WHOINIT_MANUFACTURER               (0x05)



/* MsgFlags */

#define MPI2_IOCINIT_MSGFLAG_RDPQ_ARRAY_MODE    (0x01)



/* MsgVersion */

#define MPI2_IOCINIT_MSGVERSION_MAJOR_MASK      (0xFF00)

#define MPI2_IOCINIT_MSGVERSION_MAJOR_SHIFT     (8)
@@ -189,9 +197,17 @@ typedef struct _MPI2_IOC_INIT_REQUEST 
#define MPI2_IOCINIT_HDRVERSION_DEV_MASK        (0x00FF)

#define MPI2_IOCINIT_HDRVERSION_DEV_SHIFT       (0)



/* minimum depth for the Reply Descriptor Post Queue */

/* minimum depth for a Reply Descriptor Post Queue */

#define MPI2_RDPQ_DEPTH_MIN                     (16)



/* Reply Descriptor Post Queue Array Entry */

typedef struct _MPI2_IOC_INIT_RDPQ_ARRAY_ENTRY {

	U64                 RDPQBaseAddress;                    /* 0x00 */

	U32                 Reserved1;                          /* 0x08 */

	U32                 Reserved2;                          /* 0x0C */

} MPI2_IOC_INIT_RDPQ_ARRAY_ENTRY,

MPI2_POINTER PTR_MPI2_IOC_INIT_RDPQ_ARRAY_ENTRY,

Mpi2IOCInitRDPQArrayEntry, MPI2_POINTER pMpi2IOCInitRDPQArrayEntry;



/* IOCInit Reply message */

typedef struct _MPI2_IOC_INIT_REPLY
@@ -307,6 +323,7 @@ typedef struct _MPI2_IOC_FACTS_REPLY 
/* ProductID field uses MPI2_FW_HEADER_PID_ */



/* IOCCapabilities */

#define MPI2_IOCFACTS_CAPABILITY_RDPQ_ARRAY_CAPABLE     (0x00040000)

#define MPI2_IOCFACTS_CAPABILITY_HOST_BASED_DISCOVERY   (0x00010000)

#define MPI2_IOCFACTS_CAPABILITY_MSI_X_INDEX            (0x00008000)

#define MPI2_IOCFACTS_CAPABILITY_RAID_ACCELERATOR       (0x00004000)
@@ -1153,6 +1170,7 @@ typedef struct _MPI2_FW_DOWNLOAD_REQUEST 
#define MPI2_FW_DOWNLOAD_ITYPE_MEGARAID             (0x09)

#define MPI2_FW_DOWNLOAD_ITYPE_COMPLETE             (0x0A)

#define MPI2_FW_DOWNLOAD_ITYPE_COMMON_BOOT_BLOCK    (0x0B)

#define MPI2_FW_DOWNLOAD_ITYPE_PUBLIC_KEY           (0x0C)

#define MPI2_FW_DOWNLOAD_ITYPE_MIN_PRODUCT_SPECIFIC (0xF0)



/* FWDownload TransactionContext Element */
@@ -1387,6 +1405,7 @@ typedef struct _MPI2_EXT_IMAGE_HEADER 
#define MPI2_EXT_IMAGE_TYPE_FLASH_LAYOUT            (0x06)

#define MPI2_EXT_IMAGE_TYPE_SUPPORTED_DEVICES       (0x07)

#define MPI2_EXT_IMAGE_TYPE_MEGARAID                (0x08)

#define MPI2_EXT_IMAGE_TYPE_ENCRYPTED_HASH          (0x09)

#define MPI2_EXT_IMAGE_TYPE_MIN_PRODUCT_SPECIFIC    (0x80)

#define MPI2_EXT_IMAGE_TYPE_MAX_PRODUCT_SPECIFIC    (0xFF)

#define MPI2_EXT_IMAGE_TYPE_MAX                   \
@@ -1555,6 +1574,39 @@ typedef struct _MPI2_INIT_IMAGE_FOOTER 
#define MPI2_INIT_IMAGE_RESETVECTOR_OFFSET      (0x14)





/* Encrypted Hash Extended Image Data */



typedef struct _MPI25_ENCRYPTED_HASH_ENTRY {

	U8                  HashImageType;          /* 0x00 */

	U8                  HashAlgorithm;          /* 0x01 */

	U8                  EncryptionAlgorithm;    /* 0x02 */

	U8                  Reserved1;              /* 0x03 */

	U32                 Reserved2;              /* 0x04 */

	U32                 EncryptedHash[1];       /* 0x08 */

} MPI25_ENCRYPTED_HASH_ENTRY, MPI2_POINTER PTR_MPI25_ENCRYPTED_HASH_ENTRY,

Mpi25EncryptedHashEntry_t, MPI2_POINTER pMpi25EncryptedHashEntry_t;



/* values for HashImageType */

#define MPI25_HASH_IMAGE_TYPE_UNUSED            (0x00)

#define MPI25_HASH_IMAGE_TYPE_FIRMWARE          (0x01)



/* values for HashAlgorithm */

#define MPI25_HASH_ALGORITHM_UNUSED             (0x00)

#define MPI25_HASH_ALGORITHM_SHA256             (0x01)



/* values for EncryptionAlgorithm */

#define MPI25_ENCRYPTION_ALG_UNUSED             (0x00)

#define MPI25_ENCRYPTION_ALG_RSA256             (0x01)



typedef struct _MPI25_ENCRYPTED_HASH_DATA {

	U8                              ImageVersion;           /* 0x00 */

	U8                              NumHash;                /* 0x01 */

	U16                             Reserved1;              /* 0x02 */

	U32                             Reserved2;              /* 0x04 */

	MPI25_ENCRYPTED_HASH_ENTRY      EncryptedHashEntry[1];  /* 0x08 */

} MPI25_ENCRYPTED_HASH_DATA, MPI2_POINTER PTR_MPI25_ENCRYPTED_HASH_DATA,

Mpi25EncryptedHashData_t, MPI2_POINTER pMpi25EncryptedHashData_t;



/****************************************************************************

*  PowerManagementControl message

****************************************************************************/

drivers/scsi/mpt2sas/mpi/mpi2_raid.h

+6 −2
Original line number Diff line number Diff line 
/*

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