Skip to content

Commit f8393db

Browse files
Chandrakanth Patilroot
Chandrakanth Patil
authored and
root
committed
scsi: mpt3sas: Update MPI headers to 02.00.62 version
JIRA: https://issues.redhat.com/browse/RHEL-81907 Updated MPI header files to version 02.00.62. Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com> Link: https://lore.kernel.org/r/1739410016-27503-2-git-send-email-shivasharan.srikanteshwara@broadcom.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> (cherry picked from commit 70684dc) Signed-off-by: Chandrakanth Patil <chanpati@redhat.com>
1 parent 2ac5da3 commit f8393db

File tree

3 files changed

+67
-1
lines changed

3 files changed

+67
-1
lines changed

‎drivers/scsi/mpt3sas/mpi/mpi2.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@
125125
* 06-24-19 02.00.55 Bumped MPI2_HEADER_VERSION_UNIT
126126
* 08-01-19 02.00.56 Bumped MPI2_HEADER_VERSION_UNIT
127127
* 10-02-19 02.00.57 Bumped MPI2_HEADER_VERSION_UNIT
128+
* 07-20-20 02.00.58 Bumped MPI2_HEADER_VERSION_UNIT
129+
* 03-30-21 02.00.59 Bumped MPI2_HEADER_VERSION_UNIT
130+
* 06-03-22 02.00.60 Bumped MPI2_HEADER_VERSION_UNIT
131+
* 09-20-23 02.00.61 Bumped MPI2_HEADER_VERSION_UNIT
132+
* 09-13-24 02.00.62 Bumped MPI2_HEADER_VERSION_UNIT
133+
* Added MPI2_FUNCTION_MCTP_PASSTHROUGH
128134
* --------------------------------------------------------------------------
129135
*/
130136

@@ -165,7 +171,7 @@
165171

166172

167173
/* Unit and Dev versioning for this MPI header set */
168-
#define MPI2_HEADER_VERSION_UNIT (0x39)
174+
#define MPI2_HEADER_VERSION_UNIT (0x3E)
169175
#define MPI2_HEADER_VERSION_DEV (0x00)
170176
#define MPI2_HEADER_VERSION_UNIT_MASK (0xFF00)
171177
#define MPI2_HEADER_VERSION_UNIT_SHIFT (8)
@@ -669,6 +675,7 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION {
669675
#define MPI2_FUNCTION_PWR_MGMT_CONTROL (0x30)
670676
#define MPI2_FUNCTION_SEND_HOST_MESSAGE (0x31)
671677
#define MPI2_FUNCTION_NVME_ENCAPSULATED (0x33)
678+
#define MPI2_FUNCTION_MCTP_PASSTHROUGH (0x34)
672679
#define MPI2_FUNCTION_MIN_PRODUCT_SPECIFIC (0xF0)
673680
#define MPI2_FUNCTION_MAX_PRODUCT_SPECIFIC (0xFF)
674681

‎drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@
251251
* 12-17-18 02.00.47 Swap locations of Slotx2 and Slotx4 in ManPage 7.
252252
* 08-01-19 02.00.49 Add MPI26_MANPAGE7_FLAG_X2_X4_SLOT_INFO_VALID
253253
* Add MPI26_IOUNITPAGE1_NVME_WRCACHE_SHIFT
254+
* 09-13-24 02.00.50 Added PCIe 32 GT/s link rate
254255
*/
255256

256257
#ifndef MPI2_CNFG_H
@@ -1121,6 +1122,7 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 {
11211122
#define MPI2_IOUNITPAGE7_PCIE_SPEED_5_0_GBPS (0x01)
11221123
#define MPI2_IOUNITPAGE7_PCIE_SPEED_8_0_GBPS (0x02)
11231124
#define MPI2_IOUNITPAGE7_PCIE_SPEED_16_0_GBPS (0x03)
1125+
#define MPI2_IOUNITPAGE7_PCIE_SPEED_32_0_GBPS (0x04)
11241126

11251127
/*defines for IO Unit Page 7 ProcessorState field */
11261128
#define MPI2_IOUNITPAGE7_PSTATE_MASK_SECOND (0x0000000F)
@@ -2301,6 +2303,7 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_1 {
23012303
#define MPI2_SASIOUNIT1_CONTROL_CLEAR_AFFILIATION (0x0001)
23022304

23032305
/*values for SAS IO Unit Page 1 AdditionalControlFlags */
2306+
#define MPI2_SASIOUNIT1_ACONTROL_PROD_SPECIFIC_1 (0x8000)
23042307
#define MPI2_SASIOUNIT1_ACONTROL_DA_PERSIST_CONNECT (0x0100)
23052308
#define MPI2_SASIOUNIT1_ACONTROL_MULTI_PORT_DOMAIN_ILLEGAL (0x0080)
23062309
#define MPI2_SASIOUNIT1_ACONTROL_SATA_ASYNCHROUNOUS_NOTIFICATION (0x0040)
@@ -3591,6 +3594,7 @@ typedef struct _MPI2_CONFIG_PAGE_EXT_MAN_PS {
35913594
#define MPI26_PCIE_NEG_LINK_RATE_5_0 (0x03)
35923595
#define MPI26_PCIE_NEG_LINK_RATE_8_0 (0x04)
35933596
#define MPI26_PCIE_NEG_LINK_RATE_16_0 (0x05)
3597+
#define MPI26_PCIE_NEG_LINK_RATE_32_0 (0x06)
35943598

35953599

35963600
/****************************************************************************
@@ -3700,6 +3704,7 @@ typedef struct _MPI26_CONFIG_PAGE_PIOUNIT_1 {
37003704
#define MPI26_PCIEIOUNIT1_MAX_RATE_5_0 (0x30)
37013705
#define MPI26_PCIEIOUNIT1_MAX_RATE_8_0 (0x40)
37023706
#define MPI26_PCIEIOUNIT1_MAX_RATE_16_0 (0x50)
3707+
#define MPI26_PCIEIOUNIT1_MAX_RATE_32_0 (0x60)
37033708

37043709
/*values for PCIe IO Unit Page 1 DMDReportPCIe */
37053710
#define MPI26_PCIEIOUNIT1_DMDRPT_UNIT_MASK (0x80)

‎drivers/scsi/mpt3sas/mpi/mpi2_ioc.h‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@
179179
* Added MPI26_IOCFACTS_CAPABILITY_COREDUMP_ENABLED
180180
* Added MPI2_FW_DOWNLOAD_ITYPE_COREDUMP
181181
* Added MPI2_FW_UPLOAD_ITYPE_COREDUMP
182+
* 9-13-24 02.00.39 Added MPI26_MCTP_PASSTHROUGH messages
182183
* --------------------------------------------------------------------------
183184
*/
184185

@@ -382,6 +383,7 @@ typedef struct _MPI2_IOC_FACTS_REPLY {
382383
/*ProductID field uses MPI2_FW_HEADER_PID_ */
383384

384385
/*IOCCapabilities */
386+
#define MPI26_IOCFACTS_CAPABILITY_MCTP_PASSTHRU (0x00800000)
385387
#define MPI26_IOCFACTS_CAPABILITY_COREDUMP_ENABLED (0x00200000)
386388
#define MPI26_IOCFACTS_CAPABILITY_PCIE_SRIOV (0x00100000)
387389
#define MPI26_IOCFACTS_CAPABILITY_ATOMIC_REQ (0x00080000)
@@ -1798,5 +1800,57 @@ typedef struct _MPI26_IOUNIT_CONTROL_REPLY {
17981800
Mpi26IoUnitControlReply_t,
17991801
*pMpi26IoUnitControlReply_t;
18001802

1803+
/****************************************************************************
1804+
* MCTP Passthrough messages (MPI v2.6 and later only.)
1805+
****************************************************************************/
1806+
1807+
/* MCTP Passthrough Request Message */
1808+
typedef struct _MPI26_MCTP_PASSTHROUGH_REQUEST {
1809+
U8 MsgContext; /* 0x00 */
1810+
U8 Reserved1[2]; /* 0x01 */
1811+
U8 Function; /* 0x03 */
1812+
U8 Reserved2[3]; /* 0x04 */
1813+
U8 MsgFlags; /* 0x07 */
1814+
U8 VP_ID; /* 0x08 */
1815+
U8 VF_ID; /* 0x09 */
1816+
U16 Reserved3; /* 0x0A */
1817+
U32 Reserved4; /* 0x0C */
1818+
U8 Flags; /* 0x10 */
1819+
U8 Reserved5[3]; /* 0x11 */
1820+
U32 Reserved6; /* 0x14 */
1821+
U32 H2DLength; /* 0x18 */
1822+
U32 D2HLength; /* 0x1C */
1823+
MPI25_SGE_IO_UNION H2DSGL; /* 0x20 */
1824+
MPI25_SGE_IO_UNION D2HSGL; /* 0x30 */
1825+
} MPI26_MCTP_PASSTHROUGH_REQUEST,
1826+
*PTR_MPI26_MCTP_PASSTHROUGH_REQUEST,
1827+
Mpi26MctpPassthroughRequest_t,
1828+
*pMpi26MctpPassthroughRequest_t;
1829+
1830+
/* values for the MsgContext field */
1831+
#define MPI26_MCTP_MSG_CONEXT_UNUSED (0x00)
1832+
1833+
/* values for the Flags field */
1834+
#define MPI26_MCTP_FLAGS_MSG_FORMAT_MPT (0x01)
1835+
1836+
/* MCTP Passthrough Reply Message */
1837+
typedef struct _MPI26_MCTP_PASSTHROUGH_REPLY {
1838+
U8 MsgContext; /* 0x00 */
1839+
U8 Reserved1; /* 0x01 */
1840+
U8 MsgLength; /* 0x02 */
1841+
U8 Function; /* 0x03 */
1842+
U8 Reserved2[3]; /* 0x04 */
1843+
U8 MsgFlags; /* 0x07 */
1844+
U8 VP_ID; /* 0x08 */
1845+
U8 VF_ID; /* 0x09 */
1846+
U16 Reserved3; /* 0x0A */
1847+
U16 Reserved4; /* 0x0C */
1848+
U16 IOCStatus; /* 0x0E */
1849+
U32 IOCLogInfo; /* 0x10 */
1850+
U32 ResponseDataLength; /* 0x14 */
1851+
} MPI26_MCTP_PASSTHROUGH_REPLY,
1852+
*PTR_MPI26_MCTP_PASSTHROUGH_REPLY,
1853+
Mpi26MctpPassthroughReply_t,
1854+
*pMpi26MctpPassthroughReply_t;
18011855

18021856
#endif

0 commit comments

Comments
 (0)