2 files changed, 18 insertions, 5 deletions

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index a08bd7c46766..e7e7d695816b 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -419,6 +419,7 @@ enum ixbgevf_state_t {
         __IXGBEVF_TESTING,
         __IXGBEVF_RESETTING,
         __IXGBEVF_DOWN,
+        __IXGBEVF_DISABLED,
         __IXGBEVF_REMOVING,
 };
 
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 5d9375981713..4ba139b2d25a 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -3329,7 +3329,8 @@ static int ixgbevf_suspend(struct pci_dev *pdev, pm_message_t state)
                 return retval;
 
 #endif
-        pci_disable_device(pdev);
+        if (!test_and_set_bit(__IXGBEVF_DISABLED, &adapter->state))
+                pci_disable_device(pdev);
 
         return 0;
 }
@@ -3353,6 +3354,8 @@ static int ixgbevf_resume(struct pci_dev *pdev)
                 dev_err(&pdev->dev, "Cannot enable PCI device from suspend\n");
                 return err;
         }
+        smp_mb__before_clear_bit();
+        clear_bit(__IXGBEVF_DISABLED, &adapter->state);
         pci_set_master(pdev);
 
         ixgbevf_reset(adapter);
@@ -3607,7 +3610,8 @@ err_alloc_etherdev:
         pci_release_regions(pdev);
 err_pci_reg:
 err_dma:
-        pci_disable_device(pdev);
+        if (!test_and_set_bit(__IXGBEVF_DISABLED, &adapter->state))
+                pci_disable_device(pdev);
         return err;
 }
 
@@ -3645,7 +3649,8 @@ static void ixgbevf_remove(struct pci_dev *pdev)
 
         free_netdev(netdev);
 
-        pci_disable_device(pdev);
+        if (!test_and_set_bit(__IXGBEVF_DISABLED, &adapter->state))
+                pci_disable_device(pdev);
 }
 
 /**
@@ -3662,15 +3667,20 @@ static pci_ers_result_t ixgbevf_io_error_detected(struct pci_dev *pdev,
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct ixgbevf_adapter *adapter = netdev_priv(netdev);
 
+        rtnl_lock();
         netif_device_detach(netdev);
 
-        if (state == pci_channel_io_perm_failure)
+        if (state == pci_channel_io_perm_failure) {
+                rtnl_unlock();
                 return PCI_ERS_RESULT_DISCONNECT;
+        }
 
         if (netif_running(netdev))
                 ixgbevf_down(adapter);
 
-        pci_disable_device(pdev);
+        if (!test_and_set_bit(__IXGBEVF_DISABLED, &adapter->state))
+                pci_disable_device(pdev);
+        rtnl_unlock();
 
         /* Request a slot slot reset. */
         return PCI_ERS_RESULT_NEED_RESET;
@@ -3694,6 +3704,8 @@ static pci_ers_result_t ixgbevf_io_slot_reset(struct pci_dev *pdev)
                 return PCI_ERS_RESULT_DISCONNECT;
         }
 
+        smp_mb__before_clear_bit();
+        clear_bit(__IXGBEVF_DISABLED, &adapter->state);
         pci_set_master(pdev);
 
         ixgbevf_reset(adapter);