Skip to content

Commit

Permalink
be2net: Fix pcie error recovery in case of NIC+RoCE adapters
Browse files Browse the repository at this point in the history
Interrupts registered by RoCE driver are not unregistered when
msix interrupts are disabled during error recovery causing a
crash. Detach the adapter instance from RoCE driver when error
is detected to complete the cleanup. Attach the driver again after
the adapter is recovered from error.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Padmanabh Ratnakar authored and David S. Miller committed Feb 19, 2016
1 parent 7c4a1d0 commit 68f2279
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/net/ethernet/emulex/benet/be_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -5456,6 +5456,8 @@ static pci_ers_result_t be_eeh_err_detected(struct pci_dev *pdev,

dev_err(&adapter->pdev->dev, "EEH error detected\n");

be_roce_dev_remove(adapter);

if (!be_check_error(adapter, BE_ERROR_EEH)) {
be_set_error(adapter, BE_ERROR_EEH);

Expand Down Expand Up @@ -5520,6 +5522,8 @@ static void be_eeh_resume(struct pci_dev *pdev)
if (status)
goto err;

be_roce_dev_add(adapter);

be_schedule_err_detection(adapter, ERR_DETECTION_DELAY);
return;
err:
Expand Down

0 comments on commit 68f2279

Please sign in to comment.