sfc: do not device_attach if a reset is pending

commit 9c568fd8844ec3986eb19b0b5d97536243d10d46 upstream.

efx_start_all can return without initialising queues as a reset is pending.
 This means that when netif_device_attach is called, the kernel can start
 sending traffic without having an initialised TX queue to send to.
This patch avoids this by not calling netif_device_attach if there is a
 pending reset.

Fixes: e283546c0465 ("sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)")
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.16:
 - Drop changes in ef10.c and ef10_sriov.c
 - Adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 1e274045970fa011c6dacb6baeb77db95178b164..4dd1971fd366054423827b2888fcd0beea836029 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -833,7 +833,7 @@ out:
                efx_schedule_reset(efx, RESET_TYPE_DISABLE);
        } else {
                efx_start_all(efx);
-               netif_device_attach(efx->net_dev);
+               efx_device_attach_if_not_resetting(efx);
        }
        return rc;
 
@@ -2036,6 +2036,8 @@ static int efx_net_open(struct net_device *net_dev)
        efx_link_status_changed(efx);
 
        efx_start_all(efx);
+       if (efx->state == STATE_DISABLED || efx->reset_pending)
+               netif_device_detach(efx->net_dev);
        efx_selftest_async_start(efx);
        return 0;
 }
@@ -2106,7 +2108,7 @@ static int efx_change_mtu(struct net_device *net_dev, int new_mtu)
        mutex_unlock(&efx->mac_lock);
 
        efx_start_all(efx);
-       netif_device_attach(efx->net_dev);
+       efx_device_attach_if_not_resetting(efx);
        return 0;
 }
 
@@ -2455,7 +2457,7 @@ out:
                efx->state = STATE_DISABLED;
        } else {
                netif_dbg(efx, drv, efx->net_dev, "reset complete\n");
-               netif_device_attach(efx->net_dev);
+               efx_device_attach_if_not_resetting(efx);
        }
        return rc;
 }
@@ -3035,7 +3037,7 @@ static int efx_pm_thaw(struct device *dev)
 
                efx_start_all(efx);
 
-               netif_device_attach(efx->net_dev);
+               efx_device_attach_if_not_resetting(efx);
 
                efx->state = STATE_READY;
 

diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
index 99032581336f8297e735bfd21a6bb83c57d9ba4e..8c82a996b9f0c4df7950ce737a07b53e0c04e52c 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.h
+++ b/drivers/net/ethernet/sfc/efx.h
@@ -247,4 +247,10 @@ static inline void efx_device_detach_sync(struct efx_nic *efx)
        netif_tx_unlock_bh(dev);
 }
 
+static inline void efx_device_attach_if_not_resetting(struct efx_nic *efx)
+{
+       if ((efx->state != STATE_DISABLED) && !efx->reset_pending)
+               netif_device_attach(efx->net_dev);
+}
+
 #endif /* EFX_EFX_H */

diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
index b876e3847b1a2550e9c8e406d9ccb471415786cf..0516b24f76e49ddd3024653ac5aa5af31d9f6d81 100644 (file)
--- a/drivers/net/ethernet/sfc/selftest.c
+++ b/drivers/net/ethernet/sfc/selftest.c
@@ -749,7 +749,7 @@ int efx_selftest(struct efx_nic *efx, struct efx_self_tests *tests,
        __efx_reconfigure_port(efx);
        mutex_unlock(&efx->mac_lock);
 
-       netif_device_attach(efx->net_dev);
+       efx_device_attach_if_not_resetting(efx);
 
        return rc_test;
 }