be2net: Fix pcie error recovery in case of NIC+RoCE adapters

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>

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 88f427cb76c391f734a1e3bc12b6ff0be092a6ad..46248467e20603f91e1c081d6a8f9f9620acffa7 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -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);
 
@@ -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: