mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-18 13:29:16 +02:00
generic: 6.1, 6.6: move accepted patches to backport folders
Move two accepted patches for the mt7530 DSA driver from pending to accepted. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
parent
a7ae4ed0a3
commit
50f7155d57
45
target/linux/generic/backport-6.1/790-69-v6.10-net-dsa-mt7530-do-not-set-MT7530_P5_DIS-when-PHY-.patch
Normal file
45
target/linux/generic/backport-6.1/790-69-v6.10-net-dsa-mt7530-do-not-set-MT7530_P5_DIS-when-PHY-.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From 16e6592cd5c5bd74d8890973489f60176c692614 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
|
||||
Date: Sun, 28 Apr 2024 12:19:58 +0300
|
||||
Subject: [PATCH] net: dsa: mt7530: do not set MT7530_P5_DIS when PHY muxing is
|
||||
being used
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
DSA initalises the ds->num_ports amount of ports in
|
||||
dsa_switch_touch_ports(). 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 in mt7530_setup() 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>
|
||||
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
||||
Link: https://lore.kernel.org/r/20240428-for-netnext-mt7530-do-not-disable-port5-when-phy-muxing-v2-1-bb7c37d293f8@arinc9.com
|
||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||
---
|
||||
drivers/net/dsa/mt7530.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/net/dsa/mt7530.c
|
||||
+++ b/drivers/net/dsa/mt7530.c
|
||||
@@ -1227,7 +1227,8 @@ mt7530_port_disable(struct dsa_switch *d
|
||||
if (priv->id != ID_MT7530 && priv->id != ID_MT7621)
|
||||
return;
|
||||
|
||||
- if (port == 5)
|
||||
+ /* Do not set MT7530_P5_DIS when port 5 is being used for PHY muxing. */
|
||||
+ 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);
|
||||
45
target/linux/generic/backport-6.1/790-70-v6.10-796-net-dsa-mt7530-detect-PHY-muxing-when-PHY-is-defined.patch
Normal file
45
target/linux/generic/backport-6.1/790-70-v6.10-796-net-dsa-mt7530-detect-PHY-muxing-when-PHY-is-defined.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From d8dcf5bd6d0eace9f7c1daa14b63b3925b09d033 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
|
||||
Date: Tue, 30 Apr 2024 08:01:33 +0300
|
||||
Subject: [PATCH] net: dsa: mt7530: detect PHY muxing when PHY is defined on
|
||||
switch MDIO bus
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Currently, the MT7530 DSA subdriver configures the MT7530 switch to provide
|
||||
direct access to switch PHYs, meaning, the switch PHYs listen on the MDIO
|
||||
bus the switch listens on. The PHY muxing feature makes use of this.
|
||||
|
||||
This is problematic as the PHY may be attached before the switch is
|
||||
initialised, in which case, the PHY will fail to be attached.
|
||||
|
||||
Since commit 91374ba537bd ("net: dsa: mt7530: support OF-based registration
|
||||
of switch MDIO bus"), we can describe the switch PHYs on the MDIO bus of
|
||||
the switch on the device tree. Extend the check to detect PHY muxing when
|
||||
the PHY is defined on the MDIO bus of the switch on the device tree.
|
||||
|
||||
When the PHY is described this way, the switch will be initialised first,
|
||||
then the switch MDIO bus will be registered. Only after these steps, the
|
||||
PHY will be attached.
|
||||
|
||||
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||||
Reviewed-by: Daniel Golle <daniel@makrotopia.org>
|
||||
Link: https://lore.kernel.org/r/20240430-b4-for-netnext-mt7530-use-switch-mdio-bus-for-phy-muxing-v2-1-9104d886d0db@arinc9.com
|
||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||
---
|
||||
drivers/net/dsa/mt7530.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/net/dsa/mt7530.c
|
||||
+++ b/drivers/net/dsa/mt7530.c
|
||||
@@ -2489,7 +2489,8 @@ mt7530_setup(struct dsa_switch *ds)
|
||||
if (!phy_node)
|
||||
continue;
|
||||
|
||||
- if (phy_node->parent == priv->dev->of_node->parent) {
|
||||
+ if (phy_node->parent == priv->dev->of_node->parent ||
|
||||
+ phy_node->parent->parent == priv->dev->of_node) {
|
||||
ret = of_get_phy_mode(mac_np, &interface);
|
||||
if (ret && ret != -ENODEV) {
|
||||
of_node_put(mac_np);
|
||||
45
target/linux/generic/backport-6.6/790-53-v6.10-net-dsa-mt7530-do-not-set-MT7530_P5_DIS-when-PHY-.patch
Normal file
45
target/linux/generic/backport-6.6/790-53-v6.10-net-dsa-mt7530-do-not-set-MT7530_P5_DIS-when-PHY-.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From 16e6592cd5c5bd74d8890973489f60176c692614 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
|
||||
Date: Sun, 28 Apr 2024 12:19:58 +0300
|
||||
Subject: [PATCH] net: dsa: mt7530: do not set MT7530_P5_DIS when PHY muxing is
|
||||
being used
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
DSA initalises the ds->num_ports amount of ports in
|
||||
dsa_switch_touch_ports(). 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 in mt7530_setup() 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>
|
||||
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
||||
Link: https://lore.kernel.org/r/20240428-for-netnext-mt7530-do-not-disable-port5-when-phy-muxing-v2-1-bb7c37d293f8@arinc9.com
|
||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||
---
|
||||
drivers/net/dsa/mt7530.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/net/dsa/mt7530.c
|
||||
+++ b/drivers/net/dsa/mt7530.c
|
||||
@@ -1220,7 +1220,8 @@ mt7530_port_disable(struct dsa_switch *d
|
||||
if (priv->id != ID_MT7530 && priv->id != ID_MT7621)
|
||||
return;
|
||||
|
||||
- if (port == 5)
|
||||
+ /* Do not set MT7530_P5_DIS when port 5 is being used for PHY muxing. */
|
||||
+ 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);
|
||||
45
target/linux/generic/backport-6.6/790-54-v6.10-796-net-dsa-mt7530-detect-PHY-muxing-when-PHY-is-defined.patch
Normal file
45
target/linux/generic/backport-6.6/790-54-v6.10-796-net-dsa-mt7530-detect-PHY-muxing-when-PHY-is-defined.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From d8dcf5bd6d0eace9f7c1daa14b63b3925b09d033 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
|
||||
Date: Tue, 30 Apr 2024 08:01:33 +0300
|
||||
Subject: [PATCH] net: dsa: mt7530: detect PHY muxing when PHY is defined on
|
||||
switch MDIO bus
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Currently, the MT7530 DSA subdriver configures the MT7530 switch to provide
|
||||
direct access to switch PHYs, meaning, the switch PHYs listen on the MDIO
|
||||
bus the switch listens on. The PHY muxing feature makes use of this.
|
||||
|
||||
This is problematic as the PHY may be attached before the switch is
|
||||
initialised, in which case, the PHY will fail to be attached.
|
||||
|
||||
Since commit 91374ba537bd ("net: dsa: mt7530: support OF-based registration
|
||||
of switch MDIO bus"), we can describe the switch PHYs on the MDIO bus of
|
||||
the switch on the device tree. Extend the check to detect PHY muxing when
|
||||
the PHY is defined on the MDIO bus of the switch on the device tree.
|
||||
|
||||
When the PHY is described this way, the switch will be initialised first,
|
||||
then the switch MDIO bus will be registered. Only after these steps, the
|
||||
PHY will be attached.
|
||||
|
||||
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||||
Reviewed-by: Daniel Golle <daniel@makrotopia.org>
|
||||
Link: https://lore.kernel.org/r/20240430-b4-for-netnext-mt7530-use-switch-mdio-bus-for-phy-muxing-v2-1-9104d886d0db@arinc9.com
|
||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||
---
|
||||
drivers/net/dsa/mt7530.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/net/dsa/mt7530.c
|
||||
+++ b/drivers/net/dsa/mt7530.c
|
||||
@@ -2484,7 +2484,8 @@ mt7530_setup(struct dsa_switch *ds)
|
||||
if (!phy_node)
|
||||
continue;
|
||||
|
||||
- if (phy_node->parent == priv->dev->of_node->parent) {
|
||||
+ if (phy_node->parent == priv->dev->of_node->parent ||
|
||||
+ phy_node->parent->parent == priv->dev->of_node) {
|
||||
ret = of_get_phy_mode(mac_np, &interface);
|
||||
if (ret && ret != -ENODEV) {
|
||||
of_node_put(mac_np);
|
||||
@ -1,79 +0,0 @@
|
||||
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
|
||||
@@ -1227,7 +1227,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);
|
||||
@ -1,136 +0,0 @@
|
||||
From patchwork Tue Apr 30 05:01:33 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: 13648264
|
||||
X-Patchwork-Delegate: kuba@kernel.org
|
||||
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org
|
||||
[10.30.226.201])
|
||||
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||
(No client certificate requested)
|
||||
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C9C114A89;
|
||||
Tue, 30 Apr 2024 05:01:39 +0000 (UTC)
|
||||
Authentication-Results: smtp.subspace.kernel.org;
|
||||
arc=none smtp.client-ip=10.30.226.201
|
||||
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
|
||||
t=1714453299; cv=none;
|
||||
b=gV4Z0elIASLrrICjPPmDeR0kBaXtdjeqbz/cnj3/0V74cRGmjd5sMQ4PtMYq5iPdJkWbhn4mzf/WX9xcqituDcVV7Vj68zrsE5d6NavvrMK9kf7Ef3Yyr8gEbekALfL9fKuF6ul7TeVFQiFoGQyAJNFzB9YAiQGJlWzw98bldMQ=
|
||||
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
|
||||
s=arc-20240116; t=1714453299; c=relaxed/simple;
|
||||
bh=GGkybB3RbZ4yacytPZCe3ceKcaWca6ygWTw/PJtmpsk=;
|
||||
h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc;
|
||||
b=QRWD6k4Qg1t5nZj6oj2xdwWDCGHQWHG2xj0lkYcEMm3dMkvPpLbCIOptpZBJtSq06TMxRjVJhgVJ9ATDTIYGKwCHJTx3JTxspI+YkxLsXsfnz9jNxMyQ/+CO3xzRjTuKg0mGP3fl1Q1xznm/8cenWMDUOrv/p1Wlg1XZ8s01edY=
|
||||
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
|
||||
dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
|
||||
header.b=LTwGL2cB; arc=none smtp.client-ip=10.30.226.201
|
||||
Authentication-Results: smtp.subspace.kernel.org;
|
||||
dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
|
||||
header.b="LTwGL2cB"
|
||||
Received: by smtp.kernel.org (Postfix) with ESMTPS id 1A3AEC2BBFC;
|
||||
Tue, 30 Apr 2024 05:01:39 +0000 (UTC)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
|
||||
s=k20201202; t=1714453299;
|
||||
bh=GGkybB3RbZ4yacytPZCe3ceKcaWca6ygWTw/PJtmpsk=;
|
||||
h=From:Date:Subject:To:Cc:Reply-To:From;
|
||||
b=LTwGL2cBtvmG8vpW/5yPEkA2A4EWbBIHkpxGRp6NhmQcwKx6T+Q4Gt/MKTUdGZ6pp
|
||||
FHxkNOtF/KeqTZc814r9H7gtR+6rzRBCcQfWYl2TIdj+1edX/UrwUARQa8CQYwWK3V
|
||||
jqfD9pCOCm+hptOHs6o0+j5FaW5TtN6QJTG/1GpftEfJkQYpsp/jEL28MY35u99DBK
|
||||
yZErlS77MlNQEMScOR7McNtMj0pYnTvgrZLefdORzeWQhX6REODGKFL2xoSWjtg9jw
|
||||
QeQUp07wKwtuwHpKI07IBsFwIsclZYD3/oXrjBSSZmvwHCCvAYT+PXRiH0moLzHERn
|
||||
aa8XczXBSlBVw==
|
||||
Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org
|
||||
(localhost.localdomain [127.0.0.1])
|
||||
by smtp.lore.kernel.org (Postfix) with ESMTP id 04CA2C25B10;
|
||||
Tue, 30 Apr 2024 05:01:39 +0000 (UTC)
|
||||
From: =?utf-8?b?QXLEsW7DpyDDnE5BTCB2aWEgQjQgUmVsYXk=?=
|
||||
<devnull+arinc.unal.arinc9.com@kernel.org>
|
||||
Date: Tue, 30 Apr 2024 08:01:33 +0300
|
||||
Subject: [PATCH net-next v2] net: dsa: mt7530: detect PHY muxing when PHY
|
||||
is defined on switch MDIO bus
|
||||
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:
|
||||
<20240430-b4-for-netnext-mt7530-use-switch-mdio-bus-for-phy-muxing-v2-1-9104d886d0db@arinc9.com>
|
||||
X-B4-Tracking: v=1; b=H4sIACx7MGYC/6WOSw6DMBBDr1LNulNBIHy66j0qFhAGmAUJSgIFI
|
||||
e7eNFeovLJsPfsER5bJwfN2gqWNHRsdjLjfQE2tHgm5Dx5EIvIkFzV2OQ7Goiavafc4+1JmCa6
|
||||
O0H3Yqwnnng12q4u1ZTpwXnfWI8qqEEWdlamSEgJ+sTTwHqffEHD440ETkomdN/aIn7Y05v/Pb
|
||||
ykGDWUp6yqjVMpXa1mr+qHMDM11XV8dryM7CwEAAA==
|
||||
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: Bartel Eerdekens <bartel.eerdekens@constell8.be>,
|
||||
mithat.guner@xeront.com, erkin.bozoglu@xeront.com, 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-Developer-Signature: v=1; a=ed25519-sha256; t=1714453297; l=1949;
|
||||
i=arinc.unal@arinc9.com; s=arinc9-PC; h=from:subject:message-id;
|
||||
bh=c3IRARdnxa6x5otHszH4xrnla2RxJAal1114ej/d2wE=;
|
||||
b=FL4WEHh4zYu1gBE7wbaN+X2OMCOIMJVsYBkXurHM0IC3CnI6XfpKE1V5QLUSXby75WZfvQ0se
|
||||
lrMQos/eOAaCNbkyxUkmwb3opbC915iywMECA0lv/g0IAo6snRYzMae
|
||||
X-Developer-Key: i=arinc.unal@arinc9.com; a=ed25519;
|
||||
pk=Bd1s2kQtNfZAWyeLHg39jaWBDqt8Ud1WJXLFh7gxl20=
|
||||
X-Endpoint-Received: by B4 Relay for arinc.unal@arinc9.com/arinc9-PC with
|
||||
auth_id=158
|
||||
X-Original-From: =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= <arinc.unal@arinc9.com>
|
||||
Reply-To: arinc.unal@arinc9.com
|
||||
X-Patchwork-Delegate: kuba@kernel.org
|
||||
|
||||
From: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||||
|
||||
Currently, the MT7530 DSA subdriver configures the MT7530 switch to provide
|
||||
direct access to switch PHYs, meaning, the switch PHYs listen on the MDIO
|
||||
bus the switch listens on. The PHY muxing feature makes use of this.
|
||||
|
||||
This is problematic as the PHY may be attached before the switch is
|
||||
initialised, in which case, the PHY will fail to be attached.
|
||||
|
||||
Since commit 91374ba537bd ("net: dsa: mt7530: support OF-based registration
|
||||
of switch MDIO bus"), we can describe the switch PHYs on the MDIO bus of
|
||||
the switch on the device tree. Extend the check to detect PHY muxing when
|
||||
the PHY is defined on the MDIO bus of the switch on the device tree.
|
||||
|
||||
When the PHY is described this way, the switch will be initialised first,
|
||||
then the switch MDIO bus will be registered. Only after these steps, the
|
||||
PHY will be attached.
|
||||
|
||||
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||||
---
|
||||
Changes in v2:
|
||||
- Address the terminology on the patch log.
|
||||
- Link to v1: https://lore.kernel.org/r/20240429-b4-for-netnext-mt7530-use-switch-mdio-bus-for-phy-muxing-v1-1-1f775983e155@arinc9.com
|
||||
---
|
||||
drivers/net/dsa/mt7530.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
|
||||
---
|
||||
base-commit: 5c4c0edca68a5841a8d53ccd49596fe199c8334c
|
||||
change-id: 20240429-b4-for-netnext-mt7530-use-switch-mdio-bus-for-phy-muxing-586269371c55
|
||||
|
||||
Best regards,
|
||||
|
||||
--- a/drivers/net/dsa/mt7530.c
|
||||
+++ b/drivers/net/dsa/mt7530.c
|
||||
@@ -2488,7 +2488,8 @@ mt7530_setup(struct dsa_switch *ds)
|
||||
if (!phy_node)
|
||||
continue;
|
||||
|
||||
- if (phy_node->parent == priv->dev->of_node->parent) {
|
||||
+ if (phy_node->parent == priv->dev->of_node->parent ||
|
||||
+ phy_node->parent->parent == priv->dev->of_node) {
|
||||
ret = of_get_phy_mode(mac_np, &interface);
|
||||
if (ret && ret != -ENODEV) {
|
||||
of_node_put(mac_np);
|
||||
@ -1,79 +0,0 @@
|
||||
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);
|
||||
@ -1,136 +0,0 @@
|
||||
From patchwork Tue Apr 30 05:01:33 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: 13648264
|
||||
X-Patchwork-Delegate: kuba@kernel.org
|
||||
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org
|
||||
[10.30.226.201])
|
||||
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||
(No client certificate requested)
|
||||
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C9C114A89;
|
||||
Tue, 30 Apr 2024 05:01:39 +0000 (UTC)
|
||||
Authentication-Results: smtp.subspace.kernel.org;
|
||||
arc=none smtp.client-ip=10.30.226.201
|
||||
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
|
||||
t=1714453299; cv=none;
|
||||
b=gV4Z0elIASLrrICjPPmDeR0kBaXtdjeqbz/cnj3/0V74cRGmjd5sMQ4PtMYq5iPdJkWbhn4mzf/WX9xcqituDcVV7Vj68zrsE5d6NavvrMK9kf7Ef3Yyr8gEbekALfL9fKuF6ul7TeVFQiFoGQyAJNFzB9YAiQGJlWzw98bldMQ=
|
||||
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
|
||||
s=arc-20240116; t=1714453299; c=relaxed/simple;
|
||||
bh=GGkybB3RbZ4yacytPZCe3ceKcaWca6ygWTw/PJtmpsk=;
|
||||
h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc;
|
||||
b=QRWD6k4Qg1t5nZj6oj2xdwWDCGHQWHG2xj0lkYcEMm3dMkvPpLbCIOptpZBJtSq06TMxRjVJhgVJ9ATDTIYGKwCHJTx3JTxspI+YkxLsXsfnz9jNxMyQ/+CO3xzRjTuKg0mGP3fl1Q1xznm/8cenWMDUOrv/p1Wlg1XZ8s01edY=
|
||||
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
|
||||
dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
|
||||
header.b=LTwGL2cB; arc=none smtp.client-ip=10.30.226.201
|
||||
Authentication-Results: smtp.subspace.kernel.org;
|
||||
dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
|
||||
header.b="LTwGL2cB"
|
||||
Received: by smtp.kernel.org (Postfix) with ESMTPS id 1A3AEC2BBFC;
|
||||
Tue, 30 Apr 2024 05:01:39 +0000 (UTC)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
|
||||
s=k20201202; t=1714453299;
|
||||
bh=GGkybB3RbZ4yacytPZCe3ceKcaWca6ygWTw/PJtmpsk=;
|
||||
h=From:Date:Subject:To:Cc:Reply-To:From;
|
||||
b=LTwGL2cBtvmG8vpW/5yPEkA2A4EWbBIHkpxGRp6NhmQcwKx6T+Q4Gt/MKTUdGZ6pp
|
||||
FHxkNOtF/KeqTZc814r9H7gtR+6rzRBCcQfWYl2TIdj+1edX/UrwUARQa8CQYwWK3V
|
||||
jqfD9pCOCm+hptOHs6o0+j5FaW5TtN6QJTG/1GpftEfJkQYpsp/jEL28MY35u99DBK
|
||||
yZErlS77MlNQEMScOR7McNtMj0pYnTvgrZLefdORzeWQhX6REODGKFL2xoSWjtg9jw
|
||||
QeQUp07wKwtuwHpKI07IBsFwIsclZYD3/oXrjBSSZmvwHCCvAYT+PXRiH0moLzHERn
|
||||
aa8XczXBSlBVw==
|
||||
Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org
|
||||
(localhost.localdomain [127.0.0.1])
|
||||
by smtp.lore.kernel.org (Postfix) with ESMTP id 04CA2C25B10;
|
||||
Tue, 30 Apr 2024 05:01:39 +0000 (UTC)
|
||||
From: =?utf-8?b?QXLEsW7DpyDDnE5BTCB2aWEgQjQgUmVsYXk=?=
|
||||
<devnull+arinc.unal.arinc9.com@kernel.org>
|
||||
Date: Tue, 30 Apr 2024 08:01:33 +0300
|
||||
Subject: [PATCH net-next v2] net: dsa: mt7530: detect PHY muxing when PHY
|
||||
is defined on switch MDIO bus
|
||||
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:
|
||||
<20240430-b4-for-netnext-mt7530-use-switch-mdio-bus-for-phy-muxing-v2-1-9104d886d0db@arinc9.com>
|
||||
X-B4-Tracking: v=1; b=H4sIACx7MGYC/6WOSw6DMBBDr1LNulNBIHy66j0qFhAGmAUJSgIFI
|
||||
e7eNFeovLJsPfsER5bJwfN2gqWNHRsdjLjfQE2tHgm5Dx5EIvIkFzV2OQ7Goiavafc4+1JmCa6
|
||||
O0H3Yqwnnng12q4u1ZTpwXnfWI8qqEEWdlamSEgJ+sTTwHqffEHD440ETkomdN/aIn7Y05v/Pb
|
||||
ykGDWUp6yqjVMpXa1mr+qHMDM11XV8dryM7CwEAAA==
|
||||
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: Bartel Eerdekens <bartel.eerdekens@constell8.be>,
|
||||
mithat.guner@xeront.com, erkin.bozoglu@xeront.com, 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-Developer-Signature: v=1; a=ed25519-sha256; t=1714453297; l=1949;
|
||||
i=arinc.unal@arinc9.com; s=arinc9-PC; h=from:subject:message-id;
|
||||
bh=c3IRARdnxa6x5otHszH4xrnla2RxJAal1114ej/d2wE=;
|
||||
b=FL4WEHh4zYu1gBE7wbaN+X2OMCOIMJVsYBkXurHM0IC3CnI6XfpKE1V5QLUSXby75WZfvQ0se
|
||||
lrMQos/eOAaCNbkyxUkmwb3opbC915iywMECA0lv/g0IAo6snRYzMae
|
||||
X-Developer-Key: i=arinc.unal@arinc9.com; a=ed25519;
|
||||
pk=Bd1s2kQtNfZAWyeLHg39jaWBDqt8Ud1WJXLFh7gxl20=
|
||||
X-Endpoint-Received: by B4 Relay for arinc.unal@arinc9.com/arinc9-PC with
|
||||
auth_id=158
|
||||
X-Original-From: =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= <arinc.unal@arinc9.com>
|
||||
Reply-To: arinc.unal@arinc9.com
|
||||
X-Patchwork-Delegate: kuba@kernel.org
|
||||
|
||||
From: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||||
|
||||
Currently, the MT7530 DSA subdriver configures the MT7530 switch to provide
|
||||
direct access to switch PHYs, meaning, the switch PHYs listen on the MDIO
|
||||
bus the switch listens on. The PHY muxing feature makes use of this.
|
||||
|
||||
This is problematic as the PHY may be attached before the switch is
|
||||
initialised, in which case, the PHY will fail to be attached.
|
||||
|
||||
Since commit 91374ba537bd ("net: dsa: mt7530: support OF-based registration
|
||||
of switch MDIO bus"), we can describe the switch PHYs on the MDIO bus of
|
||||
the switch on the device tree. Extend the check to detect PHY muxing when
|
||||
the PHY is defined on the MDIO bus of the switch on the device tree.
|
||||
|
||||
When the PHY is described this way, the switch will be initialised first,
|
||||
then the switch MDIO bus will be registered. Only after these steps, the
|
||||
PHY will be attached.
|
||||
|
||||
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||||
---
|
||||
Changes in v2:
|
||||
- Address the terminology on the patch log.
|
||||
- Link to v1: https://lore.kernel.org/r/20240429-b4-for-netnext-mt7530-use-switch-mdio-bus-for-phy-muxing-v1-1-1f775983e155@arinc9.com
|
||||
---
|
||||
drivers/net/dsa/mt7530.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
|
||||
---
|
||||
base-commit: 5c4c0edca68a5841a8d53ccd49596fe199c8334c
|
||||
change-id: 20240429-b4-for-netnext-mt7530-use-switch-mdio-bus-for-phy-muxing-586269371c55
|
||||
|
||||
Best regards,
|
||||
|
||||
--- a/drivers/net/dsa/mt7530.c
|
||||
+++ b/drivers/net/dsa/mt7530.c
|
||||
@@ -2483,7 +2483,8 @@ mt7530_setup(struct dsa_switch *ds)
|
||||
if (!phy_node)
|
||||
continue;
|
||||
|
||||
- if (phy_node->parent == priv->dev->of_node->parent) {
|
||||
+ if (phy_node->parent == priv->dev->of_node->parent ||
|
||||
+ phy_node->parent->parent == priv->dev->of_node) {
|
||||
ret = of_get_phy_mode(mac_np, &interface);
|
||||
if (ret && ret != -ENODEV) {
|
||||
of_node_put(mac_np);
|
||||
Loading…
Reference in New Issue
Block a user