aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

net: mdio: fix owner field for mdio buses registered using ACPI

Browse Source 
Bus ownership is wrong when using acpi_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.

CC: Maxime Bizon <mbizon@freebox.fr>
Fixes: 803ca24d2f ("net: mdio: Add ACPI support code for mdio")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli
2023-03-16 16:33:17 -07:00
committed by David S. Miller
parent 99669259f3
commit 30b605b850
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/mdio/acpi_mdio.c
View File

@@ -18,16 +18,18 @@ MODULE_AUTHOR("Calvin Johnson <calvin.johnson@oss.nxp.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
/** /**
* acpi_mdiobus_register - Register mii_bus and create PHYs from the ACPI ASL. * __acpi_mdiobus_register - Register mii_bus and create PHYs from the ACPI ASL.
* @mdio: pointer to mii_bus structure * @mdio: pointer to mii_bus structure
* @fwnode: pointer to fwnode of MDIO bus. This fwnode is expected to represent * @fwnode: pointer to fwnode of MDIO bus. This fwnode is expected to represent
* @owner: module owning this @mdio object.
* an ACPI device object corresponding to the MDIO bus and its children are * an ACPI device object corresponding to the MDIO bus and its children are
* expected to correspond to the PHY devices on that bus. * expected to correspond to the PHY devices on that bus.
* *
* This function registers the mii_bus structure and registers a phy_device * This function registers the mii_bus structure and registers a phy_device
* for each child node of @fwnode. * for each child node of @fwnode.
*/ */
int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode) int __acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode,
struct module *owner)
{ {
struct fwnode_handle *child; struct fwnode_handle *child;
u32 addr; u32 addr;
@@ -35,7 +37,7 @@ int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode)
/* Mask out all PHYs from auto probing. */ /* Mask out all PHYs from auto probing. */
mdio->phy_mask = GENMASK(31, 0); mdio->phy_mask = GENMASK(31, 0);
ret = mdiobus_register(mdio); ret = __mdiobus_register(mdio, owner);
if (ret) if (ret)
return ret; return ret;
@@ -55,4 +57,4 @@ int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode)
} }
return 0; return 0;
} }
EXPORT_SYMBOL(acpi_mdiobus_register); EXPORT_SYMBOL(__acpi_mdiobus_register);

9
include/linux/acpi_mdio.h
View File

@@ -9,7 +9,14 @@
#include <linux/phy.h> #include <linux/phy.h>
#if IS_ENABLED(CONFIG_ACPI_MDIO) #if IS_ENABLED(CONFIG_ACPI_MDIO)
int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode); int __acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode,
struct module *owner);
static inline int
acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *handle)
{
return __acpi_mdiobus_register(mdio, handle, THIS_MODULE);
}
#else /* CONFIG_ACPI_MDIO */ #else /* CONFIG_ACPI_MDIO */
static inline int static inline int
acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode) acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode)