net: phy: make phy_package a separate module
Subsystems (5)
Heiner Kallweit
maintainercover net: phy: make phy_package a separate module
Only a handful of PHY drivers needs the PHY package functionality, therefore make it a separate module which is built only if needed.
Heiner Kallweit (3):
net: phy: move __phy_package_[read|write]_mmd to phy_package.c
net: phy: make phy_package a separate module
net: phy: add Kconfig symbol PHY_PACKAGE
drivers/net/phy/Kconfig | 6 +++ drivers/net/phy/Makefile | 3 +- drivers/net/phy/mediatek/Kconfig | 1 + drivers/net/phy/phy-core.c | 75 +++---------------------------- drivers/net/phy/phy_package.c | 71 ++++++++++++++++++++++++++++- drivers/net/phy/phylib-internal.h | 6 ++- drivers/net/phy/qcom/Kconfig | 1 + 7 files changed, 91 insertions(+), 72 deletions(-)
Signature · 1 line
2.49.0
Heiner Kallweit
maintainerPATCH 1/3 net: phy: move __phy_package_[read|write]_mmd to phy_package.c
Move both functions to phy_package.c, so that phy_core.c no longer has a dependency on phy_package.c (phy_package_address).
--- drivers/net/phy/phy-core.c | 75 +++---------------------------- drivers/net/phy/phy_package.c | 68 +++++++++++++++++++++++++++- drivers/net/phy/phylib-internal.h | 6 ++- 3 files changed, 78 insertions(+), 71 deletions(-)
drivers/net/phy/phy-core.c +6 -69
@@ -375,8 +375,8 @@ static void mmd_phy_indirect(struct mii_bus *bus, int phy_addr, int devad, devad | MII_MMD_CTRL_NOINCR); } -static int mmd_phy_read (struct mii_bus *bus,int phy_addr,bool is_c45, -int devad,u32 regnum) +int mmd_phy_read (struct mii_bus *bus,int phy_addr,bool is_c45, +int devad,u32 regnum) {if (is_c45)return __mdiobus_c45_read (bus, phy_addr, devad, regnum);
@@ -385,9 +385,10 @@ static int mmd_phy_read(struct mii_bus *bus, int phy_addr, bool is_c45,/* Read the content of the MMD's selected register */ return __mdiobus_read (bus, phy_addr,MII_MMD_DATA ); } +EXPORT_SYMBOL_GPL (mmd_phy_read); -static int mmd_phy_write (struct mii_bus *bus,int phy_addr,bool is_c45, -int devad,u32 regnum,u16 val) +int mmd_phy_write (struct mii_bus *bus,int phy_addr,bool is_c45, +int devad,u32 regnum,u16 val) {if (is_c45)return __mdiobus_c45_write (bus, phy_addr, devad, regnum, val);
@@ -396,6 +397,7 @@ static int mmd_phy_write(struct mii_bus *bus, int phy_addr, bool is_c45,/* Write the data into MMD's selected register */ return __mdiobus_write (bus, phy_addr,MII_MMD_DATA , val); } +EXPORT_SYMBOL_GPL (mmd_phy_write);/** * __phy_read_mmd - Convenience function for reading a register
@@ -485,71 +487,6 @@ int phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val) }EXPORT_SYMBOL (phy_write_mmd); -/** -* __phy_package_read_mmd - read MMD reg relative to PHY package base addr -* @phydev: The phy_device struct -* @addr_offset: The offset to be added to PHY package base_addr -* @devad: The MMD to read from -* @regnum: The register on the MMD to read -* -* Convenience helper for reading a register of an MMD on a given PHY -* using the PHY package base address. The base address is added to -* the addr_offset value. -* -* Same calling rules as for __phy_read(); -* -* NOTE: It's assumed that the entire PHY package is either C22 or C45. -*/ -int __phy_package_read_mmd (struct phy_device *phydev, -unsigned int addr_offset,int devad, -u32 regnum) -{ -int addr =phy_package_address (phydev, addr_offset); - -if (addr <0 ) -return addr; - -if (regnum > (u16 )~0 || devad >32 ) -return -EINVAL ; - -return mmd_phy_read (phydev->mdio.bus, addr, phydev->is_c45, devad, - regnum); -} -EXPORT_SYMBOL (__phy_package_read_mmd); - -/** -* __phy_package_write_mmd - write MMD reg relative to PHY package base addr -* @phydev: The phy_device struct -* @addr_offset: The offset to be added to PHY package base_addr -* @devad: The MMD to write to -* @regnum: The register on the MMD to write -* @val: value to write to @regnum -* -* Convenience helper for writing a register of an MMD on a given PHY -* using the PHY package base address. The base address is added to -* the addr_offset value. -* -* Same calling rules as for __phy_write(); -* -* NOTE: It's assumed that the entire PHY package is either C22 or C45. -*/ -int __phy_package_write_mmd (struct phy_device *phydev, -unsigned int addr_offset,int devad, -u32 regnum,u16 val) -{ -int addr =phy_package_address (phydev, addr_offset); - -if (addr <0 ) -return addr; - -if (regnum > (u16 )~0 || devad >32 ) -return -EINVAL ; - -return mmd_phy_write (phydev->mdio.bus, addr, phydev->is_c45, devad, - regnum, val); -} -EXPORT_SYMBOL (__phy_package_write_mmd); -/** * phy_modify_changed - Function for modifying a PHY register * @phydev: the phy_device struct
drivers/net/phy/phy_package.c +67 -1
80 lines not on this page · raw message
drivers/net/phy/phylib-internal.h +5 -1
@@ -7,6 +7,7 @@#define __PHYLIB_INTERNAL_Hstruct phy_device ; +struct mii_bus ;/* * phy_supported_speeds - return all speeds currently supported by a PHY device
@@ -20,7 +21,10 @@ void of_set_phy_timing_role(struct phy_device *phydev);int phy_speed_down_core (struct phy_device *phydev);void phy_check_downshift (struct phy_device *phydev); -int phy_package_address (struct phy_device *phydev,unsigned int addr_offset); +int mmd_phy_read (struct mii_bus *bus,int phy_addr,bool is_c45, +int devad,u32 regnum); +int mmd_phy_write (struct mii_bus *bus,int phy_addr,bool is_c45, +int devad,u32 regnum,u16 val);int genphy_c45_read_eee_adv (struct phy_device *phydev,unsigned long *adv);
Signature · 1 line
2.49.0
Heiner Kallweit
maintainerPATCH 2/3 net: phy: make phy_package a separate module
In reply to Heiner KallweitMake phy_package a separate module, so that this code is only loaded if needed.
--- drivers/net/phy/Makefile | 3 ++- drivers/net/phy/phy_package.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/net/phy/Makefile +2 -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 mdio_bus_provider.o + phy_caps.o mdio_bus_provider.o mdio-bus-y += mdio_bus.o mdio_device.o ifdef CONFIG_PHYLIB
@@ -19,6 +19,7 @@ obj-$(CONFIG_MDIO_BUS) += mdio-bus.o obj-$(CONFIG_PHYLINK) += phylink.o obj-$(CONFIG_PHYLIB) += libphy.o obj-$(CONFIG_PHYLIB) += mdio_devres.o +obj-$(CONFIG_PHYLIB) += phy_package.o obj-$(CONFIG_NETWORK_PHY_TIMESTAMPING) += mii_timestamper.o
drivers/net/phy/phy_package.c +3 -0
@@ -414,3 +414,6 @@ int devm_of_phy_package_join(struct device *dev, struct phy_device *phydev,return ret; }EXPORT_SYMBOL_GPL (devm_of_phy_package_join); + +MODULE_DESCRIPTION ("PHY package support" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
2.49.0
Heiner Kallweit
maintainerPATCH 3/3 net: phy: add Kconfig symbol PHY_PACKAGE
In reply to Heiner KallweitOnly a handful of PHY drivers needs the PHY package functionality, therefore build the module only if needed.
--- drivers/net/phy/Kconfig | 6 ++++++ drivers/net/phy/Makefile | 2 +- drivers/net/phy/mediatek/Kconfig | 1 + drivers/net/phy/qcom/Kconfig | 1 + 4 files changed, 9 insertions(+), 1 deletion(-)
drivers/net/phy/Kconfig +6 -0
@@ -25,6 +25,9 @@ if PHYLIB config SWPHY bool +config PHY_PACKAGE + tristate + config LED_TRIGGER_PHY bool "Support LED triggers for tracking link state" depends on LEDS_TRIGGERS
@@ -157,6 +160,7 @@ config BCM54140_PHY tristate "Broadcom BCM54140 PHY" depends on HWMON || HWMON=n select BCM_NET_PHYLIB + select PHY_PACKAGE help Support the Broadcom BCM54140 Quad SGMII/QSGMII PHY.
@@ -292,6 +296,7 @@ source "drivers/net/phy/mediatek/Kconfig" config MICREL_PHY tristate "Micrel PHYs" depends on PTP_1588_CLOCK_OPTIONAL + select PHY_PACKAGE help Supports the KSZ9021, VSC8201, KS8001 PHYs.
@@ -323,6 +328,7 @@ config MICROSEMI_PHY depends on MACSEC || MACSEC=n depends on PTP_1588_CLOCK_OPTIONAL || !NETWORK_PHY_TIMESTAMPING select CRYPTO_LIB_AES if MACSEC + select PHY_PACKAGE help Currently supports VSC8514, VSC8530, VSC8531, VSC8540 and VSC8541 PHYs
drivers/net/phy/Makefile +1 -1
@@ -19,7 +19,7 @@ obj-$(CONFIG_MDIO_BUS) += mdio-bus.o obj-$(CONFIG_PHYLINK) += phylink.o obj-$(CONFIG_PHYLIB) += libphy.o obj-$(CONFIG_PHYLIB) += mdio_devres.o -obj-$(CONFIG_PHYLIB) += phy_package.o +obj-$(CONFIG_PHY_PACKAGE) += phy_package.o obj-$(CONFIG_NETWORK_PHY_TIMESTAMPING) += mii_timestamper.o
drivers/net/phy/mediatek/Kconfig +1 -0
@@ -27,6 +27,7 @@ config MEDIATEK_GE_SOC_PHY depends on ARCH_AIROHA || (ARCH_MEDIATEK && NVMEM_MTK_EFUSE) || \ COMPILE_TEST select MTK_NET_PHYLIB + select PHY_PACKAGE help Supports MediaTek SoC built-in Gigabit Ethernet PHYs.
drivers/net/phy/qcom/Kconfig +1 -0
@@ -24,6 +24,7 @@ config QCA808X_PHY config QCA807X_PHY tristate "Qualcomm QCA807x PHYs" select QCOM_NET_PHYLIB + select PHY_PACKAGE depends on OF_MDIO help Currently supports the Qualcomm QCA8072, QCA8075 and the PSGMII
Signature · 1 line
2.49.0
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 12 Jun 2025 23:25:00 +0200 you wrote:
Only a handful of PHY drivers needs the PHY package functionality, therefore make it a separate module which is built only if needed.
Heiner Kallweit (3):
net: phy: move __phy_package_[read|write]_mmd tophy_package.c
net: phy: makephy_packagea separate module
net: phy: addKconfigsymbolPHY_PACKAGE[...]
Here is the summary with links:
- [net-next,1/3] net: phy: move __phy_package_[read|write]_mmd to phy_package.c
https://git.kernel.org/netdev/net-next/c/cbd1ab0ce8f6 - [net-next,2/3] net: phy: make phy_package a separate module https://git.kernel.org/netdev/net-next/c/a1acde1e1bcf - [net-next,3/3] net: phy: add Kconfig symbol PHY_PACKAGE https://git.kernel.org/netdev/net-next/c/7d57386905d4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html