diff options
| author | Daniel Pieczko <dpieczko@solarflare.com> | 2013-09-18 11:16:24 +0200 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-09-20 18:18:33 +0200 |
| commit | dfdaa95c7abc3dc7acf44b0c4aeac4c3c44966d6 (patch) | |
| tree | 7670f9db2afeb1857f6a69e2ca65e7a4f2b0e8ba /drivers/net/ethernet/sfc/mcdi.c | |
| parent | Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cma... (diff) | |
| download | linux-dfdaa95c7abc3dc7acf44b0c4aeac4c3c44966d6.tar.xz linux-dfdaa95c7abc3dc7acf44b0c4aeac4c3c44966d6.zip | |
sfc: Wait for MC reboot to complete before scheduling driver reset
Scheduling a reset following an MC reboot event before waiting for
reboot to complete results in a race that can lead to a state where
must_realloc_vis is false in efx_ef10_fini_dmaq() but the VIs have
been destroyed during the MC reboot.
To avoid MC errors when trying to remove VIs that do not exist, wait
for the MC reboot to complete before scheduling the reset.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/mcdi.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/mcdi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c index 128d7cdf9eb2..73143ece4832 100644 --- a/drivers/net/ethernet/sfc/mcdi.c +++ b/drivers/net/ethernet/sfc/mcdi.c @@ -800,9 +800,6 @@ static void efx_mcdi_ev_death(struct efx_nic *efx, int rc) } else { int count; - /* Nobody was waiting for an MCDI request, so trigger a reset */ - efx_schedule_reset(efx, RESET_TYPE_MC_FAILURE); - /* Consume the status word since efx_mcdi_rpc_finish() won't */ for (count = 0; count < MCDI_STATUS_DELAY_COUNT; ++count) { if (efx_mcdi_poll_reboot(efx)) @@ -810,6 +807,9 @@ static void efx_mcdi_ev_death(struct efx_nic *efx, int rc) udelay(MCDI_STATUS_DELAY_US); } mcdi->new_epoch = true; + + /* Nobody was waiting for an MCDI request, so trigger a reset */ + efx_schedule_reset(efx, RESET_TYPE_MC_FAILURE); } spin_unlock(&mcdi->iface_lock); |