]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: dsa: b53: fix b53_imp_vlan_setup for BCM5325
authorÁlvaro Fernández Rojas <noltari@gmail.com>
Sat, 14 Jun 2025 07:59:59 +0000 (09:59 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 18 Jun 2025 00:52:28 +0000 (17:52 -0700)
CPU port should be B53_CPU_PORT instead of B53_CPU_PORT_25 for
B53_PVLAN_PORT_MASK register.

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-14-noltari@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/dsa/b53/b53_common.c

index 6aaa81af5367bc6a55ed4432850faf3718f071e3..29f207a69b9cbef69720061c98397edad22c4c70 100644 (file)
@@ -543,6 +543,10 @@ void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)
        unsigned int i;
        u16 pvlan;
 
+       /* BCM5325 CPU port is at 8 */
+       if ((is5325(dev) || is5365(dev)) && cpu_port == B53_CPU_PORT_25)
+               cpu_port = B53_CPU_PORT;
+
        /* Enable the IMP port to be in the same VLAN as the other ports
         * on a per-port basis such that we only have Port i and IMP in
         * the same VLAN.