diff mbox series

[1/2] net: mdio: fix owner field for mdio buses registered using device-tree

Message ID 20230316205301.2087667-2-f.fainelli@gmail.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series ACPI/DT mdiobus module owner fixes | expand

Checks

Context Check Description
netdev/series_format warning Target tree name not specified in the subject
netdev/tree_selection success Guessed tree name to be net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit fail Errors and warnings before: 157 this patch: 161
netdev/cc_maintainers success CCed 12 of 12 maintainers
netdev/build_clang fail Errors and warnings before: 291 this patch: 295
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn fail Errors and warnings before: 151 this patch: 155
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 87 lines checked
netdev/kdoc fail Errors and warnings before: 0 this patch: 4
netdev/source_inline success Was 0 now: 0

Commit Message

Florian Fainelli March 16, 2023, 8:53 p.m. UTC 
From: Maxime Bizon <mbizon@freebox.fr>

Bus ownership is wrong when using of_mdiobus_register() to register an mdio
bus. That function is not inline, so when it calls mdiobus_register() the wrong
THIS_MODULE value is captured.

Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Fixes: 90eff9096c01 ("net: phy: Allow splitting MDIO bus/device support from PHYs")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/mdio/of_mdio.c    |  9 +++++----
 drivers/net/phy/mdio_devres.c |  8 ++++----
 include/linux/of_mdio.h       | 22 +++++++++++++++++++---
 3 files changed, 28 insertions(+), 11 deletions(-)

Comments

kernel test robot March 16, 2023, 10:38 p.m. UTC | #1 
Hi Florian,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on net/main]
[also build test WARNING on net-next/main horms-ipvs/master linus/master v6.3-rc2 next-20230316]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Florian-Fainelli/net-mdio-fix-owner-field-for-mdio-buses-registered-using-device-tree/20230317-050628
patch link:    https://lore.kernel.org/r/20230316205301.2087667-2-f.fainelli%40gmail.com
patch subject: [PATCH 1/2] net: mdio: fix owner field for mdio buses registered using device-tree
config: m68k-allyesconfig (https://download.01.org/0day-ci/archive/20230317/202303170623.MPjYVWU5-lkp@intel.com/config)
compiler: m68k-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/1449da923a3f5684696a0e559f7e7a970aa025ae
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Florian-Fainelli/net-mdio-fix-owner-field-for-mdio-buses-registered-using-device-tree/20230317-050628
        git checkout 1449da923a3f5684696a0e559f7e7a970aa025ae
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=m68k olddefconfig
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=m68k SHELL=/bin/bash drivers/net/mdio/ drivers/net/phy/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202303170623.MPjYVWU5-lkp@intel.com/

All warnings (new ones prefixed by >>):

   drivers/net/mdio/of_mdio.c:151: warning: Function parameter or member 'owner' not described in '__of_mdiobus_register'
>> drivers/net/mdio/of_mdio.c:151: warning: expecting prototype for of_mdiobus_register(). Prototype was for __of_mdiobus_register() instead
--
   drivers/net/phy/mdio_devres.c:108: warning: Function parameter or member 'owner' not described in '__devm_of_mdiobus_register'
>> drivers/net/phy/mdio_devres.c:108: warning: expecting prototype for devm_of_mdiobus_register(). Prototype was for __devm_of_mdiobus_register() instead


vim +151 drivers/net/mdio/of_mdio.c

801a8ef54e8b21 drivers/of/of_mdio.c       Andrew Lunn           2016-01-06  140  
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  141  /**
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  142   * of_mdiobus_register - Register mii_bus and create PHYs from the device tree
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  143   * @mdio: pointer to mii_bus structure
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  144   * @np: pointer to device_node of MDIO bus.
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  145   *
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  146   * This function registers the mii_bus structure and registers a phy_device
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  147   * for each child node of @np.
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  148   */
1449da923a3f56 drivers/net/mdio/of_mdio.c Maxime Bizon          2023-03-16  149  int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
1449da923a3f56 drivers/net/mdio/of_mdio.c Maxime Bizon          2023-03-16  150  			  struct module *owner)
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25 @151  {
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  152  	struct device_node *child;
2e79cb303010d5 drivers/of/of_mdio.c       Florian Fainelli      2013-12-05  153  	bool scanphys = false;
e7f4dc3536a400 drivers/of/of_mdio.c       Andrew Lunn           2016-01-06  154  	int addr, rc;
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  155  
6d07a68a59274f drivers/of/of_mdio.c       Florian Fainelli      2018-05-15  156  	if (!np)
1449da923a3f56 drivers/net/mdio/of_mdio.c Maxime Bizon          2023-03-16  157  		return __mdiobus_register(mdio, owner);
6d07a68a59274f drivers/of/of_mdio.c       Florian Fainelli      2018-05-15  158  
a77f4f70fd34ac drivers/of/of_mdio.c       Florian Fainelli      2016-04-28  159  	/* Do not continue if the node is disabled */
a77f4f70fd34ac drivers/of/of_mdio.c       Florian Fainelli      2016-04-28  160  	if (!of_device_is_available(np))
a77f4f70fd34ac drivers/of/of_mdio.c       Florian Fainelli      2016-04-28  161  		return -ENODEV;
a77f4f70fd34ac drivers/of/of_mdio.c       Florian Fainelli      2016-04-28  162  
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  163  	/* Mask out all PHYs from auto probing.  Instead the PHYs listed in
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  164  	 * the device tree are populated after the bus has been registered */
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  165  	mdio->phy_mask = ~0;
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  166  
7e33d84db1a8a6 drivers/net/mdio/of_mdio.c Ioana Ciornei         2021-06-17  167  	device_set_node(&mdio->dev, of_fwnode_handle(np));
25106022002128 drivers/of/of_mdio.c       David Daney           2012-05-02  168  
69226896ad636b drivers/of/of_mdio.c       Roger Quadros         2017-04-21  169  	/* Get bus level PHY reset GPIO details */
69226896ad636b drivers/of/of_mdio.c       Roger Quadros         2017-04-21  170  	mdio->reset_delay_us = DEFAULT_GPIO_RESET_DELAY;
69226896ad636b drivers/of/of_mdio.c       Roger Quadros         2017-04-21  171  	of_property_read_u32(np, "reset-delay-us", &mdio->reset_delay_us);
bb3831294cd507 drivers/of/of_mdio.c       Bruno Thomsen         2020-07-30  172  	mdio->reset_post_delay_us = 0;
bb3831294cd507 drivers/of/of_mdio.c       Bruno Thomsen         2020-07-30  173  	of_property_read_u32(np, "reset-post-delay-us", &mdio->reset_post_delay_us);
69226896ad636b drivers/of/of_mdio.c       Roger Quadros         2017-04-21  174  
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  175  	/* Register the MDIO bus */
1449da923a3f56 drivers/net/mdio/of_mdio.c Maxime Bizon          2023-03-16  176  	rc = __mdiobus_register(mdio, owner);
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  177  	if (rc)
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  178  		return rc;
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  179  
801a8ef54e8b21 drivers/of/of_mdio.c       Andrew Lunn           2016-01-06  180  	/* Loop over the child nodes and register a phy_device for each phy */
e207e7619cc9be drivers/of/of_mdio.c       Alexander Sverdlin    2012-11-29  181  	for_each_available_child_of_node(np, child) {
8f8382888cbaf6 drivers/of/of_mdio.c       Daniel Mack           2014-05-24  182  		addr = of_mdio_parse_addr(&mdio->dev, child);
8f8382888cbaf6 drivers/of/of_mdio.c       Daniel Mack           2014-05-24  183  		if (addr < 0) {
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  184  			scanphys = true;
194588604765ac drivers/of/of_mdio.c       David Daney           2010-10-27  185  			continue;
194588604765ac drivers/of/of_mdio.c       David Daney           2010-10-27  186  		}
194588604765ac drivers/of/of_mdio.c       David Daney           2010-10-27  187  
801a8ef54e8b21 drivers/of/of_mdio.c       Andrew Lunn           2016-01-06  188  		if (of_mdiobus_child_is_phy(child))
66bdede495c71d drivers/of/of_mdio.c       Geert Uytterhoeven    2017-10-18  189  			rc = of_mdiobus_register_phy(mdio, child, addr);
a9049e0c513c45 drivers/of/of_mdio.c       Andrew Lunn           2016-01-06  190  		else
66bdede495c71d drivers/of/of_mdio.c       Geert Uytterhoeven    2017-10-18  191  			rc = of_mdiobus_register_device(mdio, child, addr);
95f566de0269a0 drivers/of/of_mdio.c       Madalin Bucur         2018-01-09  192  
95f566de0269a0 drivers/of/of_mdio.c       Madalin Bucur         2018-01-09  193  		if (rc == -ENODEV)
95f566de0269a0 drivers/of/of_mdio.c       Madalin Bucur         2018-01-09  194  			dev_err(&mdio->dev,
95f566de0269a0 drivers/of/of_mdio.c       Madalin Bucur         2018-01-09  195  				"MDIO device at address %d is missing.\n",
95f566de0269a0 drivers/of/of_mdio.c       Madalin Bucur         2018-01-09  196  				addr);
95f566de0269a0 drivers/of/of_mdio.c       Madalin Bucur         2018-01-09  197  		else if (rc)
66bdede495c71d drivers/of/of_mdio.c       Geert Uytterhoeven    2017-10-18  198  			goto unregister;
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  199  	}
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  200  
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  201  	if (!scanphys)
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  202  		return 0;
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  203  
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  204  	/* auto scan for PHYs with empty reg property */
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  205  	for_each_available_child_of_node(np, child) {
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  206  		/* Skip PHYs with reg property set */
2fca6d288d7cac drivers/of/of_mdio.c       Sergei Shtylyov       2016-02-28  207  		if (of_find_property(child, "reg", NULL))
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  208  			continue;
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  209  
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  210  		for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  211  			/* skip already registered PHYs */
7f854420fbfe9d drivers/of/of_mdio.c       Andrew Lunn           2016-01-06  212  			if (mdiobus_is_registered_device(mdio, addr))
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  213  				continue;
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  214  
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  215  			/* be noisy to encourage people to set reg property */
a613b26a50136a drivers/of/of_mdio.c       Rob Herring           2018-08-27  216  			dev_info(&mdio->dev, "scan phy %pOFn at address %i\n",
a613b26a50136a drivers/of/of_mdio.c       Rob Herring           2018-08-27  217  				 child, addr);
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  218  
66bdede495c71d drivers/of/of_mdio.c       Geert Uytterhoeven    2017-10-18  219  			if (of_mdiobus_child_is_phy(child)) {
5a8d7f126c97d0 drivers/of/of_mdio.c       Florian Fainelli      2020-06-19  220  				/* -ENODEV is the return code that PHYLIB has
5a8d7f126c97d0 drivers/of/of_mdio.c       Florian Fainelli      2020-06-19  221  				 * standardized on to indicate that bus
5a8d7f126c97d0 drivers/of/of_mdio.c       Florian Fainelli      2020-06-19  222  				 * scanning should continue.
5a8d7f126c97d0 drivers/of/of_mdio.c       Florian Fainelli      2020-06-19  223  				 */
66bdede495c71d drivers/of/of_mdio.c       Geert Uytterhoeven    2017-10-18  224  				rc = of_mdiobus_register_phy(mdio, child, addr);
5a8d7f126c97d0 drivers/of/of_mdio.c       Florian Fainelli      2020-06-19  225  				if (!rc)
209c65b61d9434 drivers/of/of_mdio.c       Dajun Jin             2020-03-02  226  					break;
5a8d7f126c97d0 drivers/of/of_mdio.c       Florian Fainelli      2020-06-19  227  				if (rc != -ENODEV)
5a8d7f126c97d0 drivers/of/of_mdio.c       Florian Fainelli      2020-06-19  228  					goto unregister;
66bdede495c71d drivers/of/of_mdio.c       Geert Uytterhoeven    2017-10-18  229  			}
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  230  		}
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  231  	}
779d835e7eee11 drivers/of/of_mdio.c       Sebastian Hesselbarth 2013-04-07  232  
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  233  	return 0;
66bdede495c71d drivers/of/of_mdio.c       Geert Uytterhoeven    2017-10-18  234  
66bdede495c71d drivers/of/of_mdio.c       Geert Uytterhoeven    2017-10-18  235  unregister:
1c48709e6d9d35 drivers/net/mdio/of_mdio.c Liang He              2022-09-13  236  	of_node_put(child);
66bdede495c71d drivers/of/of_mdio.c       Geert Uytterhoeven    2017-10-18  237  	mdiobus_unregister(mdio);
66bdede495c71d drivers/of/of_mdio.c       Geert Uytterhoeven    2017-10-18  238  	return rc;
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  239  }
1449da923a3f56 drivers/net/mdio/of_mdio.c Maxime Bizon          2023-03-16  240  EXPORT_SYMBOL(__of_mdiobus_register);
8bc487d150b939 drivers/of/of_mdio.c       Grant Likely          2009-04-25  241
diff mbox series

Patch

diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c
index 510822d6d0d9..9c39a0a0d569 100644
--- a/drivers/net/mdio/of_mdio.c
+++ b/drivers/net/mdio/of_mdio.c
@@ -146,14 +146,15 @@  EXPORT_SYMBOL(of_mdiobus_child_is_phy);
  * This function registers the mii_bus structure and registers a phy_device
  * for each child node of @np.
  */
-int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
+int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
+			  struct module *owner)
 {
 	struct device_node *child;
 	bool scanphys = false;
 	int addr, rc;
 
 	if (!np)
-		return mdiobus_register(mdio);
+		return __mdiobus_register(mdio, owner);
 
 	/* Do not continue if the node is disabled */
 	if (!of_device_is_available(np))
@@ -172,7 +173,7 @@  int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
 	of_property_read_u32(np, "reset-post-delay-us", &mdio->reset_post_delay_us);
 
 	/* Register the MDIO bus */
-	rc = mdiobus_register(mdio);
+	rc = __mdiobus_register(mdio, owner);
 	if (rc)
 		return rc;
 
@@ -236,7 +237,7 @@  int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
 	mdiobus_unregister(mdio);
 	return rc;
 }
-EXPORT_SYMBOL(of_mdiobus_register);
+EXPORT_SYMBOL(__of_mdiobus_register);
 
 /**
  * of_mdio_find_device - Given a device tree node, find the mdio_device
diff --git a/drivers/net/phy/mdio_devres.c b/drivers/net/phy/mdio_devres.c
index b560e99695df..83ff4a91d346 100644
--- a/drivers/net/phy/mdio_devres.c
+++ b/drivers/net/phy/mdio_devres.c
@@ -103,8 +103,8 @@  EXPORT_SYMBOL(__devm_mdiobus_register);
  * @mdio:	MII bus structure to register
  * @np:		Device node to parse
  */
-int devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio,
-			     struct device_node *np)
+int __devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio,
+			       struct device_node *np, struct module *owner)
 {
 	struct mdiobus_devres *dr;
 	int ret;
@@ -117,7 +117,7 @@  int devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio,
 	if (!dr)
 		return -ENOMEM;
 
-	ret = of_mdiobus_register(mdio, np);
+	ret = __of_mdiobus_register(mdio, np, owner);
 	if (ret) {
 		devres_free(dr);
 		return ret;
@@ -127,7 +127,7 @@  int devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio,
 	devres_add(dev, dr);
 	return 0;
 }
-EXPORT_SYMBOL(devm_of_mdiobus_register);
+EXPORT_SYMBOL(__devm_of_mdiobus_register);
 #endif /* CONFIG_OF_MDIO */
 
 MODULE_LICENSE("GPL");
diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h
index da633d34ab86..8a52ef2e6fa6 100644
--- a/include/linux/of_mdio.h
+++ b/include/linux/of_mdio.h
@@ -14,9 +14,25 @@ 
 
 #if IS_ENABLED(CONFIG_OF_MDIO)
 bool of_mdiobus_child_is_phy(struct device_node *child);
-int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np);
-int devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio,
-			     struct device_node *np);
+int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
+			  struct module *owner);
+
+static inline int of_mdiobus_register(struct mii_bus *mdio,
+				      struct device_node *np)
+{
+	return __of_mdiobus_register(mdio, np, THIS_MODULE);
+}
+
+int __devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio,
+			       struct device_node *np, struct module *owner);
+
+static inline int devm_of_mdiobus_register(struct device *dev,
+					   struct mii_bus *mdio,
+					   struct device_node *np)
+{
+	return __devm_of_mdiobus_register(dev, mdio, np, THIS_MODULE);
+}
+
 struct mdio_device *of_mdio_find_device(struct device_node *np);
 struct phy_device *of_phy_find_device(struct device_node *phy_np);
 struct phy_device *