| Message ID | edba99c5-0f95-40bd-8398-98d811068369@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | net: phy: move PHY package code to its own source file | expand |
Hi Heiner, kernel test robot noticed the following build errors: [auto build test ERROR on net-next/main] url: https://github.com/intel-lab-lkp/linux/commits/Heiner-Kallweit/net-phy-move-PHY-package-code-from-phy_device-c-to-own-source-file/20250301-055302 base: net-next/main patch link: https://lore.kernel.org/r/edba99c5-0f95-40bd-8398-98d811068369%40gmail.com patch subject: [PATCH net-next v2 7/8] net: phy: move PHY package related code from phy.h to phy_package.c config: arc-randconfig-001-20250302 (https://download.01.org/0day-ci/archive/20250302/202503020223.C2TbkgPv-lkp@intel.com/config) compiler: arceb-elf-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250302/202503020223.C2TbkgPv-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202503020223.C2TbkgPv-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/net/phy/bcm54140.c: In function 'bcm54140_base_read_rdb': >> drivers/net/phy/bcm54140.c:436:15: error: implicit declaration of function '__phy_package_write'; did you mean '__phy_package_write_mmd'? [-Werror=implicit-function-declaration] 436 | ret = __phy_package_write(phydev, BCM54140_BASE_ADDR, | ^~~~~~~~~~~~~~~~~~~ | __phy_package_write_mmd >> drivers/net/phy/bcm54140.c:441:15: error: implicit declaration of function '__phy_package_read'; did you mean '__phy_package_read_mmd'? [-Werror=implicit-function-declaration] 441 | ret = __phy_package_read(phydev, BCM54140_BASE_ADDR, | ^~~~~~~~~~~~~~~~~~ | __phy_package_read_mmd cc1: some warnings being treated as errors vim +436 drivers/net/phy/bcm54140.c 4406d36dfdf1fb Michael Walle 2020-04-20 430 6937602ed3f9eb Michael Walle 2020-04-20 431 static int bcm54140_base_read_rdb(struct phy_device *phydev, u16 rdb) 6937602ed3f9eb Michael Walle 2020-04-20 432 { 6937602ed3f9eb Michael Walle 2020-04-20 433 int ret; 6937602ed3f9eb Michael Walle 2020-04-20 434 dc9989f173289f Michael Walle 2020-05-06 435 phy_lock_mdio_bus(phydev); 9eea577eb1155f Christian Marangi 2023-12-15 @436 ret = __phy_package_write(phydev, BCM54140_BASE_ADDR, 9eea577eb1155f Christian Marangi 2023-12-15 437 MII_BCM54XX_RDB_ADDR, rdb); 6937602ed3f9eb Michael Walle 2020-04-20 438 if (ret < 0) 6937602ed3f9eb Michael Walle 2020-04-20 439 goto out; 6937602ed3f9eb Michael Walle 2020-04-20 440 9eea577eb1155f Christian Marangi 2023-12-15 @441 ret = __phy_package_read(phydev, BCM54140_BASE_ADDR, 9eea577eb1155f Christian Marangi 2023-12-15 442 MII_BCM54XX_RDB_DATA); 6937602ed3f9eb Michael Walle 2020-04-20 443 6937602ed3f9eb Michael Walle 2020-04-20 444 out: dc9989f173289f Michael Walle 2020-05-06 445 phy_unlock_mdio_bus(phydev); 6937602ed3f9eb Michael Walle 2020-04-20 446 return ret; 6937602ed3f9eb Michael Walle 2020-04-20 447 } 6937602ed3f9eb Michael Walle 2020-04-20 448
Hi Heiner,
kernel test robot noticed the following build errors:
[auto build test ERROR on net-next/main]
url: https://github.com/intel-lab-lkp/linux/commits/Heiner-Kallweit/net-phy-move-PHY-package-code-from-phy_device-c-to-own-source-file/20250301-055302
base: net-next/main
patch link: https://lore.kernel.org/r/edba99c5-0f95-40bd-8398-98d811068369%40gmail.com
patch subject: [PATCH net-next v2 7/8] net: phy: move PHY package related code from phy.h to phy_package.c
config: loongarch-randconfig-001-20250302 (https://download.01.org/0day-ci/archive/20250302/202503020328.FJG7PJon-lkp@intel.com/config)
compiler: loongarch64-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250302/202503020328.FJG7PJon-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202503020328.FJG7PJon-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/net/phy/bcm54140.c: In function 'bcm54140_base_read_rdb':
drivers/net/phy/bcm54140.c:436:15: error: implicit declaration of function '__phy_package_write'; did you mean '__phy_package_write_mmd'? [-Wimplicit-function-declaration]
436 | ret = __phy_package_write(phydev, BCM54140_BASE_ADDR,
| ^~~~~~~~~~~~~~~~~~~
| __phy_package_write_mmd
drivers/net/phy/bcm54140.c:441:15: error: implicit declaration of function '__phy_package_read'; did you mean '__phy_package_read_mmd'? [-Wimplicit-function-declaration]
441 | ret = __phy_package_read(phydev, BCM54140_BASE_ADDR,
| ^~~~~~~~~~~~~~~~~~
| __phy_package_read_mmd
drivers/net/phy/bcm54140.c: In function 'bcm54140_probe':
>> drivers/net/phy/bcm54140.c:599:13: error: implicit declaration of function 'phy_package_init_once'; did you mean 'phy_package_write_mmd'? [-Wimplicit-function-declaration]
599 | if (phy_package_init_once(phydev)) {
| ^~~~~~~~~~~~~~~~~~~~~
| phy_package_write_mmd
vim +599 drivers/net/phy/bcm54140.c
6937602ed3f9ebd Michael Walle 2020-04-20 578
6937602ed3f9ebd Michael Walle 2020-04-20 579 static int bcm54140_probe(struct phy_device *phydev)
6937602ed3f9ebd Michael Walle 2020-04-20 580 {
6937602ed3f9ebd Michael Walle 2020-04-20 581 struct bcm54140_priv *priv;
6937602ed3f9ebd Michael Walle 2020-04-20 582 int ret;
6937602ed3f9ebd Michael Walle 2020-04-20 583
6937602ed3f9ebd Michael Walle 2020-04-20 584 priv = devm_kzalloc(&phydev->mdio.dev, sizeof(*priv), GFP_KERNEL);
6937602ed3f9ebd Michael Walle 2020-04-20 585 if (!priv)
6937602ed3f9ebd Michael Walle 2020-04-20 586 return -ENOMEM;
6937602ed3f9ebd Michael Walle 2020-04-20 587
6937602ed3f9ebd Michael Walle 2020-04-20 588 phydev->priv = priv;
6937602ed3f9ebd Michael Walle 2020-04-20 589
6937602ed3f9ebd Michael Walle 2020-04-20 590 ret = bcm54140_get_base_addr_and_port(phydev);
6937602ed3f9ebd Michael Walle 2020-04-20 591 if (ret)
6937602ed3f9ebd Michael Walle 2020-04-20 592 return ret;
6937602ed3f9ebd Michael Walle 2020-04-20 593
dc9989f173289f3 Michael Walle 2020-05-06 594 devm_phy_package_join(&phydev->mdio.dev, phydev, priv->base_addr, 0);
dc9989f173289f3 Michael Walle 2020-05-06 595
4406d36dfdf1fbd Michael Walle 2020-04-20 596 #if IS_ENABLED(CONFIG_HWMON)
4406d36dfdf1fbd Michael Walle 2020-04-20 597 mutex_init(&priv->alarm_lock);
4406d36dfdf1fbd Michael Walle 2020-04-20 598
dc9989f173289f3 Michael Walle 2020-05-06 @599 if (phy_package_init_once(phydev)) {
4406d36dfdf1fbd Michael Walle 2020-04-20 600 ret = bcm54140_probe_once(phydev);
4406d36dfdf1fbd Michael Walle 2020-04-20 601 if (ret)
4406d36dfdf1fbd Michael Walle 2020-04-20 602 return ret;
4406d36dfdf1fbd Michael Walle 2020-04-20 603 }
4406d36dfdf1fbd Michael Walle 2020-04-20 604 #endif
4406d36dfdf1fbd Michael Walle 2020-04-20 605
6937602ed3f9ebd Michael Walle 2020-04-20 606 phydev_dbg(phydev, "probed (port %d, base PHY address %d)\n",
6937602ed3f9ebd Michael Walle 2020-04-20 607 priv->port, priv->base_addr);
6937602ed3f9ebd Michael Walle 2020-04-20 608
6937602ed3f9ebd Michael Walle 2020-04-20 609 return 0;
6937602ed3f9ebd Michael Walle 2020-04-20 610 }
6937602ed3f9ebd Michael Walle 2020-04-20 611
diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c index 19cf12ee8..7ff975efd 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -17,6 +17,8 @@ #include <linux/of.h> #include <linux/netdevice.h> #include <dt-bindings/net/mscc-phy-vsc8531.h> + +#include "../phylib.h" #include "mscc_serdes.h" #include "mscc.h" diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c index b1c1670de..154d29be6 100644 --- a/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c @@ -6,6 +6,7 @@ #include <linux/phy.h> #include <linux/of.h> +#include "phylib.h" #include "phylib-internal.h" /** diff --git a/drivers/net/phy/phy_package.c b/drivers/net/phy/phy_package.c index 873420e58..12c92d26e 100644 --- a/drivers/net/phy/phy_package.c +++ b/drivers/net/phy/phy_package.c @@ -7,6 +7,7 @@ #include <linux/phy.h> #include "phylib.h" +#include "phylib-internal.h" struct device_node *phy_package_get_node(struct phy_device *phydev) { @@ -20,6 +21,66 @@ void *phy_package_get_priv(struct phy_device *phydev) } EXPORT_SYMBOL_GPL(phy_package_get_priv); +int phy_package_address(struct phy_device *phydev, unsigned int addr_offset) +{ + struct phy_package_shared *shared = phydev->shared; + u8 base_addr = shared->base_addr; + + if (addr_offset >= PHY_MAX_ADDR - base_addr) + return -EIO; + + /* we know that addr will be in the range 0..31 and thus the + * implicit cast to a signed int is not a problem. + */ + return base_addr + addr_offset; +} + +int __phy_package_read(struct phy_device *phydev, unsigned int addr_offset, + u32 regnum) +{ + int addr = phy_package_address(phydev, addr_offset); + + if (addr < 0) + return addr; + + return __mdiobus_read(phydev->mdio.bus, addr, regnum); +} +EXPORT_SYMBOL_GPL(__phy_package_read); + +int __phy_package_write(struct phy_device *phydev, unsigned int addr_offset, + u32 regnum, u16 val) +{ + int addr = phy_package_address(phydev, addr_offset); + + if (addr < 0) + return addr; + + return __mdiobus_write(phydev->mdio.bus, addr, regnum, val); +} +EXPORT_SYMBOL_GPL(__phy_package_write); + +static bool __phy_package_set_once(struct phy_device *phydev, unsigned int b) +{ + struct phy_package_shared *shared = phydev->shared; + + if (!shared) + return false; + + return !test_and_set_bit(b, &shared->flags); +} + +bool phy_package_init_once(struct phy_device *phydev) +{ + return __phy_package_set_once(phydev, 0); +} +EXPORT_SYMBOL_GPL(phy_package_init_once); + +bool phy_package_probe_once(struct phy_device *phydev) +{ + return __phy_package_set_once(phydev, 1); +} +EXPORT_SYMBOL_GPL(phy_package_probe_once); + /** * phy_package_join - join a common PHY group * @phydev: target phy_device struct diff --git a/drivers/net/phy/phylib-internal.h b/drivers/net/phy/phylib-internal.h index dc9592c6b..afac2bd15 100644 --- a/drivers/net/phy/phylib-internal.h +++ b/drivers/net/phy/phylib-internal.h @@ -20,6 +20,8 @@ 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 genphy_c45_read_eee_adv(struct phy_device *phydev, unsigned long *adv); #endif /* __PHYLIB_INTERNAL_H */ diff --git a/drivers/net/phy/phylib.h b/drivers/net/phy/phylib.h index a42e1fc07..06c50d275 100644 --- a/drivers/net/phy/phylib.h +++ b/drivers/net/phy/phylib.h @@ -11,5 +11,11 @@ struct phy_device; struct device_node *phy_package_get_node(struct phy_device *phydev); void *phy_package_get_priv(struct phy_device *phydev); +int __phy_package_read(struct phy_device *phydev, unsigned int addr_offset, + u32 regnum); +int __phy_package_write(struct phy_device *phydev, unsigned int addr_offset, + u32 regnum, u16 val); +bool phy_package_init_once(struct phy_device *phydev); +bool phy_package_probe_once(struct phy_device *phydev); #endif /* __PHYLIB_H */ diff --git a/include/linux/phy.h b/include/linux/phy.h index 7bfbae510..2b12d1bef 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -350,10 +350,6 @@ struct phy_package_shared { void *priv; }; -/* used as bit number in atomic bitops */ -#define PHY_SHARED_F_INIT_DONE 0 -#define PHY_SHARED_F_PROBE_DONE 1 - /** * struct mii_bus - Represents an MDIO bus * @@ -2149,67 +2145,6 @@ int __phy_hwtstamp_set(struct phy_device *phydev, struct kernel_hwtstamp_config *config, struct netlink_ext_ack *extack); -static inline int phy_package_address(struct phy_device *phydev, - unsigned int addr_offset) -{ - struct phy_package_shared *shared = phydev->shared; - u8 base_addr = shared->base_addr; - - if (addr_offset >= PHY_MAX_ADDR - base_addr) - return -EIO; - - /* we know that addr will be in the range 0..31 and thus the - * implicit cast to a signed int is not a problem. - */ - return base_addr + addr_offset; -} - -static inline int phy_package_read(struct phy_device *phydev, - unsigned int addr_offset, u32 regnum) -{ - int addr = phy_package_address(phydev, addr_offset); - - if (addr < 0) - return addr; - - return mdiobus_read(phydev->mdio.bus, addr, regnum); -} - -static inline int __phy_package_read(struct phy_device *phydev, - unsigned int addr_offset, u32 regnum) -{ - int addr = phy_package_address(phydev, addr_offset); - - if (addr < 0) - return addr; - - return __mdiobus_read(phydev->mdio.bus, addr, regnum); -} - -static inline int phy_package_write(struct phy_device *phydev, - unsigned int addr_offset, u32 regnum, - u16 val) -{ - int addr = phy_package_address(phydev, addr_offset); - - if (addr < 0) - return addr; - - return mdiobus_write(phydev->mdio.bus, addr, regnum, val); -} - -static inline int __phy_package_write(struct phy_device *phydev, - unsigned int addr_offset, u32 regnum, - u16 val) -{ - int addr = phy_package_address(phydev, addr_offset); - - if (addr < 0) - return addr; - - return __mdiobus_write(phydev->mdio.bus, addr, regnum, val); -} - int __phy_package_read_mmd(struct phy_device *phydev, unsigned int addr_offset, int devad, u32 regnum); @@ -2226,27 +2161,6 @@ int phy_package_write_mmd(struct phy_device *phydev, unsigned int addr_offset, int devad, u32 regnum, u16 val); -static inline bool __phy_package_set_once(struct phy_device *phydev, - unsigned int b) -{ - struct phy_package_shared *shared = phydev->shared; - - if (!shared) - return false; - - return !test_and_set_bit(b, &shared->flags); -} - -static inline bool phy_package_init_once(struct phy_device *phydev) -{ - return __phy_package_set_once(phydev, PHY_SHARED_F_INIT_DONE); -} - -static inline bool phy_package_probe_once(struct phy_device *phydev) -{ - return __phy_package_set_once(phydev, PHY_SHARED_F_PROBE_DONE); -} - extern const struct bus_type mdio_bus_type; struct mdio_board_info {
Move PHY package related inline functions from phy.h to phy_package.c. While doing so remove locked versions phy_package_read() and phy_package_write() which have no user. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/net/phy/mscc/mscc_main.c | 2 + drivers/net/phy/phy-core.c | 1 + drivers/net/phy/phy_package.c | 61 ++++++++++++++++++++++ drivers/net/phy/phylib-internal.h | 2 + drivers/net/phy/phylib.h | 6 +++ include/linux/phy.h | 86 ------------------------------- 6 files changed, 72 insertions(+), 86 deletions(-)