]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: dsa: b53: prevent DIS_LEARNING access on BCM5325
authorÁlvaro Fernández Rojas <noltari@gmail.com>
Sat, 14 Jun 2025 07:59:55 +0000 (09:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Aug 2025 16:41:18 +0000 (18:41 +0200)
[ Upstream commit 800728abd9f83bda4de62a30ce62a8b41c242020 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/dsa/b53/b53_common.c

index 8abbcc588267d7616498a3481c8c29423adaa235..990d21fad939fdf625b3454e8b8f14ccd767ac75 100644 (file)
@@ -583,6 +583,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);
@@ -2195,7 +2198,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;