mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +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>
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From cd1cee68e57eedb460a68d1f42abf9f740b17e94 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:57 +0300
|
||
Subject: [PATCH 10/30] net: dsa: mt7530: do not set priv->p5_interface on
|
||
mt7530_setup_port5()
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Running mt7530_setup_port5() from mt7530_setup() used to handle all cases
|
||
of configuring port 5, including phylink.
|
||
|
||
Setting priv->p5_interface under mt7530_setup_port5() makes sure that
|
||
mt7530_setup_port5() from mt753x_phylink_mac_config() won't run.
|
||
|
||
The commit ("net: dsa: mt7530: improve code path for setting up port 5")
|
||
makes so that mt7530_setup_port5() from mt7530_setup() runs only on
|
||
non-phylink cases.
|
||
|
||
Get rid of unnecessarily setting priv->p5_interface under
|
||
mt7530_setup_port5() as port 5 phylink configuration will be done by
|
||
running mt7530_setup_port5() from mt753x_phylink_mac_config() now.
|
||
|
||
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-6-042401f2b279@arinc9.com
|
||
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||
---
|
||
drivers/net/dsa/mt7530.c | 2 --
|
||
1 file changed, 2 deletions(-)
|
||
|
||
--- a/drivers/net/dsa/mt7530.c
|
||
+++ b/drivers/net/dsa/mt7530.c
|
||
@@ -978,8 +978,6 @@ static void mt7530_setup_port5(struct ds
|
||
dev_dbg(ds->dev, "Setup P5, HWTRAP=0x%x, intf_sel=%s, phy-mode=%s\n",
|
||
val, p5_intf_modes(priv->p5_intf_sel), phy_modes(interface));
|
||
|
||
- priv->p5_interface = interface;
|
||
-
|
||
unlock_exit:
|
||
mutex_unlock(&priv->reg_mutex);
|
||
}
|