net: phy: factor out provider part from mdio_bus.c
Heiner Kallweit
maintainerPATCH v2 1/1 net: phy: factor out provider part from mdio_bus.c
After 52358dd63e34 ("net: phy: remove function stubs") there's a problem if CONFIG_MDIO_BUS is set, but CONFIG_PHYLIB is not. mdiobus_scan() uses phylib functions like get_phy_device(). Bringing back the stub wouldn't make much sense, because it would allow to compile mdiobus_scan(), but the function would be unusable. The stub returned NULL, and we have the following in mdiobus_scan():
phydev = get_phy_device(bus, addr, c45);
if (IS_ERR(phydev))
return phydev;So calling mdiobus_scan() w/o CONFIG_PHYLIB would cause a crash later in mdiobus_scan(). In general the PHYLIB functionality isn't optional here. Consequently, MDIO bus providers depend on PHYLIB.
Therefore factor it out and build it together with the libphy core modules. In addition make all MDIO bus providers under /drivers/net/mdio depend on PHYLIB. Same applies to enetc MDIO bus provider. Note that PHYLIB selects MDIO_DEVRES, therefore we can omit this here.
---
v2:
- rebased
--- drivers/net/ethernet/freescale/enetc/Kconfig | 3 +- drivers/net/mdio/Kconfig | 16 +- drivers/net/phy/Makefile | 2 +- drivers/net/phy/mdio_bus.c | 462 +----------------- drivers/net/phy/mdio_bus_provider.c | 484 +++++++++++++++++++ include/linux/phy.h | 1 + 6 files changed, 494 insertions(+), 474 deletions(-) create mode 100644 drivers/net/phy/mdio_bus_provider.c
drivers/net/ethernet/freescale/enetc/Kconfig +1 -2
@@ -73,8 +73,7 @@ config FSL_ENETC_IERB config FSL_ENETC_MDIO tristate "ENETC MDIO driver" - depends on PCI && MDIO_BUS - select MDIO_DEVRES + depends on PCI && PHYLIB help This driver supports NXP ENETC Central MDIO controller as a PCIe physical function (PF) device.
drivers/net/mdio/Kconfig +5 -11
@@ -19,30 +19,25 @@ config MDIO_BUS reflects whether the mdio_bus/mdio_device code is built as a loadable module or built-in. +if PHYLIB + config FWNODE_MDIO - def_tristate PHYLIB - depends on (ACPI || OF) || COMPILE_TEST + def_tristate (ACPI || OF) || COMPILE_TEST select FIXED_PHY help FWNODE MDIO bus (Ethernet PHY) accessors config OF_MDIO - def_tristate PHYLIB - depends on OF - depends on PHYLIB + def_tristate OF select FIXED_PHY help OpenFirmware MDIO bus (Ethernet PHY) accessors config ACPI_MDIO - def_tristate PHYLIB - depends on ACPI - depends on PHYLIB + def_tristate ACPI help ACPI MDIO bus (Ethernet PHY) accessors -if MDIO_BUS - config MDIO_DEVRES tristate
@@ -57,7 +52,6 @@ config MDIO_SUN4I config MDIO_XGENE tristate "APM X-Gene SoC MDIO bus controller" depends on ARCH_XGENE || COMPILE_TEST - depends on PHYLIB help This module provides a driver for the MDIO busses found in the APM X-Gene SoC's.
drivers/net/phy/Makefile +1 -1
@@ -3,7 +3,7 @@ libphy-y := phy.o phy-c45.o phy-core.o phy_device.o \ linkmode.o phy_link_topology.o \ - phy_package.o phy_caps.o + phy_package.o phy_caps.o mdio_bus_provider.o mdio-bus-y += mdio_bus.o mdio_device.o ifdef CONFIG_MDIO_DEVICE
drivers/net/phy/mdio_bus.c +2 -460
512 lines not on this page · raw message
drivers/net/phy/mdio_bus_provider.c new file +484 -0
484 lines not on this page · raw message
include/linux/phy.h +1 -0
@@ -2062,6 +2062,7 @@ int __phy_hwtstamp_set(struct phy_device *phydev, struct netlink_ext_ack *extack);extern const struct bus_type mdio_bus_type; +extern const struct class mdio_bus_class;struct mdio_board_info {const char *bus_id;
Signature · 1 line
2.49.0
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 Tue, 29 Apr 2025 08:04:46 +0200 you wrote:
After
52358dd63e34("net: phy: remove function stubs") there's a problem ifCONFIG_MDIO_BUSis set, butCONFIG_PHYLIBis not.mdiobus_scan()uses phylib functions likeget_phy_device(). Bringing back the stub wouldn't make much sense, because it would allow to compilemdiobus_scan(), but the function would be unusable. The stub returned NULL, and we have the following inmdiobus_scan():[...]
Here is the summary with links:
- [v2,net-next] net: phy: factor out provider part from mdio_bus.c
https://git.kernel.org/netdev/net-next/c/a3e1c0ad8357
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html