On Thu, 2013-04-11 at 16:25 -0400, Steven Rostedt wrote:
> 3.6.11.2 stable review patch.
> If anyone has any objections, please let me know.
>
> ------------------
>
> From: Daniel Pieczko <dpieczko@xxxxxxxxxxxxxx>
>
> [ Upstream commit c2f3b8e3a44b6fe9e36704e30157ebe1a88c08b1 ]
>
> The assertion of netif_device_present() at the top of
> efx_hard_start_xmit() may fail if we don't do this.
You should also cherry-pick commit 35205b211c8d 'sfc: Disable soft
interrupt handling during efx_device_detach_sync()' on top of this.
Ben.
> Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
> Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
> ---
> drivers/net/ethernet/sfc/efx.c | 4 ++--
> drivers/net/ethernet/sfc/efx.h | 13 +++++++++++++
> drivers/net/ethernet/sfc/selftest.c | 2 +-
> 3 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
> index 65a8d49..073fd60 100644
> --- a/drivers/net/ethernet/sfc/efx.c
> +++ b/drivers/net/ethernet/sfc/efx.c
> @@ -2224,7 +2224,7 @@ int efx_reset(struct efx_nic *efx, enum reset_type method)
> netif_info(efx, drv, efx->net_dev, "resetting (%s)\n",
> RESET_TYPE(method));
>
> - netif_device_detach(efx->net_dev);
> + efx_device_detach_sync(efx);
> efx_reset_down(efx, method);
>
> rc = efx->type->reset(efx, method);
> @@ -2719,7 +2719,7 @@ static int efx_pm_freeze(struct device *dev)
>
> efx->state = STATE_FINI;
>
> - netif_device_detach(efx->net_dev);
> + efx_device_detach_sync(efx);
>
> efx_stop_all(efx);
> efx_stop_interrupts(efx, false);
> diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
> index 70755c9..320cf7b 100644
> --- a/drivers/net/ethernet/sfc/efx.h
> +++ b/drivers/net/ethernet/sfc/efx.h
> @@ -162,4 +162,17 @@ extern void efx_link_status_changed(struct efx_nic *efx);
> extern void efx_link_set_advertising(struct efx_nic *efx, u32);
> extern void efx_link_set_wanted_fc(struct efx_nic *efx, u8);
>
> +static inline void efx_device_detach_sync(struct efx_nic *efx)
> +{
> + struct net_device *dev = efx->net_dev;
> +
> + /* Lock/freeze all TX queues so that we can be sure the
> + * TX scheduler is stopped when we're done and before
> + * netif_device_present() becomes false.
> + */
> + netif_tx_lock(dev);
> + netif_device_detach(dev);
> + netif_tx_unlock(dev);
> +}
> +
> #endif /* EFX_EFX_H */
> diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
> index 96068d1..57dec37 100644
> --- a/drivers/net/ethernet/sfc/selftest.c
> +++ b/drivers/net/ethernet/sfc/selftest.c
> @@ -721,7 +721,7 @@ int efx_selftest(struct efx_nic *efx, struct efx_self_tests *tests,
> /* Detach the device so the kernel doesn't transmit during the
> * loopback test and the watchdog timeout doesn't fire.
> */
> - netif_device_detach(efx->net_dev);
> + efx_device_detach_sync(efx);
>
> if (efx->type->test_chip) {
> rc_reset = efx->type->test_chip(efx, tests);
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html