forked from Openwrt-EcoNet/openwrt
b0c8780604
Update BCM5325 patches to the latest version sent to netdev. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 2c09136c63be15b91cf39b52a707b3be8eb1fe71 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
|
|
Date: Fri, 30 May 2025 23:13:01 +0200
|
|
Subject: [RFC PATCH net-next v2 05/10] net: dsa: b53: prevent DIS_LEARNING
|
|
access on BCM5325
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
BCM5325 doesn't implement DIS_LEARNING register so we should avoid reading
|
|
or writing it.
|
|
|
|
Fixes: f9b3827ee66c ("net: dsa: b53: Support setting learning on port")
|
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|
---
|
|
drivers/net/dsa/b53/b53_common.c | 11 ++++++++++-
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
@@ -593,6 +593,9 @@ static void b53_port_set_learning(struct
|
|
{
|
|
u16 reg;
|
|
|
|
+ if (is5325(dev))
|
|
+ return;
|
|
+
|
|
b53_read16(dev, B53_CTRL_PAGE, B53_DIS_LEARNING, ®);
|
|
if (learning)
|
|
reg &= ~BIT(port);
|
|
@@ -2246,7 +2249,13 @@ int b53_br_flags_pre(struct dsa_switch *
|
|
struct switchdev_brport_flags flags,
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
- if (flags.mask & ~(BR_FLOOD | BR_MCAST_FLOOD | BR_LEARNING))
|
|
+ struct b53_device *dev = ds->priv;
|
|
+ unsigned long mask = (BR_FLOOD | BR_MCAST_FLOOD);
|
|
+
|
|
+ if (!is5325(dev))
|
|
+ mask |= BR_LEARNING;
|
|
+
|
|
+ if (flags.mask & ~mask)
|
|
return -EINVAL;
|
|
|
|
return 0;
|