catspeed-cc/openwrt
2
1
Fork 0
Code Issues Pull Requests Activity

realtek: mdio: derive phy info from control structure

Browse Source 
For polling setup the driver looks up the atached phy ids with
function rtmdio_get_phy_info(). This derives the data from a
given bus and a port number. While this works for a single bus
the combination of port and bus makes no sense. One is the global
view the other the bus individual view. Change the signature so
the lookup is done globally via ctrl/port.

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/22830
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Markus Stockhausen 2026-04-07 18:22:07 +02:00 committed by Robert Marko
parent fafe10fd25
commit 924db12314
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/realtek/files-6.18/drivers/net/mdio/mdio-realtek-otto.c
View File

@ -640,9 +640,9 @@ static u32 rtmdio_get_phy_id(struct phy_device *phydev)
return phydev->phy_id;
}
static int rtmdio_get_phy_info(struct mii_bus *bus, int addr, struct rtmdio_phy_info *phyinfo)
static int rtmdio_get_phy_info(struct rtmdio_ctrl *ctrl, int pn, struct rtmdio_phy_info *phyinfo)
{
struct phy_device *phydev = mdiobus_get_phy(bus, addr);
struct phy_device *phydev = mdiobus_get_phy(ctrl->bus[0].mii_bus, pn);
u32 phyid = rtmdio_get_phy_id(phydev);
int ret = 0;
@ -683,7 +683,7 @@ static int rtmdio_get_phy_info(struct mii_bus *bus, int addr, struct rtmdio_phy_
phyinfo->has_res_reg = true;
break;
default:
pr_warn("skip polling setup for unknown PHY %08x on address %d\n", phyid, addr);
pr_warn("skip polling setup for unknown PHY %08x on port %d\n", phyid, pn);
ret = -EINVAL;
break;
}
@ -767,7 +767,7 @@ static void rtmdio_930x_setup_polling(struct mii_bus *bus)
/* Define PHY specific polling parameters */
for_each_port(ctrl, pn) {
if (rtmdio_get_phy_info(bus, pn, &phyinfo))
if (rtmdio_get_phy_info(ctrl, pn, &phyinfo))
continue;
/* set to "PHY driven" */
@ -830,7 +830,7 @@ static void rtmdio_931x_setup_polling(struct mii_bus *bus)
u8 smi = ctrl->port[pn].smi_bus;
unsigned int mask, val;
if (rtmdio_get_phy_info(bus, pn, &phyinfo))
if (rtmdio_get_phy_info(ctrl, pn, &phyinfo))
continue;
/* set to "PHY driven" */