mpt: clean up empty lines in .c and .h files
This commit is contained in:
Mateusz Guzik
parent
139b723f80
commit
0bd9a5da1c
@ -118,7 +118,6 @@
|
||||
#ifndef MPI_H
|
||||
#define MPI_H
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* M P I V e r s i o n D e f i n i t i o n s
|
||||
@ -175,7 +174,6 @@
|
||||
#define MPI_FAULT_DATA_RECEIVE_PCI_PARITY_ERROR (0x8117)
|
||||
#define MPI_FAULT_DATA_RECEIVE_PCI_BUS_FAULT (0x8118)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* P C I S y s t e m I n t e r f a c e R e g i s t e r s
|
||||
@ -206,7 +204,6 @@
|
||||
#define MPI_DB_HPBAC_DISABLE_ACCESS (0x02)
|
||||
#define MPI_DB_HPBAC_FREE_BUFFER (0x03)
|
||||
|
||||
|
||||
#define MPI_WRITE_SEQUENCE_OFFSET (0x00000004)
|
||||
#define MPI_WRSEQ_KEY_VALUE_MASK (0x0000000F)
|
||||
#define MPI_WRSEQ_1ST_KEY_VALUE (0x04)
|
||||
@ -250,8 +247,6 @@
|
||||
|
||||
#define MPI_HI_PRI_REQUEST_QUEUE_OFFSET (0x00000048)
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* M e s s a g e F r a m e D e s c r i p t o r s
|
||||
@ -273,7 +268,6 @@
|
||||
#define MPI_CONTEXT_REPLY_TYPE_SHIFT (29)
|
||||
#define MPI_CONTEXT_REPLY_CONTEXT_MASK (0x1FFFFFFF)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Context Reply macros */
|
||||
/****************************************************************************/
|
||||
@ -286,7 +280,6 @@
|
||||
(((typ) << MPI_CONTEXT_REPLY_TYPE_SHIFT) & \
|
||||
MPI_CONTEXT_REPLY_TYPE_MASK))
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* M e s s a g e F u n c t i o n s
|
||||
@ -354,7 +347,6 @@
|
||||
#define MPI_FUNCTION_REPLY_FRAME_REMOVAL (0x43)
|
||||
#define MPI_FUNCTION_HOST_PAGEBUF_ACCESS_CONTROL (0x44)
|
||||
|
||||
|
||||
/* standard version format */
|
||||
typedef struct _MPI_VERSION_STRUCT
|
||||
{
|
||||
@ -372,7 +364,6 @@ typedef union _MPI_VERSION_FORMAT
|
||||
} MPI_VERSION_FORMAT, MPI_POINTER PTR_MPI_VERSION_FORMAT,
|
||||
MpiVersionFormat_t, MPI_POINTER pMpiVersionFormat_t;
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* S c a t t e r G a t h e r E l e m e n t s
|
||||
@ -508,7 +499,6 @@ typedef struct _SGE_TRANSACTION_UNION
|
||||
} SGE_TRANSACTION_UNION, MPI_POINTER PTR_SGE_TRANSACTION_UNION,
|
||||
SGETransactionUnion_t, MPI_POINTER pSGETransactionUnion_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* SGE IO types union for IO SGL's */
|
||||
/****************************************************************************/
|
||||
@ -553,7 +543,6 @@ typedef struct _SGE_MPI_UNION
|
||||
MPI_SGE_UNION_t, MPI_POINTER pMPI_SGE_UNION_t,
|
||||
SGEAllUnion_t, MPI_POINTER pSGEAllUnion_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* SGE field definition and masks */
|
||||
/****************************************************************************/
|
||||
@ -604,7 +593,6 @@ typedef struct _SGE_MPI_UNION
|
||||
#define MPI_SGE_CHAIN_OFFSET_MASK (0x00FF0000)
|
||||
#define MPI_SGE_CHAIN_OFFSET_SHIFT (16)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* SGE operation Macros */
|
||||
/****************************************************************************/
|
||||
@ -626,8 +614,6 @@ typedef struct _SGE_MPI_UNION
|
||||
|
||||
#define MPI_GET_CHAIN_OFFSET(x) ((x&MPI_SGE_CHAIN_OFFSET_MASK)>>MPI_SGE_CHAIN_OFFSET_SHIFT)
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* S t a n d a r d M e s s a g e S t r u c t u r e s
|
||||
@ -649,7 +635,6 @@ typedef struct _MSG_REQUEST_HEADER
|
||||
} MSG_REQUEST_HEADER, MPI_POINTER PTR_MSG_REQUEST_HEADER,
|
||||
MPIHeader_t, MPI_POINTER pMPIHeader_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Default Reply */
|
||||
/****************************************************************************/
|
||||
@ -668,12 +653,10 @@ typedef struct _MSG_DEFAULT_REPLY
|
||||
} MSG_DEFAULT_REPLY, MPI_POINTER PTR_MSG_DEFAULT_REPLY,
|
||||
MPIDefaultReply_t, MPI_POINTER pMPIDefaultReply_t;
|
||||
|
||||
|
||||
/* MsgFlags definition for all replies */
|
||||
|
||||
#define MPI_MSGFLAGS_CONTINUATION_REPLY (0x80)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* I O C S t a t u s V a l u e s
|
||||
@ -732,7 +715,6 @@ typedef struct _MSG_DEFAULT_REPLY
|
||||
#define MPI_IOCSTATUS_EEDP_REF_TAG_ERROR (0x004E)
|
||||
#define MPI_IOCSTATUS_EEDP_APP_TAG_ERROR (0x004F)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* SCSI Target values */
|
||||
/****************************************************************************/
|
||||
@ -804,7 +786,6 @@ typedef struct _MSG_DEFAULT_REPLY
|
||||
|
||||
#define MPI_IOCSTATUS_DIAGNOSTIC_RELEASED (0x00A0)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* IOCStatus flag to indicate that log info is available */
|
||||
/****************************************************************************/
|
||||
@ -825,5 +806,4 @@ typedef struct _MSG_DEFAULT_REPLY
|
||||
#define MPI_IOCLOGINFO_TYPE_ISCSI (0x4)
|
||||
#define MPI_IOCLOGINFO_LOG_DATA_MASK (0x0FFFFFFF)
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@ -365,7 +365,6 @@
|
||||
#ifndef MPI_CNFG_H
|
||||
#define MPI_CNFG_H
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* C o n f i g M e s s a g e a n d S t r u c t u r e s
|
||||
@ -402,8 +401,6 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER
|
||||
} CONFIG_EXTENDED_PAGE_HEADER, MPI_POINTER PTR_CONFIG_EXTENDED_PAGE_HEADER,
|
||||
ConfigExtendedPageHeader_t, MPI_POINTER pConfigExtendedPageHeader_t;
|
||||
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* PageType field values
|
||||
****************************************************************************/
|
||||
@ -430,7 +427,6 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER
|
||||
|
||||
#define MPI_CONFIG_TYPENUM_MASK (0x0FFF)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* ExtPageType field values
|
||||
****************************************************************************/
|
||||
@ -441,7 +437,6 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER
|
||||
#define MPI_CONFIG_EXTPAGETYPE_LOG (0x14)
|
||||
#define MPI_CONFIG_EXTPAGETYPE_ENCLOSURE (0x15)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* PageAddress field values
|
||||
****************************************************************************/
|
||||
@ -531,8 +526,6 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER
|
||||
#define MPI_SAS_ENCLOS_PGAD_H_HANDLE_MASK (0x0000FFFF)
|
||||
#define MPI_SAS_ENCLOS_PGAD_H_HANDLE_SHIFT (0)
|
||||
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* Config Request Message
|
||||
****************************************************************************/
|
||||
@ -553,7 +546,6 @@ typedef struct _MSG_CONFIG
|
||||
} MSG_CONFIG, MPI_POINTER PTR_MSG_CONFIG,
|
||||
Config_t, MPI_POINTER pConfig_t;
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* Action field values
|
||||
****************************************************************************/
|
||||
@ -565,7 +557,6 @@ typedef struct _MSG_CONFIG
|
||||
#define MPI_CONFIG_ACTION_PAGE_READ_DEFAULT (0x05)
|
||||
#define MPI_CONFIG_ACTION_PAGE_READ_NVRAM (0x06)
|
||||
|
||||
|
||||
/* Config Reply Message */
|
||||
typedef struct _MSG_CONFIG_REPLY
|
||||
{
|
||||
@ -584,8 +575,6 @@ typedef struct _MSG_CONFIG_REPLY
|
||||
} MSG_CONFIG_REPLY, MPI_POINTER PTR_MSG_CONFIG_REPLY,
|
||||
ConfigReply_t, MPI_POINTER pConfigReply_t;
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* C o n f i g u r a t i o n P a g e s
|
||||
@ -622,7 +611,6 @@ typedef struct _MSG_CONFIG_REPLY
|
||||
#define MPI_MANUFACTPAGE_DEVID_SAS1068E (0x0058)
|
||||
#define MPI_MANUFACTPAGE_DEVID_SAS1078 (0x0062)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_MANUFACTURING_0
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -637,7 +625,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_0
|
||||
|
||||
#define MPI_MANUFACTURING0_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_MANUFACTURING_1
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -647,7 +634,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_1
|
||||
|
||||
#define MPI_MANUFACTURING1_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _MPI_CHIP_REVISION_ID
|
||||
{
|
||||
U16 DeviceID; /* 00h */
|
||||
@ -656,7 +642,6 @@ typedef struct _MPI_CHIP_REVISION_ID
|
||||
} MPI_CHIP_REVISION_ID, MPI_POINTER PTR_MPI_CHIP_REVISION_ID,
|
||||
MpiChipRevisionId_t, MPI_POINTER pMpiChipRevisionId_t;
|
||||
|
||||
|
||||
/*
|
||||
* Host code (drivers, BIOS, utilities, etc.) should leave this define set to
|
||||
* one and check Header.PageLength at runtime.
|
||||
@ -675,7 +660,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_2
|
||||
|
||||
#define MPI_MANUFACTURING2_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
/*
|
||||
* Host code (drivers, BIOS, utilities, etc.) should leave this define set to
|
||||
* one and check Header.PageLength at runtime.
|
||||
@ -694,7 +678,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_3
|
||||
|
||||
#define MPI_MANUFACTURING3_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_MANUFACTURING_4
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -752,7 +735,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_4
|
||||
#define MPI_MANPAGE4_EXTFLAGS_SATA_CACHE_DISABLE (0x0002)
|
||||
#define MPI_MANPAGE4_EXTFLAGS_LEGACY_MODE (0x0001)
|
||||
|
||||
|
||||
#ifndef MPI_MANPAGE5_NUM_FORCEWWID
|
||||
#define MPI_MANPAGE5_NUM_FORCEWWID (1)
|
||||
#endif
|
||||
@ -775,7 +757,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_5
|
||||
/* defines for the Flags field */
|
||||
#define MPI_MANPAGE5_TWO_WWID_PER_PHY (0x01)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_MANUFACTURING_6
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -785,7 +766,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_6
|
||||
|
||||
#define MPI_MANUFACTURING6_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _MPI_MANPAGE7_CONNECTOR_INFO
|
||||
{
|
||||
U32 Pinout; /* 00h */
|
||||
@ -845,7 +825,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_7
|
||||
/* defines for the Flags field */
|
||||
#define MPI_MANPAGE7_FLAG_USE_SLOT_INFO (0x00000001)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_MANUFACTURING_8
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -855,7 +834,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_8
|
||||
|
||||
#define MPI_MANUFACTURING8_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_MANUFACTURING_9
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -865,7 +843,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_9
|
||||
|
||||
#define MPI_MANUFACTURING9_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_MANUFACTURING_10
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -875,7 +852,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_10
|
||||
|
||||
#define MPI_MANUFACTURING10_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* IO Unit Config Pages
|
||||
****************************************************************************/
|
||||
@ -889,7 +865,6 @@ typedef struct _CONFIG_PAGE_IO_UNIT_0
|
||||
|
||||
#define MPI_IOUNITPAGE0_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_IO_UNIT_1
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -944,7 +919,6 @@ typedef struct _CONFIG_PAGE_IO_UNIT_2
|
||||
#define MPI_IOUNITPAGE2_FLAGS_ADAPTER_DISPLAY (0x00000020)
|
||||
#define MPI_IOUNITPAGE2_FLAGS_ADAPTER_DEV_DISPLAY (0x00000040)
|
||||
|
||||
|
||||
/*
|
||||
* Host code (drivers, BIOS, utilities, etc.) should leave this define set to
|
||||
* one and check Header.PageLength at runtime.
|
||||
@ -970,7 +944,6 @@ typedef struct _CONFIG_PAGE_IO_UNIT_3
|
||||
#define MPI_IOUNITPAGE3_GPIO_SETTING_OFF (0x00)
|
||||
#define MPI_IOUNITPAGE3_GPIO_SETTING_ON (0x01)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_IO_UNIT_4
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -981,7 +954,6 @@ typedef struct _CONFIG_PAGE_IO_UNIT_4
|
||||
|
||||
#define MPI_IOUNITPAGE4_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* IOC Config Pages
|
||||
****************************************************************************/
|
||||
@ -1003,7 +975,6 @@ typedef struct _CONFIG_PAGE_IOC_0
|
||||
|
||||
#define MPI_IOCPAGE0_PAGEVERSION (0x01)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_IOC_1
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -1027,7 +998,6 @@ typedef struct _CONFIG_PAGE_IOC_1
|
||||
|
||||
#define MPI_IOCPAGE1_PCISLOTNUM_UNKNOWN (0xFF)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_IOC_2_RAID_VOL
|
||||
{
|
||||
U8 VolumeID; /* 00h */
|
||||
@ -1091,7 +1061,6 @@ typedef struct _CONFIG_PAGE_IOC_2
|
||||
#define MPI_IOCPAGE2_CAP_FLAGS_SAFTE_SUPPORT (0x40000000)
|
||||
#define MPI_IOCPAGE2_CAP_FLAGS_CROSS_CHANNEL_SUPPORT (0x80000000)
|
||||
|
||||
|
||||
typedef struct _IOC_3_PHYS_DISK
|
||||
{
|
||||
U8 PhysDiskID; /* 00h */
|
||||
@ -1121,7 +1090,6 @@ typedef struct _CONFIG_PAGE_IOC_3
|
||||
|
||||
#define MPI_IOCPAGE3_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _IOC_4_SEP
|
||||
{
|
||||
U8 SEPTargetID; /* 00h */
|
||||
@ -1150,7 +1118,6 @@ typedef struct _CONFIG_PAGE_IOC_4
|
||||
|
||||
#define MPI_IOCPAGE4_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _IOC_5_HOT_SPARE
|
||||
{
|
||||
U8 PhysDiskNum; /* 00h */
|
||||
@ -1230,7 +1197,6 @@ typedef struct _CONFIG_PAGE_IOC_6
|
||||
|
||||
#define MPI_IOCPAGE6_CAP_FLAGS_GLOBAL_HOT_SPARE (0x00000001)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* BIOS Config Pages
|
||||
****************************************************************************/
|
||||
@ -1504,7 +1470,6 @@ typedef struct _CONFIG_PAGE_BIOS_4
|
||||
|
||||
#define MPI_BIOSPAGE4_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* SCSI Port Config Pages
|
||||
****************************************************************************/
|
||||
@ -1557,7 +1522,6 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_0
|
||||
#define MPI_SCSIPORTPAGE0_PHY_BUS_FREE_CONNECTED_ID (0xFE)
|
||||
#define MPI_SCSIPORTPAGE0_PHY_UNKNOWN_CONNECTED_ID (0xFF)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_SCSI_PORT_1
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -1580,7 +1544,6 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_1
|
||||
#define MPI_SCSIPORTPAGE1_TARGCONFIG_TARG_ONLY (0x01)
|
||||
#define MPI_SCSIPORTPAGE1_TARGCONFIG_INIT_TARG (0x02)
|
||||
|
||||
|
||||
typedef struct _MPI_DEVICE_INFO
|
||||
{
|
||||
U8 Timeout; /* 00h */
|
||||
@ -1611,7 +1574,6 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_2
|
||||
#define MPI_SCSIPORTPAGE2_PORT_FLAGS_BASIC_DV_ONLY (0x00000020)
|
||||
#define MPI_SCSIPORTPAGE2_PORT_FLAGS_OFF_DV (0x00000060)
|
||||
|
||||
|
||||
/* PortSettings values */
|
||||
#define MPI_SCSIPORTPAGE2_PORT_HOST_ID_MASK (0x0000000F)
|
||||
#define MPI_SCSIPORTPAGE2_PORT_MASK_INIT_HBA (0x00000030)
|
||||
@ -1637,7 +1599,6 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_2
|
||||
#define MPI_SCSIPORTPAGE2_DEVICE_WIDE_DISABLE (0x0010)
|
||||
#define MPI_SCSIPORTPAGE2_DEVICE_BOOT_CHOICE (0x0020)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* SCSI Target Device Config Pages
|
||||
****************************************************************************/
|
||||
@ -1673,7 +1634,6 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_0
|
||||
#define MPI_SCSIDEVPAGE0_INFO_WDTR_REJECTED (0x00000004)
|
||||
#define MPI_SCSIDEVPAGE0_INFO_PPR_REJECTED (0x00000008)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_SCSI_DEVICE_1
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -1706,7 +1666,6 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_1
|
||||
#define MPI_SCSIDEVPAGE1_CONF_EXTENDED_PARAMS_ENABLE (0x00000008)
|
||||
#define MPI_SCSIDEVPAGE1_CONF_FORCE_PPR_MSG (0x00000010)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_SCSI_DEVICE_2
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -1747,7 +1706,6 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_2
|
||||
#define MPI_SCSIDEVPAGE2_DPS_BIT_14_PL_SELECT_MASK (0x30000000)
|
||||
#define MPI_SCSIDEVPAGE2_DPS_BIT_15_PL_SELECT_MASK (0xC0000000)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_SCSI_DEVICE_3
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -1763,7 +1721,6 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_3
|
||||
#define MPI_SCSIDEVPAGE3_MAX_COUNTER (0xFFFE)
|
||||
#define MPI_SCSIDEVPAGE3_UNSUPPORTED_COUNTER (0xFFFF)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* FC Port Config Pages
|
||||
****************************************************************************/
|
||||
@ -1856,7 +1813,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_0
|
||||
#define MPI_FCPORTPAGE0_CURRENT_SPEED_4GBIT MPI_FCPORTPAGE0_SUPPORT_4GBIT_SPEED
|
||||
#define MPI_FCPORTPAGE0_CURRENT_SPEED_NOT_NEGOTIATED (0x00008000) /* (SNIA)HBA_PORTSPEED_NOT_NEGOTIATED (1<<15) Speed not established */
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_FC_PORT_1
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -1922,7 +1878,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_1
|
||||
#define MPI_FCPORTPAGE1_INITIATOR_DEV_TIMEOUT_MASK (0x7F)
|
||||
#define MPI_FCPORTPAGE1_INITIATOR_DEV_UNIT_16 (0x80)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_FC_PORT_2
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -1933,7 +1888,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_2
|
||||
|
||||
#define MPI_FCPORTPAGE2_PAGEVERSION (0x01)
|
||||
|
||||
|
||||
typedef struct _WWN_FORMAT
|
||||
{
|
||||
U64 WWNN; /* 00h */
|
||||
@ -1981,7 +1935,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_3
|
||||
|
||||
#define MPI_FCPORTPAGE3_PAGEVERSION (0x01)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_FC_PORT_4
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -2002,7 +1955,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_4
|
||||
#define MPI_FCPORTPAGE4_PORT_REMOVABLE_MEDIA (0x000000C0)
|
||||
#define MPI_FCPORTPAGE4_PORT_SPINUP_DELAY_MASK (0x00000F00)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_FC_PORT_5_ALIAS_INFO
|
||||
{
|
||||
U8 Flags; /* 00h */
|
||||
@ -2054,7 +2006,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_6
|
||||
|
||||
#define MPI_FCPORTPAGE6_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_FC_PORT_7
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -2065,7 +2016,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_7
|
||||
|
||||
#define MPI_FCPORTPAGE7_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_FC_PORT_8
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -2075,7 +2025,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_8
|
||||
|
||||
#define MPI_FCPORTPAGE8_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_FC_PORT_9
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -2095,7 +2044,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_9
|
||||
|
||||
#define MPI_FCPORTPAGE9_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA
|
||||
{
|
||||
U8 Id; /* 10h */
|
||||
@ -2167,7 +2115,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA
|
||||
#define MPI_FCPORT10_BASE_ENCODE_NRZ (0x03)
|
||||
#define MPI_FCPORT10_BASE_ENCODE_MANCHESTER (0x04)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA
|
||||
{
|
||||
U8 Options[2]; /* 50h */
|
||||
@ -2189,7 +2136,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA
|
||||
#define MPI_FCPORT10_EXT_OPTION1_LOS_INVERT (0x04)
|
||||
#define MPI_FCPORT10_EXT_OPTION1_LOS (0x02)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_FC_PORT_10
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -2223,7 +2169,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_10
|
||||
#define MPI_FCPORTPAGE10_FLAGS_CC_BASE_OK (0x00000010)
|
||||
#define MPI_FCPORTPAGE10_FLAGS_CC_EXT_OK (0x00000020)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* FC Device Config Pages
|
||||
****************************************************************************/
|
||||
@ -2377,7 +2322,6 @@ typedef struct _CONFIG_PAGE_RAID_VOL_0
|
||||
#define MPI_RAIDVOLPAGE0_INSUFFICIENT_METADATA_INACTIVE (0x05)
|
||||
#define MPI_RAIDVOLPAGE0_PREVIOUSLY_DELETED (0x06)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_RAID_VOL_1
|
||||
{
|
||||
CONFIG_PAGE_HEADER Header; /* 00h */
|
||||
@ -2395,7 +2339,6 @@ typedef struct _CONFIG_PAGE_RAID_VOL_1
|
||||
|
||||
#define MPI_RAIDVOLPAGE1_PAGEVERSION (0x01)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* RAID Physical Disk Config Pages
|
||||
****************************************************************************/
|
||||
@ -2477,7 +2420,6 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_0
|
||||
|
||||
#define MPI_RAIDPHYSDISKPAGE0_PAGEVERSION (0x02)
|
||||
|
||||
|
||||
typedef struct _RAID_PHYS_DISK1_PATH
|
||||
{
|
||||
U8 PhysDiskID; /* 00h */
|
||||
@ -2495,7 +2437,6 @@ typedef struct _RAID_PHYS_DISK1_PATH
|
||||
#define MPI_RAID_PHYSDISK1_FLAG_BROKEN (0x0002)
|
||||
#define MPI_RAID_PHYSDISK1_FLAG_INVALID (0x0001)
|
||||
|
||||
|
||||
/*
|
||||
* Host code (drivers, BIOS, utilities, etc.) should leave this define set to
|
||||
* one and check Header.PageLength or NumPhysDiskPaths at runtime.
|
||||
@ -2517,7 +2458,6 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1
|
||||
|
||||
#define MPI_RAIDPHYSDISKPAGE1_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* LAN Config Pages
|
||||
****************************************************************************/
|
||||
@ -2561,7 +2501,6 @@ typedef struct _CONFIG_PAGE_LAN_1
|
||||
#define MPI_LAN_PAGE1_DEV_STATE_RESET (0x00)
|
||||
#define MPI_LAN_PAGE1_DEV_STATE_OPERATIONAL (0x01)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* Inband Config Pages
|
||||
****************************************************************************/
|
||||
@ -2577,8 +2516,6 @@ typedef struct _CONFIG_PAGE_INBAND_0
|
||||
|
||||
#define MPI_INBAND_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* SAS IO Unit Config Pages
|
||||
****************************************************************************/
|
||||
@ -2656,7 +2593,6 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
|
||||
#define MPI_SAS_IOUNIT0_DS_MAX_SATA_TARGETS (0x00001000)
|
||||
#define MPI_SAS_IOUNIT0_DS_MULTI_PORT_DOMAIN (0x00002000)
|
||||
|
||||
|
||||
typedef struct _MPI_SAS_IO_UNIT1_PHY_DATA
|
||||
{
|
||||
U8 Port; /* 00h */
|
||||
@ -2751,7 +2687,6 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1
|
||||
|
||||
/* see mpi_sas.h for values for SAS IO Unit Page 1 ControllerPhyDeviceInfo values */
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2
|
||||
{
|
||||
CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */
|
||||
@ -2787,7 +2722,6 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2
|
||||
#define MPI_SAS_IOUNIT2_FLAGS_RESERVE_ID_0_FOR_BOOT (0x10)
|
||||
#define MPI_SAS_IOUNIT2_FLAGS_DA_STARTING_SLOT (0x20)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_SAS_IO_UNIT_3
|
||||
{
|
||||
CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */
|
||||
@ -2805,7 +2739,6 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_3
|
||||
|
||||
#define MPI_SASIOUNITPAGE3_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* SAS Expander Config Pages
|
||||
****************************************************************************/
|
||||
@ -2850,7 +2783,6 @@ typedef struct _CONFIG_PAGE_SAS_EXPANDER_0
|
||||
#define MPI_SAS_EXPANDER0_FLAGS_ROUTE_TABLE_CONFIG (0x02)
|
||||
#define MPI_SAS_EXPANDER0_FLAGS_CONFIG_IN_PROGRESS (0x01)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_SAS_EXPANDER_1
|
||||
{
|
||||
CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */
|
||||
@ -2899,7 +2831,6 @@ typedef struct _CONFIG_PAGE_SAS_EXPANDER_1
|
||||
#define MPI_SAS_EXPANDER1_NEG_RATE_1_5 (0x08)
|
||||
#define MPI_SAS_EXPANDER1_NEG_RATE_3_0 (0x09)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* SAS Device Config Pages
|
||||
****************************************************************************/
|
||||
@ -2959,7 +2890,6 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_0
|
||||
|
||||
/* see mpi_sas.h for values for SAS Device Page 0 DeviceInfo values */
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_SAS_DEVICE_1
|
||||
{
|
||||
CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */
|
||||
@ -2975,7 +2905,6 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_1
|
||||
|
||||
#define MPI_SASDEVICE1_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_SAS_DEVICE_2
|
||||
{
|
||||
CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */
|
||||
@ -2994,7 +2923,6 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_2
|
||||
#define MPI_SASDEVICE2_ENC_MAP_MASK_START_INDEX (0x001FF800)
|
||||
#define MPI_SASDEVICE2_ENC_MAP_SHIFT_START_INDEX (11)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* SAS PHY Config Pages
|
||||
****************************************************************************/
|
||||
@ -3062,7 +2990,6 @@ typedef struct _CONFIG_PAGE_SAS_PHY_0
|
||||
#define MPI_SAS_PHY0_PHYINFO_RATE_1_5 (0x00000008)
|
||||
#define MPI_SAS_PHY0_PHYINFO_RATE_3_0 (0x00000009)
|
||||
|
||||
|
||||
typedef struct _CONFIG_PAGE_SAS_PHY_1
|
||||
{
|
||||
CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */
|
||||
@ -3076,7 +3003,6 @@ typedef struct _CONFIG_PAGE_SAS_PHY_1
|
||||
|
||||
#define MPI_SASPHY1_PAGEVERSION (0x00)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* SAS Enclosure Config Pages
|
||||
****************************************************************************/
|
||||
@ -3113,7 +3039,6 @@ typedef struct _CONFIG_PAGE_SAS_ENCLOSURE_0
|
||||
#define MPI_SAS_ENCLS0_FLAGS_MNG_SES_ENCLOSURE (0x0004)
|
||||
#define MPI_SAS_ENCLS0_FLAGS_MNG_IOC_GPIO (0x0005)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* Log Config Pages
|
||||
****************************************************************************/
|
||||
@ -3154,6 +3079,4 @@ typedef struct _CONFIG_PAGE_LOG_0
|
||||
|
||||
#define MPI_LOG_0_PAGEVERSION (0x01)
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -75,7 +75,6 @@
|
||||
#ifndef MPI_FC_H
|
||||
#define MPI_FC_H
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* F C D i r e c t A c c e s s M e s s a g e s
|
||||
@ -170,7 +169,6 @@ typedef struct _MSG_LINK_SERVICE_BUFFER_POST_REPLY
|
||||
#define FCP_TARGET_TYPE_MASK (0xFF000000)
|
||||
#define FCP_TARGET_TYPE_SHIFT (24)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Link Service Response messages */
|
||||
/****************************************************************************/
|
||||
@ -201,7 +199,6 @@ typedef struct _MSG_LINK_SERVICE_RSP_REQUEST
|
||||
#define LINK_SERVICE_RSP_FLAGS_IMMEDIATE (0x80)
|
||||
#define LINK_SERVICE_RSP_FLAGS_PORT_MASK (0x01)
|
||||
|
||||
|
||||
/* Link Service Response Reply */
|
||||
typedef struct _MSG_LINK_SERVICE_RSP_REPLY
|
||||
{
|
||||
@ -219,7 +216,6 @@ typedef struct _MSG_LINK_SERVICE_RSP_REPLY
|
||||
} MSG_LINK_SERVICE_RSP_REPLY, MPI_POINTER PTR_MSG_LINK_SERVICE_RSP_REPLY,
|
||||
LinkServiceRspReply_t, MPI_POINTER pLinkServiceRspReply_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Extended Link Service Send messages */
|
||||
/****************************************************************************/
|
||||
@ -242,7 +238,6 @@ typedef struct _MSG_EXLINK_SERVICE_SEND_REQUEST
|
||||
#define EX_LINK_SERVICE_SEND_MSGFLAGS_MASK (0xFF000000)
|
||||
#define EX_LINK_SERVICE_SEND_MSGFLAGS_SHIFT (24)
|
||||
|
||||
|
||||
/* Extended Link Service Send Reply */
|
||||
typedef struct _MSG_EXLINK_SERVICE_SEND_REPLY
|
||||
{
|
||||
@ -302,7 +297,6 @@ typedef struct _MSG_FC_ABORT_REPLY
|
||||
} MSG_FC_ABORT_REPLY, MPI_POINTER PTR_MSG_FC_ABORT_REPLY,
|
||||
FcAbortReply_t, MPI_POINTER pFcAbortReply_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* FC Common Transport Send messages */
|
||||
/****************************************************************************/
|
||||
@ -328,7 +322,6 @@ typedef struct _MSG_FC_COMMON_TRANSPORT_SEND_REQUEST
|
||||
#define MPI_FC_CT_SEND_MSGFLAGS_MASK (0xFF000000)
|
||||
#define MPI_FC_CT_SEND_MSGFLAGS_SHIFT (24)
|
||||
|
||||
|
||||
/* FC Common Transport Send Reply */
|
||||
typedef struct _MSG_FC_COMMON_TRANSPORT_SEND_REPLY
|
||||
{
|
||||
@ -347,7 +340,6 @@ typedef struct _MSG_FC_COMMON_TRANSPORT_SEND_REPLY
|
||||
} MSG_FC_COMMON_TRANSPORT_SEND_REPLY, MPI_POINTER PTR_MSG_FC_COMMON_TRANSPORT_SEND_REPLY,
|
||||
FcCommonTransportSendReply_t, MPI_POINTER pFcCommonTransportSendReply_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* FC Primitive Send messages */
|
||||
/****************************************************************************/
|
||||
@ -393,4 +385,3 @@ typedef struct _MSG_FC_PRIMITIVE_SEND_REPLY
|
||||
FcPrimitiveSendReply_t, MPI_POINTER pFcPrimitiveSendReply_t;
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -91,7 +91,6 @@
|
||||
#ifndef MPI_INIT_H
|
||||
#define MPI_INIT_H
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* S C S I I n i t i a t o r M e s s a g e s
|
||||
@ -122,7 +121,6 @@ typedef struct _MSG_SCSI_IO_REQUEST
|
||||
} MSG_SCSI_IO_REQUEST, MPI_POINTER PTR_MSG_SCSI_IO_REQUEST,
|
||||
SCSIIORequest_t, MPI_POINTER pSCSIIORequest_t;
|
||||
|
||||
|
||||
/* SCSI IO MsgFlags bits */
|
||||
|
||||
#define MPI_SCSIIO_MSGFLGS_SENSE_WIDTH (0x01)
|
||||
@ -172,7 +170,6 @@ typedef struct _MSG_SCSI_IO_REQUEST
|
||||
#define MPI_SCSIIO_CONTROL_ABORT_TASK_SET (0x00020000)
|
||||
#define MPI_SCSIIO_CONTROL_RESERVED2 (0x00010000)
|
||||
|
||||
|
||||
/* SCSI IO reply structure */
|
||||
typedef struct _MSG_SCSI_IO_REPLY
|
||||
{
|
||||
@ -197,7 +194,6 @@ typedef struct _MSG_SCSI_IO_REPLY
|
||||
} MSG_SCSI_IO_REPLY, MPI_POINTER PTR_MSG_SCSI_IO_REPLY,
|
||||
SCSIIOReply_t, MPI_POINTER pSCSIIOReply_t;
|
||||
|
||||
|
||||
/* SCSI IO Reply SCSIStatus values (SAM-2 status codes) */
|
||||
|
||||
#define MPI_SCSI_STATUS_SUCCESS (0x00)
|
||||
@ -215,7 +211,6 @@ typedef struct _MSG_SCSI_IO_REPLY
|
||||
#define MPI_SCSI_STATUS_FCPEXT_NO_LINK (0x81)
|
||||
#define MPI_SCSI_STATUS_FCPEXT_UNASSIGNED (0x82)
|
||||
|
||||
|
||||
/* SCSI IO Reply SCSIState values */
|
||||
|
||||
#define MPI_SCSI_STATE_AUTOSENSE_VALID (0x01)
|
||||
@ -238,7 +233,6 @@ typedef struct _MSG_SCSI_IO_REPLY
|
||||
|
||||
#define MPI_SCSI_TASKTAG_UNKNOWN (0xFFFF)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* SCSI IO 32 messages and associated structures */
|
||||
/****************************************************************************/
|
||||
@ -403,7 +397,6 @@ typedef struct _MSG_SCSI_IO32_REQUEST
|
||||
#define MPI_SCSIIO32_EEDPFLAGS_INC_SEC_REFTAG (0x4000)
|
||||
#define MPI_SCSIIO32_EEDPFLAGS_INC_PRI_REFTAG (0x8000)
|
||||
|
||||
|
||||
/* SCSIIO32 IO reply structure */
|
||||
typedef struct _MSG_SCSIIO32_IO_REPLY
|
||||
{
|
||||
@ -429,7 +422,6 @@ typedef struct _MSG_SCSIIO32_IO_REPLY
|
||||
} MSG_SCSIIO32_IO_REPLY, MPI_POINTER PTR_MSG_SCSIIO32_IO_REPLY,
|
||||
SCSIIO32Reply_t, MPI_POINTER pSCSIIO32Reply_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* SCSI Task Management messages */
|
||||
/****************************************************************************/
|
||||
@ -499,7 +491,6 @@ typedef struct _MSG_SCSI_TASK_MGMT_REPLY
|
||||
#define MPI_SCSITASKMGMT_RSP_TM_INVALID_LUN (0x09)
|
||||
#define MPI_SCSITASKMGMT_RSP_IO_QUEUED_ON_IOC (0x80)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* SCSI Enclosure Processor messages */
|
||||
/****************************************************************************/
|
||||
@ -556,7 +547,6 @@ typedef struct _MSG_SEP_REQUEST
|
||||
#define MPI_SEP_REQ_SLOTSTATUS_DEV_OFF (0x10000000)
|
||||
#define MPI_SEP_REQ_SLOTSTATUS_SWAP_RESET (0x80000000)
|
||||
|
||||
|
||||
typedef struct _MSG_SEP_REPLY
|
||||
{
|
||||
U8 TargetID; /* 00h */
|
||||
|
||||
@ -158,7 +158,6 @@
|
||||
#ifndef MPI_IOC_H
|
||||
#define MPI_IOC_H
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* I O C M e s s a g e s
|
||||
@ -216,7 +215,6 @@ typedef struct _MSG_IOC_INIT
|
||||
#define MPI_IOCINIT_HEADERVERSION_DEV_MASK (0x00FF)
|
||||
#define MPI_IOCINIT_HEADERVERSION_DEV_SHIFT (0)
|
||||
|
||||
|
||||
typedef struct _MSG_IOC_INIT_REPLY
|
||||
{
|
||||
U8 WhoInit; /* 00h */
|
||||
@ -234,8 +232,6 @@ typedef struct _MSG_IOC_INIT_REPLY
|
||||
} MSG_IOC_INIT_REPLY, MPI_POINTER PTR_MSG_IOC_INIT_REPLY,
|
||||
IOCInitReply_t, MPI_POINTER pIOCInitReply_t;
|
||||
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* IOC Facts message */
|
||||
/****************************************************************************/
|
||||
@ -340,7 +336,6 @@ typedef struct _MSG_IOC_FACTS_REPLY
|
||||
#define MPI_IOCFACTS_CAPABILITY_NO_SCSIIO16 (0x00000400)
|
||||
#define MPI_IOCFACTS_CAPABILITY_TLR (0x00000800)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* P o r t M e s s a g e s
|
||||
@ -389,7 +384,6 @@ typedef struct _MSG_PORT_FACTS_REPLY
|
||||
} MSG_PORT_FACTS_REPLY, MPI_POINTER PTR_MSG_PORT_FACTS_REPLY,
|
||||
PortFactsReply_t, MPI_POINTER pPortFactsReply_t;
|
||||
|
||||
|
||||
/* PortTypes values */
|
||||
|
||||
#define MPI_PORTFACTS_PORTTYPE_INACTIVE (0x00)
|
||||
@ -405,7 +399,6 @@ typedef struct _MSG_PORT_FACTS_REPLY
|
||||
#define MPI_PORTFACTS_PROTOCOL_TARGET (0x04)
|
||||
#define MPI_PORTFACTS_PROTOCOL_INITIATOR (0x08)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Port Enable Message */
|
||||
/****************************************************************************/
|
||||
@ -437,7 +430,6 @@ typedef struct _MSG_PORT_ENABLE_REPLY
|
||||
} MSG_PORT_ENABLE_REPLY, MPI_POINTER PTR_MSG_PORT_ENABLE_REPLY,
|
||||
PortEnableReply_t, MPI_POINTER pPortEnableReply_t;
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* E v e n t M e s s a g e s
|
||||
@ -654,7 +646,6 @@ typedef struct _EVENT_DATA_SAS_DEVICE_STATUS_CHANGE
|
||||
#define MPI_EVENT_SAS_DEV_STAT_RC_CMPL_INTERNAL_DEV_RESET (0x0E)
|
||||
#define MPI_EVENT_SAS_DEV_STAT_RC_CMPL_TASK_ABORT_INTERNAL (0x0F)
|
||||
|
||||
|
||||
/* SCSI Event data for Queue Full event */
|
||||
|
||||
typedef struct _EVENT_DATA_QUEUE_FULL
|
||||
@ -694,7 +685,6 @@ typedef struct _EVENT_DATA_RAID
|
||||
#define MPI_EVENT_RAID_RC_SMART_DATA (0x0A)
|
||||
#define MPI_EVENT_RAID_RC_REPLACE_ACTION_STARTED (0x0B)
|
||||
|
||||
|
||||
/* MPI Integrated RAID Resync Update Event data */
|
||||
|
||||
typedef struct _MPI_EVENT_DATA_IR_RESYNC_UPDATE
|
||||
@ -1010,8 +1000,6 @@ typedef struct _EVENT_DATA_SAS_EXPANDER_STATUS_CHANGE
|
||||
#define MPI_EVENT_SAS_EXP_FLAGS_ROUTE_TABLE_CONFIG (0x02)
|
||||
#define MPI_EVENT_SAS_EXP_FLAGS_CONFIG_IN_PROGRESS (0x01)
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* F i r m w a r e L o a d M e s s a g e s
|
||||
@ -1048,7 +1036,6 @@ typedef struct _MSG_FW_DOWNLOAD
|
||||
#define MPI_FW_DOWNLOAD_ITYPE_MEGARAID (0x09)
|
||||
#define MPI_FW_DOWNLOAD_ITYPE_COMMON_BOOT_BLOCK (0x0B)
|
||||
|
||||
|
||||
typedef struct _FWDownloadTCSGE
|
||||
{
|
||||
U8 Reserved; /* 00h */
|
||||
@ -1077,7 +1064,6 @@ typedef struct _MSG_FW_DOWNLOAD_REPLY
|
||||
} MSG_FW_DOWNLOAD_REPLY, MPI_POINTER PTR_MSG_FW_DOWNLOAD_REPLY,
|
||||
FWDownloadReply_t, MPI_POINTER pFWDownloadReply_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Firmware Upload message and associated structures */
|
||||
/****************************************************************************/
|
||||
@ -1137,7 +1123,6 @@ typedef struct _MSG_FW_UPLOAD_REPLY
|
||||
} MSG_FW_UPLOAD_REPLY, MPI_POINTER PTR_MSG_FW_UPLOAD_REPLY,
|
||||
FWUploadReply_t, MPI_POINTER pFWUploadReply_t;
|
||||
|
||||
|
||||
typedef struct _MPI_FW_HEADER
|
||||
{
|
||||
U32 ArmBranchInstruction0; /* 00h */
|
||||
|
||||
@ -66,7 +66,6 @@
|
||||
#ifndef MPI_LAN_H
|
||||
#define MPI_LAN_H
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* L A N M e s s a g e s
|
||||
@ -88,7 +87,6 @@ typedef struct _MSG_LAN_SEND_REQUEST
|
||||
} MSG_LAN_SEND_REQUEST, MPI_POINTER PTR_MSG_LAN_SEND_REQUEST,
|
||||
LANSendRequest_t, MPI_POINTER pLANSendRequest_t;
|
||||
|
||||
|
||||
typedef struct _MSG_LAN_SEND_REPLY
|
||||
{
|
||||
U16 Reserved; /* 00h */
|
||||
@ -106,7 +104,6 @@ typedef struct _MSG_LAN_SEND_REPLY
|
||||
} MSG_LAN_SEND_REPLY, MPI_POINTER PTR_MSG_LAN_SEND_REPLY,
|
||||
LANSendReply_t, MPI_POINTER pLANSendReply_t;
|
||||
|
||||
|
||||
/* LANReceivePost */
|
||||
|
||||
typedef struct _MSG_LAN_RECEIVE_POST_REQUEST
|
||||
@ -123,7 +120,6 @@ typedef struct _MSG_LAN_RECEIVE_POST_REQUEST
|
||||
} MSG_LAN_RECEIVE_POST_REQUEST, MPI_POINTER PTR_MSG_LAN_RECEIVE_POST_REQUEST,
|
||||
LANReceivePostRequest_t, MPI_POINTER pLANReceivePostRequest_t;
|
||||
|
||||
|
||||
typedef struct _MSG_LAN_RECEIVE_POST_REPLY
|
||||
{
|
||||
U16 Reserved; /* 00h */
|
||||
@ -144,7 +140,6 @@ typedef struct _MSG_LAN_RECEIVE_POST_REPLY
|
||||
} MSG_LAN_RECEIVE_POST_REPLY, MPI_POINTER PTR_MSG_LAN_RECEIVE_POST_REPLY,
|
||||
LANReceivePostReply_t, MPI_POINTER pLANReceivePostReply_t;
|
||||
|
||||
|
||||
/* LANReset */
|
||||
|
||||
typedef struct _MSG_LAN_RESET_REQUEST
|
||||
@ -159,7 +154,6 @@ typedef struct _MSG_LAN_RESET_REQUEST
|
||||
} MSG_LAN_RESET_REQUEST, MPI_POINTER PTR_MSG_LAN_RESET_REQUEST,
|
||||
LANResetRequest_t, MPI_POINTER pLANResetRequest_t;
|
||||
|
||||
|
||||
typedef struct _MSG_LAN_RESET_REPLY
|
||||
{
|
||||
U16 Reserved; /* 00h */
|
||||
@ -175,7 +169,6 @@ typedef struct _MSG_LAN_RESET_REPLY
|
||||
} MSG_LAN_RESET_REPLY, MPI_POINTER PTR_MSG_LAN_RESET_REPLY,
|
||||
LANResetReply_t, MPI_POINTER pLANResetReply_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* LAN Context Reply defines and macros */
|
||||
/****************************************************************************/
|
||||
@ -225,7 +218,6 @@ typedef struct _MSG_LAN_RESET_REPLY
|
||||
(((frm) << LAN_REPLY_FORM_SHIFT) & \
|
||||
LAN_REPLY_FORM_MASK))
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* LAN Current Device State defines */
|
||||
/****************************************************************************/
|
||||
@ -233,7 +225,6 @@ typedef struct _MSG_LAN_RESET_REPLY
|
||||
#define MPI_LAN_DEVICE_STATE_RESET (0x00)
|
||||
#define MPI_LAN_DEVICE_STATE_OPERATIONAL (0x01)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* LAN Loopback defines */
|
||||
/****************************************************************************/
|
||||
@ -241,4 +232,3 @@ typedef struct _MSG_LAN_RESET_REPLY
|
||||
#define MPI_LAN_TX_MODES_ENABLE_LOOPBACK_SUPPRESSION (0x01)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -40,7 +40,6 @@
|
||||
* ID: $Id: fc_log.h,v 4.6 2001/07/26 14:41:33 sschremm Exp $
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* MpiIocLogInfo_t enum
|
||||
*
|
||||
|
||||
@ -139,8 +139,6 @@
|
||||
#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_PATH_BLOCKED (0x0000001B) /* Retry Timeout */
|
||||
#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_AWT_MAXED (0x0000001C) /* Retry Timeout */
|
||||
|
||||
|
||||
|
||||
#define PL_LOGINFO_CODE_INVALID_SGL (0x00020000)
|
||||
#define PL_LOGINFO_CODE_WRONG_REL_OFF_OR_FRAME_LENGTH (0x00030000)
|
||||
#define PL_LOGINFO_CODE_FRAME_XFER_ERROR (0x00040000)
|
||||
@ -190,7 +188,6 @@
|
||||
#define PL_LOGINFO_SUB_CODE_TRANSPORT_LAYER (0x00000130) /* Leave lower nibble (1-f) reserved. */
|
||||
#define PL_LOGINFO_SUB_CODE_PORT_LAYER (0x00000140) /* Leave lower nibble (1-f) reserved. */
|
||||
|
||||
|
||||
#define PL_LOGINFO_SUB_CODE_INVALID_SGL (0x00000200)
|
||||
#define PL_LOGINFO_SUB_CODE_WRONG_REL_OFF_OR_FRAME_LENGTH (0x00000300)
|
||||
#define PL_LOGINFO_SUB_CODE_FRAME_XFER_ERROR (0x00000400) /* Bits 0-3 encode Transport Status Register (offset 0x08) */
|
||||
@ -247,7 +244,6 @@
|
||||
#define PL_LOGINFO_DA_SEP_UNSUPPORTED_COMMAND_2 (0x0020010D) /* SEP doesn't support CDB opcode f/w location 2 */
|
||||
#define PL_LOGINFO_DA_SEP_UNSUPPORTED_COMMAND_3 (0x0020010E) /* SEP doesn't support CDB opcode f/w location 3 */
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* IR LOGINFO_CODE defines, valid if IOC_LOGINFO_ORIGINATOR = IR */
|
||||
/****************************************************************************/
|
||||
@ -295,7 +291,6 @@
|
||||
/* Creation failed due to error in creating RAID Phys Disk Config Page */
|
||||
#define IR_LOGINFO_PHYSDISK_CREATE_CONFIG_PAGE_ERROR (0x00010024)
|
||||
|
||||
|
||||
/* Compatibility Error : IR Disabled */
|
||||
#define IR_LOGINFO_COMPAT_ERROR_RAID_DISABLED (0x00010030)
|
||||
/* Compatibility Error : Inquiry Comand failed */
|
||||
@ -342,7 +337,6 @@
|
||||
/* Device Firmware Update: */
|
||||
//#define IR_LOGINFO_DEV_FW_UPDATE_ERR_ (0x00010054)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Defines for convenience */
|
||||
/****************************************************************************/
|
||||
@ -351,4 +345,3 @@
|
||||
#define IOC_LOGINFO_PREFIX_IR ((MPI_IOCLOGINFO_TYPE_SAS << MPI_IOCLOGINFO_TYPE_SHIFT) | IOC_LOGINFO_ORIGINATOR_IR)
|
||||
|
||||
#endif /* end of file */
|
||||
|
||||
|
||||
@ -72,14 +72,12 @@
|
||||
#ifndef MPI_RAID_H
|
||||
#define MPI_RAID_H
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* R A I D M e s s a g e s
|
||||
*
|
||||
*******************************************************************************/
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* RAID Action Request */
|
||||
/****************************************************************************/
|
||||
@ -101,7 +99,6 @@ typedef struct _MSG_RAID_ACTION
|
||||
} MSG_RAID_ACTION_REQUEST, MPI_POINTER PTR_MSG_RAID_ACTION_REQUEST,
|
||||
MpiRaidActionRequest_t , MPI_POINTER pMpiRaidActionRequest_t;
|
||||
|
||||
|
||||
/* RAID Action request Action values */
|
||||
|
||||
#define MPI_RAID_ACTION_STATUS (0x00)
|
||||
@ -155,7 +152,6 @@ typedef struct _MSG_RAID_ACTION
|
||||
#define MPI_RAID_ACTION_ADATA_MASK_FW_UPDATE_TIMEOUT (0x0000FF00)
|
||||
#define MPI_RAID_ACTION_ADATA_SHIFT_FW_UPDATE_TIMEOUT (8)
|
||||
|
||||
|
||||
/* RAID Action reply message */
|
||||
|
||||
typedef struct _MSG_RAID_ACTION_REPLY
|
||||
@ -177,7 +173,6 @@ typedef struct _MSG_RAID_ACTION_REPLY
|
||||
} MSG_RAID_ACTION_REPLY, MPI_POINTER PTR_MSG_RAID_ACTION_REPLY,
|
||||
MpiRaidActionReply_t, MPI_POINTER pMpiRaidActionReply_t;
|
||||
|
||||
|
||||
/* RAID Volume reply ActionStatus values */
|
||||
|
||||
#define MPI_RAID_ACTION_ASTATUS_SUCCESS (0x0000)
|
||||
@ -185,7 +180,6 @@ typedef struct _MSG_RAID_ACTION_REPLY
|
||||
#define MPI_RAID_ACTION_ASTATUS_FAILURE (0x0002)
|
||||
#define MPI_RAID_ACTION_ASTATUS_IN_PROGRESS (0x0003)
|
||||
|
||||
|
||||
/* RAID Volume reply RAID Volume Indicator structure */
|
||||
|
||||
typedef struct _MPI_RAID_VOL_INDICATOR
|
||||
@ -195,7 +189,6 @@ typedef struct _MPI_RAID_VOL_INDICATOR
|
||||
} MPI_RAID_VOL_INDICATOR, MPI_POINTER PTR_MPI_RAID_VOL_INDICATOR,
|
||||
MpiRaidVolIndicator_t, MPI_POINTER pMpiRaidVolIndicator_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* SCSI IO RAID Passthrough Request */
|
||||
/****************************************************************************/
|
||||
@ -220,7 +213,6 @@ typedef struct _MSG_SCSI_IO_RAID_PT_REQUEST
|
||||
} MSG_SCSI_IO_RAID_PT_REQUEST, MPI_POINTER PTR_MSG_SCSI_IO_RAID_PT_REQUEST,
|
||||
SCSIIORaidPassthroughRequest_t, MPI_POINTER pSCSIIORaidPassthroughRequest_t;
|
||||
|
||||
|
||||
/* SCSI IO RAID Passthrough reply structure */
|
||||
|
||||
typedef struct _MSG_SCSI_IO_RAID_PT_REPLY
|
||||
@ -244,7 +236,6 @@ typedef struct _MSG_SCSI_IO_RAID_PT_REPLY
|
||||
} MSG_SCSI_IO_RAID_PT_REPLY, MPI_POINTER PTR_MSG_SCSI_IO_RAID_PT_REPLY,
|
||||
SCSIIORaidPassthroughReply_t, MPI_POINTER pSCSIIORaidPassthroughReply_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Mailbox reqeust structure */
|
||||
/****************************************************************************/
|
||||
@ -264,7 +255,6 @@ typedef struct _MSG_MAILBOX_REQUEST
|
||||
} MSG_MAILBOX_REQUEST, MPI_POINTER PTR_MSG_MAILBOX_REQUEST,
|
||||
MailboxRequest_t, MPI_POINTER pMailboxRequest_t;
|
||||
|
||||
|
||||
/* Mailbox reply structure */
|
||||
typedef struct _MSG_MAILBOX_REPLY
|
||||
{
|
||||
@ -283,6 +273,3 @@ typedef struct _MSG_MAILBOX_REPLY
|
||||
MailboxReply_t, MPI_POINTER pMailboxReply_t;
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
@ -62,7 +62,6 @@
|
||||
#ifndef MPI_SAS_H
|
||||
#define MPI_SAS_H
|
||||
|
||||
|
||||
/*
|
||||
* Values for SASStatus.
|
||||
*/
|
||||
@ -88,7 +87,6 @@
|
||||
#define MPI_SASSTATUS_SDSF_CONNECTION_FAILED (0x13)
|
||||
#define MPI_SASSTATUS_INITIATOR_RESPONSE_TIMEOUT (0x14)
|
||||
|
||||
|
||||
/*
|
||||
* Values for the SAS DeviceInfo field used in SAS Device Status Change Event
|
||||
* data and SAS IO Unit Configuration pages.
|
||||
@ -114,8 +112,6 @@
|
||||
#define MPI_SAS_DEVICE_INFO_EDGE_EXPANDER (0x00000002)
|
||||
#define MPI_SAS_DEVICE_INFO_FANOUT_EXPANDER (0x00000003)
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* S e r i a l A t t a c h e d S C S I M e s s a g e s
|
||||
@ -152,7 +148,6 @@ typedef struct _MSG_SMP_PASSTHROUGH_REQUEST
|
||||
#define MPI_SMP_PT_REQ_CONNECT_RATE_1_5 (0x08)
|
||||
#define MPI_SMP_PT_REQ_CONNECT_RATE_3_0 (0x09)
|
||||
|
||||
|
||||
/* Serial Management Protocol Passthrough Reply */
|
||||
typedef struct _MSG_SMP_PASSTHROUGH_REPLY
|
||||
{
|
||||
@ -175,7 +170,6 @@ typedef struct _MSG_SMP_PASSTHROUGH_REPLY
|
||||
|
||||
#define MPI_SMP_PT_REPLY_PT_FLAGS_IMMEDIATE (0x80)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* SATA Passthrough Request */
|
||||
/****************************************************************************/
|
||||
@ -215,7 +209,6 @@ typedef struct _MSG_SATA_PASSTHROUGH_REQUEST
|
||||
#define MPI_SATA_PT_REQ_CONNECT_RATE_1_5 (0x08)
|
||||
#define MPI_SATA_PT_REQ_CONNECT_RATE_3_0 (0x09)
|
||||
|
||||
|
||||
/* SATA Passthrough Reply */
|
||||
typedef struct _MSG_SATA_PASSTHROUGH_REPLY
|
||||
{
|
||||
@ -237,9 +230,6 @@ typedef struct _MSG_SATA_PASSTHROUGH_REPLY
|
||||
} MSG_SATA_PASSTHROUGH_REPLY, MPI_POINTER PTR_MSG_SATA_PASSTHROUGH_REPLY,
|
||||
SataPassthroughReply_t, MPI_POINTER pSataPassthroughReply_t;
|
||||
|
||||
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* SAS IO Unit Control Request */
|
||||
/****************************************************************************/
|
||||
@ -284,7 +274,6 @@ typedef struct _MSG_SAS_IOUNIT_CONTROL_REQUEST
|
||||
#define MPI_SAS_PRIMFLAGS_TRIPLE (0x02)
|
||||
#define MPI_SAS_PRIMFLAGS_REDUNDANT (0x01)
|
||||
|
||||
|
||||
/* SAS IO Unit Control Reply */
|
||||
typedef struct _MSG_SAS_IOUNIT_CONTROL_REPLY
|
||||
{
|
||||
@ -303,5 +292,3 @@ typedef struct _MSG_SAS_IOUNIT_CONTROL_REPLY
|
||||
SasIoUnitControlReply_t, MPI_POINTER pSasIoUnitControlReply_t;
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@ -90,7 +90,6 @@
|
||||
#ifndef MPI_TARG_H
|
||||
#define MPI_TARG_H
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* S C S I T a r g e t M e s s a g e s
|
||||
@ -109,7 +108,6 @@ typedef struct _CMD_BUFFER_DESCRIPTOR
|
||||
} CMD_BUFFER_DESCRIPTOR, MPI_POINTER PTR_CMD_BUFFER_DESCRIPTOR,
|
||||
CmdBufferDescriptor_t, MPI_POINTER pCmdBufferDescriptor_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Target Command Buffer Post Request */
|
||||
/****************************************************************************/
|
||||
@ -138,7 +136,6 @@ typedef struct _MSG_TARGET_CMD_BUFFER_POST_REQUEST
|
||||
#define CMD_BUFFER_POST_IO_INDEX_MASK (0x00003FFF)
|
||||
#define CMD_BUFFER_POST_IO_INDEX_MASK_0100 (0x000003FF) /* obsolete */
|
||||
|
||||
|
||||
typedef struct _MSG_TARGET_CMD_BUFFER_POST_REPLY
|
||||
{
|
||||
U8 BufferPostFlags; /* 00h */
|
||||
@ -174,7 +171,6 @@ typedef struct _MSG_PRIORITY_CMD_RECEIVED_REPLY
|
||||
} MSG_PRIORITY_CMD_RECEIVED_REPLY, MPI_POINTER PTR_MSG_PRIORITY_CMD_RECEIVED_REPLY,
|
||||
PriorityCommandReceivedReply_t, MPI_POINTER pPriorityCommandReceivedReply_t;
|
||||
|
||||
|
||||
typedef struct _MSG_TARGET_CMD_BUFFER_POST_ERROR_REPLY
|
||||
{
|
||||
U16 Reserved; /* 00h */
|
||||
@ -205,7 +201,6 @@ typedef struct _MSG_TARGET_CMD_BUFFER_POST_ERROR_REPLY
|
||||
#define PRIORITY_REASON_TARGET_BUSY (0x09)
|
||||
#define PRIORITY_REASON_UNKNOWN (0xFF)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Target Command Buffer Post Base Request */
|
||||
/****************************************************************************/
|
||||
@ -232,7 +227,6 @@ typedef struct _MSG_TARGET_CMD_BUF_POST_BASE_REQUEST
|
||||
|
||||
#define CMD_BUFFER_POST_BASE_FLAGS_AUTO_POST_ALL (0x01)
|
||||
|
||||
|
||||
typedef struct _MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY
|
||||
{
|
||||
U16 Reserved; /* 00h */
|
||||
@ -250,7 +244,6 @@ typedef struct _MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY
|
||||
TargetCmdBufferPostBaseListReply_t,
|
||||
MPI_POINTER pTargetCmdBufferPostBaseListReply_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Target Command Buffer Post List Request */
|
||||
/****************************************************************************/
|
||||
@ -272,7 +265,6 @@ typedef struct _MSG_TARGET_CMD_BUF_POST_LIST_REQUEST
|
||||
TargetCmdBufferPostListRequest_t,
|
||||
MPI_POINTER pTargetCmdBufferPostListRequest_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Command Buffer Formats (with 16 byte CDB) */
|
||||
/****************************************************************************/
|
||||
@ -289,7 +281,6 @@ typedef struct _MPI_TARGET_FCP_CMD_BUFFER
|
||||
} MPI_TARGET_FCP_CMD_BUFFER, MPI_POINTER PTR_MPI_TARGET_FCP_CMD_BUFFER,
|
||||
MpiTargetFcpCmdBuffer, MPI_POINTER pMpiTargetFcpCmdBuffer;
|
||||
|
||||
|
||||
typedef struct _MPI_TARGET_SCSI_SPI_CMD_BUFFER
|
||||
{
|
||||
/* SPI L_Q information unit */
|
||||
@ -312,7 +303,6 @@ typedef struct _MPI_TARGET_SCSI_SPI_CMD_BUFFER
|
||||
MPI_POINTER PTR_MPI_TARGET_SCSI_SPI_CMD_BUFFER,
|
||||
MpiTargetScsiSpiCmdBuffer, MPI_POINTER pMpiTargetScsiSpiCmdBuffer;
|
||||
|
||||
|
||||
typedef struct _MPI_TARGET_SSP_CMD_BUFFER
|
||||
{
|
||||
U8 FrameType; /* 00h */
|
||||
@ -352,7 +342,6 @@ typedef struct _MPI_TARGET_SSP_TASK_BUFFER
|
||||
} MPI_TARGET_SSP_TASK_BUFFER, MPI_POINTER PTR_MPI_TARGET_SSP_TASK_BUFFER,
|
||||
MpiTargetSspTaskBuffer, MPI_POINTER pMpiTargetSspTaskBuffer;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Target Assist Request */
|
||||
/****************************************************************************/
|
||||
@ -400,7 +389,6 @@ typedef struct _MSG_TARGET_ERROR_REPLY
|
||||
} MSG_TARGET_ERROR_REPLY, MPI_POINTER PTR_MSG_TARGET_ERROR_REPLY,
|
||||
TargetErrorReply_t, MPI_POINTER pTargetErrorReply_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Target Assist Extended Request */
|
||||
/****************************************************************************/
|
||||
@ -471,7 +459,6 @@ typedef struct _MSG_TARGET_ASSIST_EXT_REQUEST
|
||||
#define TARGET_ASSIST_EXT_EEDP_INC_SEC_REFTAG (0x4000)
|
||||
#define TARGET_ASSIST_EXT_EEDP_INC_PRI_REFTAG (0x8000)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Target Status Send Request */
|
||||
/****************************************************************************/
|
||||
@ -551,7 +538,6 @@ typedef struct _MPI_TARGET_SSP_RSP_IU
|
||||
} MPI_TARGET_SSP_RSP_IU, MPI_POINTER PTR_MPI_TARGET_SSP_RSP_IU,
|
||||
MpiTargetSspRspIu_t, MPI_POINTER pMpiTargetSspRspIu_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Target Mode Abort Request */
|
||||
/****************************************************************************/
|
||||
@ -594,7 +580,6 @@ typedef struct _MSG_TARGET_MODE_ABORT_REPLY
|
||||
} MSG_TARGET_MODE_ABORT_REPLY, MPI_POINTER PTR_MSG_TARGET_MODE_ABORT_REPLY,
|
||||
TargetModeAbortReply_t, MPI_POINTER pTargetModeAbortReply_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Target Mode Context Reply */
|
||||
/****************************************************************************/
|
||||
@ -608,7 +593,6 @@ typedef struct _MSG_TARGET_MODE_ABORT_REPLY
|
||||
#define TARGET_MODE_REPLY_PORT_MASK (0x10000000)
|
||||
#define TARGET_MODE_REPLY_PORT_SHIFT (28)
|
||||
|
||||
|
||||
#define GET_IO_INDEX(x) (((x) & TARGET_MODE_REPLY_IO_INDEX_MASK) \
|
||||
>> TARGET_MODE_REPLY_IO_INDEX_SHIFT)
|
||||
|
||||
@ -674,6 +658,4 @@ typedef struct _MSG_TARGET_MODE_ABORT_REPLY
|
||||
(((ii) << TARGET_MODE_REPLY_0100_SHIFT_INITIATOR_INDEX) & \
|
||||
TARGET_MODE_REPLY_0100_MASK_INITIATOR_INDEX))
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -68,7 +68,6 @@
|
||||
#define MPI_TOOLBOX_FC_MANAGEMENT_TOOL (0x04)
|
||||
#define MPI_TOOLBOX_BEACON_TOOL (0x05)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Toolbox reply */
|
||||
/****************************************************************************/
|
||||
@ -89,7 +88,6 @@ typedef struct _MSG_TOOLBOX_REPLY
|
||||
} MSG_TOOLBOX_REPLY, MPI_POINTER PTR_MSG_TOOLBOX_REPLY,
|
||||
ToolboxReply_t, MPI_POINTER pToolboxReply_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Toolbox Clean Tool request */
|
||||
/****************************************************************************/
|
||||
@ -118,7 +116,6 @@ typedef struct _MSG_TOOLBOX_CLEAN_REQUEST
|
||||
#define MPI_TOOLBOX_CLEAN_PERSIST_MANUFACT_PAGES (0x40000000)
|
||||
#define MPI_TOOLBOX_CLEAN_BOOT_SERVICES (0x80000000)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Toolbox Memory Move request */
|
||||
/****************************************************************************/
|
||||
@ -137,7 +134,6 @@ typedef struct _MSG_TOOLBOX_MEM_MOVE_REQUEST
|
||||
} MSG_TOOLBOX_MEM_MOVE_REQUEST, MPI_POINTER PTR_MSG_TOOLBOX_MEM_MOVE_REQUEST,
|
||||
ToolboxMemMoveRequest_t, MPI_POINTER pToolboxMemMoveRequest_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Toolbox Diagnostic Data Upload request */
|
||||
/****************************************************************************/
|
||||
@ -172,7 +168,6 @@ typedef struct _DIAG_DATA_UPLOAD_HEADER
|
||||
#define MPI_TB_DIAG_FORMAT_SCSI_3 (0x03)
|
||||
#define MPI_TB_DIAG_FORMAT_FC_TRACE_1 (0x04)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Toolbox ISTWI Read Write request */
|
||||
/****************************************************************************/
|
||||
@ -205,7 +200,6 @@ typedef struct _MSG_TOOLBOX_ISTWI_READ_WRITE_REQUEST
|
||||
#define MPI_TB_ISTWI_FLAGS_WRITE (0x00)
|
||||
#define MPI_TB_ISTWI_FLAGS_READ (0x01)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Toolbox FC Management request */
|
||||
/****************************************************************************/
|
||||
@ -267,7 +261,6 @@ typedef struct _MSG_TOOLBOX_FC_MANAGE_REQUEST
|
||||
#define MPI_TB_FC_MANAGE_ACTION_DISC_BUS_TID (0x02)
|
||||
#define MPI_TB_FC_MANAGE_ACTION_SET_MAX_FRAME_SIZE (0x03)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Toolbox Beacon Tool request */
|
||||
/****************************************************************************/
|
||||
@ -292,7 +285,6 @@ typedef struct _MSG_TOOLBOX_BEACON_REQUEST
|
||||
#define MPI_TOOLBOX_FLAGS_BEACON_MODE_OFF (0x00)
|
||||
#define MPI_TOOLBOX_FLAGS_BEACON_MODE_ON (0x01)
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Diagnostic Buffer Post request */
|
||||
/****************************************************************************/
|
||||
@ -323,7 +315,6 @@ typedef struct _MSG_DIAG_BUFFER_POST_REQUEST
|
||||
|
||||
#define MPI_DIAG_EXTENDED_QTAG (0x00000001)
|
||||
|
||||
|
||||
/* Diagnostic Buffer Post reply */
|
||||
typedef struct _MSG_DIAG_BUFFER_POST_REPLY
|
||||
{
|
||||
@ -342,7 +333,6 @@ typedef struct _MSG_DIAG_BUFFER_POST_REPLY
|
||||
} MSG_DIAG_BUFFER_POST_REPLY, MPI_POINTER PTR_MSG_DIAG_BUFFER_POST_REPLY,
|
||||
DiagBufferPostReply_t, MPI_POINTER pDiagBufferPostReply_t;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Diagnostic Release request */
|
||||
/****************************************************************************/
|
||||
@ -360,7 +350,6 @@ typedef struct _MSG_DIAG_RELEASE_REQUEST
|
||||
} MSG_DIAG_RELEASE_REQUEST, MPI_POINTER PTR_MSG_DIAG_RELEASE_REQUEST,
|
||||
DiagReleaseRequest_t, MPI_POINTER pDiagReleaseRequest_t;
|
||||
|
||||
|
||||
/* Diagnostic Release reply */
|
||||
typedef struct _MSG_DIAG_RELEASE_REPLY
|
||||
{
|
||||
@ -378,5 +367,4 @@ typedef struct _MSG_DIAG_RELEASE_REPLY
|
||||
} MSG_DIAG_RELEASE_REPLY, MPI_POINTER PTR_MSG_DIAG_RELEASE_REPLY,
|
||||
DiagReleaseReply_t, MPI_POINTER pDiagReleaseReply_t;
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@ -57,7 +57,6 @@
|
||||
#ifndef MPI_TYPE_H
|
||||
#define MPI_TYPE_H
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
* Define MPI_POINTER if it hasn't already been defined. By default MPI_POINTER
|
||||
* is defined to be a near pointer. MPI_POINTER can be defined as a far pointer
|
||||
@ -67,7 +66,6 @@
|
||||
#define MPI_POINTER *
|
||||
#endif
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* B a s i c T y p e s
|
||||
@ -99,7 +97,6 @@ typedef uint32_t U32;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
typedef struct _S64
|
||||
{
|
||||
U32 Low;
|
||||
@ -112,7 +109,6 @@ typedef struct _U64
|
||||
U32 High;
|
||||
} U64;
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/* Pointers */
|
||||
/****************************************************************************/
|
||||
@ -126,6 +122,4 @@ typedef U32 *PU32;
|
||||
typedef S64 *PS64;
|
||||
typedef U64 *PU64;
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -965,7 +965,6 @@ mpt_wait_state(struct mpt_softc *mpt, enum DB_STATE_BITS state)
|
||||
return (MPT_FAIL);
|
||||
}
|
||||
|
||||
|
||||
/************************* Initialization/Configuration ************************/
|
||||
static int mpt_download_fw(struct mpt_softc *mpt);
|
||||
|
||||
@ -1015,7 +1014,6 @@ mpt_enable_diag_mode(struct mpt_softc *mpt)
|
||||
|
||||
try = 20;
|
||||
while (--try) {
|
||||
|
||||
if ((mpt_read(mpt, MPT_OFFSET_DIAGNOSTIC) & MPI_DIAG_DRWE) != 0)
|
||||
break;
|
||||
|
||||
@ -1099,7 +1097,6 @@ mpt_hard_reset(struct mpt_softc *mpt)
|
||||
* the controller will become operational. Do so now.
|
||||
*/
|
||||
if (mpt->fw_image != NULL) {
|
||||
|
||||
error = mpt_download_fw(mpt);
|
||||
|
||||
if (error) {
|
||||
@ -1201,7 +1198,7 @@ mpt_free_request(struct mpt_softc *mpt, request_t *req)
|
||||
request_t *nxt;
|
||||
struct mpt_evtf_record *record;
|
||||
uint32_t offset, reply_baddr;
|
||||
|
||||
|
||||
if (req == NULL || req != &mpt->request_pool[req->index]) {
|
||||
panic("mpt_free_request: bad req ptr");
|
||||
}
|
||||
@ -1514,7 +1511,7 @@ mpt_get_iocfacts(struct mpt_softc *mpt, MSG_IOC_FACTS_REPLY *freplp)
|
||||
{
|
||||
MSG_IOC_FACTS f_req;
|
||||
int error;
|
||||
|
||||
|
||||
memset(&f_req, 0, sizeof f_req);
|
||||
f_req.Function = MPI_FUNCTION_IOC_FACTS;
|
||||
f_req.MsgContext = htole32(MPT_REPLY_HANDLER_HANDSHAKE);
|
||||
@ -1531,7 +1528,7 @@ mpt_get_portfacts(struct mpt_softc *mpt, U8 port, MSG_PORT_FACTS_REPLY *freplp)
|
||||
{
|
||||
MSG_PORT_FACTS f_req;
|
||||
int error;
|
||||
|
||||
|
||||
memset(&f_req, 0, sizeof f_req);
|
||||
f_req.Function = MPI_FUNCTION_PORT_FACTS;
|
||||
f_req.PortNumber = port;
|
||||
@ -1576,7 +1573,6 @@ mpt_send_ioc_init(struct mpt_softc *mpt, uint32_t who)
|
||||
return (error);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Utiltity routine to read configuration headers and pages
|
||||
*/
|
||||
@ -2392,7 +2388,7 @@ mpt_upload_fw(struct mpt_softc *mpt)
|
||||
SGE_SIMPLE32 *sge;
|
||||
uint32_t flags;
|
||||
int error;
|
||||
|
||||
|
||||
memset(&fw_req_buf, 0, sizeof(fw_req_buf));
|
||||
fw_req = (MSG_FW_UPLOAD *)fw_req_buf;
|
||||
fw_req->ImageType = MPI_FW_UPLOAD_ITYPE_FW_IOC_MEM;
|
||||
@ -2737,7 +2733,6 @@ mpt_configure_ioc(struct mpt_softc *mpt, int tn, int needreset)
|
||||
return (ENOMEM);
|
||||
}
|
||||
|
||||
|
||||
if ((mpt->ioc_facts.Flags & MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT) &&
|
||||
(mpt->fw_uploaded == 0)) {
|
||||
struct mpt_map_info mi;
|
||||
@ -2812,7 +2807,6 @@ mpt_configure_ioc(struct mpt_softc *mpt, int tn, int needreset)
|
||||
"PORTFACTS[%d]: Type %x PFlags %x IID %d MaxDev %d\n",
|
||||
port, pfp->PortType, pfp->ProtocolFlags, pfp->PortSCSIID,
|
||||
pfp->MaxDevices);
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
@ -2909,7 +2903,6 @@ mpt_enable_ioc(struct mpt_softc *mpt, int portenable)
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Enable the port if asked. This is only done if we're resetting
|
||||
* the IOC after initial startup.
|
||||
|
||||
@ -683,7 +683,6 @@ struct mpt_softc {
|
||||
struct req_queue request_pending_list;
|
||||
struct req_queue request_timeout_list;
|
||||
|
||||
|
||||
struct cam_sim *sim;
|
||||
struct cam_path *path;
|
||||
|
||||
|
||||
@ -426,7 +426,6 @@ mpt_read_config_info_fc(struct mpt_softc *mpt)
|
||||
mpt->mpt_fcport_page0.Header.PageNumber,
|
||||
mpt->mpt_fcport_page0.Header.PageType);
|
||||
|
||||
|
||||
rv = mpt_read_cur_cfg_page(mpt, 0, &mpt->mpt_fcport_page0.Header,
|
||||
sizeof(mpt->mpt_fcport_page0), FALSE, 5000);
|
||||
if (rv) {
|
||||
@ -1378,7 +1377,6 @@ bad:
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
||||
flags = MPI_SGE_FLAGS_SIMPLE_ELEMENT | MPI_SGE_FLAGS_64_BIT_ADDRESSING;
|
||||
if (istgt == 0) {
|
||||
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_OUT) {
|
||||
@ -1780,7 +1778,6 @@ bad:
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
||||
flags = MPI_SGE_FLAGS_SIMPLE_ELEMENT;
|
||||
if (istgt == 0) {
|
||||
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_OUT) {
|
||||
@ -1908,12 +1905,9 @@ bad:
|
||||
chain_list_addr = trq->req_pbuf;
|
||||
chain_list_addr += cur_off;
|
||||
|
||||
|
||||
|
||||
ce->Address = htole32(chain_list_addr);
|
||||
ce->Flags = MPI_SGE_FLAGS_CHAIN_ELEMENT;
|
||||
|
||||
|
||||
/*
|
||||
* If we have more than a frame's worth of segments left,
|
||||
* set up the chain list to have the last element be another
|
||||
@ -2880,7 +2874,6 @@ mpt_fc_els_reply_handler(struct mpt_softc *mpt, request_t *req,
|
||||
return (TRUE);
|
||||
}
|
||||
|
||||
|
||||
rctl = (le32toh(rp->Rctl_Did) & MPI_FC_RCTL_MASK) >> MPI_FC_RCTL_SHIFT;
|
||||
type = (le32toh(rp->Type_Fctl) & MPI_FC_TYPE_MASK) >> MPI_FC_TYPE_SHIFT;
|
||||
|
||||
@ -3126,7 +3119,6 @@ XXXX
|
||||
if ((sstate & MPI_SCSI_STATE_AUTOSENSE_FAILED) != 0)
|
||||
mpt_set_ccb_status(ccb, CAM_AUTOSENSE_FAIL);
|
||||
} else if ((sstate & MPI_SCSI_STATE_RESPONSE_INFO_VALID) != 0) {
|
||||
|
||||
/* XXX Handle SPI-Packet and FCP-2 response info. */
|
||||
mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR);
|
||||
} else
|
||||
@ -4253,7 +4245,6 @@ mpt_add_target_commands(struct mpt_softc *mpt)
|
||||
mpt_post_target_command(mpt, req, i);
|
||||
}
|
||||
|
||||
|
||||
if (i == 0) {
|
||||
mpt_lprt(mpt, MPT_PRT_ERROR, "could not add any target bufs\n");
|
||||
free(mpt->tgt_cmd_ptrs, M_DEVBUF);
|
||||
@ -4499,7 +4490,6 @@ mpt_scsi_tgt_local(struct mpt_softc *mpt, request_t *cmd_req,
|
||||
}
|
||||
tgt->is_local = 1;
|
||||
|
||||
|
||||
memset(req->req_vbuf, 0, MPT_RQSL(mpt));
|
||||
ta = req->req_vbuf;
|
||||
|
||||
@ -5056,7 +5046,6 @@ mpt_scsi_tgt_atio(struct mpt_softc *mpt, request_t *req, uint32_t reply_desc)
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
atiop = (struct ccb_accept_tio *) STAILQ_FIRST(&trtp->atios);
|
||||
if (atiop == NULL) {
|
||||
mpt_lprt(mpt, MPT_PRT_WARN,
|
||||
@ -5094,7 +5083,7 @@ mpt_scsi_tgt_atio(struct mpt_softc *mpt, request_t *req, uint32_t reply_desc)
|
||||
mpt_prtc(mpt, " itag %x tag %x rdesc %x dl=%u\n",
|
||||
tgt->itag, tgt->tag_id, tgt->reply_desc, tgt->resid);
|
||||
}
|
||||
|
||||
|
||||
xpt_done((union ccb *)atiop);
|
||||
}
|
||||
|
||||
|
||||
@ -592,7 +592,6 @@ mpt_print_scsi_tmf_request(MSG_SCSI_TASK_MGMT *msg)
|
||||
printf("\tTaskMsgContext 0x%08x\n", msg->TaskMsgContext);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
mpt_print_scsi_target_assist_request(PTR_MSG_TARGET_ASSIST_REQUEST msg)
|
||||
{
|
||||
|
||||
@ -286,7 +286,7 @@ mpt_raid_attach(struct mpt_softc *mpt)
|
||||
mpt_prt(mpt, "Unable to spawn RAID thread!\n");
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
|
||||
MPT_LOCK(mpt);
|
||||
handler.reply_handler = mpt_raid_reply_handler;
|
||||
error = mpt_register_handler(mpt, MPT_HANDLER_REPLY, handler,
|
||||
@ -560,7 +560,7 @@ mpt_raid_reply_frame_handler(struct mpt_softc *mpt, request_t *req,
|
||||
reply = (MSG_RAID_ACTION_REPLY *)reply_frame;
|
||||
req->IOCStatus = le16toh(reply->IOCStatus);
|
||||
rap = (MSG_RAID_ACTION_REQUEST *)req->req_vbuf;
|
||||
|
||||
|
||||
switch (rap->Action) {
|
||||
case MPI_RAID_ACTION_QUIESCE_PHYS_IO:
|
||||
mpt_prt(mpt, "QUIESCE PHYSIO DONE\n");
|
||||
@ -675,7 +675,6 @@ mpt_raid_thread(void *arg)
|
||||
firstrun = 1;
|
||||
MPT_LOCK(mpt);
|
||||
while (mpt->shutdwn_raid == 0) {
|
||||
|
||||
if (mpt->raid_wakeup == 0) {
|
||||
mpt_sleep(mpt, &mpt->raid_volumes, PUSER, "idle", 0);
|
||||
continue;
|
||||
@ -817,7 +816,7 @@ mpt_is_raid_member(struct mpt_softc *mpt, target_id_t tgt)
|
||||
return (1);
|
||||
}
|
||||
return (0);
|
||||
|
||||
|
||||
}
|
||||
|
||||
/* XXX Ignores that there may be multiple buses/IOCs involved. */
|
||||
@ -998,7 +997,6 @@ mpt_verify_resync_rate(struct mpt_softc *mpt, struct mpt_raid_volume *mpt_vol)
|
||||
& MPI_RAIDVOL0_SETTING_PRIORITY_RESYNC;
|
||||
if (vol_pg->ResyncRate != 0
|
||||
&& vol_pg->ResyncRate != mpt->raid_resync_rate) {
|
||||
|
||||
req = mpt_get_request(mpt, /*sleep_ok*/TRUE);
|
||||
if (req == NULL) {
|
||||
mpt_vol_prt(mpt, mpt_vol, "mpt_verify_resync_rate: "
|
||||
@ -1386,9 +1384,7 @@ mpt_refresh_raid_data(struct mpt_softc *mpt)
|
||||
mpt_disk->flags |= MPT_RDF_REFERENCED;
|
||||
if ((mpt_disk->flags & (MPT_RDF_ACTIVE|MPT_RDF_UP2DATE))
|
||||
!= (MPT_RDF_ACTIVE|MPT_RDF_UP2DATE)) {
|
||||
|
||||
mpt_refresh_raid_disk(mpt, mpt_disk, ioc_disk);
|
||||
|
||||
}
|
||||
mpt_disk->flags |= MPT_RDF_ACTIVE;
|
||||
mpt->raid_rescan++;
|
||||
@ -1422,7 +1418,6 @@ mpt_refresh_raid_data(struct mpt_softc *mpt)
|
||||
!= (MPT_RVF_ACTIVE|MPT_RVF_UP2DATE))
|
||||
|| (vol_pg->VolumeStatus.Flags
|
||||
& MPI_RAIDVOL0_STATUS_FLAG_RESYNC_IN_PROGRESS) != 0) {
|
||||
|
||||
mpt_refresh_raid_vol(mpt, mpt_vol, ioc_vol);
|
||||
}
|
||||
mpt_vol->flags |= MPT_RVF_ACTIVE;
|
||||
@ -1501,7 +1496,6 @@ mpt_refresh_raid_data(struct mpt_softc *mpt)
|
||||
left = MPT_U64_2_SCALAR(mpt_vol->sync_progress.BlocksRemaining);
|
||||
total = MPT_U64_2_SCALAR(mpt_vol->sync_progress.TotalBlocks);
|
||||
if (vol_pg->ResyncRate != 0) {
|
||||
|
||||
prio = ((u_int)vol_pg->ResyncRate * 100000) / 0xFF;
|
||||
mpt_vol_prt(mpt, mpt_vol, "Rate %d.%d%%\n",
|
||||
prio / 1000, prio % 1000);
|
||||
@ -1539,7 +1533,6 @@ mpt_refresh_raid_data(struct mpt_softc *mpt)
|
||||
}
|
||||
|
||||
if ((mpt_disk->flags & MPT_RDF_ANNOUNCED) == 0) {
|
||||
|
||||
mpt_announce_disk(mpt, mpt_disk);
|
||||
mpt_disk->flags |= MPT_RVF_ANNOUNCED;
|
||||
}
|
||||
@ -1718,7 +1711,6 @@ mpt_raid_set_vol_mwce(struct mpt_softc *mpt, mpt_raid_mwce_t mwce)
|
||||
mwce = vol_pg->VolumeSettings.Settings
|
||||
& MPI_RAIDVOL0_SETTING_WRITE_CACHING_ENABLE;
|
||||
if (force_full_resync && resyncing && mwce) {
|
||||
|
||||
/*
|
||||
* XXX disable/enable volume should force a resync,
|
||||
* but we'll need to queice, drain, and restart
|
||||
|
||||
@ -577,7 +577,7 @@ mpt_user_raid_action(struct mpt_softc *mpt, struct mpt_raid_action *raid_act,
|
||||
mpt_free_request(mpt, req);
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
res = (struct mpt_user_raid_action_result *)
|
||||
(((uint8_t *)req->req_vbuf) + MPT_RQSL(mpt));
|
||||
raid_act->volume_status = res->volume_status;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user