Skip to contentSkip to conversation

net: phy: aquantia: check for NVMEM deferral

PATCH Applied Robert Marko 3 participants 3 messages Nov 27, 2025 – Nov 29, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: phy: aquantia: check for NVMEM deferral

Currently, if NVMEM provider is probed later than Aquantia, loading the firmware will fail with -EINVAL.

To fix this, simply check for -EPROBE_DEFER when NVMEM is attempted and return it.

Fixes e93984ebc1c8 ("net: phy: aquantia: add firmware load support")
---
 drivers/net/phy/aquantia/aquantia_firmware.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/aquantia/aquantia_firmware.c +1 -1
index bbbcc9736b00..569256152689 100644
@@ -369,7 +369,7 @@ int aqr_firmware_load(struct phy_device *phydev)
 		 * assume that, and load a new image.
 		 */
 		ret = aqr_firmware_load_nvmem(phydev);
-		if (!ret)
+		if (ret == -EPROBE_DEFER || !ret)
 			return ret;
 
 		ret = aqr_firmware_load_fs(phydev);
Signature · 1 line
2.52.0
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Robert Marko

Currently, if NVMEM provider is probed later than Aquantia, loading the firmware will fail with -EINVAL.

To fix this, simply check for -EPROBE_DEFER when NVMEM is attempted and return it.

Fixes e93984ebc1c8 ("net: phy: aquantia: add firmware load support")

As aqr_firmware_load() is called from the probe function, returning -EPROBE_DEFER from here is fine.

Thanks!

Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
#2 lore raw
In reply to Robert Marko
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:

Quoted 10 lines · On Thu, 27 Nov 2025 12:44:35 +0100 you wrote:

Currently, if NVMEM provider is probed later than Aquantia, loading the firmware will fail with -EINVAL.

To fix this, simply check for -EPROBE_DEFER when NVMEM is attempted and return it.

Fixes e93984ebc1c8 ("net: phy: aquantia: add firmware load support")

[...]

Here is the summary with links:
- [net] net: phy: aquantia: check for NVMEM deferral

    https://git.kernel.org/netdev/net/c/a6c121a2432e

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html