lkml.org 
[lkml]   [2014]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 RESEND 13/23] megaraid: Fail resume if MSI-X re-initialization failed
    Date
    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: Alexander Gordeev <agordeev@redhat.com>
    ---
    drivers/scsi/megaraid/megaraid_sas_base.c | 8 +++++---
    1 files changed, 5 insertions(+), 3 deletions(-)

    diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
    index 112799b..ba06102 100644
    --- a/drivers/scsi/megaraid/megaraid_sas_base.c
    +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
    @@ -5134,9 +5134,10 @@ megasas_resume(struct pci_dev *pdev)
    goto fail_ready_state;

    /* Now re-enable MSI-X */
    - if (instance->msix_vectors)
    - pci_enable_msix(instance->pdev, instance->msixentry,
    - instance->msix_vectors);
    + if (instance->msix_vectors &&
    + pci_enable_msix(instance->pdev, instance->msixentry,
    + instance->msix_vectors))
    + goto fail_reenable_msix;

    switch (instance->pdev->device) {
    case PCI_DEVICE_ID_LSI_FUSION:
    @@ -5245,6 +5246,7 @@ fail_init_mfi:

    fail_set_dma_mask:
    fail_ready_state:
    +fail_reenable_msix:

    pci_disable_device(pdev);

    --
    1.7.7.6


    \
     
     \ /
      Last update: 2014-07-16 20:41    [W:4.807 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site