Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58136856 authored by Chandrakanth Patil's avatar Chandrakanth Patil Committed by Martin K. Petersen
Browse files

scsi: megaraid_sas: Add support for MPI toolbox commands 



Added driver support to allow passthrough MPI toolbox type MFI commands to
firmware based on firmware capability.

Signed-off-by: default avatarSumit Saxena <sumit.saxena@broadcom.com>
Signed-off-by: default avatarChandrakanth Patil <chandrakanth.patil@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7fc55700

drivers/scsi/megaraid/megaraid_sas.h

+35 −1
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ enum MFI_CMD_OP { 
	MFI_CMD_SMP		= 0x7,

	MFI_CMD_STP		= 0x8,

	MFI_CMD_NVME		= 0x9,

	MFI_CMD_TOOLBOX		= 0xa,

	MFI_CMD_OP_COUNT,

	MFI_CMD_INVALID		= 0xff

};
@@ -1467,7 +1468,39 @@ struct megasas_ctrl_info { 


	u8 reserved6[64];



	u32 rsvdForAdptOp[64];

	struct {

	#if defined(__BIG_ENDIAN_BITFIELD)

		u32 reserved:19;

		u32 support_pci_lane_margining: 1;

		u32 support_psoc_update:1;

		u32 support_force_personality_change:1;

		u32 support_fde_type_mix:1;

		u32 support_snap_dump:1;

		u32 support_nvme_tm:1;

		u32 support_oce_only:1;

		u32 support_ext_mfg_vpd:1;

		u32 support_pcie:1;

		u32 support_cvhealth_info:1;

		u32 support_profile_change:2;

		u32 mr_config_ext2_supported:1;

	#else

		u32 mr_config_ext2_supported:1;

		u32 support_profile_change:2;

		u32 support_cvhealth_info:1;

		u32 support_pcie:1;

		u32 support_ext_mfg_vpd:1;

		u32 support_oce_only:1;

		u32 support_nvme_tm:1;

		u32 support_snap_dump:1;

		u32 support_fde_type_mix:1;

		u32 support_force_personality_change:1;

		u32 support_psoc_update:1;

		u32 support_pci_lane_margining: 1;

		u32 reserved:19;

	#endif

	} adapter_operations5;



	u32 rsvdForAdptOp[63];



	u8 reserved7[3];
@@ -2399,6 +2432,7 @@ struct megasas_instance { 
	u8 enable_fw_dev_list;

	bool atomic_desc_support;

	bool support_seqnum_jbod_fp;

	bool support_pci_lane_margining;

};



struct MR_LD_VF_MAP {

drivers/scsi/megaraid/megaraid_sas_base.c

+30 −1
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ static u32 support_poll_for_event; 
u32 megasas_dbg_lvl;

static u32 support_device_change;

static bool support_nvme_encapsulation;

static bool support_pci_lane_margining;



/* define lock for aen poll */

spinlock_t poll_aen_lock;
@@ -3494,6 +3495,7 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd, 
	case MFI_CMD_SMP:

	case MFI_CMD_STP:

	case MFI_CMD_NVME:

	case MFI_CMD_TOOLBOX:

		megasas_complete_int_cmd(instance, cmd);

		break;
@@ -5099,6 +5101,7 @@ megasas_get_ctrl_info(struct megasas_instance *instance) 
		le32_to_cpus((u32 *)&ci->adapterOperations2);

		le32_to_cpus((u32 *)&ci->adapterOperations3);

		le16_to_cpus((u16 *)&ci->adapter_operations4);

		le32_to_cpus((u32 *)&ci->adapter_operations5);



		/* Update the latest Ext VD info.

		 * From Init path, store current firmware details.
@@ -5112,6 +5115,8 @@ megasas_get_ctrl_info(struct megasas_instance *instance) 
			ci->adapter_operations4.support_pd_map_target_id;

		instance->support_nvme_passthru =

			ci->adapter_operations4.support_nvme_passthru;

		instance->support_pci_lane_margining =

			ci->adapter_operations5.support_pci_lane_margining;

		instance->task_abort_tmo = ci->TaskAbortTO;

		instance->max_reset_tmo = ci->MaxResetTO;
@@ -5145,6 +5150,8 @@ megasas_get_ctrl_info(struct megasas_instance *instance) 
			 instance->task_abort_tmo, instance->max_reset_tmo);

		dev_info(&instance->pdev->dev, "JBOD sequence map support\t: %s\n",

			 instance->support_seqnum_jbod_fp ? "Yes" : "No");

		dev_info(&instance->pdev->dev, "PCI Lane Margining support\t: %s\n",

			 instance->support_pci_lane_margining ? "Yes" : "No");



		break;
@@ -7793,7 +7800,9 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance, 


	if ((ioc->frame.hdr.cmd >= MFI_CMD_OP_COUNT) ||

	    ((ioc->frame.hdr.cmd == MFI_CMD_NVME) &&

	    !instance->support_nvme_passthru)) {

	    !instance->support_nvme_passthru) ||

	    ((ioc->frame.hdr.cmd == MFI_CMD_TOOLBOX) &&

	    !instance->support_pci_lane_margining)) {

		dev_err(&instance->pdev->dev,

			"Received invalid ioctl command 0x%x\n",

			ioc->frame.hdr.cmd);
@@ -8277,6 +8286,14 @@ support_nvme_encapsulation_show(struct device_driver *dd, char *buf) 


static DRIVER_ATTR_RO(support_nvme_encapsulation);



static ssize_t

support_pci_lane_margining_show(struct device_driver *dd, char *buf)

{

	return sprintf(buf, "%u\n", support_pci_lane_margining);

}



static DRIVER_ATTR_RO(support_pci_lane_margining);



static inline void megasas_remove_scsi_device(struct scsi_device *sdev)

{

	sdev_printk(KERN_INFO, sdev, "SCSI device is removed\n");
@@ -8546,6 +8563,7 @@ static int __init megasas_init(void) 
	support_poll_for_event = 2;

	support_device_change = 1;

	support_nvme_encapsulation = true;

	support_pci_lane_margining = true;



	memset(&megasas_mgmt_info, 0, sizeof(megasas_mgmt_info));
@@ -8602,8 +8620,17 @@ static int __init megasas_init(void) 
	if (rval)

		goto err_dcf_support_nvme_encapsulation;



	rval = driver_create_file(&megasas_pci_driver.driver,

				  &driver_attr_support_pci_lane_margining);

	if (rval)

		goto err_dcf_support_pci_lane_margining;



	return rval;



err_dcf_support_pci_lane_margining:

	driver_remove_file(&megasas_pci_driver.driver,

			   &driver_attr_support_nvme_encapsulation);



err_dcf_support_nvme_encapsulation:

	driver_remove_file(&megasas_pci_driver.driver,

			   &driver_attr_support_device_change);
@@ -8643,6 +8670,8 @@ static void __exit megasas_exit(void) 
	driver_remove_file(&megasas_pci_driver.driver, &driver_attr_version);

	driver_remove_file(&megasas_pci_driver.driver,

			   &driver_attr_support_nvme_encapsulation);

	driver_remove_file(&megasas_pci_driver.driver,

			   &driver_attr_support_pci_lane_margining);



	pci_unregister_driver(&megasas_pci_driver);

	megasas_exit_debugfs();

drivers/scsi/megaraid/megaraid_sas_fusion.c

+7 −0
Original line number Diff line number Diff line
@@ -4245,6 +4245,13 @@ void megasas_refire_mgmt_cmd(struct megasas_instance *instance) 
				result = COMPLETE_CMD;

			}



			break;

		case MFI_CMD_TOOLBOX:

			if (!instance->support_pci_lane_margining) {

				cmd_mfi->frame->hdr.cmd_status = MFI_STAT_INVALID_CMD;

				result = COMPLETE_CMD;

			}



			break;

		default:

			break;