lkml.org 
[lkml]   [2023]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 2/2] net: mdio: fix owner field for mdio buses registered using ACPI
    Date
    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: 803ca24d2f92 ("net: mdio: Add ACPI support code for mdio")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    ---
    drivers/net/mdio/acpi_mdio.c | 10 ++++++----
    include/linux/acpi_mdio.h | 9 ++++++++-
    2 files changed, 14 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/mdio/acpi_mdio.c b/drivers/net/mdio/acpi_mdio.c
    index d77c987fda9c..4630dde01974 100644
    --- a/drivers/net/mdio/acpi_mdio.c
    +++ b/drivers/net/mdio/acpi_mdio.c
    @@ -18,16 +18,18 @@ MODULE_AUTHOR("Calvin Johnson <calvin.johnson@oss.nxp.com>");
    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
    * @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
    * expected to correspond to the PHY devices on that bus.
    *
    * This function registers the mii_bus structure and registers a phy_device
    * 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;
    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. */
    mdio->phy_mask = GENMASK(31, 0);
    - ret = mdiobus_register(mdio);
    + ret = __mdiobus_register(mdio, owner);
    if (ret)
    return ret;

    @@ -55,4 +57,4 @@ int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode)
    }
    return 0;
    }
    -EXPORT_SYMBOL(acpi_mdiobus_register);
    +EXPORT_SYMBOL(__acpi_mdiobus_register);
    diff --git a/include/linux/acpi_mdio.h b/include/linux/acpi_mdio.h
    index 0a24ab7cb66f..8e2eefa9fbc0 100644
    --- a/include/linux/acpi_mdio.h
    +++ b/include/linux/acpi_mdio.h
    @@ -9,7 +9,14 @@
    #include <linux/phy.h>

    #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 */
    static inline int
    acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode)
    --
    2.34.1
    \
     
     \ /
      Last update: 2023-03-27 01:04    [W:7.151 / U:3.864 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site