openwrt/target/linux/generic/backport-6.1/790-28-v6.9-net-dsa-mt7530-do-not-set-priv-p5_interface-on-mt753.patch

From 120581c81ad19704a9325505c83a82b7e760e96e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
Date: Mon, 22 Jan 2024 08:35:57 +0300
Subject: [PATCH 28/48] net: dsa: mt7530: do not set priv->p5_interface on
 mt7530_setup_port5()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Running mt7530_setup_port5() from mt7530_setup() used to handle all cases
of configuring port 5, including phylink.

Setting priv->p5_interface under mt7530_setup_port5() makes sure that
mt7530_setup_port5() from mt753x_phylink_mac_config() won't run.

The commit ("net: dsa: mt7530: improve code path for setting up port 5")
makes so that mt7530_setup_port5() from mt7530_setup() runs only on
non-phylink cases.

Get rid of unnecessarily setting priv->p5_interface under
mt7530_setup_port5() as port 5 phylink configuration will be done by
running mt7530_setup_port5() from mt753x_phylink_mac_config() now.

Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Link: https://lore.kernel.org/r/20240122-for-netnext-mt7530-improvements-1-v3-6-042401f2b279@arinc9.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 drivers/net/dsa/mt7530.c | 2 --
 1 file changed, 2 deletions(-)

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -971,8 +971,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));
 
-	priv->p5_interface = interface;
-
 unlock_exit:
 	mutex_unlock(&priv->reg_mutex);
 }
-												generic: 6.1: sync mt7530 DSA driver with upstream

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>

											
										
										
											2024-04-09 22:33:05 +00:00
+								From 120581c81ad19704a9325505c83a82b7e760e96e Mon Sep 17 00:00:00 2001
 								From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
 								Date: Mon, 22 Jan 2024 08:35:57 +0300
 								Subject: [PATCH 28/48] net: dsa: mt7530: do not set priv->p5_interface on
 								 mt7530_setup_port5()
 								MIME-Version: 1.0
 								Content-Type: text/plain; charset=UTF-8
 								Content-Transfer-Encoding: 8bit
 								Running mt7530_setup_port5() from mt7530_setup() used to handle all cases
 								of configuring port 5, including phylink.
 								Setting priv->p5_interface under mt7530_setup_port5() makes sure that
 								mt7530_setup_port5() from mt753x_phylink_mac_config() won't run.
 								The commit ("net: dsa: mt7530: improve code path for setting up port 5")
 								makes so that mt7530_setup_port5() from mt7530_setup() runs only on
 								non-phylink cases.
 								Get rid of unnecessarily setting priv->p5_interface under
 								mt7530_setup_port5() as port 5 phylink configuration will be done by
 								running mt7530_setup_port5() from mt753x_phylink_mac_config() now.
 								Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
 								Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
 								Link: https://lore.kernel.org/r/20240122-for-netnext-mt7530-improvements-1-v3-6-042401f2b279@arinc9.com
 								Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 								---
 								 drivers/net/dsa/mt7530.c | 2 --
 file changed, 2 deletions(-)
 								--- a/drivers/net/dsa/mt7530.c
 								+++ b/drivers/net/dsa/mt7530.c
@@ -971,8 +971,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));
 								-	priv->p5_interface = interface;
 								-
 								 unlock_exit:
 								 	mutex_unlock(&priv->reg_mutex);
 								 }