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

Commit 3f1abce4 authored by Adam Radford's avatar Adam Radford Committed by James Bottomley
Browse files

[SCSI] megaraid_sas: Remove MSI-X black list, use MFI_REG_STATE instead 



This patch for megaraid_sas removes the MSI-X black list and uses
MFI_REG_STATE.ready.msiEnable instead.

Signed-off-by: default avatarAdam Radford <aradford@gmail.com>
Signed-off-by: default avatarJames Bottomley <jbottomley@parallels.com>
parent bb650a1b

drivers/scsi/megaraid/megaraid_sas_base.c

+12 −13
Original line number Diff line number Diff line
@@ -3454,7 +3454,7 @@ static int megasas_init_fw(struct megasas_instance *instance) 
{

	u32 max_sectors_1;

	u32 max_sectors_2;

	u32 tmp_sectors;

	u32 tmp_sectors, msix_enable;

	struct megasas_register_set __iomem *reg_set;

	struct megasas_ctrl_info *ctrl_info;

	unsigned long bar_list;
@@ -3507,6 +3507,13 @@ static int megasas_init_fw(struct megasas_instance *instance) 
	if (megasas_transition_to_ready(instance))

		goto fail_ready_state;



	/* Check if MSI-X is supported while in ready state */

	msix_enable = (instance->instancet->read_fw_status_reg(reg_set) &

		       0x4000000) >> 0x1a;

	if (msix_enable && !msix_disable &&

	    !pci_enable_msix(instance->pdev, &instance->msixentry, 1))

		instance->msi_flag = 1;



	/* Get operational params, sge flags, send init cmd to controller */

	if (instance->instancet->init_adapter(instance))

		goto fail_init_adapter;
@@ -4076,14 +4083,6 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	else

		INIT_WORK(&instance->work_init, process_fw_state_change_wq);



	/* Try to enable MSI-X */

	if ((instance->pdev->device != PCI_DEVICE_ID_LSI_SAS1078R) &&

	    (instance->pdev->device != PCI_DEVICE_ID_LSI_SAS1078DE) &&

	    (instance->pdev->device != PCI_DEVICE_ID_LSI_VERDE_ZCR) &&

	    !msix_disable && !pci_enable_msix(instance->pdev,

					      &instance->msixentry, 1))

		instance->msi_flag = 1;



	/*

	 * Initialize MFI Firmware

	 */
@@ -4332,10 +4331,6 @@ megasas_resume(struct pci_dev *pdev) 
	if (megasas_set_dma_mask(pdev))

		goto fail_set_dma_mask;



	/* Now re-enable MSI-X */

	if (instance->msi_flag)

		pci_enable_msix(instance->pdev, &instance->msixentry, 1);



	/*

	 * Initialize MFI Firmware

	 */
@@ -4348,6 +4343,10 @@ megasas_resume(struct pci_dev *pdev) 
	if (megasas_transition_to_ready(instance))

		goto fail_ready_state;



	/* Now re-enable MSI-X */

	if (instance->msi_flag)

		pci_enable_msix(instance->pdev, &instance->msixentry, 1);



	switch (instance->pdev->device) {

	case PCI_DEVICE_ID_LSI_FUSION:

	{