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

Commit 8c79d626 authored by sreekanth.reddy@lsi.com's avatar sreekanth.reddy@lsi.com Committed by James Bottomley
Browse files

[SCSI] mpt2sas : MPI 2.0 Rev V(2.0.14) specification 



Changeset in MPI 2.0 Rev V(2.0.14) specification

        1) Bumped MPI2_HEADER_VERSION_UNIT.
        2) Added a product specific range to event values.
        3) Added clarification to Direct-Attached SAS PHY Power condition.
        4) Updated timing requirements for performing Hard Reset.

Signed-off-by: default avatarSreekanth Reddy <sreekanth.reddy@lsi.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent eece5de5

drivers/scsi/mpt2sas/mpi/mpi2.h

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

 *  Copyright (c) 2000-2011 LSI Corporation.

 *  Copyright (c) 2000-2012 LSI Corporation.

 *

 *

 *           Name:  mpi2.h
@@ -8,7 +8,7 @@ 
 *                  scatter/gather formats.

 *  Creation Date:  June 21, 2006

 *

 *  mpi2.h Version:  02.00.23

 *  mpi2.h Version:  02.00.25

 *

 *  Version History

 *  ---------------
@@ -72,6 +72,9 @@ 
 *  05-25-11  02.00.21  Bumped MPI2_HEADER_VERSION_UNIT.

 *  08-24-11  02.00.22  Bumped MPI2_HEADER_VERSION_UNIT.

 *  11-18-11  02.00.23  Bumped MPI2_HEADER_VERSION_UNIT.

 *  02-06-12  02.00.24  Bumped MPI2_HEADER_VERSION_UNIT.

 *  03-29-12  02.00.25  Bumped MPI2_HEADER_VERSION_UNIT.

 *                      Added Hard Reset delay timings.

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

 */
@@ -97,7 +100,7 @@ 
#define MPI2_VERSION_02_00                  (0x0200)



/* versioning for this MPI header set */

#define MPI2_HEADER_VERSION_UNIT            (0x17)

#define MPI2_HEADER_VERSION_UNIT            (0x19)

#define MPI2_HEADER_VERSION_DEV             (0x00)

#define MPI2_HEADER_VERSION_UNIT_MASK       (0xFF00)

#define MPI2_HEADER_VERSION_UNIT_SHIFT      (8)
@@ -275,6 +278,11 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS 
#define MPI2_REQUEST_DESCRIPTOR_POST_HIGH_OFFSET    (0x000000C4)





/* Hard Reset delay timings */

#define MPI2_HARD_RESET_PCIE_FIRST_READ_DELAY_MICRO_SEC     (50000)

#define MPI2_HARD_RESET_PCIE_RESET_READ_WINDOW_MICRO_SEC    (255000)

#define MPI2_HARD_RESET_PCIE_SECOND_READ_DELAY_MICRO_SEC    (256000)



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

*

*        Message Descriptors

drivers/scsi/mpt2sas/mpi/mpi2_init.h

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

 *  Copyright (c) 2000-2010 LSI Corporation.

 *  Copyright (c) 2000-2012 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.11

 *    mpi2_init.h Version:  02.00.13

 *

 *  Version History

 *  ---------------
@@ -34,6 +34,8 @@ 
 *  02-10-10  02.00.09  Removed unused structure that had "#if 0" around it.

 *  05-12-10  02.00.10  Added optional vendor-unique region to SCSI IO Request.

 *  11-10-10  02.00.11  Added MPI2_SCSIIO_NUM_SGLOFFSETS define.

 *  02-06-12  02.00.13  Added alternate defines for Task Priority / Command

 *                      Priority to match SAM-4.

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

 */
@@ -194,6 +196,9 @@ typedef struct _MPI2_SCSI_IO_REQUEST 


#define MPI2_SCSIIO_CONTROL_TASKPRI_MASK        (0x00007800)

#define MPI2_SCSIIO_CONTROL_TASKPRI_SHIFT       (11)

/* alternate name for the previous field; called Command Priority in SAM-4 */

#define MPI2_SCSIIO_CONTROL_CMDPRI_MASK         (0x00007800)

#define MPI2_SCSIIO_CONTROL_CMDPRI_SHIFT        (11)



#define MPI2_SCSIIO_CONTROL_TASKATTRIBUTE_MASK  (0x00000700)

#define MPI2_SCSIIO_CONTROL_SIMPLEQ             (0x00000000)

drivers/scsi/mpt2sas/mpi/mpi2_ioc.h

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

 *  Copyright (c) 2000-2011 LSI Corporation.

 *  Copyright (c) 2000-2012 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.19

 *  mpi2_ioc.h Version:  02.00.21

 *

 *  Version History

 *  ---------------
@@ -117,6 +117,7 @@ 
 *  08-24-11  02.00.19  Added PhysicalPort field to

 *                      MPI2_EVENT_DATA_SAS_DEVICE_STATUS_CHANGE structure.

 *                      Marked MPI2_PM_CONTROL_FEATURE_PCIE_LINK as obsolete.

 *  03-29-12  02.00.21  Added a product specific range to event values.

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

 */
@@ -492,7 +493,8 @@ typedef struct _MPI2_EVENT_NOTIFICATION_REPLY 
#define MPI2_EVENT_SAS_NOTIFY_PRIMITIVE             (0x0026)

#define MPI2_EVENT_TEMP_THRESHOLD                   (0x0027)

#define MPI2_EVENT_HOST_MESSAGE                     (0x0028)



#define MPI2_EVENT_MIN_PRODUCT_SPECIFIC             (0x006E)

#define MPI2_EVENT_MAX_PRODUCT_SPECIFIC             (0x007F)



/* Log Entry Added Event data */

drivers/scsi/mpt2sas/mpi/mpi2_raid.h

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

 *  Copyright (c) 2000-2010 LSI Corporation.

 *  Copyright (c) 2000-2012 LSI Corporation.

 *

 *

 *           Name:  mpi2_raid.h

 *          Title:  MPI Integrated RAID messages and structures

 *  Creation Date:  April 26, 2007

 *

 *    mpi2_raid.h Version:  02.00.06

 *    mpi2_raid.h Version:  02.00.08

 *

 *  Version History

 *  ---------------
@@ -26,7 +26,7 @@ 
 *  08-24-10  02.00.06  Added MPI2_RAID_ACTION_COMPATIBILITY_CHECK along with

 *                      related structures and defines.

 *                      Added product-specific range to RAID Action values.



 *  02-06-12  02.00.08  Added MPI2_RAID_ACTION_PHYSDISK_HIDDEN.

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

 */
@@ -181,6 +181,7 @@ typedef struct _MPI2_RAID_ACTION_REQUEST 
#define MPI2_RAID_ACTION_START_RAID_FUNCTION        (0x21)

#define MPI2_RAID_ACTION_STOP_RAID_FUNCTION         (0x22)

#define MPI2_RAID_ACTION_COMPATIBILITY_CHECK        (0x23)

#define MPI2_RAID_ACTION_PHYSDISK_HIDDEN            (0x24)

#define MPI2_RAID_ACTION_MIN_PRODUCT_SPECIFIC       (0x80)

#define MPI2_RAID_ACTION_MAX_PRODUCT_SPECIFIC       (0xFF)