mirror of
https://github.com/immortalwrt/immortalwrt.git
synced 2025-08-11 06:11:53 +08:00
0bd694ea22
Backport accepted BCM5325 patches from net-next. These patches will be merged in the v6.17 kernel window. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 22ccaaca43440e90a3b68d2183045b42247dc4be Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
|
|
Date: Sat, 14 Jun 2025 09:59:53 +0200
|
|
Subject: [PATCH] net: dsa: b53: prevent SWITCH_CTRL access on BCM5325
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
BCM5325 doesn't implement SWITCH_CTRL register so we should avoid reading
|
|
or writing it.
|
|
|
|
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|
Link: https://patch.msgid.link/20250614080000.1884236-8-noltari@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/b53/b53_common.c | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
@@ -361,11 +361,12 @@ static void b53_set_forwarding(struct b5
|
|
|
|
b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt);
|
|
|
|
- /* Include IMP port in dumb forwarding mode
|
|
- */
|
|
- b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, &mgmt);
|
|
- mgmt |= B53_MII_DUMB_FWDG_EN;
|
|
- b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt);
|
|
+ if (!is5325(dev)) {
|
|
+ /* Include IMP port in dumb forwarding mode */
|
|
+ b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, &mgmt);
|
|
+ mgmt |= B53_MII_DUMB_FWDG_EN;
|
|
+ b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt);
|
|
+ }
|
|
|
|
/* Look at B53_UC_FWD_EN and B53_MC_FWD_EN to decide whether
|
|
* frames should be flooded or not.
|