mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +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>
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
From 27b692012840f658c84a3102c0aeca2676f03132 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Thu, 15 Dec 2022 03:47:59 +0000
|
|
Subject: [PATCH 01/48] net: dsa: mt7530: remove redundant assignment
|
|
|
|
Russell King correctly pointed out that the MAC_2500FD capability is
|
|
already added for port 5 (if not in RGMII mode) and port 6 (which only
|
|
supports SGMII) by mt7531_mac_port_get_caps. Remove the reduntant
|
|
setting of this capability flag which was added by a previous commit.
|
|
|
|
Fixes: e19de30d2080 ("net: dsa: mt7530: add support for in-band link status")
|
|
Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Link: https://lore.kernel.org/r/Y5qY7x6la5TxZxzX@makrotopia.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -3010,9 +3010,6 @@ static void mt753x_phylink_get_caps(stru
|
|
config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
|
|
MAC_10 | MAC_100 | MAC_1000FD;
|
|
|
|
- if ((priv->id == ID_MT7531) && mt753x_is_mac_port(port))
|
|
- config->mac_capabilities |= MAC_2500FD;
|
|
-
|
|
/* This driver does not make use of the speed, duplex, pause or the
|
|
* advertisement in its mac_config, so it is safe to mark this driver
|
|
* as non-legacy.
|