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

Commit dd088128 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Christoph Hellwig
Browse files

megaraid: Fail resume if MSI-X re-initialization failed 



Currently the driver fails to analize MSI-X re-enablement
status on resuming and always assumes the success. This
update checks the MSI-X initialization result and fails
to resume if MSI-Xs re-enablement failed.

Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Acked-by: default avatarKashyap Desai <Kashyap.desai@avagotech.com>
Cc: Neela Syam Kolli <megaraidlinux@lsi.com>
Cc: linux-scsi@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 18fce3c4

drivers/scsi/megaraid/megaraid_sas_base.c

+5 −3
Original line number Diff line number Diff line
@@ -5132,9 +5132,10 @@ megasas_resume(struct pci_dev *pdev) 
		goto fail_ready_state;



	/* Now re-enable MSI-X */

	if (instance->msix_vectors)

	if (instance->msix_vectors &&

	    pci_enable_msix(instance->pdev, instance->msixentry,

				instance->msix_vectors);

			    instance->msix_vectors))

		goto fail_reenable_msix;



	switch (instance->pdev->device) {

	case PCI_DEVICE_ID_LSI_FUSION:
@@ -5243,6 +5244,7 @@ megasas_resume(struct pci_dev *pdev) 


fail_set_dma_mask:

fail_ready_state:

fail_reenable_msix:



	pci_disable_device(pdev);