net: dsa: b53: fix learning on VLAN unaware bridges

KanjiMonster · Sasha Levin · commit 0345ae141d6e · 2025-05-12T13:14:51.000-04:00
[ Upstream commit 9f34ad8 ] When VLAN filtering is off, we configure the switch to forward, but not learn on VLAN table misses. This effectively disables learning while not filtering. Fix this by switching to forward and learn. Setting the learning disable register will still control whether learning actually happens. Fixes: dad8d7c ("net: dsa: b53: Properly account for VLAN filtering") Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Tested-by: Florian Fainelli <florian.fainelli@broadcom.com> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Link: https://patch.msgid.link/20250429201710.330937-11-jonas.gorski@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
@@ -383,7 +383,7 @@ static void b53_enable_vlan(struct b53_device *dev, int port, bool enable,
 			vc4 |= VC4_ING_VID_VIO_DROP << VC4_ING_VID_CHECK_S;
 			vc5 |= VC5_DROP_VTABLE_MISS;
 		} else {
-			vc4 |= VC4_ING_VID_VIO_FWD << VC4_ING_VID_CHECK_S;
+			vc4 |= VC4_NO_ING_VID_CHK << VC4_ING_VID_CHECK_S;
 			vc5 &= ~VC5_DROP_VTABLE_MISS;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ static void b53_enable_vlan(struct b53_device *dev, int port, bool enable,`
`383`	`383`	`vc4 \|= VC4_ING_VID_VIO_DROP << VC4_ING_VID_CHECK_S;`
`384`	`384`	`vc5 \|= VC5_DROP_VTABLE_MISS;`
`385`	`385`	`} else {`
`386`		`- vc4 \|= VC4_ING_VID_VIO_FWD << VC4_ING_VID_CHECK_S;`
	`386`	`+ vc4 \|= VC4_NO_ING_VID_CHK << VC4_ING_VID_CHECK_S;`
`387`	`387`	`vc5 &= ~VC5_DROP_VTABLE_MISS;`
`388`	`388`	`}`
`389`	`389`