Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ca2b46d authored by Jon Cooper's avatar Jon Cooper Committed by David S. Miller
Browse files

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: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a531400

drivers/net/ethernet/sfc/mcdi.c

+5 −2
Original line number Diff line number Diff line
@@ -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,