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>
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From d55c300aa1fe240aa3eba18550ba6c4e2c4bd157 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:03 +0200
|
||
Subject: [PATCH 43/48] net: dsa: mt7530: put initialising PCS devices code
|
||
back to original order
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
The commit fae463084032 ("net: dsa: mt753x: fix pcs conversion regression")
|
||
fixes regression caused by cpu_port_config manually calling phylink
|
||
operations. cpu_port_config was deemed useless and was removed. Therefore,
|
||
put initialising PCS devices code back to its original order.
|
||
|
||
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||
---
|
||
drivers/net/dsa/mt7530.c | 20 ++++++++++----------
|
||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||
|
||
--- a/drivers/net/dsa/mt7530.c
|
||
+++ b/drivers/net/dsa/mt7530.c
|
||
@@ -2845,17 +2845,9 @@ static int
|
||
mt753x_setup(struct dsa_switch *ds)
|
||
{
|
||
struct mt7530_priv *priv = ds->priv;
|
||
- int i, ret;
|
||
+ int ret = priv->info->sw_setup(ds);
|
||
+ int i;
|
||
|
||
- /* Initialise the PCS devices */
|
||
- for (i = 0; i < priv->ds->num_ports; i++) {
|
||
- priv->pcs[i].pcs.ops = priv->info->pcs_ops;
|
||
- priv->pcs[i].pcs.neg_mode = true;
|
||
- priv->pcs[i].priv = priv;
|
||
- priv->pcs[i].port = i;
|
||
- }
|
||
-
|
||
- ret = priv->info->sw_setup(ds);
|
||
if (ret)
|
||
return ret;
|
||
|
||
@@ -2867,6 +2859,14 @@ mt753x_setup(struct dsa_switch *ds)
|
||
if (ret && priv->irq)
|
||
mt7530_free_irq_common(priv);
|
||
|
||
+ /* Initialise the PCS devices */
|
||
+ for (i = 0; i < priv->ds->num_ports; i++) {
|
||
+ priv->pcs[i].pcs.ops = priv->info->pcs_ops;
|
||
+ priv->pcs[i].pcs.neg_mode = true;
|
||
+ priv->pcs[i].priv = priv;
|
||
+ priv->pcs[i].port = i;
|
||
+ }
|
||
+
|
||
if (priv->create_sgmii) {
|
||
ret = priv->create_sgmii(priv);
|
||
if (ret && priv->irq)
|