net: phy: Don't register LEDs for genphy
Subsystems (3)
PATCH 1/1 net: phy: Don't register LEDs for genphy
If a PHY has no driver, the genphy driver is probed/removed directly in phy_attach/detach. If the PHY's ofnode has an "leds" subnode, then the LEDs will be (un)registered when probing/removing the genphy driver. This could occur if the leds are for a non-generic driver that isn't loaded for whatever reason. Synchronously removing the PHY device in phy_detach leads to the following deadlock:
rtnl_lock()ndo_close()
...
phy_detach()
phy_remove()
phy_leds_unregister()
led_classdev_unregister()
led_trigger_set()
netdev_trigger_deactivate()
unregister_netdevice_notifier()
rtnl_lock()There is a corresponding deadlock on the open/register side of things (and that one is reported by lockdep), but it requires a race while this one is deterministic. Regular drivers do not have this problem since they are probed asynchronously (without RTNL held).
Generic PHYs do not support LEDs anyway, so don't bother registering them.
---
This is the net-next version of [1] that fixes the conflict with commit 42ed7f7e94da ("net: phy: remove phy_driver_is_genphy_10g").
[1] https://lore.kernel.org/netdev/[email protected]
drivers/net/phy/phy_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/phy/phy_device.c +2 -2
@@ -3502,7 +3502,7 @@ static int phy_probe(struct device *dev)/* Get the LEDs from the device tree, and instantiate standard * LEDs for them. */ -if (IS_ENABLED (CONFIG_PHYLIB_LEDS )) +if (IS_ENABLED (CONFIG_PHYLIB_LEDS ) && !phy_driver_is_genphy (phydev)) err =of_phy_leds (phydev); out:
@@ -3519,7 +3519,7 @@ static int phy_remove(struct device *dev)cancel_delayed_work_sync (&phydev->state_queue); -if (IS_ENABLED (CONFIG_PHYLIB_LEDS )) +if (IS_ENABLED (CONFIG_PHYLIB_LEDS ) && !phy_driver_is_genphy (phydev))phy_leds_unregister (phydev); phydev->state =PHY_DOWN ;
Signature · 1 line
2.35.1.1320.gc452695387.dirty
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Thu, 10 Jul 2025 16:14:53 -0400 you wrote:
If a PHY has no driver, the genphy driver is probed/removed directly in phy_attach/detach. If the PHY's ofnode has an "leds" subnode, then the LEDs will be (un)registered when probing/removing the genphy driver. This could occur if the leds are for a non-generic driver that isn't loaded for whatever reason. Synchronously removing the PHY device in
phy_detachleads to the following deadlock:[...]
Here is the summary with links:
- [net-next] net: phy: Don't register LEDs for genphy
https://git.kernel.org/netdev/net-next/c/a44312d58e78
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html