Commit 57a80be5 authored by Ranjan Kumar's avatar Ranjan Kumar Committed by Martin K. Petersen
Browse files

scsi: mpi3mr: Update MPI Headers to revision 31 



Update MPI Headers to revision 31.

Signed-off-by: default avatarRanjan Kumar <ranjan.kumar@broadcom.com>
Signed-off-by: default avatarSathya Prakash <sathya.prakash@broadcom.com>
Link: https://lore.kernel.org/r/20240313100746.128951-7-ranjan.kumar@broadcom.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0a2714b7

drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h

+3 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ struct mpi3_man6_gpio_entry { 
#define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_SOURCE_GENERIC                     (0x00)

#define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_SOURCE_CABLE_MGMT                  (0x10)

#define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_SOURCE_ACTIVE_CABLE_OVERCURRENT    (0x20)

#define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_ACK_REQUIRED                       (0x02)

#define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_TRIGGER_MASK                       (0x01)

#define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_TRIGGER_EDGE                       (0x00)

#define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_TRIGGER_LEVEL                      (0x01)
@@ -1315,6 +1316,8 @@ struct mpi3_driver_page0 { 
	__le32                             reserved18;

};

#define MPI3_DRIVER0_PAGEVERSION               (0x00)

#define MPI3_DRIVER0_BSDOPTS_DEVICEEXPOSURE_DISABLE	    (0x00000020)

#define MPI3_DRIVER0_BSDOPTS_WRITECACHE_DISABLE		    (0x00000010)

#define MPI3_DRIVER0_BSDOPTS_HEADLESS_MODE_ENABLE           (0x00000008)

#define MPI3_DRIVER0_BSDOPTS_DIS_HII_CONFIG_UTIL            (0x00000004)

#define MPI3_DRIVER0_BSDOPTS_REGISTRATION_MASK              (0x00000003)

drivers/scsi/mpi3mr/mpi/mpi30_image.h

+5 −15
Original line number Diff line number Diff line
@@ -198,16 +198,17 @@ struct mpi3_supported_devices_data { 
	struct mpi3_supported_device   supported_device[MPI3_SUPPORTED_DEVICE_MAX];

};



#ifndef MPI3_ENCRYPTED_HASH_MAX

#define MPI3_ENCRYPTED_HASH_MAX                      (1)

#ifndef MPI3_PUBLIC_KEY_MAX

#define MPI3_PUBLIC_KEY_MAX                      (1)

#endif

struct mpi3_encrypted_hash_entry {

	u8                         hash_image_type;

	u8                         hash_algorithm;

	u8                         encryption_algorithm;

	u8                         reserved03;

	__le32                     reserved04;

	__le32                     encrypted_hash[MPI3_ENCRYPTED_HASH_MAX];

	__le16                     public_key_size;

	__le16                     signature_size;

	__le32                     public_key[MPI3_PUBLIC_KEY_MAX];

};



#define MPI3_HASH_IMAGE_TYPE_KEY_WITH_SIGNATURE      (0x03)
@@ -228,17 +229,6 @@ struct mpi3_encrypted_hash_entry { 
#define MPI3_ENCRYPTION_ALGORITHM_RSA2048            (0x04)

#define MPI3_ENCRYPTION_ALGORITHM_RSA4096            (0x05)

#define MPI3_ENCRYPTION_ALGORITHM_RSA3072            (0x06)

#ifndef MPI3_PUBLIC_KEY_MAX

#define MPI3_PUBLIC_KEY_MAX                          (1)

#endif

struct mpi3_encrypted_key_with_hash_entry {

	u8                         hash_image_type;

	u8                         hash_algorithm;

	u8                         encryption_algorithm;

	u8                         reserved03;

	__le32                     reserved04;

	__le32                     public_key[MPI3_PUBLIC_KEY_MAX];

};



#ifndef MPI3_ENCRYPTED_HASH_ENTRY_MAX

#define MPI3_ENCRYPTED_HASH_ENTRY_MAX               (1)

drivers/scsi/mpi3mr/mpi/mpi30_ioc.h

+11 −7
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ struct mpi3_ioc_facts_data { 
	__le16                     max_io_throttle_group;

	__le16                     io_throttle_low;

	__le16                     io_throttle_high;

	__le32			   diag_fdl_size;

	__le32			   diag_tty_size;

};

#define MPI3_IOCFACTS_CAPABILITY_NON_SUPERVISOR_MASK          (0x80000000)

#define MPI3_IOCFACTS_CAPABILITY_SUPERVISOR_IOC               (0x00000000)
@@ -108,13 +110,13 @@ struct mpi3_ioc_facts_data { 
#define MPI3_IOCFACTS_CAPABILITY_INT_COALESCE_MASK            (0x00000600)

#define MPI3_IOCFACTS_CAPABILITY_INT_COALESCE_FIXED_THRESHOLD (0x00000000)

#define MPI3_IOCFACTS_CAPABILITY_INT_COALESCE_OUTSTANDING_IO  (0x00000200)

#define MPI3_IOCFACTS_CAPABILITY_COMPLETE_RESET_CAPABLE       (0x00000100)

#define MPI3_IOCFACTS_CAPABILITY_SEG_DIAG_TRACE_ENABLED       (0x00000080)

#define MPI3_IOCFACTS_CAPABILITY_SEG_DIAG_FW_ENABLED          (0x00000040)

#define MPI3_IOCFACTS_CAPABILITY_SEG_DIAG_DRIVER_ENABLED      (0x00000020)

#define MPI3_IOCFACTS_CAPABILITY_ADVANCED_HOST_PD_ENABLED     (0x00000010)

#define MPI3_IOCFACTS_CAPABILITY_RAID_CAPABLE                 (0x00000008)

#define MPI3_IOCFACTS_CAPABILITY_MULTIPATH_ENABLED            (0x00000002)

#define MPI3_IOCFACTS_CAPABILITY_COMPLETE_RESET_SUPPORTED     (0x00000100)

#define MPI3_IOCFACTS_CAPABILITY_SEG_DIAG_TRACE_SUPPORTED     (0x00000080)

#define MPI3_IOCFACTS_CAPABILITY_SEG_DIAG_FW_SUPPORTED        (0x00000040)

#define MPI3_IOCFACTS_CAPABILITY_SEG_DIAG_DRIVER_SUPPORTED    (0x00000020)

#define MPI3_IOCFACTS_CAPABILITY_ADVANCED_HOST_PD_SUPPORTED   (0x00000010)

#define MPI3_IOCFACTS_CAPABILITY_RAID_SUPPORTED               (0x00000008)

#define MPI3_IOCFACTS_CAPABILITY_MULTIPATH_SUPPORTED          (0x00000002)

#define MPI3_IOCFACTS_CAPABILITY_COALESCE_CTRL_SUPPORTED      (0x00000001)

#define MPI3_IOCFACTS_PID_TYPE_MASK                           (0xf000)

#define MPI3_IOCFACTS_PID_TYPE_SHIFT                          (12)
@@ -159,6 +161,8 @@ struct mpi3_ioc_facts_data { 
#define MPI3_IOCFACTS_FLAGS_PERSONALITY_RAID_DDR              (0x00000002)

#define MPI3_IOCFACTS_IO_THROTTLE_DATA_LENGTH_NOT_REQUIRED    (0x0000)

#define MPI3_IOCFACTS_MAX_IO_THROTTLE_GROUP_NOT_REQUIRED      (0x0000)

#define MPI3_IOCFACTS_DIAGFDLSIZE_NOT_SUPPORTED		      (0x00000000)

#define MPI3_IOCFACTS_DIAGTTYSIZE_NOT_SUPPORTED               (0x00000000)

struct mpi3_mgmt_passthrough_request {

	__le16                 host_tag;

	u8                     ioc_use_only02;

drivers/scsi/mpi3mr/mpi/mpi30_transport.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ union mpi3_version_union { 


#define MPI3_VERSION_MAJOR                                              (3)

#define MPI3_VERSION_MINOR                                              (0)

#define MPI3_VERSION_UNIT                                               (28)

#define MPI3_VERSION_UNIT                                               (31)

#define MPI3_VERSION_DEV                                                (0)

#define MPI3_DEVHANDLE_INVALID                                          (0xffff)

struct mpi3_sysif_oper_queue_indexes {

drivers/scsi/mpi3mr/mpi3mr_fw.c

+4 −4
Original line number Diff line number Diff line
@@ -1280,7 +1280,7 @@ mpi3mr_revalidate_factsdata(struct mpi3mr_ioc *mrioc) 
			    mrioc->shost->max_sectors * 512, mrioc->facts.max_data_length);



	if ((mrioc->sas_transport_enabled) && (mrioc->facts.ioc_capabilities &

	    MPI3_IOCFACTS_CAPABILITY_MULTIPATH_ENABLED))

	    MPI3_IOCFACTS_CAPABILITY_MULTIPATH_SUPPORTED))

		ioc_err(mrioc,

		    "critical error: multipath capability is enabled at the\n"

		    "\tcontroller while sas transport support is enabled at the\n"
@@ -3677,8 +3677,8 @@ static const struct { 
	u32 capability;

	char *name;

} mpi3mr_capabilities[] = {

	{ MPI3_IOCFACTS_CAPABILITY_RAID_CAPABLE, "RAID" },

	{ MPI3_IOCFACTS_CAPABILITY_MULTIPATH_ENABLED, "MultiPath" },

	{ MPI3_IOCFACTS_CAPABILITY_RAID_SUPPORTED, "RAID" },

	{ MPI3_IOCFACTS_CAPABILITY_MULTIPATH_SUPPORTED, "MultiPath" },

};



/**
@@ -3960,7 +3960,7 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc) 
		    MPI3MR_HOST_IOS_KDUMP);



	if (!(mrioc->facts.ioc_capabilities &

	    MPI3_IOCFACTS_CAPABILITY_MULTIPATH_ENABLED)) {

	    MPI3_IOCFACTS_CAPABILITY_MULTIPATH_SUPPORTED)) {

		mrioc->sas_transport_enabled = 1;

		mrioc->scsi_device_channel = 1;

		mrioc->shost->max_channel = 1;