mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
fe9d2ccbc3
Move accepted patches to backport folder, re-add previously removed patch
which caused havoc on MT7621 and add the (still pending) fix.
Fixes: d40691a5fb ("generic: 6.1, 6.6: mt7530: import pending patches")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
80 lines
3.1 KiB
Diff
80 lines
3.1 KiB
Diff
From patchwork Sat Apr 27 11:24:42 2024
|
||
Content-Type: text/plain; charset="utf-8"
|
||
MIME-Version: 1.0
|
||
Content-Transfer-Encoding: 8bit
|
||
X-Patchwork-Submitter: =?utf-8?b?QXLEsW7DpyDDnE5BTCB2aWEgQjQgUmVsYXk=?=
|
||
<devnull+arinc.unal.arinc9.com@kernel.org>
|
||
X-Patchwork-Id: 13645655
|
||
From: =?utf-8?b?QXLEsW7DpyDDnE5BTCB2aWEgQjQgUmVsYXk=?=
|
||
<devnull+arinc.unal.arinc9.com@kernel.org>
|
||
Date: Sat, 27 Apr 2024 14:24:42 +0300
|
||
Subject: [PATCH net-next] net: dsa: mt7530: do not set MT7530_P5_DIS when
|
||
PHY muxing is being used
|
||
Precedence: bulk
|
||
X-Mailing-List: netdev@vger.kernel.org
|
||
List-Id: <netdev.vger.kernel.org>
|
||
List-Subscribe: <mailto:netdev+subscribe@vger.kernel.org>
|
||
List-Unsubscribe: <mailto:netdev+unsubscribe@vger.kernel.org>
|
||
MIME-Version: 1.0
|
||
Message-Id:
|
||
<20240427-for-netnext-mt7530-do-not-disable-port5-when-phy-muxing-v1-1-793cdf9d7707@arinc9.com>
|
||
To: Daniel Golle <daniel@makrotopia.org>, DENG Qingfang <dqfext@gmail.com>,
|
||
Sean Wang <sean.wang@mediatek.com>, Andrew Lunn <andrew@lunn.ch>,
|
||
Florian Fainelli <f.fainelli@gmail.com>,
|
||
Vladimir Oltean <olteanv@gmail.com>,
|
||
"David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>,
|
||
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
|
||
Matthias Brugger <matthias.bgg@gmail.com>,
|
||
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
||
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
|
||
linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org,
|
||
=?utf-8?b?QXLEsW7DpyDDnE5BTA==?= <arinc.unal@arinc9.com>
|
||
X-Mailer: b4 0.13.0
|
||
X-Patchwork-Delegate: kuba@kernel.org
|
||
|
||
From: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||
|
||
When the PHY muxing feature is in use, port 5 won't be defined in the
|
||
device tree. Because of this, the type member of the dsa_port structure for
|
||
this port will be assigned DSA_PORT_TYPE_UNUSED. The dsa_port_setup()
|
||
function calls ds->ops->port_disable() when the port type is
|
||
DSA_PORT_TYPE_UNUSED.
|
||
|
||
The MT7530_P5_DIS bit is unset when PHY muxing is being used.
|
||
mt7530_port_disable() which is assigned to ds->ops->port_disable() is
|
||
called afterwards. Currently, mt7530_port_disable() sets MT7530_P5_DIS
|
||
which breaks network connectivity when PHY muxing is being used.
|
||
|
||
Therefore, do not set MT7530_P5_DIS when PHY muxing is being used.
|
||
|
||
Fixes: 377174c5760c ("net: dsa: mt7530: move MT753X_MTRAP operations for MT7530")
|
||
Reported-by: Daniel Golle <daniel@makrotopia.org>
|
||
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||
---
|
||
Hello.
|
||
|
||
I've sent this to net-next as the patch it fixes is on the current
|
||
development cycle.
|
||
---
|
||
drivers/net/dsa/mt7530.c | 2 +-
|
||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
||
|
||
---
|
||
base-commit: 5c4c0edca68a5841a8d53ccd49596fe199c8334c
|
||
change-id: 20240427-for-netnext-mt7530-do-not-disable-port5-when-phy-muxing-7ff5fd0995d7
|
||
|
||
Best regards,
|
||
|
||
--- a/drivers/net/dsa/mt7530.c
|
||
+++ b/drivers/net/dsa/mt7530.c
|
||
@@ -1220,7 +1220,7 @@ mt7530_port_disable(struct dsa_switch *d
|
||
if (priv->id != ID_MT7530 && priv->id != ID_MT7621)
|
||
return;
|
||
|
||
- if (port == 5)
|
||
+ if (port == 5 && priv->p5_mode == GMAC5)
|
||
mt7530_set(priv, MT753X_MTRAP, MT7530_P5_DIS);
|
||
else if (port == 6)
|
||
mt7530_set(priv, MT753X_MTRAP, MT7530_P6_DIS);
|