net: phy: fix circular LEDS_CLASS dependencies
Subsystems (3)
PATCH 1/1 net: phy: fix circular LEDS_CLASS dependencies
From: Arnd Bergmann <[email protected]>
The CONFIG_PHYLIB symbol is selected by a number of device drivers that need PHY support, but it now has a dependency on CONFIG_LEDS_CLASS, which may not be enabled, causing build failures.
Avoid the risk of missing and circular dependencies by guarding the phylib LED support itself in another Kconfig symbol that can only be enabled if the dependency is met.
This could be made a hidden symbol and always enabled when both CONFIG_OF and CONFIG_LEDS_CLASS are reachable from the phylib, but there may be an advantage in having users see this option when they have a misconfigured kernel without built-in LED support.
--- drivers/net/phy/Kconfig | 9 ++++++++- drivers/net/phy/phy_device.c | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/net/phy/Kconfig +8 -1
@@ -18,7 +18,6 @@ menuconfig PHYLIB depends on NETDEVICES select MDIO_DEVICE select MDIO_DEVRES - depends on LEDS_CLASS || LEDS_CLASS=n help Ethernet controllers are usually attached to PHY devices. This option provides infrastructure for
@@ -45,6 +44,14 @@ config LED_TRIGGER_PHY <Speed in megabits>Mbps OR <Speed in gigabits>Gbps OR link for any speed known to the PHY. +config PHYLIB_LEDS + bool "Support probing LEDs from device tree" + depends on LEDS_CLASS=y || LEDS_CLASS=PHYLIB + depends on OF + default y + help + When LED class support is enabled, phylib can automatically + probe LED setting from device tree. config FIXED_PHY tristate "MDIO Bus/PHY emulation with fixed speed/link PHYs"
drivers/net/phy/phy_device.c +2 -1
@@ -3284,7 +3284,8 @@ static int phy_probe(struct device *dev)/* Get the LEDs from the device tree, and instantiate standard * LEDs for them. */ - err =of_phy_leds (phydev); +if (IS_ENABLED (CONFIG_PHYLIB_LEDS )) + err =of_phy_leds (phydev); out:/* Re-assert the reset signal on error */
Signature · 1 line
2.39.2
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The
CONFIG_PHYLIBsymbol is selected by a number of device drivers that need PHY support, but it now has a dependency onCONFIG_LEDS_CLASS, which may not be enabled, causing build failures.Avoid the risk of missing and circular dependencies by guarding the phylib LED support itself in another
Kconfigsymbol that can only be enabled if the dependency is met.
Quoted 7 lines
This could be made a hidden symbol and always enabled when both
CONFIG_OFandCONFIG_LEDS_CLASSare reachable from the phylib, but there may be an advantage in having users see this option when they have a misconfigured kernel without built-in LED support.Fixes 01e5b728e9e4 ("net: phy: Add a binding for PHY LEDs")Signed-off-by Arnd Bergmann <[email protected]>
This is for net-next.
Andrew
Jakub Kicinski
maintainerQuoted 6 lines · On Thu, 20 Apr 2023 10:45:51 +0200 Arnd Bergmann wrote:
From: Arnd Bergmann <[email protected]>
The
CONFIG_PHYLIBsymbol is selected by a number of device drivers that need PHY support, but it now has a dependency onCONFIG_LEDS_CLASS, which may not be enabled, causing build failures.
Quoted 8 lines
Avoid the risk of missing and circular dependencies by guarding the phylib LED support itself in another
Kconfigsymbol that can only be enabled if the dependency is met.This could be made a hidden symbol and always enabled when both
CONFIG_OFandCONFIG_LEDS_CLASSare reachable from the phylib, but there may be an advantage in having users see this option when they have a misconfigured kernel without built-in LED support.
The problem is breaking build for the config I use in testing, so let me apply without waiting full review period. Thanks!
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 11 lines · On Thu, 20 Apr 2023 10:45:51 +0200 you wrote:
From: Arnd Bergmann <[email protected]>
The
CONFIG_PHYLIBsymbol is selected by a number of device drivers that need PHY support, but it now has a dependency onCONFIG_LEDS_CLASS, which may not be enabled, causing build failures.Avoid the risk of missing and circular dependencies by guarding the phylib LED support itself in another
Kconfigsymbol that can only be enabled if the dependency is met.[...]
Here is the summary with links:
- net: phy: fix circular LEDS_CLASS dependencies
https://git.kernel.org/netdev/net-next/c/4bb7aac70b5d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html