mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
4354b34f6f
Backport lots upstream changes, many of them fixes, for the mt7530 DSA driver, similar to how it was done for Linux 6.1 in the previous commit. The remaining differences compared to the upstream driver are only the 'slave' -> 'user', 'master' -> 'conduit' language change in DSA and the rename of 'struct ethtool_eee' to 'struct ethtool_keee' as well as tree-wide replacement of ethtool_sprintf with ethtool_puts, all of them do not have any functional impact. Apart from some minor bug fixes and style improvements the switch should now behave more conformant when it comes to link-local frames, and we will again be able to cleanly pick patches from upstream. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
96 lines
3.1 KiB
Diff
96 lines
3.1 KiB
Diff
From c1b2294a9b4b9b6c0cbe58666cb86e0a9cb0abfd Mon Sep 17 00:00:00 2001
|
||
From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
|
||
Date: Mon, 22 Jan 2024 08:35:56 +0300
|
||
Subject: [PATCH 09/30] net: dsa: mt7530: improve code path for setting up port
|
||
5
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
There're two code paths for setting up port 5:
|
||
|
||
mt7530_setup()
|
||
-> mt7530_setup_port5()
|
||
|
||
mt753x_phylink_mac_config()
|
||
-> mt753x_mac_config()
|
||
-> mt7530_mac_config()
|
||
-> mt7530_setup_port5()
|
||
|
||
Currently mt7530_setup_port5() from mt7530_setup() always runs. If port 5
|
||
is used as a CPU, DSA, or user port, mt7530_setup_port5() from
|
||
mt753x_phylink_mac_config() won't run. That is because priv->p5_interface
|
||
set on mt7530_setup_port5() will match state->interface on
|
||
mt753x_phylink_mac_config() which will stop running mt7530_setup_port5()
|
||
again.
|
||
|
||
Therefore, mt7530_setup_port5() will never run from
|
||
mt753x_phylink_mac_config().
|
||
|
||
Address this by not running mt7530_setup_port5() from mt7530_setup() if
|
||
port 5 is used as a CPU, DSA, or user port. This driver isn't in the
|
||
dsa_switches_apply_workarounds[] array so phylink will always be present.
|
||
|
||
To keep the cases where port 5 isn't controlled by phylink working as
|
||
before, preserve the mt7530_setup_port5() call from mt7530_setup().
|
||
|
||
Do not set priv->p5_intf_sel to P5_DISABLED. It is already set to that when
|
||
"priv" is allocated.
|
||
|
||
Move setting the interface to a more specific location. It's supposed to be
|
||
overwritten if PHY muxing is detected.
|
||
|
||
Improve the comment which explains the process.
|
||
|
||
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
||
Link: https://lore.kernel.org/r/20240122-for-netnext-mt7530-improvements-1-v3-5-042401f2b279@arinc9.com
|
||
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||
---
|
||
drivers/net/dsa/mt7530.c | 17 ++++++++---------
|
||
1 file changed, 8 insertions(+), 9 deletions(-)
|
||
|
||
--- a/drivers/net/dsa/mt7530.c
|
||
+++ b/drivers/net/dsa/mt7530.c
|
||
@@ -2362,16 +2362,15 @@ mt7530_setup(struct dsa_switch *ds)
|
||
return ret;
|
||
|
||
/* Setup port 5 */
|
||
- priv->p5_intf_sel = P5_DISABLED;
|
||
- interface = PHY_INTERFACE_MODE_NA;
|
||
-
|
||
if (!dsa_is_unused_port(ds, 5)) {
|
||
priv->p5_intf_sel = P5_INTF_SEL_GMAC5;
|
||
- ret = of_get_phy_mode(dsa_to_port(ds, 5)->dn, &interface);
|
||
- if (ret && ret != -ENODEV)
|
||
- return ret;
|
||
} else {
|
||
- /* Scan the ethernet nodes. look for GMAC1, lookup used phy */
|
||
+ /* Scan the ethernet nodes. Look for GMAC1, lookup the used PHY.
|
||
+ * Set priv->p5_intf_sel to the appropriate value if PHY muxing
|
||
+ * is detected.
|
||
+ */
|
||
+ interface = PHY_INTERFACE_MODE_NA;
|
||
+
|
||
for_each_child_of_node(dn, mac_np) {
|
||
if (!of_device_is_compatible(mac_np,
|
||
"mediatek,eth-mac"))
|
||
@@ -2402,6 +2401,8 @@ mt7530_setup(struct dsa_switch *ds)
|
||
of_node_put(phy_node);
|
||
break;
|
||
}
|
||
+
|
||
+ mt7530_setup_port5(ds, interface);
|
||
}
|
||
|
||
#ifdef CONFIG_GPIOLIB
|
||
@@ -2412,8 +2413,6 @@ mt7530_setup(struct dsa_switch *ds)
|
||
}
|
||
#endif /* CONFIG_GPIOLIB */
|
||
|
||
- mt7530_setup_port5(ds, interface);
|
||
-
|
||
/* Flush the FDB table */
|
||
ret = mt7530_fdb_cmd(priv, MT7530_FDB_FLUSH, NULL);
|
||
if (ret < 0)
|