fm10k: disable service task during suspend

The service task reads some registers as part of its normal routine,
even while the interface is down. Normally this is ok. However, during
suspend we have disabled the PCI device. Due to this, registers will
read in the same way as a surprise-remove event. Disable the service
task while we suspend, and re-enable it after we resume. If we don't do
this, the device could be UP when you suspend and come back from resume
as closed (since fm10k closes the device when it gets a surprise
remove).

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>
Orabug: 25394529
(cherry picked from commit e40296628bec7400f529927eef4bc87cb425a22a)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index d6febd90a1d2e07cb948358fb886aec21bf6be70..05c8391aaf7f4f8bd7fd1d009e4da7ba430ae66f 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -2007,6 +2007,16 @@ static int fm10k_resume(struct pci_dev *pdev)
        if (err)
                return err;
 
+       /* assume host is not ready, to prevent race with watchdog in case we
+        * actually don't have connection to the switch
+        */
+       interface->host_ready = false;
+       fm10k_watchdog_host_not_ready(interface);
+
+       /* clear the service task disable bit to allow service task to start */
+       clear_bit(__FM10K_SERVICE_DISABLE, &interface->state);
+       fm10k_service_event_schedule(interface);
+
        /* restore SR-IOV interface */
        fm10k_iov_resume(pdev);
 
@@ -2034,6 +2044,15 @@ static int fm10k_suspend(struct pci_dev *pdev,
 
        fm10k_iov_suspend(pdev);
 
+       /* the watchdog tasks may read registers, which will appear like a
+        * surprise-remove event once the PCI device is disabled. This will
+        * cause us to close the netdevice, so we don't retain the open/closed
+        * state post-resume. Prevent this by disabling the service task while
+        * suspended, until we actually resume.
+        */
+       set_bit(__FM10K_SERVICE_DISABLE, &interface->state);
+       cancel_work_sync(&interface->service_task);
+
        rtnl_lock();
 
        if (netif_running(netdev))