From fecf7087f0a32151f146ce6c6a7fd30b4b1a838d Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 7 Sep 2025 00:00:10 +0200 Subject: [PATCH 1/4] net: phy: fixed_phy: remove unused interrupt support The two callers of __fixed_phy_add() both pass PHY_POLL, so we can remove the irq argument to simplify the function. Signed-off-by: Heiner Kallweit Signed-off-by: Jakub Kicinski --- drivers/net/phy/fixed_phy.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c index aae7bd4ce93e..1ac17ef333e4 100644 --- a/drivers/net/phy/fixed_phy.c +++ b/drivers/net/phy/fixed_phy.c @@ -114,7 +114,7 @@ int fixed_phy_set_link_update(struct phy_device *phydev, } EXPORT_SYMBOL_GPL(fixed_phy_set_link_update); -static int __fixed_phy_add(unsigned int irq, int phy_addr, +static int __fixed_phy_add(int phy_addr, const struct fixed_phy_status *status) { int ret; @@ -129,9 +129,6 @@ static int __fixed_phy_add(unsigned int irq, int phy_addr, if (!fp) return -ENOMEM; - if (irq != PHY_POLL) - fmb->mii_bus->irq[phy_addr] = irq; - fp->addr = phy_addr; fp->status = *status; @@ -142,7 +139,7 @@ static int __fixed_phy_add(unsigned int irq, int phy_addr, void fixed_phy_add(const struct fixed_phy_status *status) { - __fixed_phy_add(PHY_POLL, 0, status); + __fixed_phy_add(0, status); } EXPORT_SYMBOL_GPL(fixed_phy_add); @@ -179,7 +176,7 @@ struct phy_device *fixed_phy_register(const struct fixed_phy_status *status, if (phy_addr < 0) return ERR_PTR(phy_addr); - ret = __fixed_phy_add(PHY_POLL, phy_addr, status); + ret = __fixed_phy_add(phy_addr, status); if (ret < 0) { ida_free(&phy_fixed_ida, phy_addr); return ERR_PTR(ret); From 0625b3bfbb7f5706d83fa1fd3f8a30a5fded108f Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 7 Sep 2025 00:01:02 +0200 Subject: [PATCH 2/4] net: phy: fixed_phy: remove member no_carrier from struct fixed_phy After the recent removal of gpio support member no_carrier isn't needed any longer. Signed-off-by: Heiner Kallweit Signed-off-by: Jakub Kicinski --- drivers/net/phy/fixed_phy.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c index 1ac17ef333e4..35ac29c3e004 100644 --- a/drivers/net/phy/fixed_phy.c +++ b/drivers/net/phy/fixed_phy.c @@ -32,7 +32,6 @@ struct fixed_phy { int addr; struct phy_device *phydev; struct fixed_phy_status status; - bool no_carrier; int (*link_update)(struct net_device *, struct fixed_phy_status *); struct list_head node; }; @@ -52,7 +51,7 @@ int fixed_phy_change_carrier(struct net_device *dev, bool new_carrier) list_for_each_entry(fp, &fmb->phys, node) { if (fp->addr == phydev->mdio.addr) { - fp->no_carrier = !new_carrier; + fp->status.link = new_carrier; return 0; } } @@ -67,8 +66,6 @@ static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num) list_for_each_entry(fp, &fmb->phys, node) { if (fp->addr == phy_addr) { - fp->status.link = !fp->no_carrier; - /* Issue callback if user registered it. */ if (fp->link_update) fp->link_update(fp->phydev->attached_dev, From f8db55c8eb8e9d958694bae6958d5a3467caabb2 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 7 Sep 2025 00:01:52 +0200 Subject: [PATCH 3/4] net: phy: fixed_phy: add helper fixed_phy_find Factor out the functionality to search for a fixed_phy matching an address. This improves readability of the code. Signed-off-by: Heiner Kallweit Signed-off-by: Jakub Kicinski --- drivers/net/phy/fixed_phy.c | 79 +++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c index 35ac29c3e004..eae513b70ab0 100644 --- a/drivers/net/phy/fixed_phy.c +++ b/drivers/net/phy/fixed_phy.c @@ -40,42 +40,49 @@ static struct fixed_mdio_bus platform_fmb = { .phys = LIST_HEAD_INIT(platform_fmb.phys), }; -int fixed_phy_change_carrier(struct net_device *dev, bool new_carrier) +static struct fixed_phy *fixed_phy_find(int addr) { struct fixed_mdio_bus *fmb = &platform_fmb; + struct fixed_phy *fp; + + list_for_each_entry(fp, &fmb->phys, node) { + if (fp->addr == addr) + return fp; + } + + return NULL; +} + +int fixed_phy_change_carrier(struct net_device *dev, bool new_carrier) +{ struct phy_device *phydev = dev->phydev; struct fixed_phy *fp; if (!phydev || !phydev->mdio.bus) return -EINVAL; - list_for_each_entry(fp, &fmb->phys, node) { - if (fp->addr == phydev->mdio.addr) { - fp->status.link = new_carrier; - return 0; - } - } - return -EINVAL; + fp = fixed_phy_find(phydev->mdio.addr); + if (!fp) + return -EINVAL; + + fp->status.link = new_carrier; + + return 0; } EXPORT_SYMBOL_GPL(fixed_phy_change_carrier); static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num) { - struct fixed_mdio_bus *fmb = bus->priv; struct fixed_phy *fp; - list_for_each_entry(fp, &fmb->phys, node) { - if (fp->addr == phy_addr) { - /* Issue callback if user registered it. */ - if (fp->link_update) - fp->link_update(fp->phydev->attached_dev, - &fp->status); + fp = fixed_phy_find(phy_addr); + if (!fp) + return 0xffff; - return swphy_read_reg(reg_num, &fp->status); - } - } + if (fp->link_update) + fp->link_update(fp->phydev->attached_dev, &fp->status); - return 0xFFFF; + return swphy_read_reg(reg_num, &fp->status); } static int fixed_mdio_write(struct mii_bus *bus, int phy_addr, int reg_num, @@ -93,21 +100,19 @@ int fixed_phy_set_link_update(struct phy_device *phydev, int (*link_update)(struct net_device *, struct fixed_phy_status *)) { - struct fixed_mdio_bus *fmb = &platform_fmb; struct fixed_phy *fp; if (!phydev || !phydev->mdio.bus) return -EINVAL; - list_for_each_entry(fp, &fmb->phys, node) { - if (fp->addr == phydev->mdio.addr) { - fp->link_update = link_update; - fp->phydev = phydev; - return 0; - } - } + fp = fixed_phy_find(phydev->mdio.addr); + if (!fp) + return -ENOENT; - return -ENOENT; + fp->link_update = link_update; + fp->phydev = phydev; + + return 0; } EXPORT_SYMBOL_GPL(fixed_phy_set_link_update); @@ -144,17 +149,15 @@ static DEFINE_IDA(phy_fixed_ida); static void fixed_phy_del(int phy_addr) { - struct fixed_mdio_bus *fmb = &platform_fmb; - struct fixed_phy *fp, *tmp; + struct fixed_phy *fp; - list_for_each_entry_safe(fp, tmp, &fmb->phys, node) { - if (fp->addr == phy_addr) { - list_del(&fp->node); - kfree(fp); - ida_free(&phy_fixed_ida, phy_addr); - return; - } - } + fp = fixed_phy_find(phy_addr); + if (!fp) + return; + + list_del(&fp->node); + kfree(fp); + ida_free(&phy_fixed_ida, phy_addr); } struct phy_device *fixed_phy_register(const struct fixed_phy_status *status, From 2983825579358887a59cd9f76d55d5f54f659ebf Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 7 Sep 2025 00:02:44 +0200 Subject: [PATCH 4/4] net: phy: fixed_phy: remove struct fixed_mdio_bus Use two separate static variables instead of the struct, this allows to simplify the code. Signed-off-by: Heiner Kallweit Signed-off-by: Jakub Kicinski --- drivers/net/phy/fixed_phy.c | 50 ++++++++++++++----------------------- 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c index eae513b70ab0..0e1b28f06f18 100644 --- a/drivers/net/phy/fixed_phy.c +++ b/drivers/net/phy/fixed_phy.c @@ -23,11 +23,6 @@ #include "swphy.h" -struct fixed_mdio_bus { - struct mii_bus *mii_bus; - struct list_head phys; -}; - struct fixed_phy { int addr; struct phy_device *phydev; @@ -36,16 +31,14 @@ struct fixed_phy { struct list_head node; }; -static struct fixed_mdio_bus platform_fmb = { - .phys = LIST_HEAD_INIT(platform_fmb.phys), -}; +static struct mii_bus *fmb_mii_bus; +static LIST_HEAD(fmb_phys); static struct fixed_phy *fixed_phy_find(int addr) { - struct fixed_mdio_bus *fmb = &platform_fmb; struct fixed_phy *fp; - list_for_each_entry(fp, &fmb->phys, node) { + list_for_each_entry(fp, &fmb_phys, node) { if (fp->addr == addr) return fp; } @@ -119,9 +112,8 @@ EXPORT_SYMBOL_GPL(fixed_phy_set_link_update); static int __fixed_phy_add(int phy_addr, const struct fixed_phy_status *status) { - int ret; - struct fixed_mdio_bus *fmb = &platform_fmb; struct fixed_phy *fp; + int ret; ret = swphy_validate_state(status); if (ret < 0) @@ -134,7 +126,7 @@ static int __fixed_phy_add(int phy_addr, fp->addr = phy_addr; fp->status = *status; - list_add_tail(&fp->node, &fmb->phys); + list_add_tail(&fp->node, &fmb_phys); return 0; } @@ -163,12 +155,11 @@ static void fixed_phy_del(int phy_addr) struct phy_device *fixed_phy_register(const struct fixed_phy_status *status, struct device_node *np) { - struct fixed_mdio_bus *fmb = &platform_fmb; struct phy_device *phy; int phy_addr; int ret; - if (!fmb->mii_bus || fmb->mii_bus->state != MDIOBUS_REGISTERED) + if (!fmb_mii_bus || fmb_mii_bus->state != MDIOBUS_REGISTERED) return ERR_PTR(-EPROBE_DEFER); /* Get the next available PHY address, up to PHY_MAX_ADDR */ @@ -182,7 +173,7 @@ struct phy_device *fixed_phy_register(const struct fixed_phy_status *status, return ERR_PTR(ret); } - phy = get_phy_device(fmb->mii_bus, phy_addr, false); + phy = get_phy_device(fmb_mii_bus, phy_addr, false); if (IS_ERR(phy)) { fixed_phy_del(phy_addr); return ERR_PTR(-EINVAL); @@ -247,41 +238,38 @@ EXPORT_SYMBOL_GPL(fixed_phy_unregister); static int __init fixed_mdio_bus_init(void) { - struct fixed_mdio_bus *fmb = &platform_fmb; int ret; - fmb->mii_bus = mdiobus_alloc(); - if (!fmb->mii_bus) + fmb_mii_bus = mdiobus_alloc(); + if (!fmb_mii_bus) return -ENOMEM; - snprintf(fmb->mii_bus->id, MII_BUS_ID_SIZE, "fixed-0"); - fmb->mii_bus->name = "Fixed MDIO Bus"; - fmb->mii_bus->priv = fmb; - fmb->mii_bus->read = &fixed_mdio_read; - fmb->mii_bus->write = &fixed_mdio_write; - fmb->mii_bus->phy_mask = ~0; + snprintf(fmb_mii_bus->id, MII_BUS_ID_SIZE, "fixed-0"); + fmb_mii_bus->name = "Fixed MDIO Bus"; + fmb_mii_bus->read = &fixed_mdio_read; + fmb_mii_bus->write = &fixed_mdio_write; + fmb_mii_bus->phy_mask = ~0; - ret = mdiobus_register(fmb->mii_bus); + ret = mdiobus_register(fmb_mii_bus); if (ret) goto err_mdiobus_alloc; return 0; err_mdiobus_alloc: - mdiobus_free(fmb->mii_bus); + mdiobus_free(fmb_mii_bus); return ret; } module_init(fixed_mdio_bus_init); static void __exit fixed_mdio_bus_exit(void) { - struct fixed_mdio_bus *fmb = &platform_fmb; struct fixed_phy *fp, *tmp; - mdiobus_unregister(fmb->mii_bus); - mdiobus_free(fmb->mii_bus); + mdiobus_unregister(fmb_mii_bus); + mdiobus_free(fmb_mii_bus); - list_for_each_entry_safe(fp, tmp, &fmb->phys, node) { + list_for_each_entry_safe(fp, tmp, &fmb_phys, node) { list_del(&fp->node); kfree(fp); }