mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
401a6ccfaf
Backport lots upstream changes, many of them fixes, for the mt7530 DSA driver. Some of them may or may not find they way into Linux 6.1 stable, some certainly won't because they are fixes for backported commits which aren't even present in Linux 6.1 upstream. Apart from adding new patches, also remove mutated patch 723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch which should never have been added for Linux 6.1 -- it was applied already upstream but coincidentally would fuzzy-apply in the wrong place as well (for MT7530 instead of MT7531). While that didn't really hurt anyone it is just unneeded. The other deleted patch 795-mt7530-register-OF-node-for-internal-MDIO-bus.patch has been replaced by an equivalent commit with a more complete patch description by upstream maintainer Arınç Ünal. The remaining differences compared to the upstream driver are: * C22/C45 MDIO ops aren't split Upstream did that, backporting it would require making changes to *all* DSA drivers * 'slave' -> 'user', 'master' -> 'conduit' language change in DSA * support for selecting preferred CPU port on MT7531 Also this would require too many DSA framework changes potentially affecting other devices. If we ever really use Linux 6.1 in a release (I hope not) we can still reconsider to make the effort to backport that. In addition to 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. MAINTAIERS NOTE: Three patches are already part of Linux stable and should be removed with the next minor kernel version bump: 789-STABLE-01-net-dsa-mt7530-prevent-possible-incorrect-XTAL-frequ.patch 789-STABLE-02-net-dsa-mt7530-fix-link-local-frames-that-ingress-vl.patch 789-STABLE-03-net-dsa-mt7530-fix-handling-of-all-link-local-frames.patch Signed-off-by: Daniel Golle <daniel@makrotopia.org>
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From 9ec0a800c8e0850e1358b7402d6af557af81cb38 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:03 +0300
|
||
Subject: [PATCH 31/48] net: dsa: mt7530: move XTAL check to mt7530_setup()
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
The crystal frequency concerns the switch core. The frequency should be
|
||
checked when the switch is being set up so the driver can reject the
|
||
unsupported hardware earlier and without requiring port 6 to be used.
|
||
|
||
Move it to mt7530_setup(). Drop the unnecessary function printing.
|
||
|
||
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
||
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-2-d7d92a185cb1@arinc9.com
|
||
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||
---
|
||
drivers/net/dsa/mt7530.c | 13 ++++++-------
|
||
1 file changed, 6 insertions(+), 7 deletions(-)
|
||
|
||
--- a/drivers/net/dsa/mt7530.c
|
||
+++ b/drivers/net/dsa/mt7530.c
|
||
@@ -408,13 +408,6 @@ mt7530_pad_clk_setup(struct dsa_switch *
|
||
|
||
xtal = mt7530_read(priv, MT7530_MHWTRAP) & HWTRAP_XTAL_MASK;
|
||
|
||
- if (xtal == HWTRAP_XTAL_20MHZ) {
|
||
- dev_err(priv->dev,
|
||
- "%s: MT7530 with a 20MHz XTAL is not supported!\n",
|
||
- __func__);
|
||
- return -EINVAL;
|
||
- }
|
||
-
|
||
switch (interface) {
|
||
case PHY_INTERFACE_MODE_RGMII:
|
||
trgint = 0;
|
||
@@ -2286,6 +2279,12 @@ mt7530_setup(struct dsa_switch *ds)
|
||
return -ENODEV;
|
||
}
|
||
|
||
+ if ((val & HWTRAP_XTAL_MASK) == HWTRAP_XTAL_20MHZ) {
|
||
+ dev_err(priv->dev,
|
||
+ "MT7530 with a 20MHz XTAL is not supported!\n");
|
||
+ return -EINVAL;
|
||
+ }
|
||
+
|
||
/* Reset the switch through internal reset */
|
||
mt7530_write(priv, MT7530_SYS_CTRL,
|
||
SYS_CTRL_PHY_RST | SYS_CTRL_SW_RST |
|