diff --git a/sys/dev/mpr/mpi/mpi2.h b/sys/dev/mpr/mpi/mpi2.h index bd66dac83e11..1f8f49fcb486 100644 --- a/sys/dev/mpr/mpi/mpi2.h +++ b/sys/dev/mpr/mpi/mpi2.h @@ -160,7 +160,6 @@ #ifndef MPI2_H #define MPI2_H - /***************************************************************************** * * MPI Version Definitions @@ -181,21 +180,18 @@ MPI2_VERSION_MINOR) #define MPI2_VERSION_02_00 (0x0200) - /* minor version for MPI v2.5 compatible products */ #define MPI25_VERSION_MINOR (0x05) #define MPI25_VERSION ((MPI2_VERSION_MAJOR << MPI2_VERSION_MAJOR_SHIFT) | \ MPI25_VERSION_MINOR) #define MPI2_VERSION_02_05 (0x0205) - /* minor version for MPI v2.6 compatible products */ #define MPI26_VERSION_MINOR (0x06) #define MPI26_VERSION ((MPI2_VERSION_MAJOR << MPI2_VERSION_MAJOR_SHIFT) | \ MPI26_VERSION_MINOR) #define MPI2_VERSION_02_06 (0x0206) - /* Unit and Dev versioning for this MPI header set */ #define MPI2_HEADER_VERSION_UNIT (0x34) #define MPI2_HEADER_VERSION_DEV (0x00) @@ -205,7 +201,6 @@ #define MPI2_HEADER_VERSION_DEV_SHIFT (0) #define MPI2_HEADER_VERSION ((MPI2_HEADER_VERSION_UNIT << 8) | MPI2_HEADER_VERSION_DEV) - /***************************************************************************** * * IOC State Definitions @@ -224,7 +219,6 @@ #define MPI2_FAULT_PRODUCT_SPECIFIC_MIN (0x0000) #define MPI2_FAULT_PRODUCT_SPECIFIC_MAX (0xEFFF) - /***************************************************************************** * * System Interface Register Definitions @@ -280,7 +274,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 */ @@ -371,7 +364,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_RPHI_MSIX_INDEX_SHIFT (24) #define MPI25_SUP_REPLY_POST_HOST_INDEX_OFFSET (0x0000030C) /* MPI v2.5 only */ - /* * Defines for the HCBSize and address */ @@ -397,7 +389,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_REQUEST_DESCRIPTOR_POST_HIGH_OFFSET (0x000000C4) #define MPI26_ATOMIC_REQUEST_DESCRIPTOR_POST_OFFSET (0x000000C8) - /* 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) @@ -436,7 +427,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 { @@ -450,7 +440,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 { @@ -463,7 +452,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 { @@ -477,7 +465,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 { @@ -491,7 +478,6 @@ typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR Mpi2RAIDAcceleratorRequestDescriptor_t, MPI2_POINTER pMpi2RAIDAcceleratorRequestDescriptor_t; - /* Fast Path SCSI IO Request Descriptor */ typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR MPI25_FP_SCSI_IO_REQUEST_DESCRIPTOR, @@ -499,7 +485,6 @@ typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR Mpi25FastPathSCSIIORequestDescriptor_t, MPI2_POINTER pMpi25FastPathSCSIIORequestDescriptor_t; - /* PCIe Encapsulated Request Descriptor */ typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR MPI26_PCIE_ENCAPSULATED_REQUEST_DESCRIPTOR, @@ -507,7 +492,6 @@ typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR Mpi26PCIeEncapsulatedRequestDescriptor_t, MPI2_POINTER pMpi26PCIeEncapsulatedRequestDescriptor_t; - /* union of Request Descriptors */ typedef union _MPI2_REQUEST_DESCRIPTOR_UNION { @@ -522,7 +506,6 @@ typedef union _MPI2_REQUEST_DESCRIPTOR_UNION } MPI2_REQUEST_DESCRIPTOR_UNION, MPI2_POINTER PTR_MPI2_REQUEST_DESCRIPTOR_UNION, Mpi2RequestDescriptorUnion_t, MPI2_POINTER pMpi2RequestDescriptorUnion_t; - /* Atomic Request Descriptors */ /* @@ -549,7 +532,6 @@ typedef struct _MPI26_ATOMIC_REQUEST_DESCRIPTOR /* for the RequestFlags field, use the same defines as MPI2_DEFAULT_REQUEST_DESCRIPTOR */ - /* Reply Descriptors */ /* Default Reply Descriptor */ @@ -589,7 +571,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 { @@ -603,7 +584,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 { @@ -618,7 +598,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 { @@ -636,7 +615,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 { @@ -649,7 +627,6 @@ typedef struct _MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR Mpi2RAIDAcceleratorSuccessReplyDescriptor_t, MPI2_POINTER pMpi2RAIDAcceleratorSuccessReplyDescriptor_t; - /* Fast Path SCSI IO Success Reply Descriptor */ typedef MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR MPI25_FP_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR, @@ -657,7 +634,6 @@ typedef MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR Mpi25FastPathSCSIIOSuccessReplyDescriptor_t, MPI2_POINTER pMpi25FastPathSCSIIOSuccessReplyDescriptor_t; - /* PCIe Encapsulated Success Reply Descriptor */ typedef MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR MPI26_PCIE_ENCAPSULATED_SUCCESS_REPLY_DESCRIPTOR, @@ -665,7 +641,6 @@ typedef MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR Mpi26PCIeEncapsulatedSuccessReplyDescriptor_t, MPI2_POINTER pMpi26PCIeEncapsulatedSuccessReplyDescriptor_t; - /* union of Reply Descriptors */ typedef union _MPI2_REPLY_DESCRIPTORS_UNION { @@ -681,8 +656,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 @@ -723,13 +696,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 @@ -844,7 +814,6 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION #define MPI2_IOCLOGINFO_TYPE_ISCSI (0x4) #define MPI2_IOCLOGINFO_LOG_DATA_MASK (0x0FFFFFFF) - /***************************************************************************** * * Standard Message Structures @@ -869,7 +838,6 @@ typedef struct _MPI2_REQUEST_HEADER } MPI2_REQUEST_HEADER, MPI2_POINTER PTR_MPI2_REQUEST_HEADER, MPI2RequestHeader_t, MPI2_POINTER pMPI2RequestHeader_t; - /**************************************************************************** * Default Reply ****************************************************************************/ @@ -891,7 +859,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 @@ -908,7 +875,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) @@ -917,7 +883,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 @@ -953,7 +918,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 - for MPI v2.0 products only ****************************************************************************/ @@ -989,7 +953,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 - for MPI v2.0 products only ****************************************************************************/ @@ -1055,7 +1018,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 - for MPI v2.0 products only ****************************************************************************/ @@ -1070,7 +1032,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 - for MPI v2.0 products only ****************************************************************************/ @@ -1085,7 +1046,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 ****************************************************************************/ @@ -1101,7 +1061,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 ****************************************************************************/ @@ -1177,7 +1136,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 @@ -1213,7 +1171,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 ****************************************************************************/ @@ -1242,7 +1199,6 @@ typedef struct _MPI25_IEEE_SGE_CHAIN64 } MPI25_IEEE_SGE_CHAIN64, MPI2_POINTER PTR_MPI25_IEEE_SGE_CHAIN64, Mpi25IeeeSgeChain64_t, MPI2_POINTER pMpi25IeeeSgeChain64_t; - /**************************************************************************** * All IEEE SGE types union ****************************************************************************/ @@ -1258,7 +1214,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 union for IO SGL's ****************************************************************************/ @@ -1270,7 +1225,6 @@ typedef union _MPI25_SGE_IO_UNION } MPI25_SGE_IO_UNION, MPI2_POINTER PTR_MPI25_SGE_IO_UNION, Mpi25SGEIOUnion_t, MPI2_POINTER pMpi25SGEIOUnion_t; - /**************************************************************************** * IEEE SGE field definitions and masks ****************************************************************************/ @@ -1327,8 +1281,6 @@ typedef union _MPI25_SGE_IO_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 @@ -1342,7 +1294,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; @@ -1352,7 +1303,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 @@ -1372,6 +1322,4 @@ typedef union _MPI2_SGE_IO_UNION #define MPI2_SGLFLAGS_SGL_TYPE_IEEE32 (0x01) /* MPI v2.0 products only */ #define MPI2_SGLFLAGS_SGL_TYPE_IEEE64 (0x02) - #endif - diff --git a/sys/dev/mpr/mpi/mpi2_cnfg.h b/sys/dev/mpr/mpi/mpi2_cnfg.h index 89be3593bf58..c979f338ed09 100644 --- a/sys/dev/mpr/mpi/mpi2_cnfg.h +++ b/sys/dev/mpr/mpi/mpi2_cnfg.h @@ -329,7 +329,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) @@ -347,7 +346,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) @@ -367,7 +365,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION /* Product specific reserved values 0xE0 - 0xEF */ /* Vendor specific reserved values 0xF0 - 0xFF */ - /***************************************************************************** * PageAddress defines *****************************************************************************/ @@ -379,7 +376,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) @@ -389,7 +385,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) @@ -400,7 +395,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) @@ -408,7 +402,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) @@ -417,7 +410,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) @@ -425,7 +417,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) @@ -448,7 +439,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) @@ -457,14 +447,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) - /* PCIe Switch PageAddress format */ #define MPI26_PCIE_SWITCH_PGAD_FORM_MASK (0xF0000000) #define MPI26_PCIE_SWITCH_PGAD_FORM_GET_NEXT_HNDL (0x00000000) @@ -475,7 +463,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI26_PCIE_SWITCH_PGAD_PORTNUM_MASK (0x00FF0000) #define MPI26_PCIE_SWITCH_PGAD_PORTNUM_SHIFT (16) - /* PCIe Device PageAddress format */ #define MPI26_PCIE_DEVICE_PGAD_FORM_MASK (0xF0000000) #define MPI26_PCIE_DEVICE_PGAD_FORM_GET_NEXT_HANDLE (0x00000000) @@ -490,8 +477,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI26_PCIE_DEVICE_PGAD_LINKNUM_MASK (0x000000FF) - - /**************************************************************************** * Configuration messages ****************************************************************************/ @@ -531,7 +516,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 { @@ -552,8 +536,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 @@ -630,7 +612,6 @@ typedef struct _MPI2_CONFIG_REPLY #define MPI26_MFGPAGE_DEVID_HARD_SEC_SAS3816 (0x00E6) #define MPI26_MFGPAGE_DEVID_INVALID1_SAS3816 (0x00E7) - /* Manufacturing Page 0 */ typedef struct _MPI2_CONFIG_PAGE_MAN_0 @@ -647,7 +628,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_0 #define MPI2_MANUFACTURING0_PAGEVERSION (0x00) - /* Manufacturing Page 1 */ typedef struct _MPI2_CONFIG_PAGE_MAN_1 @@ -660,7 +640,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_1 #define MPI2_MANUFACTURING1_PAGEVERSION (0x00) - typedef struct _MPI2_CHIP_REVISION_ID { U16 DeviceID; /* 0x00 */ @@ -669,7 +648,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 */ /* @@ -691,7 +669,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_2 #define MPI2_MANUFACTURING2_PAGEVERSION (0x00) - /* Manufacturing Page 3 */ /* @@ -713,7 +690,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_3 #define MPI2_MANUFACTURING3_PAGEVERSION (0x00) - /* Manufacturing Page 4 */ typedef struct _MPI2_MANPAGE4_PWR_SAVE_SETTINGS @@ -789,7 +765,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 */ /* @@ -822,7 +797,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_5 #define MPI2_MANUFACTURING5_PAGEVERSION (0x03) - /* Manufacturing Page 6 */ typedef struct _MPI2_CONFIG_PAGE_MAN_6 @@ -835,7 +809,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_6 #define MPI2_MANUFACTURING6_PAGEVERSION (0x00) - /* Manufacturing Page 7 */ typedef struct _MPI2_MANPAGE7_CONNECTOR_INFO @@ -918,7 +891,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_7 #define MPI2_MANPAGE7_FLAG_EVENTREPLAY_SLOT_ORDER (0x00000002) #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). @@ -957,7 +929,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_PS #define MPI2_MANUFACTURING30_PAGEVERSION (0x00) #define MPI2_MANUFACTURING31_PAGEVERSION (0x00) - /**************************************************************************** * IO Unit Config Pages ****************************************************************************/ @@ -975,7 +946,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 @@ -1006,7 +976,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 */ /* @@ -1035,7 +1004,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 */ /* @@ -1074,7 +1042,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 @@ -1095,7 +1062,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 @@ -1138,7 +1104,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 #define MPI25_IOUNITPAGE7_PM_MODE_REDUCED_POWER (0x05) #define MPI25_IOUNITPAGE7_PM_MODE_STANDBY (0x06) - /* defines for IO Unit Page 7 PCIeWidth field */ #define MPI2_IOUNITPAGE7_PCIE_WIDTH_X1 (0x01) #define MPI2_IOUNITPAGE7_PCIE_WIDTH_X2 (0x02) @@ -1188,7 +1153,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 #define MPI2_IOUNITPAGE7_PMCAP_PCIE_WIDTH_CHANGE (0x00000008) /* obsolete */ #define MPI2_IOUNITPAGE7_PMCAP_PCIE_SPEED_CHANGE (0x00000004) /* obsolete */ - /* defines for IO Unit Page 7 IOCTemperatureUnits field */ #define MPI2_IOUNITPAGE7_IOC_TEMP_NOT_PRESENT (0x00) #define MPI2_IOUNITPAGE7_IOC_TEMP_FAHRENHEIT (0x01) @@ -1208,7 +1172,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 /* defines for IO Unit Page 7 Flags field */ #define MPI2_IOUNITPAGE7_FLAG_CABLE_POWER_EXC (0x01) - /* IO Unit Page 8 */ #define MPI2_IOUNIT8_NUM_THRESHOLDS (4) @@ -1252,7 +1215,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_8 #define MPI2_IOUNITPAGE8_PAGEVERSION (0x00) - /* IO Unit Page 9 */ typedef struct _MPI2_IOUNIT9_SENSOR @@ -1292,7 +1254,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_9 #define MPI2_IOUNITPAGE9_PAGEVERSION (0x00) - /* IO Unit Page 10 */ typedef struct _MPI2_IOUNIT10_FUNCTION @@ -1325,7 +1286,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_10 #define MPI2_IOUNITPAGE10_PAGEVERSION (0x01) - /* IO Unit Page 11 (for MPI v2.6 and later) */ typedef struct _MPI26_IOUNIT11_SPINUP_GROUP @@ -1340,7 +1300,6 @@ typedef struct _MPI26_IOUNIT11_SPINUP_GROUP /* defines for IO Unit Page 11 SpinupFlags */ #define MPI26_IOUNITPAGE11_SPINUP_DISABLE_FLAG (0x01) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * four and check the value returned for NumPhys at runtime. @@ -1377,8 +1336,6 @@ typedef struct _MPI26_CONFIG_PAGE_IO_UNIT_11 /* defines for PHY field */ #define MPI26_IOUNITPAGE11_PHY_SPINUP_GROUP_MASK (0x03) - - /**************************************************************************** * IOC Config Pages ****************************************************************************/ @@ -1403,7 +1360,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_0 #define MPI2_IOCPAGE0_PAGEVERSION (0x02) - /* IOC Page 1 */ typedef struct _MPI2_CONFIG_PAGE_IOC_1 @@ -1474,7 +1430,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) @@ -1492,7 +1447,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_7 #define MPI2_IOCPAGE7_PAGEVERSION (0x02) - /* IOC Page 8 */ typedef struct _MPI2_CONFIG_PAGE_IOC_8 @@ -1529,7 +1483,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 ****************************************************************************/ @@ -1616,8 +1569,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_1 #define MPI2_BIOSPAGE1_UEFI_VER_MINOR_MASK (0x00FF) #define MPI2_BIOSPAGE1_UEFI_VER_MINOR_SHIFT (0) - - /* BIOS Page 2 */ typedef struct _MPI2_BOOT_DEVICE_ADAPTER_ORDER @@ -1704,7 +1655,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 */ #define MPI2_BIOSPAGE3_NUM_ADAPTER (4) @@ -1751,7 +1701,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 */ /* @@ -1781,7 +1730,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_4 #define MPI2_BIOSPAGE4_PAGEVERSION (0x01) - /**************************************************************************** * RAID Volume Config Pages ****************************************************************************/ @@ -1912,7 +1860,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 @@ -1930,7 +1877,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_1 #define MPI2_RAIDVOLPAGE1_PAGEVERSION (0x03) - /**************************************************************************** * RAID Physical Disk Config Pages ****************************************************************************/ @@ -2032,7 +1978,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 */ /* @@ -2074,7 +2019,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 ****************************************************************************/ @@ -2097,7 +2041,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI25_SAS_NEG_LINK_RATE_12_0 (0x0B) #define MPI26_SAS_NEG_LINK_RATE_22_5 (0x0C) - /* values for AttachedPhyInfo fields */ #define MPI2_SAS_APHYINFO_INSIDE_ZPSDS_PERSISTENT (0x00000040) #define MPI2_SAS_APHYINFO_REQUESTED_INSIDE_ZPSDS (0x00000020) @@ -2114,7 +2057,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) @@ -2155,7 +2097,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) @@ -2172,7 +2113,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI25_SAS_PRATE_MIN_RATE_12_0 (0x0B) #define MPI26_SAS_PRATE_MIN_RATE_22_5 (0x0C) - /* values for SAS HwLinkRate fields */ #define MPI2_SAS_HWRATE_MAX_RATE_MASK (0xF0) #define MPI2_SAS_HWRATE_MAX_RATE_1_5 (0x80) @@ -2187,8 +2127,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI25_SAS_HWRATE_MIN_RATE_12_0 (0x0B) #define MPI26_SAS_HWRATE_MIN_RATE_22_5 (0x0C) - - /**************************************************************************** * SAS IO Unit Config Pages ****************************************************************************/ @@ -2267,7 +2205,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 @@ -2369,7 +2306,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 (for MPI v2.5 and earlier) */ typedef struct _MPI2_SAS_IOUNIT4_SPINUP_GROUP @@ -2384,7 +2320,6 @@ typedef struct _MPI2_SAS_IOUNIT4_SPINUP_GROUP /* defines for SAS IO Unit Page 4 SpinupFlags */ #define MPI2_SASIOUNIT4_SPINUP_DISABLE_FLAG (0x01) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check the value returned for NumPhys at runtime. @@ -2420,7 +2355,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 @@ -2490,7 +2424,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 @@ -2545,7 +2478,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 @@ -2565,7 +2497,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. @@ -2593,7 +2524,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 @@ -2628,8 +2558,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_8 #define MPI25_SASIOUNIT8_TXRXSLEEP_ACTIVE (0x02) #define MPI25_SASIOUNIT8_TXRXSLEEP_SHUTDOWN (0x03) - - /* SAS IO Unit Page 16 */ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT16 @@ -2652,7 +2580,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT16 #define MPI2_SASIOUNITPAGE16_PAGEVERSION (0x00) - /**************************************************************************** * SAS Expander Config Pages ****************************************************************************/ @@ -2725,7 +2652,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 @@ -2775,7 +2701,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1 /* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */ - /**************************************************************************** * SAS Device Config Pages ****************************************************************************/ @@ -2868,7 +2793,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_1 #define MPI2_SASDEVICE1_PAGEVERSION (0x01) - /**************************************************************************** * SAS PHY Config Pages ****************************************************************************/ @@ -2910,7 +2834,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_0 /* use MPI2_SAS_NEG_LINK_RATE_ defines for the NegotiatedLinkRate field */ - /* SAS PHY Page 1 */ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_1 @@ -2926,7 +2849,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_1 #define MPI2_SASPHY1_PAGEVERSION (0x01) - /* SAS PHY Page 2 */ typedef struct _MPI2_SASPHY2_PHY_EVENT @@ -2940,7 +2862,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. @@ -2962,7 +2883,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 @@ -3066,7 +2986,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 @@ -3085,9 +3004,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 ****************************************************************************/ @@ -3115,7 +3031,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 ****************************************************************************/ @@ -3224,7 +3139,6 @@ typedef struct _MPI2_CONFIG_PAGE_LOG_0 #define MPI2_LOG_0_PAGEVERSION (0x02) - /**************************************************************************** * RAID Config Page ****************************************************************************/ @@ -3257,7 +3171,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 */ @@ -3281,7 +3194,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 ****************************************************************************/ @@ -3314,7 +3226,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 ****************************************************************************/ @@ -3381,7 +3292,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 @@ -3432,7 +3342,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 ****************************************************************************/ @@ -3453,7 +3362,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXT_MAN_PS /* PageVersion should be provided by product-specific code */ - /**************************************************************************** * values for fields used by several types of PCIe Config Pages ****************************************************************************/ @@ -3468,7 +3376,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXT_MAN_PS #define MPI26_PCIE_NEG_LINK_RATE_8_0 (0x04) #define MPI26_PCIE_NEG_LINK_RATE_16_0 (0x05) - /**************************************************************************** * PCIe IO Unit Config Pages (MPI v2.6 and later) ****************************************************************************/ @@ -3525,7 +3432,6 @@ typedef struct _MPI26_CONFIG_PAGE_PIOUNIT_0 #define MPI26_PCIEIOUNIT0_ES_MAX_SWITCHES_EXCEEDED (0x40000000) #define MPI26_PCIEIOUNIT0_ES_MAX_DEVICES_EXCEEDED (0x20000000) - /* PCIe IO Unit Page 1 */ typedef struct _MPI26_PCIE_IO_UNIT1_PHY_DATA @@ -3587,10 +3493,8 @@ typedef struct _MPI26_CONFIG_PAGE_PIOUNIT_1 #define MPI26_PCIEIOUNIT1_DMD_REPORT_UNITS_16_SEC (0x80) #define MPI26_PCIEIOUNIT1_DMD_REPORT_DELAY_TIME_MASK (0x7F) - /* see mpi2_pci.h for values for PCIe IO Unit Page 0 ControllerPhyDeviceInfo values */ - /**************************************************************************** * PCIe Switch Config Pages (MPI v2.6 and later) ****************************************************************************/ @@ -3616,7 +3520,6 @@ typedef struct _MPI26_CONFIG_PAGE_PSWITCH_0 #define MPI26_PCIESWITCH0_PAGEVERSION (0x00) - /* PCIe Switch Page 1 */ typedef struct _MPI26_CONFIG_PAGE_PSWITCH_1 @@ -3645,8 +3548,6 @@ typedef struct _MPI26_CONFIG_PAGE_PSWITCH_1 #define MPI26_PCIESWITCH1_2_RETIMER_PRESENCE (0x0002) #define MPI26_PCIESWITCH1_RETIMER_PRESENCE (0x0001) - - /**************************************************************************** * PCIe Device Config Pages (MPI v2.6 and later) ****************************************************************************/ @@ -3730,7 +3631,6 @@ typedef struct _MPI26_CONFIG_PAGE_PCIEDEV_0 /* use MPI26_PCIE_NEG_LINK_RATE_ defines for the NegotiatedLinkRate field */ - /* PCIe Device Page 2 */ typedef struct _MPI26_CONFIG_PAGE_PCIEDEV_2 @@ -3757,7 +3657,6 @@ typedef struct _MPI26_CONFIG_PAGE_PCIEDEV_2 /* Defines for the NOIOB field */ #define MPI26_PCIEDEV2_NOIOB_UNSUPPORTED (0x0000) - /**************************************************************************** * PCIe Link Config Pages (MPI v2.6 and later) ****************************************************************************/ @@ -3793,7 +3692,6 @@ typedef struct _MPI26_PCIELINK2_LINK_EVENT /* use MPI26_PCIELINK3_EVTCODE_ for the LinkEventCode field */ - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check the value returned for NumLinkEvents at runtime. @@ -3817,7 +3715,6 @@ typedef struct _MPI26_CONFIG_PAGE_PCIELINK_2 #define MPI26_PCIELINK2_PAGEVERSION (0x00) - /* PCIe Link Page 3 */ typedef struct _MPI26_PCIELINK3_LINK_EVENT_CONFIG @@ -3893,6 +3790,4 @@ typedef struct _MPI26_CONFIG_PAGE_PCIELINK_3 #define MPI26_PCIELINK3_PAGEVERSION (0x00) - #endif - diff --git a/sys/dev/mpr/mpi/mpi2_hbd.h b/sys/dev/mpr/mpi/mpi2_hbd.h index 9c1f679c178e..46905614eba3 100644 --- a/sys/dev/mpr/mpi/mpi2_hbd.h +++ b/sys/dev/mpr/mpi/mpi2_hbd.h @@ -128,7 +128,6 @@ typedef struct _MPI2_HBD_ACTION_REQUEST #define MPI25_HBD_MAX_RATE_12_0 (0x0B) #define MPI26_HBD_MAX_RATE_22_5 (0x0C) - /* Host Based Discovery Action Reply Message */ typedef struct _MPI2_HBD_ACTION_REPLY { @@ -148,7 +147,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 - - diff --git a/sys/dev/mpr/mpi/mpi2_init.h b/sys/dev/mpr/mpi/mpi2_init.h index 87f4b6aa5fed..74185b0b6dcb 100644 --- a/sys/dev/mpr/mpi/mpi2_init.h +++ b/sys/dev/mpr/mpi/mpi2_init.h @@ -266,7 +266,6 @@ typedef struct _MPI2_SCSI_IO_REQUEST #define MPI2_SCSIIO_CONTROL_TLR_ON (0x00000040) #define MPI2_SCSIIO_CONTROL_TLR_OFF (0x00000080) - /* MPI v2.5 CDB field */ typedef union _MPI25_SCSI_IO_CDB_UNION { @@ -377,7 +376,6 @@ typedef struct _MPI25_SCSI_IO_REQUEST /* use MPI2_SCSIIO_CONTROL_ defines for the Control field */ - /* NOTE: The SCSI IO Reply is nearly the same for MPI 2.0 and MPI 2.5, so * MPI2_SCSI_IO_REPLY is used for both. */ @@ -416,7 +414,6 @@ typedef struct _MPI2_SCSI_IO_REPLY #define MPI26_SCSIIO_REPLY_MSGFLAGS_GUARD_OBSERVED_VALID (0x02) #define MPI26_SCSIIO_REPLY_MSGFLAGS_APPTAG_OBSERVED_VALID (0x04) - /* SCSI IO Reply SCSIStatus values (SAM-4 status codes) */ #define MPI2_SCSI_STATUS_GOOD (0x00) @@ -446,7 +443,6 @@ typedef struct _MPI2_SCSI_IO_REPLY #define MPI2_SCSI_TASKTAG_UNKNOWN (0xFFFF) - /**************************************************************************** * SCSI Task Management messages ****************************************************************************/ @@ -497,7 +493,6 @@ typedef struct _MPI2_SCSI_TASK_MANAGE_REQUEST #define MPI2_SCSITASKMGMT_MSGFLAGS_SAS_HARD_LINK_RESET (0x10) #define MPI26_SCSITASKMGMT_MSGFLAGS_PROTOCOL_LVL_RST_PCIE (0x18) - /* SCSI Task Management Reply Message */ typedef struct _MPI2_SCSI_TASK_MANAGE_REPLY { @@ -542,7 +537,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 ****************************************************************************/ @@ -591,7 +585,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 { @@ -629,7 +622,4 @@ typedef struct _MPI2_SEP_REPLY #define MPI2_SEP_REPLY_SLOTSTATUS_DEV_FAULTY (0x00000002) #define MPI2_SEP_REPLY_SLOTSTATUS_NO_ERROR (0x00000001) - #endif - - diff --git a/sys/dev/mpr/mpi/mpi2_ioc.h b/sys/dev/mpr/mpi/mpi2_ioc.h index e31ce232c9d7..3fc9c2bd14e4 100644 --- a/sys/dev/mpr/mpi/mpi2_ioc.h +++ b/sys/dev/mpr/mpi/mpi2_ioc.h @@ -314,7 +314,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 ****************************************************************************/ @@ -334,7 +333,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 { @@ -438,7 +436,6 @@ typedef struct _MPI2_IOC_FACTS_REPLY #define MPI2_IOCFACTS_PROTOCOL_SCSI_INITIATOR (0x0002) #define MPI2_IOCFACTS_PROTOCOL_SCSI_TARGET (0x0001) - /**************************************************************************** * PortFacts message ****************************************************************************/ @@ -489,7 +486,6 @@ typedef struct _MPI2_PORT_FACTS_REPLY #define MPI2_PORTFACTS_PORTTYPE_SAS_VIRTUAL (0x31) #define MPI2_PORTFACTS_PORTTYPE_TRI_MODE (0x40) /* MPI v2.6 and later */ - /**************************************************************************** * PortEnable message ****************************************************************************/ @@ -510,7 +506,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 { @@ -530,7 +525,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 ****************************************************************************/ @@ -559,7 +553,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 { @@ -622,7 +615,6 @@ typedef struct _MPI2_EVENT_NOTIFICATION_REPLY #define MPI2_EVENT_MIN_PRODUCT_SPECIFIC (0x006E) #define MPI2_EVENT_MAX_PRODUCT_SPECIFIC (0x007F) - /* Log Entry Added Event data */ /* the following structure matches MPI2_LOG_0_ENTRY in mpi2_cnfg.h */ @@ -642,7 +634,6 @@ typedef struct _MPI2_EVENT_DATA_LOG_ENTRY_ADDED MPI2_POINTER PTR_MPI2_EVENT_DATA_LOG_ENTRY_ADDED, Mpi2EventDataLogEntryAdded_t, MPI2_POINTER pMpi2EventDataLogEntryAdded_t; - /* GPIO Interrupt Event data */ typedef struct _MPI2_EVENT_DATA_GPIO_INTERRUPT @@ -654,7 +645,6 @@ typedef struct _MPI2_EVENT_DATA_GPIO_INTERRUPT MPI2_POINTER PTR_MPI2_EVENT_DATA_GPIO_INTERRUPT, Mpi2EventDataGpioInterrupt_t, MPI2_POINTER pMpi2EventDataGpioInterrupt_t; - /* Temperature Threshold Event data */ typedef struct _MPI2_EVENT_DATA_TEMPERATURE @@ -676,7 +666,6 @@ typedef struct _MPI2_EVENT_DATA_TEMPERATURE #define MPI2_EVENT_TEMPERATURE1_EXCEEDED (0x0002) #define MPI2_EVENT_TEMPERATURE0_EXCEEDED (0x0001) - /* Host Message Event data */ typedef struct _MPI2_EVENT_DATA_HOST_MESSAGE @@ -689,7 +678,6 @@ typedef struct _MPI2_EVENT_DATA_HOST_MESSAGE } MPI2_EVENT_DATA_HOST_MESSAGE, MPI2_POINTER PTR_MPI2_EVENT_DATA_HOST_MESSAGE, Mpi2EventDataHostMessage_t, MPI2_POINTER pMpi2EventDataHostMessage_t; - /* Power Performance Change Event data */ typedef struct _MPI2_EVENT_DATA_POWER_PERF_CHANGE @@ -715,7 +703,6 @@ typedef struct _MPI2_EVENT_DATA_POWER_PERF_CHANGE #define MPI2_EVENT_PM_MODE_REDUCED_POWER (0x05) #define MPI2_EVENT_PM_MODE_STANDBY (0x06) - /* Active Cable Exception Event data */ typedef struct _MPI26_EVENT_DATA_ACTIVE_CABLE_EXCEPT @@ -755,7 +742,6 @@ typedef struct _MPI2_EVENT_DATA_HARD_RESET_RECEIVED Mpi2EventDataHardResetReceived_t, MPI2_POINTER pMpi2EventDataHardResetReceived_t; - /* Task Set Full Event data */ /* this event is obsolete */ @@ -766,7 +752,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 @@ -800,7 +785,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 @@ -823,7 +807,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 @@ -841,7 +824,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 @@ -864,7 +846,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 */ /* @@ -918,7 +899,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 @@ -962,7 +942,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 @@ -986,7 +965,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_BROADCAST_PRIMITIVE #define MPI2_EVENT_PRIMITIVE_CHANGE0_RESERVED (0x07) #define MPI2_EVENT_PRIMITIVE_CHANGE1_RESERVED (0x08) - /* SAS Notify Primitive Event data */ typedef struct _MPI2_EVENT_DATA_SAS_NOTIFY_PRIMITIVE @@ -1006,7 +984,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_NOTIFY_PRIMITIVE #define MPI2_EVENT_NOTIFY_RESERVED1 (0x03) #define MPI2_EVENT_NOTIFY_RESERVED2 (0x04) - /* SAS Initiator Device Status Change Event data */ typedef struct _MPI2_EVENT_DATA_SAS_INIT_DEV_STATUS_CHANGE @@ -1024,7 +1001,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 @@ -1037,7 +1013,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_INIT_TABLE_OVERFLOW Mpi2EventDataSasInitTableOverflow_t, MPI2_POINTER pMpi2EventDataSasInitTableOverflow_t; - /* SAS Topology Change List Event data */ /* @@ -1110,7 +1085,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 @@ -1168,7 +1142,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 @@ -1185,7 +1158,6 @@ typedef struct _MPI2_EVENT_DATA_SAS_QUIESCE #define MPI2_EVENT_SAS_QUIESCE_RC_STARTED (0x01) #define MPI2_EVENT_SAS_QUIESCE_RC_COMPLETED (0x02) - typedef struct _MPI25_EVENT_DATA_SAS_DEVICE_DISCOVERY_ERROR { U16 DevHandle; /* 0x00 */ @@ -1203,7 +1175,6 @@ typedef struct _MPI25_EVENT_DATA_SAS_DEVICE_DISCOVERY_ERROR #define MPI25_EVENT_SAS_DISC_ERR_SMP_FAILED (0x01) #define MPI25_EVENT_SAS_DISC_ERR_SMP_TIMEOUT (0x02) - /* Host Based Discovery Phy Event data */ typedef struct _MPI2_EVENT_HBD_PHY_SAS @@ -1242,7 +1213,6 @@ typedef struct _MPI2_EVENT_DATA_HBD_PHY /* values for the DescriptorType field */ #define MPI2_EVENT_HBD_DT_SAS (0x01) - /* PCIe Device Status Change Event data (MPI v2.6 and later) */ typedef struct _MPI26_EVENT_DATA_PCIE_DEVICE_STATUS_CHANGE @@ -1275,7 +1245,6 @@ typedef struct _MPI26_EVENT_DATA_PCIE_DEVICE_STATUS_CHANGE #define MPI26_EVENT_PCIDEV_STAT_RC_DEV_INIT_FAILURE (0x10) #define MPI26_EVENT_PCIDEV_STAT_RC_PCIE_HOT_RESET_FAILED (0x11) - /* PCIe Enumeration Event data (MPI v2.6 and later) */ typedef struct _MPI26_EVENT_DATA_PCIE_ENUMERATION @@ -1303,7 +1272,6 @@ typedef struct _MPI26_EVENT_DATA_PCIE_ENUMERATION #define MPI26_EVENT_PCIE_ENUM_ES_MAX_DEVICES_EXCEED (0x20000000) #define MPI26_EVENT_PCIE_ENUM_ES_RESOURCES_EXHAUSTED (0x10000000) - /* PCIe Topology Change List Event data (MPI v2.6 and later) */ /* @@ -1396,7 +1364,6 @@ typedef struct _MPI26_EVENT_DATA_PCIE_LINK_COUNTER MPI2_POINTER PTR_MPI26_EVENT_DATA_PCIE_LINK_COUNTER, Mpi26EventDataPcieLinkCounter_t, MPI2_POINTER pMpi26EventDataPcieLinkCounter_t; - /* use MPI26_PCIELINK3_EVTCODE_ values from mpi2_cnfg.h for the LinkEventCode field */ /* use MPI26_PCIELINK3_COUNTER_TYPE_ values from mpi2_cnfg.h for the CounterType field */ @@ -1427,7 +1394,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 { @@ -1446,7 +1412,6 @@ typedef struct _MPI2_EVENT_ACK_REPLY } MPI2_EVENT_ACK_REPLY, MPI2_POINTER PTR_MPI2_EVENT_ACK_REPLY, Mpi2EventAckReply_t, MPI2_POINTER pMpi2EventAckReply_t; - /**************************************************************************** * SendHostMessage message ****************************************************************************/ @@ -1476,7 +1441,6 @@ typedef struct _MPI2_SEND_HOST_MESSAGE_REQUEST MPI2_POINTER PTR_MPI2_SEND_HOST_MESSAGE_REQUEST, Mpi2SendHostMessageRequest_t, MPI2_POINTER pMpi2SendHostMessageRequest_t; - /* SendHostMessage Reply message */ typedef struct _MPI2_SEND_HOST_MESSAGE_REPLY { @@ -1495,7 +1459,6 @@ typedef struct _MPI2_SEND_HOST_MESSAGE_REPLY } MPI2_SEND_HOST_MESSAGE_REPLY, MPI2_POINTER PTR_MPI2_SEND_HOST_MESSAGE_REPLY, Mpi2SendHostMessageReply_t, MPI2_POINTER pMpi2SendHostMessageReply_t; - /**************************************************************************** * FWDownload message ****************************************************************************/ @@ -1543,7 +1506,6 @@ typedef struct _MPI2_FW_DOWNLOAD_REQUEST #define MPI2_FW_DOWNLOAD_ITYPE_MIN_PRODUCT_SPECIFIC (0xF0) #define MPI2_FW_DOWNLOAD_ITYPE_TERMINATE (0xFF) /* MPI v2.6 and newer */ - /* MPI v2.0 FWDownload TransactionContext Element */ typedef struct _MPI2_FW_DOWNLOAD_TCSGE { @@ -1557,7 +1519,6 @@ typedef struct _MPI2_FW_DOWNLOAD_TCSGE } MPI2_FW_DOWNLOAD_TCSGE, MPI2_POINTER PTR_MPI2_FW_DOWNLOAD_TCSGE, Mpi2FWDownloadTCSGE_t, MPI2_POINTER pMpi2FWDownloadTCSGE_t; - /* MPI v2.5 FWDownload Request message */ typedef struct _MPI25_FW_DOWNLOAD_REQUEST { @@ -1580,7 +1541,6 @@ typedef struct _MPI25_FW_DOWNLOAD_REQUEST } MPI25_FW_DOWNLOAD_REQUEST, MPI2_POINTER PTR_MPI25_FW_DOWNLOAD_REQUEST, Mpi25FWDownloadRequest, MPI2_POINTER pMpi25FWDownloadRequest; - /* FWDownload Reply message */ typedef struct _MPI2_FW_DOWNLOAD_REPLY { @@ -1600,7 +1560,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 ****************************************************************************/ @@ -1656,7 +1615,6 @@ typedef struct _MPI2_FW_UPLOAD_TCSGE } MPI2_FW_UPLOAD_TCSGE, MPI2_POINTER PTR_MPI2_FW_UPLOAD_TCSGE, Mpi2FWUploadTCSGE_t, MPI2_POINTER pMpi2FWUploadTCSGE_t; - /* MPI v2.5 FWUpload Request message */ typedef struct _MPI25_FW_UPLOAD_REQUEST { @@ -1679,7 +1637,6 @@ typedef struct _MPI25_FW_UPLOAD_REQUEST } MPI25_FW_UPLOAD_REQUEST, MPI2_POINTER PTR_MPI25_FW_UPLOAD_REQUEST, Mpi25FWUploadRequest_t, MPI2_POINTER pMpi25FWUploadRequest_t; - /* FWUpload Reply message */ typedef struct _MPI2_FW_UPLOAD_REPLY { @@ -1700,7 +1657,6 @@ typedef struct _MPI2_FW_UPLOAD_REPLY } MPI2_FW_UPLOAD_REPLY, MPI2_POINTER PTR_MPI2_FW_UPLOAD_REPLY, Mpi2FWUploadReply_t, MPI2_POINTER pMPi2FWUploadReply_t; - /**************************************************************************** * PowerManagementControl message ****************************************************************************/ @@ -1789,7 +1745,6 @@ typedef struct _MPI2_PWR_MGMT_CONTROL_REQUEST #define MPI2_PM_CONTROL_PARAM2_STANDBY (0x40) /* Parameter3 and Parameter4 are reserved */ - /* PowerManagementControl Reply message */ typedef struct _MPI2_PWR_MGMT_CONTROL_REPLY { @@ -1809,7 +1764,6 @@ 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; - /**************************************************************************** * IO Unit Control messages (MPI v2.6 and later only.) ****************************************************************************/ @@ -1877,7 +1831,6 @@ typedef struct _MPI26_IOUNIT_CONTROL_REQUEST #define MPI26_CTRL_LOOKUP_METHOD_ENCLOSURE_SLOT (0x02) #define MPI26_CTRL_LOOKUP_METHOD_SAS_DEVICE_NAME (0x03) - /* IO Unit Control Reply Message */ typedef struct _MPI26_IOUNIT_CONTROL_REPLY { @@ -1897,6 +1850,4 @@ typedef struct _MPI26_IOUNIT_CONTROL_REPLY } MPI26_IOUNIT_CONTROL_REPLY, MPI2_POINTER PTR_MPI26_IOUNIT_CONTROL_REPLY, Mpi26IoUnitControlReply_t, MPI2_POINTER pMpi26IoUnitControlReply_t; - #endif - diff --git a/sys/dev/mpr/mpi/mpi2_pci.h b/sys/dev/mpr/mpi/mpi2_pci.h index b2154b1dae47..04acc60167d8 100755 --- a/sys/dev/mpr/mpi/mpi2_pci.h +++ b/sys/dev/mpr/mpi/mpi2_pci.h @@ -62,7 +62,6 @@ #ifndef MPI2_PCI_H #define MPI2_PCI_H - /* * Values for the PCIe DeviceInfo field used in PCIe Device Status Change Event * data and PCIe Configuration pages. @@ -74,7 +73,6 @@ #define MPI26_PCIE_DEVINFO_PCI_SWITCH (0x00000001) #define MPI26_PCIE_DEVINFO_NVME (0x00000003) - /**************************************************************************** * NVMe Encapsulated message ****************************************************************************/ @@ -119,7 +117,6 @@ typedef struct _MPI26_NVME_ENCAPSULATED_REQUEST #define MPI26_NVME_FLAGS_READ (0x0002) #define MPI26_NVME_FLAGS_BIDIRECTIONAL (0x0003) - /* NVMe Encapuslated Reply Message */ typedef struct _MPI26_NVME_ENCAPSULATED_ERROR_REPLY { @@ -142,7 +139,4 @@ typedef struct _MPI26_NVME_ENCAPSULATED_ERROR_REPLY Mpi26NVMeEncapsulatedErrorReply_t, MPI2_POINTER pMpi26NVMeEncapsulatedErrorReply_t; - #endif - - diff --git a/sys/dev/mpr/mpi/mpi2_ra.h b/sys/dev/mpr/mpi/mpi2_ra.h index 7937bc7fabc9..9d755a4de378 100644 --- a/sys/dev/mpr/mpi/mpi2_ra.h +++ b/sys/dev/mpr/mpi/mpi2_ra.h @@ -63,7 +63,6 @@ typedef struct _MPI2_RAID_ACCELERATOR_CONTROL_BLOCK Mpi2RAIDAcceleratorControlBlock_t, MPI2_POINTER pMpi2RAIDAcceleratorControlBlock_t; - /****************************************************************************** * * RAID Accelerator Messages @@ -92,7 +91,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 { @@ -112,7 +110,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 - - diff --git a/sys/dev/mpr/mpi/mpi2_raid.h b/sys/dev/mpr/mpi/mpi2_raid.h index d6ae241c6748..7861acf046a3 100644 --- a/sys/dev/mpr/mpi/mpi2_raid.h +++ b/sys/dev/mpr/mpi/mpi2_raid.h @@ -179,7 +179,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 { @@ -225,7 +224,6 @@ typedef struct _MPI2_RAID_ACTION_REQUEST #define MPI2_RAID_ACTION_MIN_PRODUCT_SPECIFIC (0x80) #define MPI2_RAID_ACTION_MAX_PRODUCT_SPECIFIC (0xFF) - /* RAID Volume Creation Structure */ /* @@ -277,7 +275,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 @@ -292,7 +289,6 @@ typedef struct _MPI2_RAID_ONLINE_CAPACITY_EXPANSION Mpi2RaidOnlineCapacityExpansion_t, MPI2_POINTER pMpi2RaidOnlineCapacityExpansion_t; - /* RAID Compatibility Input Structure */ typedef struct _MPI2_RAID_COMPATIBILITY_INPUT_STRUCT @@ -311,7 +307,6 @@ typedef struct _MPI2_RAID_COMPATIBILITY_INPUT_STRUCT #define MPI2_RAID_COMPAT_SOURCE_IS_VOLUME_FLAG (0x00000002) #define MPI2_RAID_COMPAT_REPORT_SOURCE_INFO_FLAG (0x00000001) - /* RAID Volume Indicator Structure */ typedef struct _MPI2_RAID_VOL_INDICATOR @@ -333,7 +328,6 @@ typedef struct _MPI2_RAID_VOL_INDICATOR #define MPI2_RAID_VOL_FLAGS_OP_RESYNC (0x00000003) #define MPI2_RAID_VOL_FLAGS_OP_MDC (0x00000004) - /* RAID Compatibility Result Structure */ typedef struct _MPI2_RAID_COMPATIBILITY_RESULT_STRUCT @@ -365,7 +359,6 @@ typedef struct _MPI2_RAID_COMPATIBILITY_RESULT_STRUCT #define MPI2_RAID_COMPAT_GENATTRIB_SAS_PROTOCOL (0x00000002) #define MPI2_RAID_COMPAT_GENATTRIB_SATA_PROTOCOL (0x00000001) - /* RAID Action Reply ActionData union */ typedef union _MPI2_RAID_ACTION_REPLY_DATA { @@ -380,7 +373,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 { @@ -401,6 +393,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 - diff --git a/sys/dev/mpr/mpi/mpi2_sas.h b/sys/dev/mpr/mpi/mpi2_sas.h index 0a15655117a3..5154294f568a 100644 --- a/sys/dev/mpr/mpi/mpi2_sas.h +++ b/sys/dev/mpr/mpi/mpi2_sas.h @@ -98,7 +98,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. @@ -122,7 +121,6 @@ #define MPI2_SAS_DEVICE_INFO_EDGE_EXPANDER (0x00000002) #define MPI2_SAS_DEVICE_INFO_FANOUT_EXPANDER (0x00000003) - /***************************************************************************** * * SAS Messages @@ -159,7 +157,6 @@ typedef struct _MPI2_SMP_PASSTHROUGH_REQUEST /* MPI v2.0: use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */ - /* SMP Passthrough Reply Message */ typedef struct _MPI2_SMP_PASSTHROUGH_REPLY { @@ -187,7 +184,6 @@ typedef struct _MPI2_SMP_PASSTHROUGH_REPLY /* values for SASStatus field are at the top of this file */ - /**************************************************************************** * SATA Passthrough messages ****************************************************************************/ @@ -202,7 +198,6 @@ typedef union _MPI2_SATA_PT_SGE_UNION } MPI2_SATA_PT_SGE_UNION, MPI2_POINTER PTR_MPI2_SATA_PT_SGE_UNION, Mpi2SataPTSGEUnion_t, MPI2_POINTER pMpi2SataPTSGEUnion_t; - /* SATA Passthrough Request Message */ typedef struct _MPI2_SATA_PASSTHROUGH_REQUEST { @@ -235,7 +230,6 @@ typedef struct _MPI2_SATA_PASSTHROUGH_REQUEST /* MPI v2.0: use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */ - /* SATA Passthrough Reply Message */ typedef struct _MPI2_SATA_PASSTHROUGH_REPLY { @@ -260,7 +254,6 @@ typedef struct _MPI2_SATA_PASSTHROUGH_REPLY /* values for SASStatus field are at the top of this file */ - /**************************************************************************** * SAS IO Unit Control messages * (MPI v2.5 and earlier only. @@ -324,7 +317,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 { @@ -345,7 +337,4 @@ typedef struct _MPI2_SAS_IOUNIT_CONTROL_REPLY MPI2_POINTER PTR_MPI2_SAS_IOUNIT_CONTROL_REPLY, Mpi2SasIoUnitControlReply_t, MPI2_POINTER pMpi2SasIoUnitControlReply_t; - #endif - - diff --git a/sys/dev/mpr/mpi/mpi2_targ.h b/sys/dev/mpr/mpi/mpi2_targ.h index 78f24327476d..a20e8c8973f0 100644 --- a/sys/dev/mpr/mpi/mpi2_targ.h +++ b/sys/dev/mpr/mpi/mpi2_targ.h @@ -75,7 +75,6 @@ #ifndef MPI2_TARG_H #define MPI2_TARG_H - /****************************************************************************** * * SCSI Target Messages @@ -119,7 +118,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 ****************************************************************************/ @@ -172,7 +170,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) ****************************************************************************/ @@ -229,7 +226,6 @@ typedef struct _MPI2_TARGET_SSP_TASK_BUFFER #define MPI2_TARGET_HASHED_SAS_ADDRESS_MASK (0xFFFFFF00) #define MPI2_TARGET_HASHED_SAS_ADDRESS_SHIFT (8) - /**************************************************************************** * MPI v2.0 Target Assist Request ****************************************************************************/ @@ -333,7 +329,6 @@ typedef struct _MPI2_TARGET_ASSIST_REQUEST #define MPI2_TA_EEDPFLAGS_REPLACE_OP (0x0006) #define MPI2_TA_EEDPFLAGS_CHECK_REGEN_OP (0x0007) - /**************************************************************************** * MPI v2.5 Target Assist Request ****************************************************************************/ @@ -445,7 +440,6 @@ typedef struct _MPI25_TARGET_ASSIST_REQUEST #define MPI25_TA_EEDPFLAGS_REPLACE_OP (0x0006) #define MPI25_TA_EEDPFLAGS_CHECK_REGEN_OP (0x0007) - /**************************************************************************** * Target Status Send Request ****************************************************************************/ @@ -495,8 +489,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. @@ -520,7 +512,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 ****************************************************************************/ @@ -546,7 +537,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 ****************************************************************************/ @@ -579,7 +569,6 @@ typedef struct _MPI2_TARGET_MODE_ABORT_REQUEST #define MPI2_TARGET_MODE_ABORT_DEVHANDLE (0x05) #define MPI2_TARGET_MODE_ABORT_ALL_COMMANDS (0x06) - /**************************************************************************** * Target Mode Abort Reply ****************************************************************************/ @@ -602,6 +591,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 - diff --git a/sys/dev/mpr/mpi/mpi2_tool.h b/sys/dev/mpr/mpi/mpi2_tool.h index e565f01d5fd8..b42f00eba522 100644 --- a/sys/dev/mpr/mpi/mpi2_tool.h +++ b/sys/dev/mpr/mpi/mpi2_tool.h @@ -93,7 +93,6 @@ #define MPI2_TOOLBOX_TEXT_DISPLAY_TOOL (0x07) #define MPI26_TOOLBOX_BACKEND_PCIE_LANE_MARGIN (0x08) - /**************************************************************************** * Toolbox reply ****************************************************************************/ @@ -116,7 +115,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 ****************************************************************************/ @@ -160,7 +158,6 @@ typedef struct _MPI2_TOOLBOX_CLEAN_REQUEST #define MPI2_TOOLBOX_CLEAN_SEEPROM (0x00000002) #define MPI2_TOOLBOX_CLEAN_NVSRAM (0x00000001) - /**************************************************************************** * Toolbox Memory Move request ****************************************************************************/ @@ -181,7 +178,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 ****************************************************************************/ @@ -211,7 +207,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 */ @@ -221,7 +216,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 ****************************************************************************/ @@ -275,7 +269,6 @@ typedef struct _MPI2_TOOLBOX_ISTWI_READ_WRITE_REQUEST #define MPI26_TOOLBOX_REQ_MSGFLAGS_ADDRESSING_DEVINDEX (0x00) /* Request uses Man Page 43 device index addressing */ #define MPI26_TOOLBOX_REQ_MSGFLAGS_ADDRESSING_DEVINFO (0x01) /* Request uses Man Page 43 device info struct addressing */ - /* Toolbox ISTWI Read Write Tool reply message */ typedef struct _MPI2_TOOLBOX_ISTWI_REPLY { @@ -301,7 +294,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 ****************************************************************************/ @@ -329,7 +321,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 ****************************************************************************/ @@ -362,7 +353,6 @@ typedef struct _MPI2_TOOLBOX_DIAGNOSTIC_CLI_REQUEST /* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */ - /* MPI v2.5 Toolbox Diagnostic CLI Tool request message */ typedef struct _MPI25_TOOLBOX_DIAGNOSTIC_CLI_REQUEST { @@ -385,7 +375,6 @@ typedef struct _MPI25_TOOLBOX_DIAGNOSTIC_CLI_REQUEST Mpi25ToolboxDiagnosticCliRequest_t, MPI2_POINTER pMpi25ToolboxDiagnosticCliRequest_t; - /* Toolbox Diagnostic CLI Tool reply message */ typedef struct _MPI2_TOOLBOX_DIAGNOSTIC_CLI_REPLY { @@ -408,7 +397,6 @@ typedef struct _MPI2_TOOLBOX_DIAGNOSTIC_CLI_REPLY Mpi2ToolboxDiagnosticCliReply_t, MPI2_POINTER pMpi2ToolboxDiagnosticCliReply_t; - /**************************************************************************** * Toolbox Console Text Display Tool ****************************************************************************/ @@ -446,7 +434,6 @@ typedef struct _MPI2_TOOLBOX_TEXT_DISPLAY_REQUEST /* defines for the Flags field */ #define MPI2_TOOLBOX_CONSOLE_FLAG_TIMESTAMP (0x01) - /**************************************************************************** * Toolbox Backend Lane Margining Tool ****************************************************************************/ @@ -480,7 +467,6 @@ typedef struct _MPI26_TOOLBOX_LANE_MARGINING_REQUEST #define MPI26_TOOL_MARGIN_COMMAND_WRITE_REGISTER_DATA (0x03) #define MPI26_TOOL_MARGIN_COMMAND_EXIT_MARGIN_MODE (0x04) - /* Toolbox Backend Lane Margining Tool reply message */ typedef struct _MPI26_TOOLBOX_LANE_MARGINING_REPLY { @@ -504,14 +490,12 @@ typedef struct _MPI26_TOOLBOX_LANE_MARGINING_REPLY Mpi26ToolboxLaneMarginingReply_t, MPI2_POINTER pMpi26ToolboxLaneMarginingReply_t; - /***************************************************************************** * * Diagnostic Buffer Messages * *****************************************************************************/ - /**************************************************************************** * Diagnostic Buffer Post request ****************************************************************************/ @@ -551,7 +535,6 @@ typedef struct _MPI2_DIAG_BUFFER_POST_REQUEST #define MPI2_DIAG_BUF_FLAG_RELEASE_ON_FULL (0x00000002) /* for MPI v2.0 products only */ #define MPI2_DIAG_BUF_FLAG_IMMEDIATE_RELEASE (0x00000001) - /**************************************************************************** * Diagnostic Buffer Post reply ****************************************************************************/ @@ -575,7 +558,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 ****************************************************************************/ @@ -595,7 +577,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 ****************************************************************************/ @@ -618,6 +599,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 - diff --git a/sys/dev/mpr/mpi/mpi2_type.h b/sys/dev/mpr/mpi/mpi2_type.h index cbfcb8f196a9..93d74586e219 100644 --- a/sys/dev/mpr/mpi/mpi2_type.h +++ b/sys/dev/mpr/mpi/mpi2_type.h @@ -53,7 +53,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 @@ -109,7 +108,6 @@ typedef struct _U64 U32 High; } U64; - /***************************************************************************** * * Pointer Types @@ -128,4 +126,3 @@ typedef U64 *PU64; #endif #endif - diff --git a/sys/dev/mpr/mpr.c b/sys/dev/mpr/mpr.c index b202ea40db45..335acc636384 100644 --- a/sys/dev/mpr/mpr.c +++ b/sys/dev/mpr/mpr.c @@ -339,7 +339,7 @@ mpr_transition_ready(struct mpr_softc *sc) error = EINVAL; break; } - + /* Wait 50ms for things to settle down. */ DELAY(50000); } @@ -1000,7 +1000,7 @@ mpr_request_sync(struct mpr_softc *sc, void *req, MPI2_DEFAULT_REPLY *reply, uint16_t *data16; int i, count, ioc_sz, residual; int sleep_flags = CAN_SLEEP; - + if (curthread->td_no_sleeping) sleep_flags = NO_SLEEP; @@ -1995,7 +1995,6 @@ mpr_parse_debug(struct mpr_softc *sc, char *list) flags = 0; sz = sizeof(mpr_debug_strings) / sizeof(mpr_debug_strings[0]); while ((token = strsep(&list, ":,")) != NULL) { - /* Handle integer flags */ flags |= strtol(token, &endtoken, 0); if (token != endtoken) @@ -2370,20 +2369,20 @@ mpr_sas_log_info(struct mpr_softc *sc , u32 log_info) }; union loginfo_type sas_loginfo; char *originator_str = NULL; - + sas_loginfo.loginfo = log_info; if (sas_loginfo.dw.bus_type != 3 /*SAS*/) return; - + /* each nexus loss loginfo */ if (log_info == 0x31170000) return; - + /* eat the loginfos associated with task aborts */ if ((log_info == 30050000) || (log_info == 0x31140000) || (log_info == 0x31130000)) return; - + switch (sas_loginfo.dw.originator) { case 0: originator_str = "IOP"; @@ -2395,7 +2394,7 @@ mpr_sas_log_info(struct mpr_softc *sc , u32 log_info) originator_str = "IR"; break; } - + mpr_dprint(sc, MPR_LOG, "log_info(0x%08x): originator(%s), " "code(0x%02x), sub_code(0x%04x)\n", log_info, originator_str, sas_loginfo.dw.code, sas_loginfo.dw.subcode); @@ -2406,7 +2405,7 @@ mpr_display_reply_info(struct mpr_softc *sc, uint8_t *reply) { MPI2DefaultReply_t *mpi_reply; u16 sc_status; - + mpi_reply = (MPI2DefaultReply_t*)reply; sc_status = le16toh(mpi_reply->IOCStatus); if (sc_status & MPI2_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE) @@ -2735,7 +2734,7 @@ mpr_update_events(struct mpr_softc *sc, struct mpr_event_handle *handle, if ((reply == NULL) || (reply->IOCStatus & MPI2_IOCSTATUS_MASK) != MPI2_IOCSTATUS_SUCCESS) error = ENXIO; - + if (reply) MPR_DPRINT_EVENT(sc, generic, reply); diff --git a/sys/dev/mpr/mpr_config.c b/sys/dev/mpr/mpr_config.c index 80c8a189b433..1916dc1cb3dc 100644 --- a/sys/dev/mpr/mpr_config.c +++ b/sys/dev/mpr/mpr_config.c @@ -127,7 +127,7 @@ mpr_config_get_ioc_pg8(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply, * counters to match - Need to review the reply FIFO handling. */ mpr_free_command(sc, cm); - + if ((cm = mpr_alloc_command(sc)) == NULL) { printf("%s: command alloc failed @ line %d\n", __func__, __LINE__); @@ -259,7 +259,7 @@ mpr_config_get_iounit_pg8(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply, * counters to match - Need to review the reply FIFO handling. */ mpr_free_command(sc, cm); - + if ((cm = mpr_alloc_command(sc)) == NULL) { printf("%s: command alloc failed @ line %d\n", __func__, __LINE__); @@ -391,7 +391,7 @@ mpr_config_get_man_pg11(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply, * counters to match - Need to review the reply FIFO handling. */ mpr_free_command(sc, cm); - + if ((cm = mpr_alloc_command(sc)) == NULL) { printf("%s: command alloc failed @ line %d\n", __func__, __LINE__); @@ -495,7 +495,7 @@ mpr_base_static_config_pages(struct mpr_softc *sc) break; } } - + if (!rc) { sc->custom_nvme_tm_handling = (le16toh(man_pg11.AddlFlags2) & MPI2_MAN_PG11_ADDLFLAGS2_CUSTOM_TM_HANDLING_MASK); diff --git a/sys/dev/mpr/mpr_ioctl.h b/sys/dev/mpr/mpr_ioctl.h index f81d01c7ad48..d449ec169b00 100644 --- a/sys/dev/mpr/mpr_ioctl.h +++ b/sys/dev/mpr/mpr_ioctl.h @@ -170,7 +170,6 @@ typedef struct mpr_adapter_data mpr_pci_bits_t PciInformation; } mpr_adapter_data_t; - typedef struct mpr_update_flash { uint64_t PtrBuffer; @@ -180,7 +179,6 @@ typedef struct mpr_update_flash uint32_t ImageType; } mpr_update_flash_t; - #define MPR_PASS_THRU_DIRECTION_NONE 0 #define MPR_PASS_THRU_DIRECTION_READ 1 #define MPR_PASS_THRU_DIRECTION_WRITE 2 @@ -200,7 +198,6 @@ typedef struct mpr_pass_thru uint32_t Timeout; } mpr_pass_thru_t; - /* * Event queue defines */ @@ -235,7 +232,6 @@ typedef struct mpr_event_report uint64_t PtrEvents; } mpr_event_report_t; - typedef struct mpr_pci_info { uint32_t BusNumber; @@ -245,7 +241,6 @@ typedef struct mpr_pci_info uint8_t PciHeader[256]; } mpr_pci_info_t; - typedef struct mpr_diag_action { uint32_t Action; @@ -278,7 +273,6 @@ typedef struct mpr_diag_action #define MPR_FW_DIAG_ERROR_NO_BUFFER (0x00000013) #define MPR_FW_DIAG_ERROR_ALREADY_RELEASED (0x00000014) - typedef struct mpr_fw_diag_register { uint8_t ExtendedType; diff --git a/sys/dev/mpr/mpr_mapping.c b/sys/dev/mpr/mpr_mapping.c index 47d82063c128..2b83ce49c158 100644 --- a/sys/dev/mpr/mpr_mapping.c +++ b/sys/dev/mpr/mpr_mapping.c @@ -501,7 +501,7 @@ _mapping_get_free_ir_mt_idx(struct mpr_softc *sc) "free entry in the mapping table for a Volume. The mapping " "table is probably corrupt.\n", __func__); } - + return high_idx; } @@ -562,7 +562,6 @@ _mapping_get_dpm_idx_from_id(struct mpr_softc *sc, u64 id, u32 phy_bits) return MPR_DPM_BAD_IDX; } - /** * _mapping_get_free_dpm_idx - get first available DPM index * @sc: per adapter object @@ -778,7 +777,7 @@ _mapping_add_to_removal_table(struct mpr_softc *sc, u16 dpm_idx) for (i = 0; i < sc->max_devices; i++, remove_entry++) { if (remove_entry->dpm_entry_num != MPR_DPM_BAD_IDX) continue; - + mpr_dprint(sc, MPR_MAPPING, "%s: Adding DPM entry %d to table " "for removal.\n", __func__, dpm_idx); remove_entry->dpm_entry_num = dpm_idx; @@ -1705,7 +1704,6 @@ _mapping_add_new_device(struct mpr_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 @@ -1962,7 +1960,6 @@ _mapping_add_new_pcie_device(struct mpr_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 @@ -2276,7 +2273,6 @@ _mapping_process_dpm_pg0(struct mpr_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 @@ -2352,7 +2348,6 @@ _mapping_process_dpm_pg0(struct mpr_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 @@ -2579,7 +2574,7 @@ mpr_mapping_initialize(struct mpr_softc *sc) mpr_dprint(sc, MPR_MAPPING, "%s: Mapping table has a max of %d entries " "and DPM has a max of %d entries.\n", __func__, sc->max_devices, sc->max_dpm_entries); - + if (ioc_pg8_flags & MPI2_IOCPAGE8_FLAGS_DISABLE_PERSISTENT_MAPPING) sc->is_dpm_enable = 0; diff --git a/sys/dev/mpr/mpr_pci.c b/sys/dev/mpr/mpr_pci.c index 034dbc366577..c2a62c67aae8 100644 --- a/sys/dev/mpr/mpr_pci.c +++ b/sys/dev/mpr/mpr_pci.c @@ -88,7 +88,6 @@ static driver_t mpr_pci_driver = { sizeof(struct mpr_softc) }; - struct mpr_ident { uint16_t vendor; uint16_t device; @@ -175,7 +174,6 @@ struct mpr_ident { { 0, 0, 0, 0, 0, NULL } }; - static devclass_t mpr_devclass; DRIVER_MODULE(mpr, pci, mpr_pci_driver, mpr_devclass, 0, 0); MODULE_PNP_INFO("U16:vendor;U16:device;U16:subvendor;U16:subdevice;D:#", pci, @@ -489,4 +487,3 @@ mpr_pci_restore(struct mpr_softc *sc) pci_cfg_restore(sc->mpr_dev, dinfo); return (0); } - diff --git a/sys/dev/mpr/mpr_sas.c b/sys/dev/mpr/mpr_sas.c index efd8986263e8..400aa86e0fc0 100644 --- a/sys/dev/mpr/mpr_sas.c +++ b/sys/dev/mpr/mpr_sas.c @@ -382,7 +382,7 @@ mprsas_remove_volume(struct mpr_softc *sc, struct mpr_command *tm) mpr_dprint(sc, MPR_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 @@ -412,7 +412,6 @@ mprsas_remove_volume(struct mpr_softc *sc, struct mpr_command *tm) mprsas_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. @@ -1456,7 +1455,6 @@ mprsas_send_reset(struct mpr_softc *sc, struct mpr_command *tm, uint8_t type) return err; } - static void mprsas_abort_complete(struct mpr_softc *sc, struct mpr_command *tm) { @@ -1659,7 +1657,6 @@ mprsas_scsiio_timeout(void *data) "processing by tm %p\n", cm, targ->tm); } else if ((targ->tm = mprsas_alloc_tm(sc)) != NULL) { - /* start recovery by aborting the first timedout command */ mpr_dprint(sc, MPR_RECOVERY|MPR_INFO, "Sending abort to target %u for SMID %d\n", targ->tid, @@ -2145,7 +2142,7 @@ mpr_sc_failed_io_info(struct mpr_softc *sc, struct ccb_scsiio *csio, char *desc_ioc_state = NULL; char *desc_scsi_status = NULL; u32 log_info = le32toh(mpi_reply->IOCLogInfo); - + if (log_info == 0x31170000) return; @@ -2161,7 +2158,7 @@ mpr_sc_failed_io_info(struct mpr_softc *sc, struct ccb_scsiio *csio, "connector name (%4s)\n", targ->encl_level, targ->encl_slot, targ->connector_name); } - + /* * We can add more detail about underflow data here * TO-DO @@ -2350,7 +2347,7 @@ mprsas_nvme_trans_status_code(uint16_t nvme_status, } break; } - + returned_sense_len = sizeof(struct scsi_sense_data); if (returned_sense_len < ccb->csio.sense_len) ccb->csio.sense_resid = ccb->csio.sense_len - @@ -2788,7 +2785,7 @@ mprsas_scsiio_complete(struct mpr_softc *sc, struct mpr_command *cm) break; } - + mpr_sc_failed_io_info(sc, csio, rep, cm->cm_targ); if (sassc->flags & MPRSAS_QUEUE_FROZEN) { @@ -3153,7 +3150,6 @@ mprsas_action_smpio(struct mprsas_softc *sassc, union ccb *ccb) targ->handle, targ->parent_handle); mprsas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE); goto bailout; - } if (targ->parent_sasaddr == 0x0) { mpr_dprint(sc, MPR_ERROR, "%s: handle %d parent handle " @@ -3165,7 +3161,6 @@ mprsas_action_smpio(struct mprsas_softc *sassc, union ccb *ccb) sasaddr = targ->parent_sasaddr; #endif /* OLD_MPR_PROBE */ - } if (sasaddr == 0) { diff --git a/sys/dev/mpr/mpr_sas_lsi.c b/sys/dev/mpr/mpr_sas_lsi.c index 82845454689d..db4cbbb24440 100644 --- a/sys/dev/mpr/mpr_sas_lsi.c +++ b/sys/dev/mpr/mpr_sas_lsi.c @@ -797,7 +797,6 @@ mprsas_fw_work(struct mpr_softc *sc, struct mpr_fw_event_work *fw_event) mpr_dprint(sc, MPR_TRACE,"Unhandled event 0x%0X\n", fw_event->event); break; - } mpr_dprint(sc, MPR_EVENT, "(%d)->(%s) Event Free: [%x]\n", event_count, __func__, fw_event->event); diff --git a/sys/dev/mpr/mpr_table.c b/sys/dev/mpr/mpr_table.c index a1bddf1a3065..c2f31af14e91 100644 --- a/sys/dev/mpr/mpr_table.c +++ b/sys/dev/mpr/mpr_table.c @@ -599,4 +599,3 @@ mpr_print_scsiio_cmd(struct mpr_softc *sc, struct mpr_command *cm) req = (MPI2_SCSI_IO_REQUEST *)cm->cm_req; mpr_print_sgl(sc, cm, req->SGLOffset0); } - diff --git a/sys/dev/mpr/mpr_user.c b/sys/dev/mpr/mpr_user.c index 751741bcc4f6..625836d6ccf6 100644 --- a/sys/dev/mpr/mpr_user.c +++ b/sys/dev/mpr/mpr_user.c @@ -710,7 +710,7 @@ mpr_user_command(struct mpr_softc *sc, struct mpr_usr_command *cmd) sz = rpl->MsgLength * 4; else sz = 0; - + if (sz > cmd->rpl_len) { mpr_printf(sc, "%s: user reply buffer (%d) smaller than " "returned buffer (%d)\n", __func__, cmd->rpl_len, sz); @@ -855,7 +855,7 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_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) { mpr_printf(sc, "%s: user reply buffer (%d) " "smaller than returned buffer (%d)\n", @@ -1536,7 +1536,6 @@ mpr_diag_register(struct mpr_softc *sc, mpr_fw_diag_register_t *diag_register, sc->fw_diag_buffer, buffer_size, mpr_memaddr_wait_cb, ctx, 0); if (error == EINPROGRESS) { - /* XXX KDM */ device_printf(sc->mpr_dev, "%s: Deferred bus_dmamap_load\n", __func__); diff --git a/sys/dev/mpr/mprvar.h b/sys/dev/mpr/mprvar.h index 152fbbc69cf2..3728a6b5a131 100644 --- a/sys/dev/mpr/mprvar.h +++ b/sys/dev/mpr/mprvar.h @@ -967,4 +967,3 @@ struct unmap_parm_list { #define SCSI_ASCQ_INVALID_LUN_ID 0x09 #endif -