aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2025-06-14 09:59:55 +0200
committerJakub Kicinski <kuba@kernel.org>2025-06-17 17:52:17 -0700
commit800728abd9f83bda4de62a30ce62a8b41c242020 (patch)
treed21e9c419521d2ec99ea7383825b86b910473bef
parentnet: dsa: b53: fix IP_MULTICAST_CTRL on BCM5325 (diff)
downloadwireguard-linux-800728abd9f83bda4de62a30ce62a8b41c242020.tar.xz
wireguard-linux-800728abd9f83bda4de62a30ce62a8b41c242020.zip
net: dsa: b53: prevent DIS_LEARNING access on BCM5325
BCM5325 doesn't implement DIS_LEARNING 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-10-noltari@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--drivers/net/dsa/b53/b53_common.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index c7c950127448..daf7c1906711 100644
--- 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 b53_device *dev, int port,
{
u16 reg;
+ if (is5325(dev))
+ return;
+
b53_read16(dev, B53_CTRL_PAGE, B53_DIS_LEARNING, &reg);
if (learning)
reg &= ~BIT(port);
@@ -2243,7 +2246,13 @@ int b53_br_flags_pre(struct dsa_switch *ds, int port,
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;