admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'net-phy-add-iterator-mdiobus_for_each_phy'

Browse Source 
Heiner Kallweit says:

====================
net: phy: add iterator mdiobus_for_each_phy

Add and use an iterator for all PHY's on a MII bus, and phy_find_next()
as a prerequisite.
====================

Link: https://patch.msgid.link/07fc63e8-53fd-46aa-853e-96187bba9d44@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2025-10-29 19:00:37 -07:00
parent cf35f4347d d4780abb8c
commit 1bae0fd900
5 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/freescale/fec_main.c
View File

@@ -2548,7 +2548,6 @@ static int fec_enet_mii_init(struct platform_device *pdev)
int err = -ENXIO;
u32 mii_speed, holdtime;
u32 bus_freq;
int addr;
/*
* The i.MX28 dual fec interfaces are not equal.
@@ -2663,11 +2662,8 @@ static int fec_enet_mii_init(struct platform_device *pdev)
of_node_put(node);
/* find all the PHY devices on the bus and set mac_managed_pm to true */
for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
phydev = mdiobus_get_phy(fep->mii_bus, addr);
if (phydev)
phydev->mac_managed_pm = true;
}
mdiobus_for_each_phy(fep->mii_bus, phydev)
phydev->mac_managed_pm = true;
mii_cnt++;

14
drivers/net/ethernet/ti/davinci_mdio.c
View File

@@ -541,8 +541,8 @@ static int davinci_mdio_probe(struct platform_device *pdev)
struct davinci_mdio_data *data;
struct resource *res;
struct phy_device *phy;
int ret, addr;
int autosuspend_delay_ms = -1;
int ret;
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
if (!data)
@@ -645,14 +645,10 @@ static int davinci_mdio_probe(struct platform_device *pdev)
goto bail_out;
/* scan and dump the bus */
for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
phy = mdiobus_get_phy(data->bus, addr);
if (phy) {
dev_info(dev, "phy[%d]: device %s, driver %s\n",
phy->mdio.addr, phydev_name(phy),
phy->drv ? phy->drv->name : "unknown");
}
}
mdiobus_for_each_phy(data->bus, phy)
dev_info(dev, "phy[%d]: device %s, driver %s\n",
phy->mdio.addr, phydev_name(phy),
phy->drv ? phy->drv->name : "unknown");
return 0;

13
drivers/net/phy/mdio_bus_provider.c
View File

@@ -249,20 +249,15 @@ static int mdiobus_scan_bus_c45(struct mii_bus *bus)
*/
static bool mdiobus_prevent_c45_scan(struct mii_bus *bus)
{
int i;
struct phy_device *phydev;
for (i = 0; i < PHY_MAX_ADDR; i++) {
struct phy_device *phydev;
u32 oui;
phydev = mdiobus_get_phy(bus, i);
if (!phydev)
continue;
oui = phydev->phy_id >> 10;
mdiobus_for_each_phy(bus, phydev) {
u32 oui = phydev->phy_id >> 10;
if (oui == MICREL_OUI)
return true;
}
return false;
}

16
drivers/net/phy/phy_device.c
View File

@@ -1224,22 +1224,24 @@ int phy_get_c45_ids(struct phy_device *phydev)
EXPORT_SYMBOL(phy_get_c45_ids);
/**
* phy_find_first - finds the first PHY device on the bus
* phy_find_next - finds the next PHY device on the bus
* @bus: the target MII bus
* @pos: cursor
*
* Return: next phy_device on the bus, or NULL
*/
struct phy_device *phy_find_first(struct mii_bus *bus)
struct phy_device *phy_find_next(struct mii_bus *bus, struct phy_device *pos)
{
struct phy_device *phydev;
int addr;
for (int addr = pos ? pos->mdio.addr + 1 : 0;
addr < PHY_MAX_ADDR; addr++) {
struct phy_device *phydev = mdiobus_get_phy(bus, addr);
for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
phydev = mdiobus_get_phy(bus, addr);
if (phydev)
return phydev;
}
return NULL;
}
EXPORT_SYMBOL(phy_find_first);
EXPORT_SYMBOL_GPL(phy_find_next);
/**
* phy_prepare_link - prepares the PHY layer to monitor link status

11
include/linux/phy.h
View File

@@ -1869,7 +1869,7 @@ int phy_sfp_probe(struct phy_device *phydev,
const struct sfp_upstream_ops *ops);
struct phy_device *phy_attach(struct net_device *dev, const char *bus_id,
phy_interface_t interface);
struct phy_device *phy_find_first(struct mii_bus *bus);
struct phy_device *phy_find_next(struct mii_bus *bus, struct phy_device *pos);
int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
u32 flags, phy_interface_t interface);
int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,
@@ -1896,6 +1896,15 @@ bool phy_check_valid(int speed, int duplex, unsigned long *features);
int phy_restart_aneg(struct phy_device *phydev);
int phy_reset_after_clk_enable(struct phy_device *phydev);
static inline struct phy_device *phy_find_first(struct mii_bus *bus)
{
return phy_find_next(bus, NULL);
}
#define mdiobus_for_each_phy(_bus, _phydev) \
for (_phydev = phy_find_first(_bus); _phydev; \
_phydev = phy_find_next(_bus, _phydev))
#if IS_ENABLED(CONFIG_PHYLIB)
int phy_start_cable_test(struct phy_device *phydev,
struct netlink_ext_ack *extack);