realtek: evaluate pcs-handle instead of sds property

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>

diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c
index db9c392d16bb14f1709f515abd18e7e126474328..6bae35633d36c86fb318defe3b5ae8850d16e424 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c
+++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c
@@ -341,20 +341,21 @@ static int __init rtl83xx_mdio_probe(struct rtl838x_switch_priv *priv)
                        continue;
                }
 
+               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() 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.
+                * 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.
                 */
 
-               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);
+               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;

diff --git a/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c b/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
index a7caab183b1e6e45dfbc943ed802ed37147979ec..0f55bf51f48fddcdba1a4d14658dc4470978aaf8 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
+++ b/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
@@ -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));