diff options
| author | Jon Cooper <jcooper@solarflare.com> | 2017-02-08 16:51:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-09 16:47:53 -0500 |
| commit | 0ca2b46dbb645c1aa23eda6f5ac49a7be31ac87d (patch) | |
| tree | c9264574c790e8221f3d6e706060c908ba452160 /drivers/net/ethernet/sfc | |
| parent | 8a531400623c52b09bc3b718e9a6142eb60a11a7 (diff) | |
| download | linux-0ca2b46dbb645c1aa23eda6f5ac49a7be31ac87d.tar.gz linux-0ca2b46dbb645c1aa23eda6f5ac49a7be31ac87d.tar.xz | |
sfc: call mcdi_reboot_detected() when MC reboots during an MCDI command
This function wasn't being called in this particular case when the MC
reboots. This caused resource reallocations to not be handled properly
and often ended up disabling the interface.
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc')
| -rw-r--r-- | drivers/net/ethernet/sfc/mcdi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c index 24b271b9c260..fae647dde0ee 100644 --- a/drivers/net/ethernet/sfc/mcdi.c +++ b/drivers/net/ethernet/sfc/mcdi.c @@ -716,8 +716,11 @@ static int _efx_mcdi_rpc_finish(struct efx_nic *efx, unsigned int cmd, if (cmd == MC_CMD_REBOOT && rc == -EIO) { /* Don't reset if MC_CMD_REBOOT returns EIO */ } else if (rc == -EIO || rc == -EINTR) { - netif_err(efx, hw, efx->net_dev, "MC fatal error %d\n", - -rc); + netif_err(efx, hw, efx->net_dev, "MC reboot detected\n"); + netif_dbg(efx, hw, efx->net_dev, "MC rebooted during command %d rc %d\n", + cmd, -rc); + if (efx->type->mcdi_reboot_detected) + efx->type->mcdi_reboot_detected(efx); efx_schedule_reset(efx, RESET_TYPE_MC_FAILURE); } else if (proxy_handle && (rc == -EPROTO) && efx_mcdi_get_proxy_handle(efx, hdr_len, data_len, |