mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-28 07:44:32 +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>
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
From 1f538cda24bcb69919da2fcac0211b66281d3d4e Mon Sep 17 00:00:00 2001
|
||
From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
|
||
Date: Tue, 6 Feb 2024 01:08:02 +0300
|
||
Subject: [PATCH 12/30] net: dsa: mt7530: empty default case on
|
||
mt7530_setup_port5()
|
||
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()
|
||
|
||
On the first code path, priv->p5_intf_sel is either set to
|
||
P5_INTF_SEL_PHY_P0 or P5_INTF_SEL_PHY_P4 when mt7530_setup_port5() is run.
|
||
|
||
On the second code path, priv->p5_intf_sel is set to P5_INTF_SEL_GMAC5 when
|
||
mt7530_setup_port5() is run.
|
||
|
||
Empty the default case which will never run but is needed nonetheless to
|
||
handle all the remaining enumeration values.
|
||
|
||
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
||
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
||
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||
Link: https://lore.kernel.org/r/20240206-for-netnext-mt7530-improvements-2-v5-1-d7d92a185cb1@arinc9.com
|
||
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||
---
|
||
drivers/net/dsa/mt7530.c | 5 +----
|
||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||
|
||
--- a/drivers/net/dsa/mt7530.c
|
||
+++ b/drivers/net/dsa/mt7530.c
|
||
@@ -943,9 +943,7 @@ static void mt7530_setup_port5(struct ds
|
||
val &= ~MHWTRAP_P5_DIS;
|
||
break;
|
||
default:
|
||
- dev_err(ds->dev, "Unsupported p5_intf_sel %d\n",
|
||
- priv->p5_intf_sel);
|
||
- goto unlock_exit;
|
||
+ break;
|
||
}
|
||
|
||
/* Setup RGMII settings */
|
||
@@ -975,7 +973,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));
|
||
|
||
-unlock_exit:
|
||
mutex_unlock(&priv->reg_mutex);
|
||
}
|
||
|