mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-19 08:56:44 +00:00
5efd41c10b
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.28 Removed upstream: pending-6.6/796-net-dsa-mt7530-trap-link-local-frames-regardless-of-.patch All oither patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.28&id=8b6c4b62582606c62074a7e7c64156f56d2785f2 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From ab1ddb241bc1cb3d80aa51207810edd5cb0bbdc5 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 25/30] 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
|
||
@@ -3009,17 +3009,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;
|
||
|
||
@@ -3031,6 +3023,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)
|