hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-12-12 23:52:09 -05:00
Code Issues Projects Releases Wiki Activity

realtek: evaluate pcs-handle instead of sds property

Browse Source 
In the Realtek dts the pcs-handle property at the switch port is the
successor of the sds property at the phy. Rearrange the MDIO and DSA
driver so they always look at the new attribute.

Remark! This code can be dropped completely if the new PCS driver
is fully featured. But this will take some time.

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/20148
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Markus Stockhausen 2025-09-24 08:28:35 -04:00 committed by Robert Marko
parent 10f3f6d6d8
commit 7d67b1022a
2 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c
View File

@ -341,21 +341,22 @@ static int __init rtl83xx_mdio_probe(struct rtl838x_switch_priv *priv)
continue;
}
/*
* TODO: phylink_pcs was completely converted to the standalone PCS driver - see
* rtpcs_create() below. Nevertheless we still make use of the old SerDes <sds>
* attribute of the phy node for the scatterd SerDes configuration functions. As
* soon as the PCS driver can completely configure the SerDes this is no longer
* needed.
*/
if (of_property_read_u32(phy_node, "sds", &priv->ports[pn].sds_num))
priv->ports[pn].sds_num = -1;
pr_debug("%s port %d has SDS %d\n", __func__, pn, priv->ports[pn].sds_num);
pcs_node = of_parse_phandle(dn, "pcs-handle", 0);
priv->pcs[pn] = rtpcs_create(priv->dev, pcs_node, pn);
/*
* TODO: phylink_pcs was completely converted to the standalone PCS driver - see
* rtpcs_create(). Nevertheless the DSA driver still relies on the info about the
* attached SerDes. As soon as the PCS driver can completely configure the SerDes
* this is no longer needed.
*/
priv->ports[pn].sds_num = -1;
if (pcs_node)
of_property_read_u32(pcs_node, "reg", &priv->ports[pn].sds_num);
if (priv->ports[pn].sds_num >= 0)
dev_dbg(priv->dev, "port %d has SDS %d\n", pn, priv->ports[pn].sds_num);
if (of_get_phy_mode(dn, &interface))
interface = PHY_INTERFACE_MODE_NA;
if (interface == PHY_INTERFACE_MODE_USXGMII)

31
target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
View File

@ -1424,7 +1424,7 @@ static int rtmdio_get_family(void)
static int rtmdio_probe(struct platform_device *pdev)
{
struct device_node *dn, *mii_np;
struct device_node *dn, *mii_np, *pcs_node;
struct device *dev = &pdev->dev;
struct rtmdio_bus_priv *priv;
struct mii_bus *bus;
@ -1527,11 +1527,6 @@ static int rtmdio_probe(struct platform_device *pdev)
return -ENODEV;
}
if (of_property_read_u32(dn, "sds", &priv->sds_id[pn]))
priv->sds_id[pn] = -1;
else
pr_info("set sds port %d to %d\n", pn, priv->sds_id[pn]);
if (of_property_read_u32_array(dn, "rtl9300,smi-address", &smi_addr[0], 2)) {
priv->smi_bus[pn] = 0;
priv->smi_addr[pn] = pn;
@ -1547,9 +1542,7 @@ static int rtmdio_probe(struct platform_device *pdev)
priv->phy_is_internal[pn] = of_property_read_bool(dn, "phy-is-integrated");
if (priv->phy_is_internal[pn] && priv->sds_id[pn] >= 0)
priv->smi_bus[pn]= -1;
else if (of_device_is_compatible(dn, "ethernet-phy-ieee802.3-c45"))
if (of_device_is_compatible(dn, "ethernet-phy-ieee802.3-c45"))
priv->smi_bus_isc45[priv->smi_bus[pn]] = true;
}
@ -1562,13 +1555,27 @@ static int rtmdio_probe(struct platform_device *pdev)
for_each_node_by_name(dn, "port") {
if (of_property_read_u32(dn, "reg", &pn))
continue;
pr_debug("%s Looking at port %d\n", __func__, pn);
dev_dbg(dev, "Looking at port %d\n", pn);
if (pn > priv->cpu_port)
continue;
if (of_get_phy_mode(dn, &priv->interfaces[pn]))
priv->interfaces[pn] = PHY_INTERFACE_MODE_NA;
pr_debug("%s phy mode of port %d is %s\n",
__func__, pn, phy_modes(priv->interfaces[pn]));
dev_dbg(dev, "phy mode of port %d is %s\n", pn, phy_modes(priv->interfaces[pn]));
/*
* TODO: The MDIO driver does not need any info about the SerDes. As long as
* the PCS driver cannot completely control the SerDes, look up the information
* via the pcs-handle of the switch port node.
*/
priv->sds_id[pn] = -1;
pcs_node = of_parse_phandle(dn, "pcs-handle", 0);
if (pcs_node)
of_property_read_u32(pcs_node, "reg", &priv->sds_id[pn]);
if (priv->phy_is_internal[pn] && priv->sds_id[pn] >= 0)
priv->smi_bus[pn]= -1;
if (priv->sds_id[pn] >= 0)
dev_dbg(dev, "PHY %d has SDS %d\n", pn, priv->sds_id[pn]);
}
snprintf(bus->id, MII_BUS_ID_SIZE, "%s-mii", dev_name(dev));