net: dsa: b53: prevent DIS_LEARNING access on BCM5325

[ 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>
This commit is contained in:
Álvaro Fernández Rojas
2025-06-14 09:59:55 +02:00
committed by Greg Kroah-Hartman
parent bc0e01d663
commit 8609f3c44e

View File

@@ -561,6 +561,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);
@@ -2062,7 +2065,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;