diff options
| author |   Steve Hodgson <shodgson@solarflare.com> | 2010-06-01 11:17:24 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-06-02 02:21:05 -0700 |
| commit | 319ba649af30321ea221740833785b46e1fe6af3 (patch) | |
| tree | cc31c48c61fe42c3c4f7e516647fd19289eb9e5d /drivers/net/sfc | |
| parent | sfc: Rename struct efx_mcdi_phy_cfg to efx_mcdi_phy_data (diff) | |
| download | linux-dev-319ba649af30321ea221740833785b46e1fe6af3.tar.xz linux-dev-319ba649af30321ea221740833785b46e1fe6af3.zip | |
sfc: Reschedule any resets scheduled inside efx_pm_freeze()
efx_pm_freeze() sets efx->state = STATE_FINI, which means
efx_reset_work() will abort any scheduled resets.
efx_pm_thaw() should reschedule efx_reset_work() again,
since a freeze/thaw will not have reset the hardware.
This bug was spotted by inspection - there is no real world example of
this happening.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc')
| -rw-r--r-- | drivers/net/sfc/efx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 156460527231..0319000379e1 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c @@ -1886,6 +1886,9 @@ static void efx_reset_work(struct work_struct *data) { struct efx_nic *efx = container_of(data, struct efx_nic, reset_work); + if (efx->reset_pending == RESET_TYPE_NONE) + return; + /* If we're not RUNNING then don't reset. Leave the reset_pending * flag set so that efx_pci_probe_main will be retried */ if (efx->state != STATE_RUNNING) { @@ -2332,6 +2335,9 @@ static int efx_pm_thaw(struct device *dev) efx->type->resume_wol(efx); + /* Reschedule any quenched resets scheduled during efx_pm_freeze() */ + queue_work(reset_workqueue, &efx->reset_work); + return 0; } |