fm10k: use common reset flow when handling io errors from PCI stack

Now that we have extracted the necessary steps for a split
suspend/resume flow, re-use these functions instead of using the current
open coded flow. This ensures that we don't miss any steps. It also
ensures that we have the correct driver states set.

Since we'll be handling all of the reset flow ourselves, we no longer
need to request a reset in the io_slot_reset() function.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 7 insertions, 53 deletions

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index a6ee046e9824..716a5c852143 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -2312,17 +2312,7 @@ static pci_ers_result_t fm10k_io_error_detected(struct pci_dev *pdev,
         if (state == pci_channel_io_perm_failure)
                 return PCI_ERS_RESULT_DISCONNECT;
 
-        rtnl_lock();
-
-        if (netif_running(netdev))
-                fm10k_close(netdev);
-
-        fm10k_mbx_free_irq(interface);
-
-        /* free interrupts */
-        fm10k_clear_queueing_scheme(interface);
-
-        rtnl_unlock();
+        fm10k_prepare_suspend(interface);
 
         /* Request a slot reset. */
         return PCI_ERS_RESULT_NEED_RESET;
@@ -2336,7 +2326,6 @@ static pci_ers_result_t fm10k_io_error_detected(struct pci_dev *pdev,
  */
 static pci_ers_result_t fm10k_io_slot_reset(struct pci_dev *pdev)
 {
-        struct fm10k_intfc *interface = pci_get_drvdata(pdev);
         pci_ers_result_t result;
 
         if (pci_enable_device_mem(pdev)) {
@@ -2354,12 +2343,6 @@ static pci_ers_result_t fm10k_io_slot_reset(struct pci_dev *pdev)
 
                 pci_wake_from_d3(pdev, false);
 
-                /* refresh hw_addr in case it was dropped */
-                interface->hw.hw_addr = interface->uc_addr;
-
-                interface->flags |= FM10K_FLAG_RESET_REQUESTED;
-                fm10k_service_event_schedule(interface);
-
                 result = PCI_ERS_RESULT_RECOVERED;
         }
 
@@ -2379,44 +2362,15 @@ static void fm10k_io_resume(struct pci_dev *pdev)
 {
         struct fm10k_intfc *interface = pci_get_drvdata(pdev);
         struct net_device *netdev = interface->netdev;
-        struct fm10k_hw *hw = &interface->hw;
-        int err = 0;
-
-        /* reset hardware to known state */
-        err = hw->mac.ops.init_hw(&interface->hw);
-        if (err) {
-                dev_err(&pdev->dev, "init_hw failed: %d\n", err);
-                return;
-        }
-
-        /* reset statistics starting values */
-        hw->mac.ops.rebind_hw_stats(hw, &interface->stats);
-
-        rtnl_lock();
-
-        err = fm10k_init_queueing_scheme(interface);
-        if (err) {
-                dev_err(&interface->pdev->dev,
-                        "init_queueing_scheme failed: %d\n", err);
-                goto unlock;
-        }
-
-        /* reassociate interrupts */
-        fm10k_mbx_request_irq(interface);
-
-        rtnl_lock();
-        if (netif_running(netdev))
-                err = fm10k_open(netdev);
-        rtnl_unlock();
+        int err;
 
-        /* final check of hardware state before registering the interface */
-        err = err ? : fm10k_hw_ready(interface);
+        err = fm10k_handle_resume(interface);
 
-        if (!err)
+        if (err)
+                dev_warn(&pdev->dev,
+                         "fm10k_io_resume failed: %d\n", err);
+        else
                 netif_device_attach(netdev);
-
-unlock:
-        rtnl_unlock();
 }
 
 static const struct pci_error_handlers fm10k_err_handler = {