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>
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From 0c282205ef8c6dd6d2c145fac1fb6aba3e65c02d Mon Sep 17 00:00:00 2001
|
||
From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
|
||
Date: Fri, 1 Mar 2024 12:43:02 +0200
|
||
Subject: [PATCH 42/48] net: dsa: mt7530: get rid of mt753x_mac_config()
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
There is no need for a separate function to call
|
||
priv->info->mac_port_config(). Call it from mt753x_phylink_mac_config()
|
||
instead and remove mt753x_mac_config().
|
||
|
||
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||
---
|
||
drivers/net/dsa/mt7530.c | 14 ++------------
|
||
1 file changed, 2 insertions(+), 12 deletions(-)
|
||
|
||
--- a/drivers/net/dsa/mt7530.c
|
||
+++ b/drivers/net/dsa/mt7530.c
|
||
@@ -2661,16 +2661,6 @@ mt7531_mac_config(struct dsa_switch *ds,
|
||
}
|
||
}
|
||
|
||
-static void
|
||
-mt753x_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
|
||
- const struct phylink_link_state *state)
|
||
-{
|
||
- struct mt7530_priv *priv = ds->priv;
|
||
-
|
||
- if (priv->info->mac_port_config)
|
||
- priv->info->mac_port_config(ds, port, mode, state->interface);
|
||
-}
|
||
-
|
||
static struct phylink_pcs *
|
||
mt753x_phylink_mac_select_pcs(struct dsa_switch *ds, int port,
|
||
phy_interface_t interface)
|
||
@@ -2696,8 +2686,8 @@ mt753x_phylink_mac_config(struct dsa_swi
|
||
struct mt7530_priv *priv = ds->priv;
|
||
u32 mcr_cur, mcr_new;
|
||
|
||
- if (port == 5 || port == 6)
|
||
- mt753x_mac_config(ds, port, mode, state);
|
||
+ if ((port == 5 || port == 6) && priv->info->mac_port_config)
|
||
+ priv->info->mac_port_config(ds, port, mode, state->interface);
|
||
|
||
mcr_cur = mt7530_read(priv, MT7530_PMCR_P(port));
|
||
mcr_new = mcr_cur;
|