Skip to content

Commit bdc3316

Browse files
author
Chandrakanth Patil
committed
scsi: mpi3mr: Update MPI headers to revision 37
JIRA: https://issues.redhat.com/browse/RHEL-111654 Sync MPI header files to revision 37 to match current firmware/spec definitions. No functional change. Signed-off-by: Chandrakanth Patil <chandrakanth.patil@broadcom.com> Link: https://lore.kernel.org/r/20250820084138.228471-5-chandrakanth.patil@broadcom.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> (cherry picked from commit a4ca630) Signed-off-by: Chandrakanth Patil <chanpati@redhat.com>
1 parent 121bec7 commit bdc3316

File tree

4 files changed

+41
-2
lines changed

4 files changed

+41
-2
lines changed

drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,9 @@ struct mpi3_man6_gpio_entry {
322322
#define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_TRIGGER_MASK (0x01)
323323
#define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_TRIGGER_EDGE (0x00)
324324
#define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_TRIGGER_LEVEL (0x01)
325+
#define MPI3_MAN6_GPIO_OVER_TEMP_PARAM1_LEVEL_WARNING (0x00)
326+
#define MPI3_MAN6_GPIO_OVER_TEMP_PARAM1_LEVEL_CRITICAL (0x01)
327+
#define MPI3_MAN6_GPIO_OVER_TEMP_PARAM1_LEVEL_FATAL (0x02)
325328
#define MPI3_MAN6_GPIO_PORT_GREEN_PARAM1_PHY_STATUS_ALL_UP (0x00)
326329
#define MPI3_MAN6_GPIO_PORT_GREEN_PARAM1_PHY_STATUS_ONE_OR_MORE_UP (0x01)
327330
#define MPI3_MAN6_GPIO_CABLE_MGMT_PARAM1_INTERFACE_MODULE_PRESENT (0x00)
@@ -1250,6 +1253,37 @@ struct mpi3_io_unit_page17 {
12501253
__le32 current_key[];
12511254
};
12521255
#define MPI3_IOUNIT17_PAGEVERSION (0x00)
1256+
struct mpi3_io_unit_page18 {
1257+
struct mpi3_config_page_header header;
1258+
u8 flags;
1259+
u8 poll_interval;
1260+
__le16 reserved0a;
1261+
__le32 reserved0c;
1262+
};
1263+
1264+
#define MPI3_IOUNIT18_PAGEVERSION (0x00)
1265+
#define MPI3_IOUNIT18_FLAGS_DIRECTATTACHED_ENABLE (0x01)
1266+
#define MPI3_IOUNIT18_POLLINTERVAL_DISABLE (0x00)
1267+
#ifndef MPI3_IOUNIT19_DEVICE_MAX
1268+
#define MPI3_IOUNIT19_DEVICE_MAX (1)
1269+
#endif
1270+
struct mpi3_iounit19_device {
1271+
__le16 temperature;
1272+
__le16 dev_handle;
1273+
__le16 persistent_id;
1274+
__le16 reserved06;
1275+
};
1276+
1277+
#define MPI3_IOUNIT19_DEVICE_TEMPERATURE_UNAVAILABLE (0x8000)
1278+
struct mpi3_io_unit_page19 {
1279+
struct mpi3_config_page_header header;
1280+
__le16 num_devices;
1281+
__le16 reserved0a;
1282+
__le32 reserved0c;
1283+
struct mpi3_iounit19_device device[MPI3_IOUNIT19_DEVICE_MAX];
1284+
};
1285+
1286+
#define MPI3_IOUNIT19_PAGEVERSION (0x00)
12531287
struct mpi3_ioc_page0 {
12541288
struct mpi3_config_page_header header;
12551289
__le32 reserved08;
@@ -2356,7 +2390,9 @@ struct mpi3_device0_vd_format {
23562390
__le16 io_throttle_group;
23572391
__le16 io_throttle_group_low;
23582392
__le16 io_throttle_group_high;
2359-
__le32 reserved0c;
2393+
u8 vd_abort_to;
2394+
u8 vd_reset_to;
2395+
__le16 reserved0e;
23602396
};
23612397
#define MPI3_DEVICE0_VD_STATE_OFFLINE (0x00)
23622398
#define MPI3_DEVICE0_VD_STATE_PARTIALLY_DEGRADED (0x01)

drivers/scsi/mpi3mr/mpi/mpi30_pci.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
#define MPI3_NVME_ENCAP_CMD_MAX (1)
1010
#endif
1111
#define MPI3_NVME_FLAGS_FORCE_ADMIN_ERR_REPLY_MASK (0x0002)
12+
#define MPI3_NVME_FLAGS_FORCE_ADMIN_ERR_REPLY_SHIFT (1)
1213
#define MPI3_NVME_FLAGS_FORCE_ADMIN_ERR_REPLY_FAIL_ONLY (0x0000)
1314
#define MPI3_NVME_FLAGS_FORCE_ADMIN_ERR_REPLY_ALL (0x0002)
1415
#define MPI3_NVME_FLAGS_SUBMISSIONQ_MASK (0x0001)
16+
#define MPI3_NVME_FLAGS_SUBMISSIONQ_SHIFT (0)
1517
#define MPI3_NVME_FLAGS_SUBMISSIONQ_IO (0x0000)
1618
#define MPI3_NVME_FLAGS_SUBMISSIONQ_ADMIN (0x0001)
1719

drivers/scsi/mpi3mr/mpi/mpi30_sas.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#define MPI3_SAS_DEVICE_INFO_STP_INITIATOR (0x00000010)
1212
#define MPI3_SAS_DEVICE_INFO_SMP_INITIATOR (0x00000008)
1313
#define MPI3_SAS_DEVICE_INFO_DEVICE_TYPE_MASK (0x00000007)
14+
#define MPI3_SAS_DEVICE_INFO_DEVICE_TYPE_SHIFT (0)
1415
#define MPI3_SAS_DEVICE_INFO_DEVICE_TYPE_NO_DEVICE (0x00000000)
1516
#define MPI3_SAS_DEVICE_INFO_DEVICE_TYPE_END_DEVICE (0x00000001)
1617
#define MPI3_SAS_DEVICE_INFO_DEVICE_TYPE_EXPANDER (0x00000002)

drivers/scsi/mpi3mr/mpi/mpi30_transport.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ union mpi3_version_union {
1818

1919
#define MPI3_VERSION_MAJOR (3)
2020
#define MPI3_VERSION_MINOR (0)
21-
#define MPI3_VERSION_UNIT (35)
21+
#define MPI3_VERSION_UNIT (37)
2222
#define MPI3_VERSION_DEV (0)
2323
#define MPI3_DEVHANDLE_INVALID (0xffff)
2424
struct mpi3_sysif_oper_queue_indexes {

0 commit comments

Comments
 (0)