mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
|
From 16e6592cd5c5bd74d8890973489f60176c692614 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
|
|||
|
|
Date: Sun, 28 Apr 2024 12:19:58 +0300
|
|||
|
|
Subject: [PATCH] net: dsa: mt7530: do not set MT7530_P5_DIS when PHY muxing is
|
|||
|
|
being used
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
DSA initalises the ds->num_ports amount of ports in
|
|||
|
|
dsa_switch_touch_ports(). When the PHY muxing feature is in use, port 5
|
|||
|
|
won't be defined in the device tree. Because of this, the type member of
|
|||
|
|
the dsa_port structure for this port will be assigned DSA_PORT_TYPE_UNUSED.
|
|||
|
|
The dsa_port_setup() function calls ds->ops->port_disable() when the port
|
|||
|
|
type is DSA_PORT_TYPE_UNUSED.
|
|||
|
|
|
|||
|
|
The MT7530_P5_DIS bit is unset in mt7530_setup() when PHY muxing is being
|
|||
|
|
used. mt7530_port_disable() which is assigned to ds->ops->port_disable() is
|
|||
|
|
called afterwards. Currently, mt7530_port_disable() sets MT7530_P5_DIS
|
|||
|
|
which breaks network connectivity when PHY muxing is being used.
|
|||
|
|
|
|||
|
|
Therefore, do not set MT7530_P5_DIS when PHY muxing is being used.
|
|||
|
|
|
|||
|
|
Fixes: 377174c5760c ("net: dsa: mt7530: move MT753X_MTRAP operations for MT7530")
|
|||
|
|
Reported-by: Daniel Golle <daniel@makrotopia.org>
|
|||
|
|
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
|||
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|||
|
|
Link: https://lore.kernel.org/r/20240428-for-netnext-mt7530-do-not-disable-port5-when-phy-muxing-v2-1-bb7c37d293f8@arinc9.com
|
|||
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|||
|
|
---
|
|||
|
|
drivers/net/dsa/mt7530.c | 3 ++-
|
|||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|||
|
|
|
|||
|
|
--- a/drivers/net/dsa/mt7530.c
|
|||
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|||
|
|
@@ -1220,7 +1220,8 @@ mt7530_port_disable(struct dsa_switch *d
|
|||
|
|
if (priv->id != ID_MT7530 && priv->id != ID_MT7621)
|
|||
|
|
return;
|
|||
|
|
|
|||
|
|
- if (port == 5)
|
|||
|
|
+ /* Do not set MT7530_P5_DIS when port 5 is being used for PHY muxing. */
|
|||
|
|
+ if (port == 5 && priv->p5_mode == GMAC5)
|
|||
|
|
mt7530_set(priv, MT753X_MTRAP, MT7530_P5_DIS);
|
|||
|
|
else if (port == 6)
|
|||
|
|
mt7530_set(priv, MT753X_MTRAP, MT7530_P6_DIS);
|