Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[deliverable/linux.git] / drivers / net / ethernet / intel / fm10k / fm10k_pci.c

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index c60c3b0f89e94e0ab1a547941a747c9cf291a47c..b8245c734c969442bd6aa5d999fcff9c194ed62d 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -123,11 +123,24 @@ static void fm10k_service_timer(unsigned long data)
 static void fm10k_detach_subtask(struct fm10k_intfc *interface)
 {
        struct net_device *netdev = interface->netdev;
+       u32 __iomem *hw_addr;
+       u32 value;
 
        /* do nothing if device is still present or hw_addr is set */
        if (netif_device_present(netdev) || interface->hw.hw_addr)
                return;
 
+       /* check the real address space to see if we've recovered */
+       hw_addr = READ_ONCE(interface->uc_addr);
+       value = readl(hw_addr);
+       if ((~value)) {
+               interface->hw.hw_addr = interface->uc_addr;
+               netif_device_attach(netdev);
+               interface->flags |= FM10K_FLAG_RESET_REQUESTED;
+               netdev_warn(netdev, "PCIe link restored, device now attached\n");
+               return;
+       }
+
        rtnl_lock();
 
        if (netif_running(netdev))
@@ -174,6 +187,8 @@ static int fm10k_handle_reset(struct fm10k_intfc *interface)
 
        rtnl_lock();
 
+       pci_set_master(interface->pdev);
+
        /* reset and initialize the hardware so it is in a known state */
        err = hw->mac.ops.reset_hw(hw);
        if (err) {
@@ -2143,6 +2158,10 @@ static int fm10k_handle_resume(struct fm10k_intfc *interface)
        interface->host_ready = false;
        fm10k_watchdog_host_not_ready(interface);
 
+       /* force link to stay down for a second to prevent link flutter */
+       interface->link_down_event = jiffies + (HZ);
+       set_bit(__FM10K_LINK_DOWN, &interface->state);
+
        /* clear the service task disable bit to allow service task to start */
        clear_bit(__FM10K_SERVICE_DISABLE, &interface->state);
        fm10k_service_event_schedule(interface);
@@ -2186,60 +2205,13 @@ static int fm10k_resume(struct pci_dev *pdev)
        /* refresh hw_addr in case it was dropped */
        hw->hw_addr = interface->uc_addr;
 
-       /* 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 err;
-       }
-
-       /* reset statistics starting values */
-       hw->mac.ops.rebind_hw_stats(hw, &interface->stats);
-
-       rtnl_lock();
-
-       err = fm10k_init_queueing_scheme(interface);
-       if (err)
-               goto err_queueing_scheme;
-
-       err = fm10k_mbx_request_irq(interface);
-       if (err)
-               goto err_mbx_irq;
-
-       err = fm10k_hw_ready(interface);
-       if (err)
-               goto err_open;
-
-       err = netif_running(netdev) ? fm10k_open(netdev) : 0;
+       err = fm10k_handle_resume(interface);
        if (err)
-               goto err_open;
-
-       rtnl_unlock();
-
-       /* 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);
+               return err;
 
        netif_device_attach(netdev);
 
        return 0;
-err_open:
-       fm10k_mbx_free_irq(interface);
-err_mbx_irq:
-       fm10k_clear_queueing_scheme(interface);
-err_queueing_scheme:
-       rtnl_unlock();
-
-       return err;
 }
 
 /**
@@ -2259,27 +2231,7 @@ static int fm10k_suspend(struct pci_dev *pdev,
 
        netif_device_detach(netdev);
 
-       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))
-               fm10k_close(netdev);
-
-       fm10k_mbx_free_irq(interface);
-
-       fm10k_clear_queueing_scheme(interface);
-
-       rtnl_unlock();
+       fm10k_prepare_suspend(interface);
 
        err = pci_save_state(pdev);
        if (err)