sfc: SFT9001/SFN4111T: Check PHY boot status during board initialisation
During SFN4111T initialisation, check whether the PHY boot status indicates a bad firmware checksum. If so, prepare to reflash rather than continuing with normal initialisation. Remove redundant PHY boot status check from tenxpress_phy_init(). Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
7b065f91fa
commit
190dbcfd68
@ -399,6 +399,7 @@ static struct i2c_board_info sfn4111t_r5_hwmon_info = {
|
||||
|
||||
int sfn4111t_init(struct efx_nic *efx)
|
||||
{
|
||||
int i = 0;
|
||||
int rc;
|
||||
|
||||
efx->board_info.hwmon_client =
|
||||
@ -417,13 +418,20 @@ int sfn4111t_init(struct efx_nic *efx)
|
||||
if (rc)
|
||||
goto fail_hwmon;
|
||||
|
||||
if (efx->phy_mode & PHY_MODE_SPECIAL) {
|
||||
efx_stats_disable(efx);
|
||||
sfn4111t_reset(efx);
|
||||
}
|
||||
|
||||
return 0;
|
||||
do {
|
||||
if (efx->phy_mode & PHY_MODE_SPECIAL) {
|
||||
/* PHY may not generate a 156.25 MHz clock and MAC
|
||||
* stats fetch will fail. */
|
||||
efx_stats_disable(efx);
|
||||
sfn4111t_reset(efx);
|
||||
}
|
||||
rc = sft9001_wait_boot(efx);
|
||||
if (rc == 0)
|
||||
return 0;
|
||||
efx->phy_mode = PHY_MODE_SPECIAL;
|
||||
} while (rc == -EINVAL && ++i < 2);
|
||||
|
||||
device_remove_file(&efx->pci_dev->dev, &dev_attr_phy_flash_cfg);
|
||||
fail_hwmon:
|
||||
i2c_unregister_device(efx->board_info.hwmon_client);
|
||||
return rc;
|
||||
|
Reference in New Issue
Block a user