[SCSI] fusion : mpi header update (2076eb6a) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/message/fusion/lsi/fc_log.h

deleted100644 → 0

+0 −89

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (c) 2000-2001 LSI Logic Corporation. All rights reserved.
	*
	* NAME: fc_log.h
	* SUMMARY: MPI IocLogInfo definitions for the SYMFC9xx chips
	* DESCRIPTION: Contains the enumerated list of values that may be returned
	* in the IOCLogInfo field of a MPI Default Reply Message.
	*
	* CREATION DATE: 6/02/2000
	* ID: $Id: fc_log.h,v 4.6 2001/07/26 14:41:33 sschremm Exp $
	*/


	/*
	* MpiIocLogInfo_t enum
	*
	* These 32 bit values are used in the IOCLogInfo field of the MPI reply
	* messages.
	* The value is 0xabcccccc where
	* a = The type of log info as per the MPI spec. Since these codes are
	* all for Fibre Channel this value will always be 2.
	* b = Specifies a subclass of the firmware where
	* 0 = FCP Initiator
	* 1 = FCP Target
	* 2 = LAN
	* 3 = MPI Message Layer
	* 4 = FC Link
	* 5 = Context Manager
	* 6 = Invalid Field Offset
	* 7 = State Change Info
	* all others are reserved for future use
	* c = A specific value within the subclass.
	*
	* NOTE: Any new values should be added to the end of each subclass so that the
	* codes remain consistent across firmware releases.
	*/
	typedef enum _MpiIocLogInfoFc
	{
	MPI_IOCLOGINFO_FC_INIT_BASE = 0x20000000,
	MPI_IOCLOGINFO_FC_INIT_ERROR_OUT_OF_ORDER_FRAME = 0x20000001, /* received an out of order frame - unsupported */
	MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_START_OF_FRAME = 0x20000002, /* Bad Rx Frame, bad start of frame primative */
	MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_END_OF_FRAME = 0x20000003, /* Bad Rx Frame, bad end of frame primative */
	MPI_IOCLOGINFO_FC_INIT_ERROR_OVER_RUN = 0x20000004, /* Bad Rx Frame, overrun */
	MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OTHER = 0x20000005, /* Other errors caught by IOC which require retries */
	MPI_IOCLOGINFO_FC_INIT_ERROR_SUBPROC_DEAD = 0x20000006, /* Main processor could not initialize sub-processor */
	MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OVERRUN = 0x20000007, /* Scatter Gather overrun */
	MPI_IOCLOGINFO_FC_INIT_ERROR_RX_BAD_STATUS = 0x20000008, /* Receiver detected context mismatch via invalid header */
	MPI_IOCLOGINFO_FC_INIT_ERROR_RX_UNEXPECTED_FRAME= 0x20000009, /* CtxMgr detected unsupported frame type */
	MPI_IOCLOGINFO_FC_INIT_ERROR_LINK_FAILURE = 0x2000000A, /* Link failure occurred */
	MPI_IOCLOGINFO_FC_INIT_ERROR_TX_TIMEOUT = 0x2000000B, /* Transmitter timeout error */

	MPI_IOCLOGINFO_FC_TARGET_BASE = 0x21000000,
	MPI_IOCLOGINFO_FC_TARGET_NO_PDISC = 0x21000001, /* not sent because we are waiting for a PDISC from the initiator */
	MPI_IOCLOGINFO_FC_TARGET_NO_LOGIN = 0x21000002, /* not sent because we are not logged in to the remote node */
	MPI_IOCLOGINFO_FC_TARGET_DOAR_KILLED_BY_LIP = 0x21000003, /* Data Out, Auto Response, not sent due to a LIP */
	MPI_IOCLOGINFO_FC_TARGET_DIAR_KILLED_BY_LIP = 0x21000004, /* Data In, Auto Response, not sent due to a LIP */
	MPI_IOCLOGINFO_FC_TARGET_DIAR_MISSING_DATA = 0x21000005, /* Data In, Auto Response, missing data frames */
	MPI_IOCLOGINFO_FC_TARGET_DONR_KILLED_BY_LIP = 0x21000006, /* Data Out, No Response, not sent due to a LIP */
	MPI_IOCLOGINFO_FC_TARGET_WRSP_KILLED_BY_LIP = 0x21000007, /* Auto-response after a write not sent due to a LIP */
	MPI_IOCLOGINFO_FC_TARGET_DINR_KILLED_BY_LIP = 0x21000008, /* Data In, No Response, not completed due to a LIP */
	MPI_IOCLOGINFO_FC_TARGET_DINR_MISSING_DATA = 0x21000009, /* Data In, No Response, missing data frames */
	MPI_IOCLOGINFO_FC_TARGET_MRSP_KILLED_BY_LIP = 0x2100000a, /* Manual Response not sent due to a LIP */
	MPI_IOCLOGINFO_FC_TARGET_NO_CLASS_3 = 0x2100000b, /* not sent because remote node does not support Class 3 */
	MPI_IOCLOGINFO_FC_TARGET_LOGIN_NOT_VALID = 0x2100000c, /* not sent because login to remote node not validated */
	MPI_IOCLOGINFO_FC_TARGET_FROM_OUTBOUND = 0x2100000e, /* cleared from the outbound queue after a logout */
	MPI_IOCLOGINFO_FC_TARGET_WAITING_FOR_DATA_IN = 0x2100000f, /* cleared waiting for data after a logout */

	MPI_IOCLOGINFO_FC_LAN_BASE = 0x22000000,
	MPI_IOCLOGINFO_FC_LAN_TRANS_SGL_MISSING = 0x22000001, /* Transaction Context Sgl Missing */
	MPI_IOCLOGINFO_FC_LAN_TRANS_WRONG_PLACE = 0x22000002, /* Transaction Context found before an EOB */
	MPI_IOCLOGINFO_FC_LAN_TRANS_RES_BITS_SET = 0x22000003, /* Transaction Context value has reserved bits set */
	MPI_IOCLOGINFO_FC_LAN_WRONG_SGL_FLAG = 0x22000004, /* Invalid SGL Flags */

	MPI_IOCLOGINFO_FC_MSG_BASE = 0x23000000,

	MPI_IOCLOGINFO_FC_LINK_BASE = 0x24000000,
	MPI_IOCLOGINFO_FC_LINK_LOOP_INIT_TIMEOUT = 0x24000001, /* Loop initialization timed out */
	MPI_IOCLOGINFO_FC_LINK_ALREADY_INITIALIZED = 0x24000002, /* Another system controller already initialized the loop */
	MPI_IOCLOGINFO_FC_LINK_LINK_NOT_ESTABLISHED = 0x24000003, /* Not synchronized to signal or still negotiating (possible cable problem) */
	MPI_IOCLOGINFO_FC_LINK_CRC_ERROR = 0x24000004, /* CRC check detected error on received frame */

	MPI_IOCLOGINFO_FC_CTX_BASE = 0x25000000,

	MPI_IOCLOGINFO_FC_INVALID_FIELD_BYTE_OFFSET = 0x26000000, /* The lower 24 bits give the byte offset of the field in the request message that is invalid */
	MPI_IOCLOGINFO_FC_INVALID_FIELD_MAX_OFFSET = 0x26ffffff,

	MPI_IOCLOGINFO_FC_STATE_CHANGE = 0x27000000 /* The lower 24 bits give additional information concerning state change */

	} MpiIocLogInfoFc_t;

drivers/message/fusion/lsi/mpi.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@
	* Title: MPI Message independent structures and definitions		* Title: MPI Message independent structures and definitions
	* Creation Date: July 27, 2000		* Creation Date: July 27, 2000
	*		*
	* mpi.h Version: 01.05.10		* mpi.h Version: 01.05.11
	*		*
	* Version History		* Version History
	* ---------------		* ---------------
	@@ -76,6 +76,7 @@
	* Added EEDP IOCStatus codes.		* Added EEDP IOCStatus codes.
	* 08-03-05 01.05.09 Bumped MPI_HEADER_VERSION_UNIT.		* 08-03-05 01.05.09 Bumped MPI_HEADER_VERSION_UNIT.
	* 08-30-05 01.05.10 Added 2 new IOCStatus codes for Target.		* 08-30-05 01.05.10 Added 2 new IOCStatus codes for Target.
			* 03-27-06 01.05.11 Bumped MPI_HEADER_VERSION_UNIT.
	* --------------------------------------------------------------------------		* --------------------------------------------------------------------------
	*/		*/

	@@ -106,7 +107,7 @@
	/* Note: The major versions of 0xe0 through 0xff are reserved */		/* Note: The major versions of 0xe0 through 0xff are reserved */

	/* versioning for this MPI header set */		/* versioning for this MPI header set */
	#define MPI_HEADER_VERSION_UNIT (0x0C)		#define MPI_HEADER_VERSION_UNIT (0x0D)
	#define MPI_HEADER_VERSION_DEV (0x00)		#define MPI_HEADER_VERSION_DEV (0x00)
	#define MPI_HEADER_VERSION_UNIT_MASK (0xFF00)		#define MPI_HEADER_VERSION_UNIT_MASK (0xFF00)
	#define MPI_HEADER_VERSION_UNIT_SHIFT (8)		#define MPI_HEADER_VERSION_UNIT_SHIFT (8)

drivers/message/fusion/lsi/mpi_cnfg.h

+140 −18

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@
	* Title: MPI Config message, structures, and Pages		* Title: MPI Config message, structures, and Pages
	* Creation Date: July 27, 2000		* Creation Date: July 27, 2000
	*		*
	* mpi_cnfg.h Version: 01.05.11		* mpi_cnfg.h Version: 01.05.12
	*		*
	* Version History		* Version History
	* ---------------		* ---------------
	@@ -266,6 +266,16 @@
	* Added postpone SATA Init bit to SAS IO Unit Page 1		* Added postpone SATA Init bit to SAS IO Unit Page 1
	* ControlFlags.		* ControlFlags.
	* Changed LogEntry format for Log Page 0.		* Changed LogEntry format for Log Page 0.
			* 03-27-06 01.05.12 Added two new Flags defines for Manufacturing Page 4.
			* Added Manufacturing Page 7.
			* Added MPI_IOCPAGE2_CAP_FLAGS_RAID_64_BIT_ADDRESSING.
			* Added IOC Page 6.
			* Added PrevBootDeviceForm field to CONFIG_PAGE_BIOS_2.
			* Added MaxLBAHigh field to RAID Volume Page 0.
			* Added Nvdata version fields to SAS IO Unit Page 0.
			* Added AdditionalControlFlags, MaxTargetPortConnectTime,
			* ReportDeviceMissingDelay, and IODeviceMissingDelay
			* fields to SAS IO Unit Page 1.
	* --------------------------------------------------------------------------		* --------------------------------------------------------------------------
	*/		*/

	@@ -631,9 +641,11 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_4
	} CONFIG_PAGE_MANUFACTURING_4, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_4,		} CONFIG_PAGE_MANUFACTURING_4, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_4,
	ManufacturingPage4_t, MPI_POINTER pManufacturingPage4_t;		ManufacturingPage4_t, MPI_POINTER pManufacturingPage4_t;

	#define MPI_MANUFACTURING4_PAGEVERSION (0x03)		#define MPI_MANUFACTURING4_PAGEVERSION (0x04)

	/* defines for the Flags field */		/* defines for the Flags field */
			#define MPI_MANPAGE4_FORCE_BAD_BLOCK_TABLE (0x80)
			#define MPI_MANPAGE4_FORCE_OFFLINE_FAILOVER (0x40)
	#define MPI_MANPAGE4_IME_DISABLE (0x20)		#define MPI_MANPAGE4_IME_DISABLE (0x20)
	#define MPI_MANPAGE4_IM_DISABLE (0x10)		#define MPI_MANPAGE4_IM_DISABLE (0x10)
	#define MPI_MANPAGE4_IS_DISABLE (0x08)		#define MPI_MANPAGE4_IS_DISABLE (0x08)
	@@ -668,6 +680,66 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_6
	#define MPI_MANUFACTURING6_PAGEVERSION (0x00)		#define MPI_MANUFACTURING6_PAGEVERSION (0x00)


			typedef struct _MPI_MANPAGE7_CONNECTOR_INFO
			{
			U32 Pinout; /* 00h */
			U8 Connector[16]; /* 04h */
			U8 Location; /* 14h */
			U8 Reserved1; /* 15h */
			U16 Slot; /* 16h */
			U32 Reserved2; /* 18h */
			} MPI_MANPAGE7_CONNECTOR_INFO, MPI_POINTER PTR_MPI_MANPAGE7_CONNECTOR_INFO,
			MpiManPage7ConnectorInfo_t, MPI_POINTER pMpiManPage7ConnectorInfo_t;

			/* defines for the Pinout field */
			#define MPI_MANPAGE7_PINOUT_SFF_8484_L4 (0x00080000)
			#define MPI_MANPAGE7_PINOUT_SFF_8484_L3 (0x00040000)
			#define MPI_MANPAGE7_PINOUT_SFF_8484_L2 (0x00020000)
			#define MPI_MANPAGE7_PINOUT_SFF_8484_L1 (0x00010000)
			#define MPI_MANPAGE7_PINOUT_SFF_8470_L4 (0x00000800)
			#define MPI_MANPAGE7_PINOUT_SFF_8470_L3 (0x00000400)
			#define MPI_MANPAGE7_PINOUT_SFF_8470_L2 (0x00000200)
			#define MPI_MANPAGE7_PINOUT_SFF_8470_L1 (0x00000100)
			#define MPI_MANPAGE7_PINOUT_SFF_8482 (0x00000002)
			#define MPI_MANPAGE7_PINOUT_CONNECTION_UNKNOWN (0x00000001)

			/* defines for the Location field */
			#define MPI_MANPAGE7_LOCATION_UNKNOWN (0x01)
			#define MPI_MANPAGE7_LOCATION_INTERNAL (0x02)
			#define MPI_MANPAGE7_LOCATION_EXTERNAL (0x04)
			#define MPI_MANPAGE7_LOCATION_SWITCHABLE (0x08)
			#define MPI_MANPAGE7_LOCATION_AUTO (0x10)
			#define MPI_MANPAGE7_LOCATION_NOT_PRESENT (0x20)
			#define MPI_MANPAGE7_LOCATION_NOT_CONNECTED (0x80)

			/*
			* Host code (drivers, BIOS, utilities, etc.) should leave this define set to
			* one and check NumPhys at runtime.
			*/
			#ifndef MPI_MANPAGE7_CONNECTOR_INFO_MAX
			#define MPI_MANPAGE7_CONNECTOR_INFO_MAX (1)
			#endif

			typedef struct _CONFIG_PAGE_MANUFACTURING_7
			{
			CONFIG_PAGE_HEADER Header; /* 00h */
			U32 Reserved1; /* 04h */
			U32 Reserved2; /* 08h */
			U32 Flags; /* 0Ch */
			U8 EnclosureName[16]; /* 10h */
			U8 NumPhys; /* 20h */
			U8 Reserved3; /* 21h */
			U16 Reserved4; /* 22h */
			MPI_MANPAGE7_CONNECTOR_INFO ConnectorInfo[MPI_MANPAGE7_CONNECTOR_INFO_MAX]; /* 24h */
			} CONFIG_PAGE_MANUFACTURING_7, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_7,
			ManufacturingPage7_t, MPI_POINTER pManufacturingPage7_t;

			#define MPI_MANUFACTURING7_PAGEVERSION (0x00)

			/* defines for the Flags field */
			#define MPI_MANPAGE7_FLAG_USE_SLOT_INFO (0x00000001)


	/****************************************************************************		/****************************************************************************
	* IO Unit Config Pages		* IO Unit Config Pages
	****************************************************************************/		****************************************************************************/
	@@ -867,7 +939,7 @@ typedef struct _CONFIG_PAGE_IOC_2
	} CONFIG_PAGE_IOC_2, MPI_POINTER PTR_CONFIG_PAGE_IOC_2,		} CONFIG_PAGE_IOC_2, MPI_POINTER PTR_CONFIG_PAGE_IOC_2,
	IOCPage2_t, MPI_POINTER pIOCPage2_t;		IOCPage2_t, MPI_POINTER pIOCPage2_t;

	#define MPI_IOCPAGE2_PAGEVERSION (0x03)		#define MPI_IOCPAGE2_PAGEVERSION (0x04)

	/* IOC Page 2 Capabilities flags */		/* IOC Page 2 Capabilities flags */

	@@ -878,6 +950,7 @@ typedef struct _CONFIG_PAGE_IOC_2
	#define MPI_IOCPAGE2_CAP_FLAGS_RAID_6_SUPPORT (0x00000010)		#define MPI_IOCPAGE2_CAP_FLAGS_RAID_6_SUPPORT (0x00000010)
	#define MPI_IOCPAGE2_CAP_FLAGS_RAID_10_SUPPORT (0x00000020)		#define MPI_IOCPAGE2_CAP_FLAGS_RAID_10_SUPPORT (0x00000020)
	#define MPI_IOCPAGE2_CAP_FLAGS_RAID_50_SUPPORT (0x00000040)		#define MPI_IOCPAGE2_CAP_FLAGS_RAID_50_SUPPORT (0x00000040)
			#define MPI_IOCPAGE2_CAP_FLAGS_RAID_64_BIT_ADDRESSING (0x10000000)
	#define MPI_IOCPAGE2_CAP_FLAGS_SES_SUPPORT (0x20000000)		#define MPI_IOCPAGE2_CAP_FLAGS_SES_SUPPORT (0x20000000)
	#define MPI_IOCPAGE2_CAP_FLAGS_SAFTE_SUPPORT (0x40000000)		#define MPI_IOCPAGE2_CAP_FLAGS_SAFTE_SUPPORT (0x40000000)
	#define MPI_IOCPAGE2_CAP_FLAGS_CROSS_CHANNEL_SUPPORT (0x80000000)		#define MPI_IOCPAGE2_CAP_FLAGS_CROSS_CHANNEL_SUPPORT (0x80000000)
	@@ -975,6 +1048,44 @@ typedef struct _CONFIG_PAGE_IOC_5

	#define MPI_IOCPAGE5_PAGEVERSION (0x00)		#define MPI_IOCPAGE5_PAGEVERSION (0x00)

			typedef struct _CONFIG_PAGE_IOC_6
			{
			CONFIG_PAGE_HEADER Header; /* 00h */
			U32 CapabilitiesFlags; /* 04h */
			U8 MaxDrivesIS; /* 08h */
			U8 MaxDrivesIM; /* 09h */
			U8 MaxDrivesIME; /* 0Ah */
			U8 Reserved1; /* 0Bh */
			U8 MinDrivesIS; /* 0Ch */
			U8 MinDrivesIM; /* 0Dh */
			U8 MinDrivesIME; /* 0Eh */
			U8 Reserved2; /* 0Fh */
			U8 MaxGlobalHotSpares; /* 10h */
			U8 Reserved3; /* 11h */
			U16 Reserved4; /* 12h */
			U32 Reserved5; /* 14h */
			U32 SupportedStripeSizeMapIS; /* 18h */
			U32 SupportedStripeSizeMapIME; /* 1Ch */
			U32 Reserved6; /* 20h */
			U8 MetadataSize; /* 24h */
			U8 Reserved7; /* 25h */
			U16 Reserved8; /* 26h */
			U16 MaxBadBlockTableEntries; /* 28h */
			U16 Reserved9; /* 2Ah */
			U16 IRNvsramUsage; /* 2Ch */
			U16 Reserved10; /* 2Eh */
			U32 IRNvsramVersion; /* 30h */
			U32 Reserved11; /* 34h */
			U32 Reserved12; /* 38h */
			} CONFIG_PAGE_IOC_6, MPI_POINTER PTR_CONFIG_PAGE_IOC_6,
			IOCPage6_t, MPI_POINTER pIOCPage6_t;

			#define MPI_IOCPAGE6_PAGEVERSION (0x00)

			/* IOC Page 6 Capabilities Flags */

			#define MPI_IOCPAGE6_CAP_FLAGS_GLOBAL_HOT_SPARE (0x00000001)


	/****************************************************************************		/****************************************************************************
	* BIOS Config Pages		* BIOS Config Pages
	@@ -1218,13 +1329,13 @@ typedef struct _CONFIG_PAGE_BIOS_2
	U32 Reserved5; /* 14h */		U32 Reserved5; /* 14h */
	U32 Reserved6; /* 18h */		U32 Reserved6; /* 18h */
	U8 BootDeviceForm; /* 1Ch */		U8 BootDeviceForm; /* 1Ch */
	U8 Reserved7; /* 1Dh */		U8 PrevBootDeviceForm; /* 1Ch */
	U16 Reserved8; /* 1Eh */		U16 Reserved8; /* 1Eh */
	MPI_BIOSPAGE2_BOOT_DEVICE BootDevice; /* 20h */		MPI_BIOSPAGE2_BOOT_DEVICE BootDevice; /* 20h */
	} CONFIG_PAGE_BIOS_2, MPI_POINTER PTR_CONFIG_PAGE_BIOS_2,		} CONFIG_PAGE_BIOS_2, MPI_POINTER PTR_CONFIG_PAGE_BIOS_2,
	BIOSPage2_t, MPI_POINTER pBIOSPage2_t;		BIOSPage2_t, MPI_POINTER pBIOSPage2_t;

	#define MPI_BIOSPAGE2_PAGEVERSION (0x01)		#define MPI_BIOSPAGE2_PAGEVERSION (0x02)

	#define MPI_BIOSPAGE2_FORM_MASK (0x0F)		#define MPI_BIOSPAGE2_FORM_MASK (0x0F)
	#define MPI_BIOSPAGE2_FORM_ADAPTER_ORDER (0x00)		#define MPI_BIOSPAGE2_FORM_ADAPTER_ORDER (0x00)
	@@ -2080,7 +2191,7 @@ typedef struct _CONFIG_PAGE_RAID_VOL_0
	RAID_VOL0_STATUS VolumeStatus; /* 08h */		RAID_VOL0_STATUS VolumeStatus; /* 08h */
	RAID_VOL0_SETTINGS VolumeSettings; /* 0Ch */		RAID_VOL0_SETTINGS VolumeSettings; /* 0Ch */
	U32 MaxLBA; /* 10h */		U32 MaxLBA; /* 10h */
	U32 Reserved1; /* 14h */		U32 MaxLBAHigh; /* 14h */
	U32 StripeSize; /* 18h */		U32 StripeSize; /* 18h */
	U32 Reserved2; /* 1Ch */		U32 Reserved2; /* 1Ch */
	U32 Reserved3; /* 20h */		U32 Reserved3; /* 20h */
	@@ -2092,7 +2203,7 @@ typedef struct _CONFIG_PAGE_RAID_VOL_0
	} CONFIG_PAGE_RAID_VOL_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_VOL_0,		} CONFIG_PAGE_RAID_VOL_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_VOL_0,
	RaidVolumePage0_t, MPI_POINTER pRaidVolumePage0_t;		RaidVolumePage0_t, MPI_POINTER pRaidVolumePage0_t;

	#define MPI_RAIDVOLPAGE0_PAGEVERSION (0x05)		#define MPI_RAIDVOLPAGE0_PAGEVERSION (0x06)

	/* values for RAID Volume Page 0 InactiveStatus field */		/* values for RAID Volume Page 0 InactiveStatus field */
	#define MPI_RAIDVOLPAGE0_UNKNOWN_INACTIVE (0x00)		#define MPI_RAIDVOLPAGE0_UNKNOWN_INACTIVE (0x00)
	@@ -2324,7 +2435,8 @@ typedef struct _MPI_SAS_IO_UNIT0_PHY_DATA
	typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0		typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
	{		{
	CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */		CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */
	U32 Reserved1; /* 08h */		U16 NvdataVersionDefault; /* 08h */
			U16 NvdataVersionPersistent; /* 0Ah */
	U8 NumPhys; /* 0Ch */		U8 NumPhys; /* 0Ch */
	U8 Reserved2; /* 0Dh */		U8 Reserved2; /* 0Dh */
	U16 Reserved3; /* 0Eh */		U16 Reserved3; /* 0Eh */
	@@ -2332,7 +2444,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
	} CONFIG_PAGE_SAS_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_0,		} CONFIG_PAGE_SAS_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_0,
	SasIOUnitPage0_t, MPI_POINTER pSasIOUnitPage0_t;		SasIOUnitPage0_t, MPI_POINTER pSasIOUnitPage0_t;

	#define MPI_SASIOUNITPAGE0_PAGEVERSION (0x03)		#define MPI_SASIOUNITPAGE0_PAGEVERSION (0x04)

	/* values for SAS IO Unit Page 0 PortFlags */		/* values for SAS IO Unit Page 0 PortFlags */
	#define MPI_SAS_IOUNIT0_PORT_FLAGS_DISCOVERY_IN_PROGRESS (0x08)		#define MPI_SAS_IOUNIT0_PORT_FLAGS_DISCOVERY_IN_PROGRESS (0x08)
	@@ -2378,7 +2490,8 @@ typedef struct _MPI_SAS_IO_UNIT1_PHY_DATA
	U8 PhyFlags; /* 02h */		U8 PhyFlags; /* 02h */
	U8 MaxMinLinkRate; /* 03h */		U8 MaxMinLinkRate; /* 03h */
	U32 ControllerPhyDeviceInfo; /* 04h */		U32 ControllerPhyDeviceInfo; /* 04h */
	U32 Reserved1; /* 08h */		U16 MaxTargetPortConnectTime; /* 08h */
			U16 Reserved1; /* 0Ah */
	} MPI_SAS_IO_UNIT1_PHY_DATA, MPI_POINTER PTR_MPI_SAS_IO_UNIT1_PHY_DATA,		} MPI_SAS_IO_UNIT1_PHY_DATA, MPI_POINTER PTR_MPI_SAS_IO_UNIT1_PHY_DATA,
	SasIOUnit1PhyData, MPI_POINTER pSasIOUnit1PhyData;		SasIOUnit1PhyData, MPI_POINTER pSasIOUnit1PhyData;

	@@ -2395,15 +2508,17 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1
	CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */		CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */
	U16 ControlFlags; /* 08h */		U16 ControlFlags; /* 08h */
	U16 MaxNumSATATargets; /* 0Ah */		U16 MaxNumSATATargets; /* 0Ah */
	U32 Reserved1; /* 0Ch */		U16 AdditionalControlFlags; /* 0Ch */
			U16 Reserved1; /* 0Eh */
	U8 NumPhys; /* 10h */		U8 NumPhys; /* 10h */
	U8 SATAMaxQDepth; /* 11h */		U8 SATAMaxQDepth; /* 11h */
	U16 Reserved2; /* 12h */		U8 ReportDeviceMissingDelay; /* 12h */
			U8 IODeviceMissingDelay; /* 13h */
	MPI_SAS_IO_UNIT1_PHY_DATA PhyData[MPI_SAS_IOUNIT1_PHY_MAX]; /* 14h */		MPI_SAS_IO_UNIT1_PHY_DATA PhyData[MPI_SAS_IOUNIT1_PHY_MAX]; /* 14h */
	} CONFIG_PAGE_SAS_IO_UNIT_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_1,		} CONFIG_PAGE_SAS_IO_UNIT_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_1,
	SasIOUnitPage1_t, MPI_POINTER pSasIOUnitPage1_t;		SasIOUnitPage1_t, MPI_POINTER pSasIOUnitPage1_t;

	#define MPI_SASIOUNITPAGE1_PAGEVERSION (0x05)		#define MPI_SASIOUNITPAGE1_PAGEVERSION (0x06)

	/* values for SAS IO Unit Page 1 ControlFlags */		/* values for SAS IO Unit Page 1 ControlFlags */
	#define MPI_SAS_IOUNIT1_CONTROL_DEVICE_SELF_TEST (0x8000)		#define MPI_SAS_IOUNIT1_CONTROL_DEVICE_SELF_TEST (0x8000)
	@@ -2428,6 +2543,13 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1
	#define MPI_SAS_IOUNIT1_CONTROL_FIRST_LVL_DISC_ONLY (0x0002)		#define MPI_SAS_IOUNIT1_CONTROL_FIRST_LVL_DISC_ONLY (0x0002)
	#define MPI_SAS_IOUNIT1_CONTROL_CLEAR_AFFILIATION (0x0001)		#define MPI_SAS_IOUNIT1_CONTROL_CLEAR_AFFILIATION (0x0001)

			/* values for SAS IO Unit Page 1 AdditionalControlFlags */
			#define MPI_SAS_IOUNIT1_ACONTROL_ALLOW_TABLE_TO_TABLE (0x0001)

			/* defines for SAS IO Unit Page 1 ReportDeviceMissingDelay */
			#define MPI_SAS_IOUNIT1_REPORT_MISSING_TIMEOUT_MASK (0x7F)
			#define MPI_SAS_IOUNIT1_REPORT_MISSING_UNIT_16 (0x80)

	/* values for SAS IO Unit Page 1 PortFlags */		/* values for SAS IO Unit Page 1 PortFlags */
	#define MPI_SAS_IOUNIT1_PORT_FLAGS_0_TARGET_IOC_NUM (0x00)		#define MPI_SAS_IOUNIT1_PORT_FLAGS_0_TARGET_IOC_NUM (0x00)
	#define MPI_SAS_IOUNIT1_PORT_FLAGS_1_TARGET_IOC_NUM (0x04)		#define MPI_SAS_IOUNIT1_PORT_FLAGS_1_TARGET_IOC_NUM (0x04)

drivers/message/fusion/lsi/mpi_history.txt

+52 −24

File changed.

Preview size limit exceeded, changes collapsed.

drivers/message/fusion/lsi/mpi_init.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@
	* Title: MPI initiator mode messages and structures		* Title: MPI initiator mode messages and structures
	* Creation Date: June 8, 2000		* Creation Date: June 8, 2000
	*		*
	* mpi_init.h Version: 01.05.06		* mpi_init.h Version: 01.05.07
	*		*
	* Version History		* Version History
	* ---------------		* ---------------
	@@ -52,6 +52,7 @@
	* Added four new defines for SEP SlotStatus.		* Added four new defines for SEP SlotStatus.
	* 08-03-05 01.05.06 Fixed some MPI_SCSIIO32_MSGFLGS_ defines to make them		* 08-03-05 01.05.06 Fixed some MPI_SCSIIO32_MSGFLGS_ defines to make them
	* unique in the first 32 characters.		* unique in the first 32 characters.
			* 03-27-06 01.05.07 Added Task Management type of Clear ACA.
	* --------------------------------------------------------------------------		* --------------------------------------------------------------------------
	*/		*/

	@@ -427,6 +428,7 @@ typedef struct _MSG_SCSI_TASK_MGMT
	#define MPI_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET (0x05)		#define MPI_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET (0x05)
	#define MPI_SCSITASKMGMT_TASKTYPE_CLEAR_TASK_SET (0x06)		#define MPI_SCSITASKMGMT_TASKTYPE_CLEAR_TASK_SET (0x06)
	#define MPI_SCSITASKMGMT_TASKTYPE_QUERY_TASK (0x07)		#define MPI_SCSITASKMGMT_TASKTYPE_QUERY_TASK (0x07)
			#define MPI_SCSITASKMGMT_TASKTYPE_CLEAR_ACA (0x08)

	/* MsgFlags bits */		/* MsgFlags bits */
	#define MPI_SCSITASKMGMT_MSGFLAGS_TARGET_RESET_OPTION (0x00)		#define MPI_SCSITASKMGMT_MSGFLAGS_TARGET_RESET_OPTION (0x00)