[PATCH net-next 2/5] net: phy: aquantia: allow firmware loading after aqr_wait_reset_complete
From: Hans-Frieder Vogt <hidden>
Date: 2024-09-11 19:24:38
Subsystem:
ethernet phy library, networking drivers, the rest · Maintainers:
Andrew Lunn, Heiner Kallweit, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Allow firmware loading from nvmem or fs. As discussed in https://lore.kernel.org/netdev/20240806112747.soclko5vex2f2c64@skbuf/ (local) the return value -ETIMEDOUT (returned by aqr_wait_reset_complete when the firmware version is still 0 after 2s) needs to be let through. Otherwise, this will prevent loading of an external firmware. Signed-off-by: Hans-Frieder Vogt <redacted> --- drivers/net/phy/aquantia/aquantia_firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/phy/aquantia/aquantia_firmware.c b/drivers/net/phy/aquantia/aquantia_firmware.c
index 524627a36c6f..090fcc9a3413 100644
--- a/drivers/net/phy/aquantia/aquantia_firmware.c
+++ b/drivers/net/phy/aquantia/aquantia_firmware.c@@ -354,7 +354,7 @@ int aqr_firmware_load(struct phy_device *phydev) int ret; ret = aqr_wait_reset_complete(phydev); - if (ret) + if (ret != -ETIMEDOUT) return ret; /* Check if the firmware is not already loaded by pooling --
2.45.2