forked from Lienol/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bcm4908: fix b53 regression regarding RGMII reg(s)
This fixes: [ 35.308550] WARNING: CPU: 0 PID: 230 at bcm_sf2_reg_rgmii_cntrl.isra.0+0x84/0x90 Signed-off-by: Rafał Miłecki <[email protected]>
- Loading branch information
Rafał Miłecki
committed
Nov 8, 2021
1 parent
4e9be47
commit c4ff53b
Showing
3 changed files
with
48 additions
and
2 deletions.
There are no files selected for viewing
46 changes: 46 additions & 0 deletions
46
...08/patches-5.10/075-v5.13-0006-net-dsa-bcm_sf2-Fix-bcm_sf2_reg_rgmii_cntrl-call-for.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
From fc516d3a6aa2c6ffe27d0da8818d13839e023e7e Mon Sep 17 00:00:00 2001 | ||
From: Florian Fainelli <[email protected]> | ||
Date: Fri, 21 May 2021 10:46:14 -0700 | ||
Subject: [PATCH] net: dsa: bcm_sf2: Fix bcm_sf2_reg_rgmii_cntrl() call for | ||
non-RGMII port | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
We cannot call bcm_sf2_reg_rgmii_cntrl() for a port that is not RGMII, | ||
yet we do that in bcm_sf2_sw_mac_link_up() irrespective of the port's | ||
interface. Move that read until we have properly qualified the PHY | ||
interface mode. This avoids triggering a warning on 7278 platforms that | ||
have GMII ports. | ||
|
||
Fixes: 55cfeb396965 ("net: dsa: bcm_sf2: add function finding RGMII register") | ||
Signed-off-by: Florian Fainelli <[email protected]> | ||
Acked-by: Rafał Miłecki <[email protected]> | ||
Signed-off-by: David S. Miller <[email protected]> | ||
--- | ||
drivers/net/dsa/bcm_sf2.c | 5 ++--- | ||
1 file changed, 2 insertions(+), 3 deletions(-) | ||
|
||
--- a/drivers/net/dsa/bcm_sf2.c | ||
+++ b/drivers/net/dsa/bcm_sf2.c | ||
@@ -821,11 +821,9 @@ static void bcm_sf2_sw_mac_link_up(struc | ||
bcm_sf2_sw_mac_link_set(ds, port, interface, true); | ||
|
||
if (port != core_readl(priv, CORE_IMP0_PRT_ID)) { | ||
- u32 reg_rgmii_ctrl; | ||
+ u32 reg_rgmii_ctrl = 0; | ||
u32 reg, offset; | ||
|
||
- reg_rgmii_ctrl = bcm_sf2_reg_rgmii_cntrl(priv, port); | ||
- | ||
if (priv->type == BCM4908_DEVICE_ID || | ||
priv->type == BCM7445_DEVICE_ID) | ||
offset = CORE_STS_OVERRIDE_GMIIP_PORT(port); | ||
@@ -836,6 +834,7 @@ static void bcm_sf2_sw_mac_link_up(struc | ||
interface == PHY_INTERFACE_MODE_RGMII_TXID || | ||
interface == PHY_INTERFACE_MODE_MII || | ||
interface == PHY_INTERFACE_MODE_REVMII) { | ||
+ reg_rgmii_ctrl = bcm_sf2_reg_rgmii_cntrl(priv, port); | ||
reg = reg_readl(priv, reg_rgmii_ctrl); | ||
reg &= ~(RX_PAUSE_EN | TX_PAUSE_EN); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,7 +29,7 @@ Signed-off-by: Rafał Miłecki <[email protected]> | |
|
||
--- a/drivers/net/dsa/bcm_sf2.c | ||
+++ b/drivers/net/dsa/bcm_sf2.c | ||
@@ -1488,10 +1488,14 @@ static int bcm_sf2_sw_probe(struct platf | ||
@@ -1487,10 +1487,14 @@ static int bcm_sf2_sw_probe(struct platf | ||
rev = reg_readl(priv, REG_PHY_REVISION); | ||
priv->hw_params.gphy_rev = rev & PHY_REVISION_MASK; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,7 +15,7 @@ Signed-off-by: Rafał Miłecki <[email protected]> | |
|
||
--- a/drivers/net/dsa/bcm_sf2.c | ||
+++ b/drivers/net/dsa/bcm_sf2.c | ||
@@ -1502,6 +1502,12 @@ static int bcm_sf2_sw_probe(struct platf | ||
@@ -1501,6 +1501,12 @@ static int bcm_sf2_sw_probe(struct platf | ||
priv->hw_params.core_rev >> 8, priv->hw_params.core_rev & 0xff, | ||
priv->irq0, priv->irq1); | ||
|
||
|