d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mps: clean up empty lines in .c and .h files

Browse Source
This commit is contained in:
Mateusz Guzik 2020-09-01 22:07:00 +00:00
parent 0bd9a5da1c
commit 742c5f2014
22 changed files with 14 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sys/dev/mps/mpi/mpi2.h
View File

@ -106,7 +106,6 @@
#ifndef MPI2_H
#define MPI2_H
/*****************************************************************************
*
* MPI Version Definitions
@ -133,7 +132,6 @@
#define MPI2_HEADER_VERSION_DEV_SHIFT (0)
#define MPI2_HEADER_VERSION ((MPI2_HEADER_VERSION_UNIT << 8) | MPI2_HEADER_VERSION_DEV)
/*****************************************************************************
*
* IOC State Definitions
@ -152,7 +150,6 @@
#define MPI2_FAULT_PRODUCT_SPECIFIC_MIN (0x0000)
#define MPI2_FAULT_PRODUCT_SPECIFIC_MAX (0xEFFF)
/*****************************************************************************
*
* System Interface Register Definitions
@ -206,7 +203,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS
#define MPI2_DOORBELL_ADD_DWORDS_MASK (0x00FF0000)
#define MPI2_DOORBELL_ADD_DWORDS_SHIFT (16)
/*
* Defines for the WriteSequence register
*/
@ -302,7 +298,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS
#define MPI2_REQUEST_DESCRIPTOR_POST_LOW_OFFSET (0x000000C0)
#define MPI2_REQUEST_DESCRIPTOR_POST_HIGH_OFFSET (0x000000C4)
/*****************************************************************************
*
* Message Descriptors
@ -333,7 +328,6 @@ typedef struct _MPI2_DEFAULT_REQUEST_DESCRIPTOR
#define MPI2_REQ_DESCRIPT_FLAGS_IOC_FIFO_MARKER (0x01)
/* High Priority Request Descriptor */
typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR
{
@ -347,7 +341,6 @@ typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR
Mpi2HighPriorityRequestDescriptor_t,
MPI2_POINTER pMpi2HighPriorityRequestDescriptor_t;
/* SCSI IO Request Descriptor */
typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR
{
@ -360,7 +353,6 @@ typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR
MPI2_POINTER PTR_MPI2_SCSI_IO_REQUEST_DESCRIPTOR,
Mpi2SCSIIORequestDescriptor_t, MPI2_POINTER pMpi2SCSIIORequestDescriptor_t;
/* SCSI Target Request Descriptor */
typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR
{
@ -374,7 +366,6 @@ typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR
Mpi2SCSITargetRequestDescriptor_t,
MPI2_POINTER pMpi2SCSITargetRequestDescriptor_t;
/* RAID Accelerator Request Descriptor */
typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR
{
@ -388,7 +379,6 @@ typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR
Mpi2RAIDAcceleratorRequestDescriptor_t,
MPI2_POINTER pMpi2RAIDAcceleratorRequestDescriptor_t;
/* union of Request Descriptors */
typedef union _MPI2_REQUEST_DESCRIPTOR_UNION
{
@ -401,7 +391,6 @@ typedef union _MPI2_REQUEST_DESCRIPTOR_UNION
} MPI2_REQUEST_DESCRIPTOR_UNION, MPI2_POINTER PTR_MPI2_REQUEST_DESCRIPTOR_UNION,
Mpi2RequestDescriptorUnion_t, MPI2_POINTER pMpi2RequestDescriptorUnion_t;
/* Reply Descriptors */
/* Default Reply Descriptor */
@ -439,7 +428,6 @@ typedef struct _MPI2_ADDRESS_REPLY_DESCRIPTOR
#define MPI2_ADDRESS_REPLY_SMID_INVALID (0x00)
/* SCSI IO Success Reply Descriptor */
typedef struct _MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR
{
@ -453,7 +441,6 @@ typedef struct _MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR
Mpi2SCSIIOSuccessReplyDescriptor_t,
MPI2_POINTER pMpi2SCSIIOSuccessReplyDescriptor_t;
/* TargetAssist Success Reply Descriptor */
typedef struct _MPI2_TARGETASSIST_SUCCESS_REPLY_DESCRIPTOR
{
@ -468,7 +455,6 @@ typedef struct _MPI2_TARGETASSIST_SUCCESS_REPLY_DESCRIPTOR
Mpi2TargetAssistSuccessReplyDescriptor_t,
MPI2_POINTER pMpi2TargetAssistSuccessReplyDescriptor_t;
/* Target Command Buffer Reply Descriptor */
typedef struct _MPI2_TARGET_COMMAND_BUFFER_REPLY_DESCRIPTOR
{
@ -486,7 +472,6 @@ typedef struct _MPI2_TARGET_COMMAND_BUFFER_REPLY_DESCRIPTOR
/* defines for Flags field */
#define MPI2_RPY_DESCRIPT_TCB_FLAGS_PHYNUM_MASK (0x3F)
/* RAID Accelerator Success Reply Descriptor */
typedef struct _MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR
{
@ -499,7 +484,6 @@ typedef struct _MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR
Mpi2RAIDAcceleratorSuccessReplyDescriptor_t,
MPI2_POINTER pMpi2RAIDAcceleratorSuccessReplyDescriptor_t;
/* union of Reply Descriptors */
typedef union _MPI2_REPLY_DESCRIPTORS_UNION
{
@ -513,8 +497,6 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION
} MPI2_REPLY_DESCRIPTORS_UNION, MPI2_POINTER PTR_MPI2_REPLY_DESCRIPTORS_UNION,
Mpi2ReplyDescriptorsUnion_t, MPI2_POINTER pMpi2ReplyDescriptorsUnion_t;
/*****************************************************************************
*
* Message Functions
@ -552,13 +534,10 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION
#define MPI2_FUNCTION_MIN_PRODUCT_SPECIFIC (0xF0) /* beginning of product-specific range */
#define MPI2_FUNCTION_MAX_PRODUCT_SPECIFIC (0xFF) /* end of product-specific range */
/* Doorbell functions */
#define MPI2_FUNCTION_IOC_MESSAGE_UNIT_RESET (0x40)
#define MPI2_FUNCTION_HANDSHAKE (0x42)
/*****************************************************************************
*
* IOC Status Values
@ -672,7 +651,6 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION
#define MPI2_IOCLOGINFO_TYPE_ISCSI (0x4)
#define MPI2_IOCLOGINFO_LOG_DATA_MASK (0x0FFFFFFF)
/*****************************************************************************
*
* Standard Message Structures
@ -697,7 +675,6 @@ typedef struct _MPI2_REQUEST_HEADER
} MPI2_REQUEST_HEADER, MPI2_POINTER PTR_MPI2_REQUEST_HEADER,
MPI2RequestHeader_t, MPI2_POINTER pMPI2RequestHeader_t;
/****************************************************************************
* Default Reply
****************************************************************************/
@ -719,7 +696,6 @@ typedef struct _MPI2_DEFAULT_REPLY
} MPI2_DEFAULT_REPLY, MPI2_POINTER PTR_MPI2_DEFAULT_REPLY,
MPI2DefaultReply_t, MPI2_POINTER pMPI2DefaultReply_t;
/* common version structure/union used in messages and configuration pages */
typedef struct _MPI2_VERSION_STRUCT
@ -736,7 +712,6 @@ typedef union _MPI2_VERSION_UNION
U32 Word;
} MPI2_VERSION_UNION;
/* LUN field defines, common to many structures */
#define MPI2_LUN_FIRST_LEVEL_ADDRESSING (0x0000FFFF)
#define MPI2_LUN_SECOND_LEVEL_ADDRESSING (0xFFFF0000)
@ -745,7 +720,6 @@ typedef union _MPI2_VERSION_UNION
#define MPI2_LUN_LEVEL_1_WORD (0xFF00)
#define MPI2_LUN_LEVEL_1_DWORD (0x0000FF00)
/*****************************************************************************
*
* Fusion-MPT MPI Scatter Gather Elements
@ -781,7 +755,6 @@ typedef struct _MPI2_SGE_SIMPLE_UNION
} MPI2_SGE_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_SGE_SIMPLE_UNION,
Mpi2SGESimpleUnion_t, MPI2_POINTER pMpi2SGESimpleUnion_t;
/****************************************************************************
* MPI Chain Element structures
****************************************************************************/
@ -817,7 +790,6 @@ typedef struct _MPI2_SGE_CHAIN_UNION
} MPI2_SGE_CHAIN_UNION, MPI2_POINTER PTR_MPI2_SGE_CHAIN_UNION,
Mpi2SGEChainUnion_t, MPI2_POINTER pMpi2SGEChainUnion_t;
/****************************************************************************
* MPI Transaction Context Element structures
****************************************************************************/
@ -883,7 +855,6 @@ typedef struct _MPI2_SGE_TRANSACTION_UNION
} MPI2_SGE_TRANSACTION_UNION, MPI2_POINTER PTR_MPI2_SGE_TRANSACTION_UNION,
Mpi2SGETransactionUnion_t, MPI2_POINTER pMpi2SGETransactionUnion_t;
/****************************************************************************
* MPI SGE union for IO SGL's
****************************************************************************/
@ -898,7 +869,6 @@ typedef struct _MPI2_MPI_SGE_IO_UNION
} MPI2_MPI_SGE_IO_UNION, MPI2_POINTER PTR_MPI2_MPI_SGE_IO_UNION,
Mpi2MpiSGEIOUnion_t, MPI2_POINTER pMpi2MpiSGEIOUnion_t;
/****************************************************************************
* MPI SGE union for SGL's with Simple and Transaction elements
****************************************************************************/
@ -913,7 +883,6 @@ typedef struct _MPI2_SGE_TRANS_SIMPLE_UNION
} MPI2_SGE_TRANS_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_SGE_TRANS_SIMPLE_UNION,
Mpi2SGETransSimpleUnion_t, MPI2_POINTER pMpi2SGETransSimpleUnion_t;
/****************************************************************************
* All MPI SGE types union
****************************************************************************/
@ -929,7 +898,6 @@ typedef struct _MPI2_MPI_SGE_UNION
} MPI2_MPI_SGE_UNION, MPI2_POINTER PTR_MPI2_MPI_SGE_UNION,
Mpi2MpiSgeUnion_t, MPI2_POINTER pMpi2MpiSgeUnion_t;
/****************************************************************************
* MPI SGE field definition and masks
****************************************************************************/
@ -1005,7 +973,6 @@ typedef struct _MPI2_MPI_SGE_UNION
#define MPI2_GET_CHAIN_OFFSET(x) ((x & MPI2_SGE_CHAIN_OFFSET_MASK) >> MPI2_SGE_CHAIN_OFFSET_SHIFT)
/*****************************************************************************
*
* Fusion-MPT IEEE Scatter Gather Elements
@ -1040,7 +1007,6 @@ typedef union _MPI2_IEEE_SGE_SIMPLE_UNION
} MPI2_IEEE_SGE_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_SIMPLE_UNION,
Mpi2IeeeSgeSimpleUnion_t, MPI2_POINTER pMpi2IeeeSgeSimpleUnion_t;
/****************************************************************************
* IEEE Chain Element structures
****************************************************************************/
@ -1056,7 +1022,6 @@ typedef union _MPI2_IEEE_SGE_CHAIN_UNION
} MPI2_IEEE_SGE_CHAIN_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_CHAIN_UNION,
Mpi2IeeeSgeChainUnion_t, MPI2_POINTER pMpi2IeeeSgeChainUnion_t;
/****************************************************************************
* All IEEE SGE types union
****************************************************************************/
@ -1071,7 +1036,6 @@ typedef struct _MPI2_IEEE_SGE_UNION
} MPI2_IEEE_SGE_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_UNION,
Mpi2IeeeSgeUnion_t, MPI2_POINTER pMpi2IeeeSgeUnion_t;
/****************************************************************************
* IEEE SGE field definitions and masks
****************************************************************************/
@ -1117,9 +1081,6 @@ typedef struct _MPI2_IEEE_SGE_UNION
#define MPI2_IEEE32_pSGE_SET_FLAGS(psg,f) (psg)->FlagsLength |= MPI2_IEEE32_SGE_SET_FLAGS(f)
#define MPI2_IEEE32_pSGE_SET_LENGTH(psg,l) (psg)->FlagsLength |= MPI2_IEEE32_SGE_LENGTH(l)
/*****************************************************************************
*
* Fusion-MPT MPI/IEEE Scatter Gather Unions
@ -1133,7 +1094,6 @@ typedef union _MPI2_SIMPLE_SGE_UNION
} MPI2_SIMPLE_SGE_UNION, MPI2_POINTER PTR_MPI2_SIMPLE_SGE_UNION,
Mpi2SimpleSgeUntion_t, MPI2_POINTER pMpi2SimpleSgeUntion_t;
typedef union _MPI2_SGE_IO_UNION
{
MPI2_SGE_SIMPLE_UNION MpiSimple;
@ -1143,7 +1103,6 @@ typedef union _MPI2_SGE_IO_UNION
} MPI2_SGE_IO_UNION, MPI2_POINTER PTR_MPI2_SGE_IO_UNION,
Mpi2SGEIOUnion_t, MPI2_POINTER pMpi2SGEIOUnion_t;
/****************************************************************************
*
* Values for SGLFlags field, used in many request messages with an SGL
@ -1162,6 +1121,4 @@ typedef union _MPI2_SGE_IO_UNION
#define MPI2_SGLFLAGS_SGL_TYPE_IEEE32 (0x01)
#define MPI2_SGLFLAGS_SGL_TYPE_IEEE64 (0x02)
#endif

86
sys/dev/mps/mpi/mpi2_cnfg.h
View File

@ -221,7 +221,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION
} MPI2_CONFIG_EXT_PAGE_HEADER_UNION, MPI2_POINTER PTR_MPI2_CONFIG_EXT_PAGE_HEADER_UNION,
Mpi2ConfigPageExtendedHeaderUnion, MPI2_POINTER pMpi2ConfigPageExtendedHeaderUnion;
/* PageType field values */
#define MPI2_CONFIG_PAGEATTR_READ_ONLY (0x00)
#define MPI2_CONFIG_PAGEATTR_CHANGEABLE (0x10)
@ -239,7 +238,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION
#define MPI2_CONFIG_TYPENUM_MASK (0x0FFF)
/* ExtPageType field values */
#define MPI2_CONFIG_EXTPAGETYPE_SAS_IO_UNIT (0x10)
#define MPI2_CONFIG_EXTPAGETYPE_SAS_EXPANDER (0x11)
@ -253,7 +251,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION
#define MPI2_CONFIG_EXTPAGETYPE_ETHERNET (0x19)
#define MPI2_CONFIG_EXTPAGETYPE_EXT_MANUFACTURING (0x1A)
/*****************************************************************************
* PageAddress defines
*****************************************************************************/
@ -265,7 +262,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION
#define MPI2_RAID_VOLUME_PGAD_HANDLE_MASK (0x0000FFFF)
/* RAID Physical Disk PageAddress format */
#define MPI2_PHYSDISK_PGAD_FORM_MASK (0xF0000000)
#define MPI2_PHYSDISK_PGAD_FORM_GET_NEXT_PHYSDISKNUM (0x00000000)
@ -275,7 +271,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION
#define MPI2_PHYSDISK_PGAD_PHYSDISKNUM_MASK (0x000000FF)
#define MPI2_PHYSDISK_PGAD_DEVHANDLE_MASK (0x0000FFFF)
/* SAS Expander PageAddress format */
#define MPI2_SAS_EXPAND_PGAD_FORM_MASK (0xF0000000)
#define MPI2_SAS_EXPAND_PGAD_FORM_GET_NEXT_HNDL (0x00000000)
@ -286,7 +281,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION
#define MPI2_SAS_EXPAND_PGAD_PHYNUM_MASK (0x00FF0000)
#define MPI2_SAS_EXPAND_PGAD_PHYNUM_SHIFT (16)
/* SAS Device PageAddress format */
#define MPI2_SAS_DEVICE_PGAD_FORM_MASK (0xF0000000)
#define MPI2_SAS_DEVICE_PGAD_FORM_GET_NEXT_HANDLE (0x00000000)
@ -294,7 +288,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION
#define MPI2_SAS_DEVICE_PGAD_HANDLE_MASK (0x0000FFFF)
/* SAS PHY PageAddress format */
#define MPI2_SAS_PHY_PGAD_FORM_MASK (0xF0000000)
#define MPI2_SAS_PHY_PGAD_FORM_PHY_NUMBER (0x00000000)
@ -303,7 +296,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION
#define MPI2_SAS_PHY_PGAD_PHY_NUMBER_MASK (0x000000FF)
#define MPI2_SAS_PHY_PGAD_PHY_TBL_INDEX_MASK (0x0000FFFF)
/* SAS Port PageAddress format */
#define MPI2_SASPORT_PGAD_FORM_MASK (0xF0000000)
#define MPI2_SASPORT_PGAD_FORM_GET_NEXT_PORT (0x00000000)
@ -311,7 +303,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION
#define MPI2_SASPORT_PGAD_PORTNUMBER_MASK (0x00000FFF)
/* SAS Enclosure PageAddress format */
#define MPI2_SAS_ENCLOS_PGAD_FORM_MASK (0xF0000000)
#define MPI2_SAS_ENCLOS_PGAD_FORM_GET_NEXT_HANDLE (0x00000000)
@ -319,7 +310,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION
#define MPI2_SAS_ENCLOS_PGAD_HANDLE_MASK (0x0000FFFF)
/* RAID Configuration PageAddress format */
#define MPI2_RAID_PGAD_FORM_MASK (0xF0000000)
#define MPI2_RAID_PGAD_FORM_GET_NEXT_CONFIGNUM (0x00000000)
@ -328,7 +318,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION
#define MPI2_RAID_PGAD_CONFIGNUM_MASK (0x000000FF)
/* Driver Persistent Mapping PageAddress format */
#define MPI2_DPM_PGAD_FORM_MASK (0xF0000000)
#define MPI2_DPM_PGAD_FORM_ENTRY_RANGE (0x00000000)
@ -337,15 +326,12 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION
#define MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT (16)
#define MPI2_DPM_PGAD_START_ENTRY_MASK (0x0000FFFF)
/* Ethernet PageAddress format */
#define MPI2_ETHERNET_PGAD_FORM_MASK (0xF0000000)
#define MPI2_ETHERNET_PGAD_FORM_IF_NUM (0x00000000)
#define MPI2_ETHERNET_PGAD_IF_NUMBER_MASK (0x000000FF)
/****************************************************************************
* Configuration messages
****************************************************************************/
@ -383,7 +369,6 @@ typedef struct _MPI2_CONFIG_REQUEST
/* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */
/* Config Reply Message */
typedef struct _MPI2_CONFIG_REPLY
{
@ -404,8 +389,6 @@ typedef struct _MPI2_CONFIG_REPLY
} MPI2_CONFIG_REPLY, MPI2_POINTER PTR_MPI2_CONFIG_REPLY,
Mpi2ConfigReply_t, MPI2_POINTER pMpi2ConfigReply_t;
/*****************************************************************************
*
* C o n f i g u r a t i o n P a g e s
@ -439,9 +422,6 @@ typedef struct _MPI2_CONFIG_REPLY
#define MPI2_MFGPAGE_DEVID_SAS2308_2 (0x0087)
#define MPI2_MFGPAGE_DEVID_SAS2308_3 (0x006E)
/* Manufacturing Page 0 */
typedef struct _MPI2_CONFIG_PAGE_MAN_0
@ -458,7 +438,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_0
#define MPI2_MANUFACTURING0_PAGEVERSION (0x00)
/* Manufacturing Page 1 */
typedef struct _MPI2_CONFIG_PAGE_MAN_1
@ -471,7 +450,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_1
#define MPI2_MANUFACTURING1_PAGEVERSION (0x00)
typedef struct _MPI2_CHIP_REVISION_ID
{
U16 DeviceID; /* 0x00 */
@ -480,7 +458,6 @@ typedef struct _MPI2_CHIP_REVISION_ID
} MPI2_CHIP_REVISION_ID, MPI2_POINTER PTR_MPI2_CHIP_REVISION_ID,
Mpi2ChipRevisionId_t, MPI2_POINTER pMpi2ChipRevisionId_t;
/* Manufacturing Page 2 */
/*
@ -502,7 +479,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_2
#define MPI2_MANUFACTURING2_PAGEVERSION (0x00)
/* Manufacturing Page 3 */
/*
@ -524,7 +500,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_3
#define MPI2_MANUFACTURING3_PAGEVERSION (0x00)
/* Manufacturing Page 4 */
typedef struct _MPI2_MANPAGE4_PWR_SAVE_SETTINGS
@ -600,7 +575,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_4
#define MPI2_MANPAGE4_IM_RESYNC_CACHE_ENABLE (0x00000002)
#define MPI2_MANPAGE4_IR_NO_MIX_SAS_SATA (0x00000001)
/* Manufacturing Page 5 */
/*
@ -633,7 +607,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_5
#define MPI2_MANUFACTURING5_PAGEVERSION (0x03)
/* Manufacturing Page 6 */
typedef struct _MPI2_CONFIG_PAGE_MAN_6
@ -646,7 +619,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_6
#define MPI2_MANUFACTURING6_PAGEVERSION (0x00)
/* Manufacturing Page 7 */
typedef struct _MPI2_MANPAGE7_CONNECTOR_INFO
@ -717,7 +689,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_7
/* defines for the Flags field */
#define MPI2_MANPAGE7_FLAG_USE_SLOT_INFO (0x00000001)
/*
* Generic structure to use for product-specific manufacturing pages
* (currently Manufacturing Page 8 through Manufacturing Page 31).
@ -756,7 +727,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_PS
#define MPI2_MANUFACTURING30_PAGEVERSION (0x00)
#define MPI2_MANUFACTURING31_PAGEVERSION (0x00)
/****************************************************************************
* IO Unit Config Pages
****************************************************************************/
@ -774,7 +744,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_0
#define MPI2_IOUNITPAGE0_PAGEVERSION (0x02)
/* IO Unit Page 1 */
typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_1
@ -798,7 +767,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_1
#define MPI2_IOUNITPAGE1_DISABLE_TASK_SET_FULL_HANDLING (0x00000020)
#define MPI2_IOUNITPAGE1_IR_USE_STATIC_VOLUME_ID (0x00000004)
/* IO Unit Page 3 */
/*
@ -827,7 +795,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_3
#define MPI2_IOUNITPAGE3_GPIO_SETTING_OFF (0x0000)
#define MPI2_IOUNITPAGE3_GPIO_SETTING_ON (0x0001)
/* IO Unit Page 5 */
/*
@ -866,7 +833,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_5
#define MPI2_IOUNITPAGE5_DMA_CAP_HASHING (0x0002)
#define MPI2_IOUNITPAGE5_DMA_CAP_ENCRYPTION (0x0001)
/* IO Unit Page 6 */
typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_6
@ -887,7 +853,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_6
/* defines for IO Unit Page 6 Flags field */
#define MPI2_IOUNITPAGE6_FLAGS_ENABLE_RAID_ACCELERATOR (0x0001)
/* IO Unit Page 7 */
typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7
@ -951,8 +916,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7
#define MPI2_IOUNITPAGE7_BOARD_TEMP_FAHRENHEIT (0x01)
#define MPI2_IOUNITPAGE7_BOARD_TEMP_CELSIUS (0x02)
/****************************************************************************
* IOC Config Pages
****************************************************************************/
@ -977,7 +940,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_0
#define MPI2_IOCPAGE0_PAGEVERSION (0x02)
/* IOC Page 1 */
typedef struct _MPI2_CONFIG_PAGE_IOC_1
@ -1047,7 +1009,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_6
#define MPI2_IOCPAGE6_CAP_FLAGS_RAID0_SUPPORT (0x00000002)
#define MPI2_IOCPAGE6_CAP_FLAGS_GLOBAL_HOT_SPARE (0x00000001)
/* IOC Page 7 */
#define MPI2_IOCPAGE7_EVENTMASK_WORDS (4)
@ -1065,7 +1026,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_7
#define MPI2_IOCPAGE7_PAGEVERSION (0x01)
/* IOC Page 8 */
typedef struct _MPI2_CONFIG_PAGE_IOC_8
@ -1102,7 +1062,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_8
#define MPI2_IOCPAGE8_IRFLAGS_LOW_VOLUME_MAPPING (0x00000000)
#define MPI2_IOCPAGE8_IRFLAGS_HIGH_VOLUME_MAPPING (0x00000001)
/****************************************************************************
* BIOS Config Pages
****************************************************************************/
@ -1155,7 +1114,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_1
#define MPI2_BIOSPAGE1_DEVSET_DISABLE_NON_RM_LUN (0x00000002)
#define MPI2_BIOSPAGE1_DEVSET_DISABLE_OTHER_LUN (0x00000001)
/* BIOS Page 2 */
typedef struct _MPI2_BOOT_DEVICE_ADAPTER_ORDER
@ -1242,7 +1200,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_2
#define MPI2_BIOSPAGE2_FORM_ENCLOSURE_SLOT (0x06)
#define MPI2_BIOSPAGE2_FORM_DEVICE_NAME (0x07)
/* BIOS Page 3 */
typedef struct _MPI2_ADAPTER_INFO
@ -1278,7 +1235,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_3
#define MPI2_BIOSPAGE3_FLAGS_ADAPTER_DISPLAY (0x00000020)
#define MPI2_BIOSPAGE3_FLAGS_ADAPTER_DEV_DISPLAY (0x00000040)
/* BIOS Page 4 */
/*
@ -1308,7 +1264,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_4
#define MPI2_BIOSPAGE4_PAGEVERSION (0x01)
/****************************************************************************
* RAID Volume Config Pages
****************************************************************************/
@ -1439,7 +1394,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_0
#define MPI2_RAIDVOLPAGE0_INSUFFICIENT_METADATA_INACTIVE (0x05)
#define MPI2_RAIDVOLPAGE0_PREVIOUSLY_DELETED (0x06)
/* RAID Volume Page 1 */
typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_1
@ -1457,7 +1411,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_1
#define MPI2_RAIDVOLPAGE1_PAGEVERSION (0x03)
/****************************************************************************
* RAID Physical Disk Config Pages
****************************************************************************/
@ -1559,7 +1512,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_0
#define MPI2_PHYSDISK0_STATUS_FLAG_QUIESCED (0x00000002)
#define MPI2_PHYSDISK0_STATUS_FLAG_OUT_OF_SYNC (0x00000001)
/* RAID Physical Disk Page 1 */
/*
@ -1601,7 +1553,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1
#define MPI2_RAIDPHYSDISKPAGE1_PAGEVERSION (0x02)
/****************************************************************************
* values for fields used by several types of SAS Config Pages
****************************************************************************/
@ -1622,7 +1573,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1
#define MPI2_SAS_NEG_LINK_RATE_3_0 (0x09)
#define MPI2_SAS_NEG_LINK_RATE_6_0 (0x0A)
/* values for AttachedPhyInfo fields */
#define MPI2_SAS_APHYINFO_INSIDE_ZPSDS_PERSISTENT (0x00000040)
#define MPI2_SAS_APHYINFO_REQUESTED_INSIDE_ZPSDS (0x00000020)
@ -1639,7 +1589,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1
#define MPI2_SAS_APHYINFO_REASON_BREAK_TIMEOUT (0x00000007)
#define MPI2_SAS_APHYINFO_REASON_PHY_TEST_STOPPED (0x00000008)
/* values for PhyInfo fields */
#define MPI2_SAS_PHYINFO_PHY_VACANT (0x80000000)
@ -1680,7 +1629,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1
#define MPI2_SAS_PHYINFO_SUBTRACTIVE_ROUTING (0x00000010)
#define MPI2_SAS_PHYINFO_TABLE_ROUTING (0x00000020)
/* values for SAS ProgrammedLinkRate fields */
#define MPI2_SAS_PRATE_MAX_RATE_MASK (0xF0)
#define MPI2_SAS_PRATE_MAX_RATE_NOT_PROGRAMMABLE (0x00)
@ -1693,7 +1641,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1
#define MPI2_SAS_PRATE_MIN_RATE_3_0 (0x09)
#define MPI2_SAS_PRATE_MIN_RATE_6_0 (0x0A)
/* values for SAS HwLinkRate fields */
#define MPI2_SAS_HWRATE_MAX_RATE_MASK (0xF0)
#define MPI2_SAS_HWRATE_MAX_RATE_1_5 (0x80)
@ -1704,8 +1651,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1
#define MPI2_SAS_HWRATE_MIN_RATE_3_0 (0x09)
#define MPI2_SAS_HWRATE_MIN_RATE_6_0 (0x0A)
/****************************************************************************
* SAS IO Unit Config Pages
****************************************************************************/
@ -1782,7 +1727,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_0
#define MPI2_SASIOUNIT0_DS_UNADDRESSABLE_DEVICE (0x00000002)
#define MPI2_SASIOUNIT0_DS_LOOP_DETECTED (0x00000001)
/* SAS IO Unit Page 1 */
typedef struct _MPI2_SAS_IO_UNIT1_PHY_DATA
@ -1877,7 +1821,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_1
/* see mpi2_sas.h for values for SAS IO Unit Page 1 ControllerPhyDeviceInfo values */
/* SAS IO Unit Page 4 */
typedef struct _MPI2_SAS_IOUNIT4_SPINUP_GROUP
@ -1923,7 +1866,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_4
/* defines for PHY field */
#define MPI2_SASIOUNIT4_PHY_SPINUP_GROUP_MASK (0x03)
/* SAS IO Unit Page 5 */
typedef struct _MPI2_SAS_IO_UNIT5_PHY_PM_SETTINGS
@ -1993,7 +1935,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_5
#define MPI2_SASIOUNITPAGE5_PAGEVERSION (0x01)
/* SAS IO Unit Page 6 */
typedef struct _MPI2_SAS_IO_UNIT6_PORT_WIDTH_MOD_GROUP_STATUS
@ -2048,7 +1989,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_6
#define MPI2_SASIOUNITPAGE6_PAGEVERSION (0x00)
/* SAS IO Unit Page 7 */
typedef struct _MPI2_SAS_IO_UNIT7_PORT_WIDTH_MOD_GROUP_SETTINGS
@ -2068,7 +2008,6 @@ typedef struct _MPI2_SAS_IO_UNIT7_PORT_WIDTH_MOD_GROUP_SETTINGS
/* defines for Flags field */
#define MPI2_SASIOUNIT7_FLAGS_ENABLE_PORT_WIDTH_MODULATION (0x01)
/*
* Host code (drivers, BIOS, utilities, etc.) should leave this define set to
* one and check the value returned for NumGroups at runtime.
@ -2096,7 +2035,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_7
#define MPI2_SASIOUNITPAGE7_PAGEVERSION (0x00)
/* SAS IO Unit Page 8 */
typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_8
@ -2123,9 +2061,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_8
#define MPI2_SASIOUNIT8_PM_IOUNIT_SATA_SLUMBER_MODE (0x000000002)
#define MPI2_SASIOUNIT8_PM_IOUNIT_SATA_PARTIAL_MODE (0x000000001)
/****************************************************************************
* SAS Expander Config Pages
****************************************************************************/
@ -2198,7 +2133,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_0
#define MPI2_SAS_EXPANDER0_FLAGS_CONFIG_IN_PROGRESS (0x0002)
#define MPI2_SAS_EXPANDER0_FLAGS_ROUTE_TABLE_CONFIG (0x0001)
/* SAS Expander Page 1 */
typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1
@ -2248,7 +2182,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1
#define MPI2_SAS_EXPANDER1_DISCINFO_LINK_STATUS_CHANGE (0x02)
#define MPI2_SAS_EXPANDER1_DISCINFO_NO_ROUTING_ENTRIES (0x01)
/****************************************************************************
* SAS Device Config Pages
****************************************************************************/
@ -2320,7 +2253,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_0
#define MPI2_SAS_DEVICE0_FLAGS_PORT_SELECTOR_ATTACH (0x0008)
#define MPI2_SAS_DEVICE0_FLAGS_DEVICE_PRESENT (0x0001)
/* SAS Device Page 1 */
typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_1
@ -2337,7 +2269,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_1
#define MPI2_SASDEVICE1_PAGEVERSION (0x01)
/****************************************************************************
* SAS PHY Config Pages
****************************************************************************/
@ -2379,7 +2310,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_0
/* use MPI2_SAS_PHYINFO_ for the PhyInfo field */
/* SAS PHY Page 1 */
typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_1
@ -2395,7 +2325,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_1
#define MPI2_SASPHY1_PAGEVERSION (0x01)
/* SAS PHY Page 2 */
typedef struct _MPI2_SASPHY2_PHY_EVENT
@ -2409,7 +2338,6 @@ typedef struct _MPI2_SASPHY2_PHY_EVENT
/* use MPI2_SASPHY3_EVENT_CODE_ for the PhyEventCode field */
/*
* Host code (drivers, BIOS, utilities, etc.) should leave this define set to
* one and check the value returned for NumPhyEvents at runtime.
@ -2431,7 +2359,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_2
#define MPI2_SASPHY2_PAGEVERSION (0x00)
/* SAS PHY Page 3 */
typedef struct _MPI2_SASPHY3_PHY_EVENT_CONFIG
@ -2524,7 +2451,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_3
#define MPI2_SASPHY3_PAGEVERSION (0x00)
/* SAS PHY Page 4 */
typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_4
@ -2543,9 +2469,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_4
#define MPI2_SASPHY4_FLAGS_FRAME_VALID (0x02)
#define MPI2_SASPHY4_FLAGS_SATA_FRAME (0x01)
/****************************************************************************
* SAS Port Config Pages
****************************************************************************/
@ -2573,7 +2496,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PORT_0
/* see mpi2_sas.h for values for SAS Port Page 0 DeviceInfo values */
/****************************************************************************
* SAS Enclosure Config Pages
****************************************************************************/
@ -2608,7 +2530,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_ENCLOSURE_0
#define MPI2_SAS_ENCLS0_FLAGS_MNG_SES_ENCLOSURE (0x0004)
#define MPI2_SAS_ENCLS0_FLAGS_MNG_IOC_GPIO (0x0005)
/****************************************************************************
* Log Config Page
****************************************************************************/
@ -2658,7 +2579,6 @@ typedef struct _MPI2_CONFIG_PAGE_LOG_0
#define MPI2_LOG_0_PAGEVERSION (0x02)
/****************************************************************************
* RAID Config Page
****************************************************************************/
@ -2691,7 +2611,6 @@ typedef struct _MPI2_RAIDCONFIG0_CONFIG_ELEMENT
#define MPI2_RAIDCONFIG0_EFLAGS_HOT_SPARE_ELEMENT (0x0002)
#define MPI2_RAIDCONFIG0_EFLAGS_OCE_ELEMENT (0x0003)
typedef struct _MPI2_CONFIG_PAGE_RAID_CONFIGURATION_0
{
MPI2_CONFIG_EXTENDED_PAGE_HEADER Header; /* 0x00 */
@ -2715,7 +2634,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_CONFIGURATION_0
/* values for RAID Configuration Page 0 Flags field */
#define MPI2_RAIDCONFIG0_FLAG_FOREIGN_CONFIG (0x00000001)
/****************************************************************************
* Driver Persistent Mapping Config Pages
****************************************************************************/
@ -2748,7 +2666,6 @@ typedef struct _MPI2_CONFIG_PAGE_DRIVER_MAPPING_0
#define MPI2_DRVMAP0_MAPINFO_SLOT_SHIFT (4)
#define MPI2_DRVMAP0_MAPINFO_MISSING_MASK (0x000F)
/****************************************************************************
* Ethernet Config Pages
****************************************************************************/
@ -2815,7 +2732,6 @@ typedef struct _MPI2_CONFIG_PAGE_ETHERNET_0
#define MPI2_ETHPG0_MS_100MBIT (0x02)
#define MPI2_ETHPG0_MS_1GBIT (0x03)
/* Ethernet Page 1 */
typedef struct _MPI2_CONFIG_PAGE_ETHERNET_1
@ -2866,7 +2782,6 @@ typedef struct _MPI2_CONFIG_PAGE_ETHERNET_1
#define MPI2_ETHPG1_MS_DATA_RATE_100MBIT (0x02)
#define MPI2_ETHPG1_MS_DATA_RATE_1GBIT (0x03)
/****************************************************************************
* Extended Manufacturing Config Pages
****************************************************************************/
@ -2888,4 +2803,3 @@ typedef struct _MPI2_CONFIG_PAGE_EXT_MAN_PS
/* PageVersion should be provided by product-specific code */
#endif

4
sys/dev/mps/mpi/mpi2_hbd.h
View File

@ -120,7 +120,6 @@ typedef struct _MPI2_HBD_ACTION_REQUEST
#define MPI2_HBD_MAX_RATE_3_0 (0x09)
#define MPI2_HBD_MAX_RATE_6_0 (0x0A)
/* Host Based Discovery Action Reply Message */
typedef struct _MPI2_HBD_ACTION_REPLY
{
@ -140,7 +139,4 @@ typedef struct _MPI2_HBD_ACTION_REPLY
} MPI2_HBD_ACTION_REPLY, MPI2_POINTER PTR_MPI2_HBD_ACTION_REPLY,
Mpi2HbdActionReply_t, MPI2_POINTER pMpi2HbdActionReply_t;
#endif

9
sys/dev/mps/mpi/mpi2_init.h
View File

@ -240,7 +240,6 @@ typedef struct _MPI2_SCSI_IO_REQUEST
#define MPI2_SCSIIO_CONTROL_TLR_ON (0x00000040)
#define MPI2_SCSIIO_CONTROL_TLR_OFF (0x00000080)
/* SCSI IO Error Reply Message */
typedef struct _MPI2_SCSI_IO_REPLY
{
@ -297,7 +296,6 @@ typedef struct _MPI2_SCSI_IO_REPLY
#define MPI2_SCSI_TASKTAG_UNKNOWN (0xFFFF)
/****************************************************************************
* SCSI Task Management messages
****************************************************************************/
@ -348,8 +346,6 @@ typedef struct _MPI2_SCSI_TASK_MANAGE_REQUEST
#define MPI2_SCSITASKMGMT_MSGFLAGS_DO_NOT_SEND_TASK_IU (0x01)
/* SCSI Task Management Reply Message */
typedef struct _MPI2_SCSI_TASK_MANAGE_REPLY
{
@ -394,7 +390,6 @@ typedef struct _MPI2_SCSI_TASK_MANAGE_REPLY
#define MPI2_SCSITASKMGMT_RI_MASK_ARI0 (0xFF000000)
#define MPI2_SCSITASKMGMT_RI_SHIFT_ARI0 (24)
/****************************************************************************
* SCSI Enclosure Processor messages
****************************************************************************/
@ -442,7 +437,6 @@ typedef struct _MPI2_SEP_REQUEST
#define MPI2_SEP_REQ_SLOTSTATUS_DEV_FAULTY (0x00000002)
#define MPI2_SEP_REQ_SLOTSTATUS_NO_ERROR (0x00000001)
/* SCSI Enclosure Processor Reply Message */
typedef struct _MPI2_SEP_REPLY
{
@ -479,7 +473,4 @@ typedef struct _MPI2_SEP_REPLY
#define MPI2_SEP_REPLY_SLOTSTATUS_DEV_FAULTY (0x00000002)
#define MPI2_SEP_REPLY_SLOTSTATUS_NO_ERROR (0x00000001)
#endif

42
sys/dev/mps/mpi/mpi2_ioc.h
View File

@ -209,7 +209,6 @@ typedef struct _MPI2_IOC_INIT_REQUEST
/* minimum depth for the Reply Descriptor Post Queue */
#define MPI2_RDPQ_DEPTH_MIN (16)
/* IOCInit Reply message */
typedef struct _MPI2_IOC_INIT_REPLY
{
@ -229,7 +228,6 @@ typedef struct _MPI2_IOC_INIT_REPLY
} MPI2_IOC_INIT_REPLY, MPI2_POINTER PTR_MPI2_IOC_INIT_REPLY,
Mpi2IOCInitReply_t, MPI2_POINTER pMpi2IOCInitReply_t;
/****************************************************************************
* IOCFacts message
****************************************************************************/
@ -249,7 +247,6 @@ typedef struct _MPI2_IOC_FACTS_REQUEST
} MPI2_IOC_FACTS_REQUEST, MPI2_POINTER PTR_MPI2_IOC_FACTS_REQUEST,
Mpi2IOCFactsRequest_t, MPI2_POINTER pMpi2IOCFactsRequest_t;
/* IOCFacts Reply message */
typedef struct _MPI2_IOC_FACTS_REPLY
{
@ -341,7 +338,6 @@ typedef struct _MPI2_IOC_FACTS_REPLY
#define MPI2_IOCFACTS_PROTOCOL_SCSI_TARGET (0x0001)
#define MPI2_IOCFACTS_PROTOCOL_SCSI_INITIATOR (0x0002)
/****************************************************************************
* PortFacts message
****************************************************************************/
@ -391,7 +387,6 @@ typedef struct _MPI2_PORT_FACTS_REPLY
#define MPI2_PORTFACTS_PORTTYPE_SAS_PHYSICAL (0x30)
#define MPI2_PORTFACTS_PORTTYPE_SAS_VIRTUAL (0x31)
/****************************************************************************
* PortEnable message
****************************************************************************/
@ -412,7 +407,6 @@ typedef struct _MPI2_PORT_ENABLE_REQUEST
} MPI2_PORT_ENABLE_REQUEST, MPI2_POINTER PTR_MPI2_PORT_ENABLE_REQUEST,
Mpi2PortEnableRequest_t, MPI2_POINTER pMpi2PortEnableRequest_t;
/* PortEnable Reply message */
typedef struct _MPI2_PORT_ENABLE_REPLY
{
@ -432,7 +426,6 @@ typedef struct _MPI2_PORT_ENABLE_REPLY
} MPI2_PORT_ENABLE_REPLY, MPI2_POINTER PTR_MPI2_PORT_ENABLE_REPLY,
Mpi2PortEnableReply_t, MPI2_POINTER pMpi2PortEnableReply_t;
/****************************************************************************
* EventNotification message
****************************************************************************/
@ -461,7 +454,6 @@ typedef struct _MPI2_EVENT_NOTIFICATION_REQUEST
MPI2_POINTER PTR_MPI2_EVENT_NOTIFICATION_REQUEST,
Mpi2EventNotificationRequest_t, MPI2_POINTER pMpi2EventNotificationRequest_t;
/* EventNotification Reply message */
typedef struct _MPI2_EVENT_NOTIFICATION_REPLY
{
@ -511,7 +503,6 @@ typedef struct _MPI2_EVENT_NOTIFICATION_REPLY
#define MPI2_EVENT_HOST_BASED_DISCOVERY_PHY (0x0024)
#define MPI2_EVENT_SAS_QUIESCE (0x0025)
/* Log Entry Added Event data */
/* the following structure matches MPI2_LOG_0_ENTRY in mpi2_cnfg.h */
@ -564,7 +555,6 @@ typedef struct _MPI2_EVENT_DATA_TASK_SET_FULL
} MPI2_EVENT_DATA_TASK_SET_FULL, MPI2_POINTER PTR_MPI2_EVENT_DATA_TASK_SET_FULL,
Mpi2EventDataTaskSetFull_t, MPI2_POINTER pMpi2EventDataTaskSetFull_t;
/* SAS Device Status Change Event data */
typedef struct _MPI2_EVENT_DATA_SAS_DEVICE_STATUS_CHANGE
@ -598,7 +588,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_DEVICE_STATUS_CHANGE
#define MPI2_EVENT_SAS_DEV_STAT_RC_EXPANDER_REDUCED_FUNCTIONALITY (0x11)
#define MPI2_EVENT_SAS_DEV_STAT_RC_CMP_EXPANDER_REDUCED_FUNCTIONALITY (0x12)
/* Integrated RAID Operation Status Event data */
typedef struct _MPI2_EVENT_DATA_IR_OPERATION_STATUS
@ -621,7 +610,6 @@ typedef struct _MPI2_EVENT_DATA_IR_OPERATION_STATUS
#define MPI2_EVENT_IR_RAIDOP_BACKGROUND_INIT (0x03)
#define MPI2_EVENT_IR_RAIDOP_MAKE_DATA_CONSISTENT (0x04)
/* Integrated RAID Volume Event data */
typedef struct _MPI2_EVENT_DATA_IR_VOLUME
@ -639,7 +627,6 @@ typedef struct _MPI2_EVENT_DATA_IR_VOLUME
#define MPI2_EVENT_IR_VOLUME_RC_STATUS_FLAGS_CHANGED (0x02)
#define MPI2_EVENT_IR_VOLUME_RC_STATE_CHANGED (0x03)
/* Integrated RAID Physical Disk Event data */
typedef struct _MPI2_EVENT_DATA_IR_PHYSICAL_DISK
@ -662,7 +649,6 @@ typedef struct _MPI2_EVENT_DATA_IR_PHYSICAL_DISK
#define MPI2_EVENT_IR_PHYSDISK_RC_STATUS_FLAGS_CHANGED (0x02)
#define MPI2_EVENT_IR_PHYSDISK_RC_STATE_CHANGED (0x03)
/* Integrated RAID Configuration Change List Event data */
/*
@ -716,7 +702,6 @@ typedef struct _MPI2_EVENT_DATA_IR_CONFIG_CHANGE_LIST
/* IR Configuration Change List Event data Flags values */
#define MPI2_EVENT_IR_CHANGE_FLAGS_FOREIGN_CONFIG (0x00000001)
/* SAS Discovery Event data */
typedef struct _MPI2_EVENT_DATA_SAS_DISCOVERY
@ -760,7 +745,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_DISCOVERY
#define MPI2_EVENT_SAS_DISC_DS_UNADDRESSABLE_DEVICE (0x00000002)
#define MPI2_EVENT_SAS_DISC_DS_LOOP_DETECTED (0x00000001)
/* SAS Broadcast Primitive Event data */
typedef struct _MPI2_EVENT_DATA_SAS_BROADCAST_PRIMITIVE
@ -784,7 +768,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_BROADCAST_PRIMITIVE
#define MPI2_EVENT_PRIMITIVE_CHANGE0_RESERVED (0x07)
#define MPI2_EVENT_PRIMITIVE_CHANGE1_RESERVED (0x08)
/* SAS Initiator Device Status Change Event data */
typedef struct _MPI2_EVENT_DATA_SAS_INIT_DEV_STATUS_CHANGE
@ -802,7 +785,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_INIT_DEV_STATUS_CHANGE
#define MPI2_EVENT_SAS_INIT_RC_ADDED (0x01)
#define MPI2_EVENT_SAS_INIT_RC_NOT_RESPONDING (0x02)
/* SAS Initiator Device Table Overflow Event data */
typedef struct _MPI2_EVENT_DATA_SAS_INIT_TABLE_OVERFLOW
@ -815,7 +797,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_INIT_TABLE_OVERFLOW
Mpi2EventDataSasInitTableOverflow_t,
MPI2_POINTER pMpi2EventDataSasInitTableOverflow_t;
/* SAS Topology Change List Event data */
/*
@ -886,7 +867,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_TOPOLOGY_CHANGE_LIST
#define MPI2_EVENT_SAS_TOPO_RC_NO_CHANGE (0x04)
#define MPI2_EVENT_SAS_TOPO_RC_DELAY_NOT_RESPONDING (0x05)
/* SAS Enclosure Device Status Change Event data */
typedef struct _MPI2_EVENT_DATA_SAS_ENCL_DEV_STATUS_CHANGE
@ -907,7 +887,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_ENCL_DEV_STATUS_CHANGE
#define MPI2_EVENT_SAS_ENCL_RC_ADDED (0x01)
#define MPI2_EVENT_SAS_ENCL_RC_NOT_RESPONDING (0x02)
/* SAS PHY Counter Event data */
typedef struct _MPI2_EVENT_DATA_SAS_PHY_COUNTER
@ -937,7 +916,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_PHY_COUNTER
/* use MPI2_SASPHY3_TFLAGS_ values from mpi2_cnfg.h for the ThresholdFlags field */
/* SAS Quiesce Event data */
typedef struct _MPI2_EVENT_DATA_SAS_QUIESCE
@ -954,7 +932,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_QUIESCE
#define MPI2_EVENT_SAS_QUIESCE_RC_STARTED (0x01)
#define MPI2_EVENT_SAS_QUIESCE_RC_COMPLETED (0x02)
/* Host Based Discovery Phy Event data */
typedef struct _MPI2_EVENT_HBD_PHY_SAS
@ -993,8 +970,6 @@ typedef struct _MPI2_EVENT_DATA_HBD_PHY
/* values for the DescriptorType field */
#define MPI2_EVENT_HBD_DT_SAS (0x01)
/****************************************************************************
* EventAck message
****************************************************************************/
@ -1017,7 +992,6 @@ typedef struct _MPI2_EVENT_ACK_REQUEST
} MPI2_EVENT_ACK_REQUEST, MPI2_POINTER PTR_MPI2_EVENT_ACK_REQUEST,
Mpi2EventAckRequest_t, MPI2_POINTER pMpi2EventAckRequest_t;
/* EventAck Reply message */
typedef struct _MPI2_EVENT_ACK_REPLY
{
@ -1036,7 +1010,6 @@ typedef struct _MPI2_EVENT_ACK_REPLY
} MPI2_EVENT_ACK_REPLY, MPI2_POINTER PTR_MPI2_EVENT_ACK_REPLY,
Mpi2EventAckReply_t, MPI2_POINTER pMpi2EventAckReply_t;
/****************************************************************************
* FWDownload message
****************************************************************************/
@ -1104,7 +1077,6 @@ typedef struct _MPI2_FW_DOWNLOAD_REPLY
} MPI2_FW_DOWNLOAD_REPLY, MPI2_POINTER PTR_MPI2_FW_DOWNLOAD_REPLY,
Mpi2FWDownloadReply_t, MPI2_POINTER pMpi2FWDownloadReply_t;
/****************************************************************************
* FWUpload message
****************************************************************************/
@ -1171,7 +1143,6 @@ typedef struct _MPI2_FW_UPLOAD_REPLY
} MPI2_FW_UPLOAD_REPLY, MPI2_POINTER PTR_MPI2_FW_UPLOAD_REPLY,
Mpi2FWUploadReply_t, MPI2_POINTER pMPi2FWUploadReply_t;
/* FW Image Header */
typedef struct _MPI2_FW_IMAGE_HEADER
{
@ -1240,7 +1211,6 @@ typedef struct _MPI2_FW_IMAGE_HEADER
#define MPI2_FW_HEADER_SIGNATURE2_OFFSET (0x0C)
#define MPI2_FW_HEADER_SIGNATURE2 (0x5AA55AFA)
/* defines for using the ProductID field */
#define MPI2_FW_HEADER_PID_TYPE_MASK (0xF000)
#define MPI2_FW_HEADER_PID_TYPE_SAS (0x2000)
@ -1250,7 +1220,6 @@ typedef struct _MPI2_FW_IMAGE_HEADER
#define MPI2_FW_HEADER_PID_PROD_TARGET_INITIATOR_SCSI (0x0200)
#define MPI2_FW_HEADER_PID_PROD_IR_SCSI (0x0700)
#define MPI2_FW_HEADER_PID_FAMILY_MASK (0x00FF)
/* SAS */
#define MPI2_FW_HEADER_PID_FAMILY_2108_SAS (0x0013)
@ -1260,7 +1229,6 @@ typedef struct _MPI2_FW_IMAGE_HEADER
/* use MPI2_IOCFACTS_CAPABILITY_ defines for IOCCapabilities field */
#define MPI2_FW_HEADER_IMAGESIZE_OFFSET (0x2C)
#define MPI2_FW_HEADER_NEXTIMAGE_OFFSET (0x30)
#define MPI2_FW_HEADER_VERNMHWAT_OFFSET (0x64)
@ -1269,7 +1237,6 @@ typedef struct _MPI2_FW_IMAGE_HEADER
#define MPI2_FW_HEADER_SIZE (0x100)
/* Extended Image Header */
typedef struct _MPI2_EXT_IMAGE_HEADER
@ -1307,8 +1274,6 @@ typedef struct _MPI2_EXT_IMAGE_HEADER
#define MPI2_EXT_IMAGE_TYPE_MAX (MPI2_EXT_IMAGE_TYPE_MEGARAID)
/* FLASH Layout Extended Image Data */
/*
@ -1378,8 +1343,6 @@ typedef struct _MPI2_FLASH_LAYOUT_DATA
/* ImageRevision */
#define MPI2_FLASH_LAYOUT_IMAGE_REVISION (0x00)
/* Supported Devices Extended Image Data */
/*
@ -1417,7 +1380,6 @@ typedef struct _MPI2_SUPPORTED_DEVICES_DATA
/* ImageRevision */
#define MPI2_SUPPORTED_DEVICES_IMAGE_REVISION (0x00)
/* Init Extended Image Data */
typedef struct _MPI2_INIT_IMAGE_FOOTER
@ -1469,7 +1431,6 @@ typedef struct _MPI2_INIT_IMAGE_FOOTER
/* defines for the ResetVector field */
#define MPI2_INIT_IMAGE_RESETVECTOR_OFFSET (0x14)
/****************************************************************************
* PowerManagementControl message
****************************************************************************/
@ -1545,7 +1506,6 @@ typedef struct _MPI2_PWR_MGMT_CONTROL_REQUEST
#define MPI2_PM_CONTROL_PARAM1_EIGHTH_IOC_SPEED (0x08)
/* Parameter2, Parameter3, and Parameter4 are reserved */
/* PowerManagementControl Reply message */
typedef struct _MPI2_PWR_MGMT_CONTROL_REPLY
{
@ -1565,6 +1525,4 @@ typedef struct _MPI2_PWR_MGMT_CONTROL_REPLY
} MPI2_PWR_MGMT_CONTROL_REPLY, MPI2_POINTER PTR_MPI2_PWR_MGMT_CONTROL_REPLY,
Mpi2PwrMgmtControlReply_t, MPI2_POINTER pMpi2PwrMgmtControlReply_t;
#endif

5
sys/dev/mps/mpi/mpi2_ra.h
View File

@ -64,7 +64,6 @@ typedef struct _MPI2_RAID_ACCELERATOR_CONTROL_BLOCK
Mpi2RAIDAcceleratorControlBlock_t,
MPI2_POINTER pMpi2RAIDAcceleratorControlBlock_t;
/******************************************************************************
*
* RAID Accelerator Messages
@ -93,7 +92,6 @@ typedef struct _MPI2_RAID_ACCELERATOR_REQUEST
} MPI2_RAID_ACCELERATOR_REQUEST, MPI2_POINTER PTR_MPI2_RAID_ACCELERATOR_REQUEST,
Mpi2RAIDAcceleratorRequest_t, MPI2_POINTER pMpi2RAIDAcceleratorRequest_t;
/* RAID Accelerator Error Reply Message */
typedef struct _MPI2_RAID_ACCELERATOR_REPLY
{
@ -113,7 +111,4 @@ typedef struct _MPI2_RAID_ACCELERATOR_REPLY
} MPI2_RAID_ACCELERATOR_REPLY, MPI2_POINTER PTR_MPI2_RAID_ACCELERATOR_REPLY,
Mpi2RAIDAcceleratorReply_t, MPI2_POINTER pMpi2RAIDAcceleratorReply_t;
#endif

8
sys/dev/mps/mpi/mpi2_raid.h
View File

@ -169,7 +169,6 @@ typedef union _MPI2_RAID_ACTION_DATA
} MPI2_RAID_ACTION_DATA, MPI2_POINTER PTR_MPI2_RAID_ACTION_DATA,
Mpi2RaidActionData_t, MPI2_POINTER pMpi2RaidActionData_t;
/* RAID Action Request Message */
typedef struct _MPI2_RAID_ACTION_REQUEST
{
@ -211,7 +210,6 @@ typedef struct _MPI2_RAID_ACTION_REQUEST
#define MPI2_RAID_ACTION_START_RAID_FUNCTION (0x21)
#define MPI2_RAID_ACTION_STOP_RAID_FUNCTION (0x22)
/* RAID Volume Creation Structure */
/*
@ -263,7 +261,6 @@ typedef struct _MPI2_RAID_VOLUME_CREATION_STRUCT
*/
#define MPI2_RAID_VOL_CREATION_USE_DEFAULT_SETTINGS (0x80)
/* RAID Online Capacity Expansion Structure */
typedef struct _MPI2_RAID_ONLINE_CAPACITY_EXPANSION
@ -278,7 +275,6 @@ typedef struct _MPI2_RAID_ONLINE_CAPACITY_EXPANSION
Mpi2RaidOnlineCapacityExpansion_t,
MPI2_POINTER pMpi2RaidOnlineCapacityExpansion_t;
/* RAID Volume Indicator Structure */
typedef struct _MPI2_RAID_VOL_INDICATOR
@ -297,7 +293,6 @@ typedef struct _MPI2_RAID_VOL_INDICATOR
#define MPI2_RAID_VOL_FLAGS_OP_RESYNC (0x00000003)
#define MPI2_RAID_VOL_FLAGS_OP_MDC (0x00000004)
/* RAID Action Reply ActionData union */
typedef union _MPI2_RAID_ACTION_REPLY_DATA
{
@ -311,7 +306,6 @@ typedef union _MPI2_RAID_ACTION_REPLY_DATA
/* use MPI2_RAIDVOL0_SETTING_ defines from mpi2_cnfg.h for MPI2_RAID_ACTION_CHANGE_VOL_WRITE_CACHE action */
/* RAID Action Reply Message */
typedef struct _MPI2_RAID_ACTION_REPLY
{
@ -332,6 +326,4 @@ typedef struct _MPI2_RAID_ACTION_REPLY
} MPI2_RAID_ACTION_REPLY, MPI2_POINTER PTR_MPI2_RAID_ACTION_REPLY,
Mpi2RaidActionReply_t, MPI2_POINTER pMpi2RaidActionReply_t;
#endif

10
sys/dev/mps/mpi/mpi2_sas.h
View File

@ -87,7 +87,6 @@
#define MPI2_SASSTATUS_SDSF_CONNECTION_FAILED (0x13)
#define MPI2_SASSTATUS_INITIATOR_RESPONSE_TIMEOUT (0x14)
/*
* Values for the SAS DeviceInfo field used in SAS Device Status Change Event
* data and SAS Configuration pages.
@ -111,7 +110,6 @@
#define MPI2_SAS_DEVICE_INFO_EDGE_EXPANDER (0x00000002)
#define MPI2_SAS_DEVICE_INFO_FANOUT_EXPANDER (0x00000003)
/*****************************************************************************
*
* SAS Messages
@ -148,7 +146,6 @@ typedef struct _MPI2_SMP_PASSTHROUGH_REQUEST
/* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */
/* SMP Passthrough Reply Message */
typedef struct _MPI2_SMP_PASSTHROUGH_REPLY
{
@ -176,7 +173,6 @@ typedef struct _MPI2_SMP_PASSTHROUGH_REPLY
/* values for SASStatus field are at the top of this file */
/****************************************************************************
* SATA Passthrough messages
****************************************************************************/
@ -212,7 +208,6 @@ typedef struct _MPI2_SATA_PASSTHROUGH_REQUEST
/* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */
/* SATA Passthrough Reply Message */
typedef struct _MPI2_SATA_PASSTHROUGH_REPLY
{
@ -237,7 +232,6 @@ typedef struct _MPI2_SATA_PASSTHROUGH_REPLY
/* values for SASStatus field are at the top of this file */
/****************************************************************************
* SAS IO Unit Control messages
****************************************************************************/
@ -295,7 +289,6 @@ typedef struct _MPI2_SAS_IOUNIT_CONTROL_REQUEST
#define MPI2_SAS_LOOKUP_METHOD_SAS_ENCLOSURE_SLOT (0x02)
#define MPI2_SAS_LOOKUP_METHOD_SAS_DEVICE_NAME (0x03)
/* SAS IO Unit Control Reply Message */
typedef struct _MPI2_SAS_IOUNIT_CONTROL_REPLY
{
@ -316,7 +309,4 @@ typedef struct _MPI2_SAS_IOUNIT_CONTROL_REPLY
MPI2_POINTER PTR_MPI2_SAS_IOUNIT_CONTROL_REPLY,
Mpi2SasIoUnitControlReply_t, MPI2_POINTER pMpi2SasIoUnitControlReply_t;
#endif

12
sys/dev/mps/mpi/mpi2_targ.h
View File

@ -62,7 +62,6 @@
#ifndef MPI2_TARG_H
#define MPI2_TARG_H
/******************************************************************************
*
* SCSI Target Messages
@ -104,7 +103,6 @@ typedef struct _MPI2_TARGET_CMD_BUF_POST_BASE_REQUEST
#define MPI2_CMD_BUF_POST_BASE_FLAGS_AUTO_POST_ALL (0x01)
/****************************************************************************
* Target Command Buffer Post List Request
****************************************************************************/
@ -157,7 +155,6 @@ typedef struct _MPI2_TARGET_BUF_POST_BASE_LIST_REPLY
/* Flags defines */
#define MPI2_CMD_BUF_POST_REPLY_IOINDEX_VALID (0x01)
/****************************************************************************
* Command Buffer Formats (with 16 byte CDB)
****************************************************************************/
@ -214,7 +211,6 @@ typedef struct _MPI2_TARGET_SSP_TASK_BUFFER
#define MPI2_TARGET_HASHED_SAS_ADDRESS_MASK (0xFFFFFF00)
#define MPI2_TARGET_HASHED_SAS_ADDRESS_SHIFT (8)
/****************************************************************************
* Target Assist Request
****************************************************************************/
@ -318,7 +314,6 @@ typedef struct _MPI2_TARGET_ASSIST_REQUEST
#define MPI2_TA_EEDPFLAGS_REPLACE_OP (0x0006)
#define MPI2_TA_EEDPFLAGS_CHECK_REGEN_OP (0x0007)
/****************************************************************************
* Target Status Send Request
****************************************************************************/
@ -368,8 +363,6 @@ typedef struct _MPI2_TARGET_STATUS_SEND_REQUEST
#define MPI2_TSS_SGLFLAGS_IEEE32_TYPE (0x01)
#define MPI2_TSS_SGLFLAGS_IEEE64_TYPE (0x02)
/*
* NOTE: The SSP status IU is big-endian. When used on a little-endian system,
* this structure properly orders the bytes.
@ -393,7 +386,6 @@ typedef struct _MPI2_TARGET_SSP_RSP_IU
} MPI2_TARGET_SSP_RSP_IU, MPI2_POINTER PTR_MPI2_TARGET_SSP_RSP_IU,
Mpi2TargetSspRspIu_t, MPI2_POINTER pMpi2TargetSspRspIu_t;
/****************************************************************************
* Target Standard Reply - used with Target Assist or Target Status Send
****************************************************************************/
@ -419,7 +411,6 @@ typedef struct _MPI2_TARGET_STANDARD_REPLY
} MPI2_TARGET_STANDARD_REPLY, MPI2_POINTER PTR_MPI2_TARGET_STANDARD_REPLY,
Mpi2TargetErrorReply_t, MPI2_POINTER pMpi2TargetErrorReply_t;
/****************************************************************************
* Target Mode Abort Request
****************************************************************************/
@ -450,7 +441,6 @@ typedef struct _MPI2_TARGET_MODE_ABORT_REQUEST
#define MPI2_TARGET_MODE_ABORT_EXACT_IO_REQUEST (0x03)
#define MPI2_TARGET_MODE_ABORT_IO_REQUEST_AND_IO (0x04)
/****************************************************************************
* Target Mode Abort Reply
****************************************************************************/
@ -473,6 +463,4 @@ typedef struct _MPI2_TARGET_MODE_ABORT_REPLY
} MPI2_TARGET_MODE_ABORT_REPLY, MPI2_POINTER PTR_MPI2_TARGET_MODE_ABORT_REPLY,
Mpi2TargetModeAbortReply_t, MPI2_POINTER pMpi2TargetModeAbortReply_t;
#endif

17
sys/dev/mps/mpi/mpi2_tool.h
View File

@ -79,7 +79,6 @@
#define MPI2_TOOLBOX_BEACON_TOOL (0x05)
#define MPI2_TOOLBOX_DIAGNOSTIC_CLI_TOOL (0x06)
/****************************************************************************
* Toolbox reply
****************************************************************************/
@ -102,7 +101,6 @@ typedef struct _MPI2_TOOLBOX_REPLY
} MPI2_TOOLBOX_REPLY, MPI2_POINTER PTR_MPI2_TOOLBOX_REPLY,
Mpi2ToolboxReply_t, MPI2_POINTER pMpi2ToolboxReply_t;
/****************************************************************************
* Toolbox Clean Tool request
****************************************************************************/
@ -135,7 +133,6 @@ typedef struct _MPI2_TOOLBOX_CLEAN_REQUEST
#define MPI2_TOOLBOX_CLEAN_SEEPROM (0x00000002)
#define MPI2_TOOLBOX_CLEAN_NVSRAM (0x00000001)
/****************************************************************************
* Toolbox Memory Move request
****************************************************************************/
@ -156,7 +153,6 @@ typedef struct _MPI2_TOOLBOX_MEM_MOVE_REQUEST
} MPI2_TOOLBOX_MEM_MOVE_REQUEST, MPI2_POINTER PTR_MPI2_TOOLBOX_MEM_MOVE_REQUEST,
Mpi2ToolboxMemMoveRequest_t, MPI2_POINTER pMpi2ToolboxMemMoveRequest_t;
/****************************************************************************
* Toolbox Diagnostic Data Upload request
****************************************************************************/
@ -186,7 +182,6 @@ typedef struct _MPI2_TOOLBOX_DIAG_DATA_UPLOAD_REQUEST
/* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */
typedef struct _MPI2_DIAG_DATA_UPLOAD_HEADER
{
U32 DiagDataLength; /* 00h */
@ -196,7 +191,6 @@ typedef struct _MPI2_DIAG_DATA_UPLOAD_HEADER
} MPI2_DIAG_DATA_UPLOAD_HEADER, MPI2_POINTER PTR_MPI2_DIAG_DATA_UPLOAD_HEADER,
Mpi2DiagDataUploadHeader_t, MPI2_POINTER pMpi2DiagDataUploadHeader_t;
/****************************************************************************
* Toolbox ISTWI Read Write Tool
****************************************************************************/
@ -243,7 +237,6 @@ typedef struct _MPI2_TOOLBOX_ISTWI_READ_WRITE_REQUEST
/* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */
/* Toolbox ISTWI Read Write Tool reply message */
typedef struct _MPI2_TOOLBOX_ISTWI_REPLY
{
@ -269,7 +262,6 @@ typedef struct _MPI2_TOOLBOX_ISTWI_REPLY
} MPI2_TOOLBOX_ISTWI_REPLY, MPI2_POINTER PTR_MPI2_TOOLBOX_ISTWI_REPLY,
Mpi2ToolboxIstwiReply_t, MPI2_POINTER pMpi2ToolboxIstwiReply_t;
/****************************************************************************
* Toolbox Beacon Tool request
****************************************************************************/
@ -297,7 +289,6 @@ typedef struct _MPI2_TOOLBOX_BEACON_REQUEST
#define MPI2_TOOLBOX_FLAGS_BEACONMODE_OFF (0x00)
#define MPI2_TOOLBOX_FLAGS_BEACONMODE_ON (0x01)
/****************************************************************************
* Toolbox Diagnostic CLI Tool
****************************************************************************/
@ -330,7 +321,6 @@ typedef struct _MPI2_TOOLBOX_DIAGNOSTIC_CLI_REQUEST
/* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */
/* Toolbox Diagnostic CLI Tool reply message */
typedef struct _MPI2_TOOLBOX_DIAGNOSTIC_CLI_REPLY
{
@ -353,14 +343,12 @@ typedef struct _MPI2_TOOLBOX_DIAGNOSTIC_CLI_REPLY
Mpi2ToolboxDiagnosticCliReply_t,
MPI2_POINTER pMpi2ToolboxDiagnosticCliReply_t;
/*****************************************************************************
*
* Diagnostic Buffer Messages
*
*****************************************************************************/
/****************************************************************************
* Diagnostic Buffer Post request
****************************************************************************/
@ -400,7 +388,6 @@ typedef struct _MPI2_DIAG_BUFFER_POST_REQUEST
#define MPI2_DIAG_BUF_FLAG_RELEASE_ON_FULL (0x00000002)
#define MPI2_DIAG_BUF_FLAG_IMMEDIATE_RELEASE (0x00000001)
/****************************************************************************
* Diagnostic Buffer Post reply
****************************************************************************/
@ -424,7 +411,6 @@ typedef struct _MPI2_DIAG_BUFFER_POST_REPLY
} MPI2_DIAG_BUFFER_POST_REPLY, MPI2_POINTER PTR_MPI2_DIAG_BUFFER_POST_REPLY,
Mpi2DiagBufferPostReply_t, MPI2_POINTER pMpi2DiagBufferPostReply_t;
/****************************************************************************
* Diagnostic Release request
****************************************************************************/
@ -444,7 +430,6 @@ typedef struct _MPI2_DIAG_RELEASE_REQUEST
} MPI2_DIAG_RELEASE_REQUEST, MPI2_POINTER PTR_MPI2_DIAG_RELEASE_REQUEST,
Mpi2DiagReleaseRequest_t, MPI2_POINTER pMpi2DiagReleaseRequest_t;
/****************************************************************************
* Diagnostic Buffer Post reply
****************************************************************************/
@ -467,6 +452,4 @@ typedef struct _MPI2_DIAG_RELEASE_REPLY
} MPI2_DIAG_RELEASE_REPLY, MPI2_POINTER PTR_MPI2_DIAG_RELEASE_REPLY,
Mpi2DiagReleaseReply_t, MPI2_POINTER pMpi2DiagReleaseReply_t;
#endif

3
sys/dev/mps/mpi/mpi2_type.h
View File

@ -54,7 +54,6 @@
#ifndef MPI2_TYPE_H
#define MPI2_TYPE_H
/*******************************************************************************
* Define MPI2_POINTER if it hasn't already been defined. By default
* MPI2_POINTER is defined to be a near pointer. MPI2_POINTER can be defined as
@ -110,7 +109,6 @@ typedef struct _U64
U32 High;
} U64;
/*****************************************************************************
*
* Pointer Types
@ -129,4 +127,3 @@ typedef U64 *PU64;
#endif
#endif

7
sys/dev/mps/mps.c
View File

@ -169,7 +169,7 @@ mps_diag_reset(struct mps_softc *sc,int sleep_flag)
sleep_flag = NO_SLEEP;
mps_dprint(sc, MPS_INIT, "sequence start, sleep_flag= %d\n", sleep_flag);
/* Push the magic sequence */
error = ETIMEDOUT;
while (tries++ < 20) {
@ -338,7 +338,7 @@ mps_transition_ready(struct mps_softc *sc)
error = EINVAL;
break;
}
/* Wait 50ms for things to settle down. */
DELAY(50000);
}
@ -1910,7 +1910,6 @@ mps_parse_debug(struct mps_softc *sc, char *list)
flags = 0;
sz = sizeof(mps_debug_strings) / sizeof(mps_debug_strings[0]);
while ((token = strsep(&list, ":,")) != NULL) {
/* Handle integer flags */
flags |= strtol(token, &endtoken, 0);
if (token != endtoken)
@ -2266,7 +2265,6 @@ mps_complete_command(struct mps_softc *sc, struct mps_command *cm)
}
}
static void
mps_sas_log_info(struct mps_softc *sc , u32 log_info)
{
@ -2625,7 +2623,6 @@ mps_update_events(struct mps_softc *sc, struct mps_event_handle *handle,
for (i = 0; i < MPI2_EVENT_NOTIFY_EVENTMASK_WORDS; i++)
sc->event_mask[i] &= ~handle->mask[i];
if ((cm = mps_alloc_command(sc)) == NULL)
return (EBUSY);
evtreq = (MPI2_EVENT_NOTIFICATION_REQUEST *)cm->cm_req;

4
sys/dev/mps/mps_config.c
View File

@ -127,7 +127,7 @@ mps_config_get_ioc_pg8(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* counters to match - Need to review the reply FIFO handling.
*/
mps_free_command(sc, cm);
if ((cm = mps_alloc_command(sc)) == NULL) {
printf("%s: command alloc failed @ line %d\n", __func__,
__LINE__);
@ -259,7 +259,7 @@ mps_config_get_man_pg10(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply)
* counters to match - Need to review the reply FIFO handling.
*/
mps_free_command(sc, cm);
if ((cm = mps_alloc_command(sc)) == NULL) {
printf("%s: command alloc failed @ line %d\n", __func__,
__LINE__);

6
sys/dev/mps/mps_ioctl.h
View File

@ -171,7 +171,6 @@ typedef struct mps_adapter_data
mps_pci_bits_t PciInformation;
} mps_adapter_data_t;
typedef struct mps_update_flash
{
uint64_t PtrBuffer;
@ -181,7 +180,6 @@ typedef struct mps_update_flash
uint32_t ImageType;
} mps_update_flash_t;
#define MPS_PASS_THRU_DIRECTION_NONE 0
#define MPS_PASS_THRU_DIRECTION_READ 1
#define MPS_PASS_THRU_DIRECTION_WRITE 2
@ -201,7 +199,6 @@ typedef struct mps_pass_thru
uint32_t Timeout;
} mps_pass_thru_t;
/*
* Event queue defines
*/
@ -236,7 +233,6 @@ typedef struct mps_event_report
uint64_t PtrEvents;
} mps_event_report_t;
typedef struct mps_pci_info
{
uint32_t BusNumber;
@ -246,7 +242,6 @@ typedef struct mps_pci_info
uint8_t PciHeader[256];
} mps_pci_info_t;
typedef struct mps_diag_action
{
uint32_t Action;
@ -279,7 +274,6 @@ typedef struct mps_diag_action
#define MPS_FW_DIAG_ERROR_NO_BUFFER (0x00000013)
#define MPS_FW_DIAG_ERROR_ALREADY_RELEASED (0x00000014)
typedef struct mps_fw_diag_register
{
uint8_t ExtendedType;

9
sys/dev/mps/mps_mapping.c
View File

@ -503,7 +503,7 @@ _mapping_get_free_ir_mt_idx(struct mps_softc *sc)
"free entry in the mapping table for a Volume. The mapping "
"table is probably corrupt.\n", __func__);
}
return high_idx;
}
@ -564,7 +564,6 @@ _mapping_get_dpm_idx_from_id(struct mps_softc *sc, u64 id, u32 phy_bits)
return MPS_DPM_BAD_IDX;
}
/**
* _mapping_get_free_dpm_idx - get first available DPM index
* @sc: per adapter object
@ -782,7 +781,7 @@ _mapping_add_to_removal_table(struct mps_softc *sc, u16 dpm_idx)
for (i = 0; i < sc->max_devices; i++, remove_entry++) {
if (remove_entry->dpm_entry_num != MPS_DPM_BAD_IDX)
continue;
mps_dprint(sc, MPS_MAPPING, "%s: Adding DPM entry %d to table "
"for removal.\n", __func__, dpm_idx);
remove_entry->dpm_entry_num = dpm_idx;
@ -1516,7 +1515,6 @@ _mapping_add_new_device(struct mps_softc *sc,
} else if ((ioc_pg8_flags &
MPI2_IOCPAGE8_FLAGS_MASK_MAPPING_MODE) ==
MPI2_IOCPAGE8_FLAGS_DEVICE_PERSISTENCE_MAPPING) {
/*
* Get the mapping table index for this device. If it's
* not in the mapping table yet, find a free entry if
@ -1828,7 +1826,6 @@ _mapping_process_dpm_pg0(struct mps_softc *sc)
}
if ((ioc_pg8_flags & MPI2_IOCPAGE8_FLAGS_MASK_MAPPING_MODE) ==
MPI2_IOCPAGE8_FLAGS_ENCLOSURE_SLOT_MAPPING) {
/*
* The dev_idx for an enclosure is the start index. If
* the start index is within the controller's default
@ -1904,7 +1901,6 @@ _mapping_process_dpm_pg0(struct mps_softc *sc)
} else if ((ioc_pg8_flags &
MPI2_IOCPAGE8_FLAGS_MASK_MAPPING_MODE) ==
MPI2_IOCPAGE8_FLAGS_DEVICE_PERSISTENCE_MAPPING) {
/*
* Device mapping, so simply copy the DPM entries to the
* mapping table, but check for a corrupt mapping table
@ -2113,7 +2109,6 @@ mps_mapping_initialize(struct mps_softc *sc)
sc->max_dpm_entries = sc->ioc_pg8.MaxPersistentEntries;
sc->is_dpm_enable = (sc->max_dpm_entries) ? 1 : 0;
sc->track_mapping_events = 0;
mps_dprint(sc, MPS_MAPPING, "%s: Mapping table has a max of %d entries "
"and DPM has a max of %d entries.\n", __func__, sc->max_devices,

1
sys/dev/mps/mps_mapping.h
View File

@ -69,7 +69,6 @@ struct _map_topology_change {
struct _map_phy_change *phy_details;
};
extern int
mpssas_get_sas_address_for_sata_disk(struct mps_softc *ioc,
u64 *sas_address, u16 handle, u32 device_info, u8 *is_SATA_SSD);

1
sys/dev/mps/mps_pci.c
View File

@ -442,4 +442,3 @@ mps_pci_restore(struct mps_softc *sc)
pci_cfg_restore(sc->mps_dev, dinfo);
return (0);
}

19
sys/dev/mps/mps_sas.c
View File

@ -236,7 +236,7 @@ void
mpssas_free_tm(struct mps_softc *sc, struct mps_command *tm)
{
int target_id = 0xFFFFFFFF;
if (tm == NULL)
return;
@ -346,7 +346,6 @@ mpssas_log_command(struct mps_command *cm, u_int level, const char *fmt, ...)
va_end(ap);
}
static void
mpssas_remove_volume(struct mps_softc *sc, struct mps_command *tm)
{
@ -383,7 +382,7 @@ mpssas_remove_volume(struct mps_softc *sc, struct mps_command *tm)
mps_dprint(sc, MPS_XINFO,
"clearing target %u handle 0x%04x\n", targ->tid, handle);
/*
* Don't clear target if remove fails because things will get confusing.
* Leave the devname and sasaddr intact so that we know to avoid reusing
@ -406,7 +405,6 @@ mpssas_remove_volume(struct mps_softc *sc, struct mps_command *tm)
mpssas_free_tm(sc, tm);
}
/*
* No Need to call "MPI2_SAS_OP_REMOVE_DEVICE" For Volume removal.
* Otherwise Volume Delete is same as Bare Drive Removal.
@ -604,7 +602,6 @@ mpssas_remove_device(struct mps_softc *sc, struct mps_command *tm)
targ->pending_remove_tm = tm;
}
mps_dprint(sc, MPS_XINFO, "clearing target %u handle 0x%04x\n",
targ->tid, handle);
}
@ -630,7 +627,6 @@ mpssas_remove_complete(struct mps_softc *sc, struct mps_command *tm)
KASSERT(TAILQ_FIRST(&targ->commands) == NULL,
("%s: no commands should be pending\n", __func__));
/*
* Currently there should be no way we can hit this case. It only
* happens when we have a failure to allocate chain frames, and
@ -680,7 +676,6 @@ mpssas_remove_complete(struct mps_softc *sc, struct mps_command *tm)
free(lun, M_MPT2);
}
}
mpssas_free_tm(sc, tm);
}
@ -1416,7 +1411,6 @@ mpssas_send_reset(struct mps_softc *sc, struct mps_command *tm, uint8_t type)
return err;
}
static void
mpssas_abort_complete(struct mps_softc *sc, struct mps_command *tm)
{
@ -1768,7 +1762,7 @@ mpssas_action_scsiio(struct mpssas_softc *sassc, union ccb *ccb)
mpi_control = MPI2_SCSIIO_CONTROL_NODATATRANSFER;
break;
}
if (csio->cdb_len == 32)
mpi_control |= 4 << MPI2_SCSIIO_CONTROL_ADDCDBLEN_SHIFT;
/*
@ -1926,7 +1920,7 @@ mps_sc_failed_io_info(struct mps_softc *sc, struct ccb_scsiio *csio,
u8 scsi_status = mpi_reply->SCSIStatus;
u32 log_info = le32toh(mpi_reply->IOCLogInfo);
const char *desc_ioc_state, *desc_scsi_status;
if (log_info == 0x31170000)
return;
@ -2368,7 +2362,7 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
mpssas_set_ccbstatus(ccb, CAM_REQ_CMP_ERR);
break;
}
mps_sc_failed_io_info(sc,csio,rep);
if (sassc->flags & MPSSAS_QUEUE_FROZEN) {
@ -2997,7 +2991,6 @@ mpssas_action_smpio(struct mpssas_softc *sassc, union ccb *ccb)
targ->handle, parent_target->handle);
mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
goto bailout;
}
sasaddr = parent_target->sasaddr;
@ -3010,7 +3003,6 @@ mpssas_action_smpio(struct mpssas_softc *sassc, union ccb *ccb)
targ->handle, targ->parent_handle);
mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
goto bailout;
}
if (targ->parent_sasaddr == 0x0) {
mps_dprint(sc, MPS_ERROR,
@ -3023,7 +3015,6 @@ mpssas_action_smpio(struct mpssas_softc *sassc, union ccb *ccb)
sasaddr = targ->parent_sasaddr;
#endif /* OLD_MPS_PROBE */
}
if (sasaddr == 0) {

3
sys/dev/mps/mps_sas_lsi.c
View File

@ -593,7 +593,6 @@ mpssas_fw_work(struct mps_softc *sc, struct mps_fw_event_work *fw_event)
mps_dprint(sc, MPS_TRACE,"Unhandled event 0x%0X\n",
fw_event->event);
break;
}
mps_dprint(sc, MPS_EVENT, "(%d)->(%s) Event Free: [%x]\n",event_count,__func__, fw_event->event);
mpssas_fw_event_free(sc, fw_event);
@ -822,7 +821,7 @@ mpssas_add_device(struct mps_softc *sc, u16 handle, u8 linkrate){
mpssas_startup_decrement(sassc);
return (error);
}
int
mpssas_get_sas_address_for_sata_disk(struct mps_softc *sc,
u64 *sas_address, u16 handle, u32 device_info, u8 *is_SATA_SSD)

1
sys/dev/mps/mps_table.c
View File

@ -564,4 +564,3 @@ mps_print_scsiio_cmd(struct mps_softc *sc, struct mps_command *cm)
req = (MPI2_SCSI_IO_REQUEST *)cm->cm_req;
mps_print_sgl(sc, cm, req->SGLOffset0);
}

5
sys/dev/mps/mps_user.c
View File

@ -723,7 +723,7 @@ mps_user_command(struct mps_softc *sc, struct mps_usr_command *cmd)
sz = rpl->MsgLength * 4;
else
sz = 0;
if (sz > cmd->rpl_len) {
mps_printf(sc, "%s: user reply buffer (%d) smaller than "
"returned buffer (%d)\n", __func__, cmd->rpl_len, sz);
@ -866,7 +866,7 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data)
if ((cm != NULL) && (cm->cm_reply != NULL)) {
rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply;
sz = rpl->MsgLength * 4;
if (sz > data->ReplySize) {
mps_printf(sc, "%s: user reply buffer (%d) "
"smaller than returned buffer (%d)\n",
@ -1445,7 +1445,6 @@ mps_diag_register(struct mps_softc *sc, mps_fw_diag_register_t *diag_register,
ctx, 0);
if (error == EINPROGRESS) {
/* XXX KDM */
device_printf(sc->mps_dev, "%s: Deferred bus_dmamap_load\n",
__func__);

1
sys/dev/mps/mpsvar.h
View File

@ -842,4 +842,3 @@ SYSCTL_DECL(_hw_mps);
#endif
#endif