]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: dsa: b53: fix VLAN_ID_IDX write size for BCM5325/65
authorJonas Gorski <jonas.gorski@gmail.com>
Fri, 28 Nov 2025 08:06:19 +0000 (09:06 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Dec 2025 13:03:29 +0000 (14:03 +0100)
[ Upstream commit 6f268e275c74dae0536e0b61982a8db25bcf4f16 ]

Since BCM5325 and BCM5365 only support up to 256 VLANs, the VLAN_ID_IDX
register is only 8 bit wide, not 16 bit, so use an appropriate accessor.

Fixes: c45655386e53 ("net: dsa: b53: add support for FDB operations on 5325/5365")
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Tested-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: https://patch.msgid.link/20251128080625.27181-2-jonas.gorski@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 eb767edc4c135bbfe170dd40c33e78fc0cad9240..a09ed32dccc07126232ee0f0e464b5fd6db488c6 100644 (file)
@@ -1924,8 +1924,12 @@ static int b53_arl_op(struct b53_device *dev, int op, int port,
 
        /* Perform a read for the given MAC and VID */
        b53_write48(dev, B53_ARLIO_PAGE, B53_MAC_ADDR_IDX, mac);
-       if (!is5325m(dev))
-               b53_write16(dev, B53_ARLIO_PAGE, B53_VLAN_ID_IDX, vid);
+       if (!is5325m(dev)) {
+               if (is5325(dev) || is5365(dev))
+                       b53_write8(dev, B53_ARLIO_PAGE, B53_VLAN_ID_IDX, vid);
+               else
+                       b53_write16(dev, B53_ARLIO_PAGE, B53_VLAN_ID_IDX, vid);
+       }
 
        /* Issue a read operation for this MAC */
        ret = b53_arl_rw_op(dev, 1);