sfc_ef100: actually perform resets
In ef100_reset(), make the MCDI call to do the reset. Also, do a reset at start-of-day during probe, to put the function in a clean state. Signed-off-by: Edward Cree <ecree@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
d802b0ae65
commit
4e5675bbab
|
@ -332,6 +332,10 @@ static int ef100_reset(struct efx_nic *efx, enum reset_type reset_type)
|
||||||
__clear_bit(reset_type, &efx->reset_pending);
|
__clear_bit(reset_type, &efx->reset_pending);
|
||||||
rc = dev_open(efx->net_dev, NULL);
|
rc = dev_open(efx->net_dev, NULL);
|
||||||
} else if (reset_type == RESET_TYPE_ALL) {
|
} else if (reset_type == RESET_TYPE_ALL) {
|
||||||
|
rc = efx_mcdi_reset(efx, reset_type);
|
||||||
|
if (rc)
|
||||||
|
return rc;
|
||||||
|
|
||||||
netif_device_attach(efx->net_dev);
|
netif_device_attach(efx->net_dev);
|
||||||
|
|
||||||
rc = dev_open(efx->net_dev, NULL);
|
rc = dev_open(efx->net_dev, NULL);
|
||||||
|
@ -466,6 +470,11 @@ static int ef100_probe_main(struct efx_nic *efx)
|
||||||
}
|
}
|
||||||
if (rc)
|
if (rc)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
/* Reset (most) configuration for this function */
|
||||||
|
rc = efx_mcdi_reset(efx, RESET_TYPE_ALL);
|
||||||
|
if (rc)
|
||||||
|
goto fail;
|
||||||
|
|
||||||
rc = efx_ef100_init_datapath_caps(efx);
|
rc = efx_ef100_init_datapath_caps(efx);
|
||||||
if (rc < 0)
|
if (rc < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
Loading…
Reference in New Issue