Rosen PenevandJonas Jelonek
9716066e80
Move upstreamed patches to backports. Move the others to pending. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: https://github.com/openwrt/openwrt/pull/24013 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
From e82cfa658fc4a0429b3d159d0e1bedb6b5cc6d38 Mon Sep 17 00:00:00 2001
|
|
From: Ziyang Huang <hzyitc@outlook.com>
|
|
Date: Sat, 18 Jan 2025 16:18:40 +0800
|
|
Subject: [PATCH 1/3] net: dsa: qca8k: support PHY-to-PHY CPU link
|
|
|
|
PHY-to-PHY CPU link is a common/demo design in IPQ50xx platform, since it only has a SGMII/SGMII+ link and a MDI link.
|
|
|
|
For DSA, CPU tag is the only requirement. Fortunately, qca8337 can enable it on any port. So it's ok to trust a PHY-to-PHY link as a CPU link.
|
|
|
|
Signed-off-by: Ziyang Huang <hzyitc@outlook.com>
|
|
---
|
|
drivers/net/dsa/qca/qca8k-8xxx.c | 14 ++++++++------
|
|
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/qca/qca8k-8xxx.c
|
|
+++ b/drivers/net/dsa/qca/qca8k-8xxx.c
|
|
@@ -1014,7 +1014,7 @@ qca8k_setup_mdio_bus(struct qca8k_priv *
|
|
return ret;
|
|
}
|
|
|
|
- if (!dsa_is_user_port(priv->ds, reg))
|
|
+ if (reg == 0 || reg == 6)
|
|
continue;
|
|
|
|
of_get_phy_mode(port, &mode);
|
|
@@ -1089,17 +1089,19 @@ qca8k_setup_mac_pwr_sel(struct qca8k_pri
|
|
|
|
static int qca8k_find_cpu_port(struct dsa_switch *ds)
|
|
{
|
|
- struct qca8k_priv *priv = ds->priv;
|
|
+ int i;
|
|
|
|
- /* Find the connected cpu port. Valid port are 0 or 6 */
|
|
if (dsa_is_cpu_port(ds, 0))
|
|
return 0;
|
|
|
|
- dev_dbg(priv->dev, "port 0 is not the CPU port. Checking port 6");
|
|
-
|
|
if (dsa_is_cpu_port(ds, 6))
|
|
return 6;
|
|
|
|
+ /* PHY-to-PHY link */
|
|
+ for (i = 1; i <= 5; i++)
|
|
+ if (dsa_is_cpu_port(ds, i))
|
|
+ return i;
|
|
+
|
|
return -EINVAL;
|
|
}
|
|
|
|
@@ -1961,7 +1963,7 @@ qca8k_setup(struct dsa_switch *ds)
|
|
|
|
cpu_port = qca8k_find_cpu_port(ds);
|
|
if (cpu_port < 0) {
|
|
- dev_err(priv->dev, "No cpu port configured in both cpu port0 and port6");
|
|
+ dev_err(priv->dev, "No cpu port configured");
|
|
return cpu_port;
|
|
}
|
|
|