mpt2sas: MPI header version N is updated.
PATCH 7/17 mpt2sas: MPI header version N is updated.
Updating MPI header version N.
Removed mpi_history.txt.
Signed-off-by Kashyap Desai <[email protected]>
---
drivers/scsi/mpt2sas/mpi/mpi2.h +13 -4
@@ -8,7 +8,7 @@* scatter/gather formats. * Creation Date: June 21, 2006 * -* mpi2.h Version: 02.00.14 +* mpi2.h Version: 02.00.15 * * Version History * ---------------
@@ -57,6 +57,10 @@* Added MSI-x index mask and shift for Reply Post Host * Index register. * Added function code for Host Based Discovery Action. +* 02-10-10 02.00.15 Bumped MPI2_HEADER_VERSION_UNIT. +* Added define for MPI2_FUNCTION_PWR_MGMT_CONTROL. +* Added defines for product-specific range of message +* function codes, 0xF0 to 0xFF. * -------------------------------------------------------------------------- */
@@ -82,7 +86,7 @@#define MPI2_VERSION_02_00 (0x0200)/* versioning for this MPI header set */ -#define MPI2_HEADER_VERSION_UNIT (0x0E) +#define MPI2_HEADER_VERSION_UNIT (0x0F)#define MPI2_HEADER_VERSION_DEV (0x00)#define MPI2_HEADER_VERSION_UNIT_MASK (0xFF00)#define MPI2_HEADER_VERSION_UNIT_SHIFT (8)
@@ -473,8 +477,6 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION/***************************************************************************** * * Message Functions -* 0x80 -> 0x8F reserved for private message use per product -* * *****************************************************************************/
@@ -506,6 +508,13 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION#define MPI2_FUNCTION_RAID_ACCELERATOR (0x2C)/* RAID Accelerator*/ /* Host Based Discovery Action */ #define MPI2_FUNCTION_HOST_BASED_DISCOVERY_ACTION (0x2F) +/* Power Management Control */ +#define MPI2_FUNCTION_PWR_MGMT_CONTROL (0x30) +/* beginning of product-specific range */ +#define MPI2_FUNCTION_MIN_PRODUCT_SPECIFIC (0xF0) +/* end of product-specific range */ +#define MPI2_FUNCTION_MAX_PRODUCT_SPECIFIC (0xFF) +
drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h +171 -22
337 lines not on this page · raw message
drivers/scsi/mpt2sas/mpi/mpi2_init.h +2 -15
@@ -6,7 +6,7 @@* Title: MPI SCSI initiator mode messages and structures * Creation Date: June 23, 2006 * -* mpi2_init.h Version: 02.00.08 +* mpi2_init.h Version: 02.00.09 * * Version History * ---------------
@@ -31,6 +31,7 @@* both SCSI IO Error Reply and SCSI Task Management Reply. * Added ResponseInfo field to MPI2_SCSI_TASK_MANAGE_REPLY. * Added MPI2_SCSITASKMGMT_RSP_TM_OVERLAPPED_TAG define. +* 02-10-10 02.00.09 Removed unused structure that had "#if 0" around it. * -------------------------------------------------------------------------- */
@@ -57,20 +58,6 @@ typedef struct } MPI2_SCSI_IO_CDB_EEDP32, MPI2_POINTER PTR_MPI2_SCSI_IO_CDB_EEDP32, Mpi2ScsiIoCdbEedp32_t, MPI2_POINTER pMpi2ScsiIoCdbEedp32_t; -/* TBD: I don't think this is needed for MPI2/Gen2 */ -#if 0 -typedef struct -{ -U8 CDB[16 ];/* 0x00 */ -U32 DataLength;/* 0x10 */ -U32 PrimaryReferenceTag;/* 0x14 */ -U16 PrimaryApplicationTag;/* 0x18 */ -U16 PrimaryApplicationTagMask;/* 0x1A */ -U32 TransferLength;/* 0x1C */ -} MPI2_SCSI_IO32_CDB_EEDP16, MPI2_POINTER PTR_MPI2_SCSI_IO32_CDB_EEDP16, - Mpi2ScsiIo32CdbEedp16_t, MPI2_POINTER pMpi2ScsiIo32CdbEedp16_t; -#endif - typedef union { U8 CDB32[32];
drivers/scsi/mpt2sas/mpi/mpi2_ioc.h +117 -2
160 lines not on this page · raw message
drivers/scsi/mpt2sas/mpt2sas_scsih.c +5 -2
@@ -223,9 +223,12 @@ static struct pci_device_id scsih_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_6, PCI_ANY_ID, PCI_ANY_ID }, - { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_7, +/* Mustang ~ 2308 */ + { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_1, PCI_ANY_ID, PCI_ANY_ID }, - { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_8, + { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2, + PCI_ANY_ID, PCI_ANY_ID }, + { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_3, PCI_ANY_ID, PCI_ANY_ID }, {0} /* Terminating entry */ };