net: fec: quiesce packet processing before stopping device in fec_suspend()

fec_suspend() calls fec_stop() to stop the transmit ring while the
transmit packet processing is still active.  This can lead to the
transmit queue being restarted by an intervening packet queued for
transmission, or by the tx quirk timer expiring.

Fix this by disabling NAPI first, which will ensure that the NAPI
handlers are not running.  Then, take the transmit lock before
detaching the netif device.  This ensures that there are no races
with the transmit path - and also ensures that the watchdog won't
fire.

We can then safely stop the ethernet device itself, knowing that the
rest of the driver is safely shut down.

On resume, we bring the device back up in reverse order - we restart
the device, reattach the device (under the tx lock), and then enable
the NAPI handlers.

We also need to adjust the close function to cope with this new
sequence, so that it's possible to cleanly close down the driver
after the hardware fails to resume (eg, due to the regulator_enable()
or pinctrl calls in the resume path returning an error.)

Acked-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 25a9f7fb30dab0fdb3a938fef2568419b579114e..fc9f6f465e7a0f95f84224ad1fe45c1d0fbd97ec 100644 (file)
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -2211,10 +2211,11 @@ fec_enet_close(struct net_device *ndev)
 
        phy_stop(fep->phy_dev);
 
-       napi_disable(&fep->napi);
-       netif_tx_disable(ndev);
-       if (netif_device_present(ndev))
+       if (netif_device_present(ndev)) {
+               napi_disable(&fep->napi);
+               netif_tx_disable(ndev);
                fec_stop(ndev);
+       }
 
        phy_disconnect(fep->phy_dev);
        fep->phy_dev = NULL;
@@ -2701,8 +2702,11 @@ fec_suspend(struct device *dev)
        rtnl_lock();
        if (netif_running(ndev)) {
                phy_stop(fep->phy_dev);
-               fec_stop(ndev);
+               napi_disable(&fep->napi);
+               netif_tx_lock_bh(ndev);
                netif_device_detach(ndev);
+               netif_tx_unlock_bh(ndev);
+               fec_stop(ndev);
        }
        rtnl_unlock();
 
@@ -2735,12 +2739,10 @@ fec_resume(struct device *dev)
 
        rtnl_lock();
        if (netif_running(ndev)) {
-               napi_disable(&fep->napi);
-               netif_tx_lock_bh(ndev);
                fec_restart(ndev, fep->full_duplex);
+               netif_tx_lock_bh(ndev);
                netif_device_attach(ndev);
                netif_tx_unlock_bh(ndev);
-               netif_device_attach(ndev);
                napi_enable(&fep->napi);
                phy_start(fep->phy_dev);
        }