net: dsa: b53: fix IP_MULTICAST_CTRL on BCM5325

BCM5325 doesn't implement B53_UC_FWD_EN, B53_MC_FWD_EN or B53_IPMC_FWD_EN.

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-9-noltari@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 24a9a037212233217d780db10778071cd49f267c..c7c9501274482413868fff6fd4599cef5f02eaf5 100644 (file)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -366,14 +366,18 @@ static void b53_set_forwarding(struct b53_device *dev, int enable)
                b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, &mgmt);
                mgmt |= B53_MII_DUMB_FWDG_EN;
                b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt);
-       }
 
-       /* Look at B53_UC_FWD_EN and B53_MC_FWD_EN to decide whether
-        * frames should be flooded or not.
-        */
-       b53_read8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, &mgmt);
-       mgmt |= B53_UC_FWD_EN | B53_MC_FWD_EN | B53_IPMC_FWD_EN;
-       b53_write8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, mgmt);
+               /* Look at B53_UC_FWD_EN and B53_MC_FWD_EN to decide whether
+                * frames should be flooded or not.
+                */
+               b53_read8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, &mgmt);
+               mgmt |= B53_UC_FWD_EN | B53_MC_FWD_EN | B53_IPMC_FWD_EN;
+               b53_write8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, mgmt);
+       } else {
+               b53_read8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, &mgmt);
+               mgmt |= B53_IP_MCAST_25;
+               b53_write8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, mgmt);
+       }
 }
 
 static void b53_enable_vlan(struct b53_device *dev, int port, bool enable,

diff --git a/drivers/net/dsa/b53/b53_regs.h b/drivers/net/dsa/b53/b53_regs.h
index 1f15332fb2a7c2f335ba2b4613c51edb2b44169f..896684d7f59473a0a00405b4adb6e591d5934a73 100644 (file)
--- a/drivers/net/dsa/b53/b53_regs.h
+++ b/drivers/net/dsa/b53/b53_regs.h
@@ -106,6 +106,7 @@
 
 /* IP Multicast control (8 bit) */
 #define B53_IP_MULTICAST_CTRL          0x21
+#define  B53_IP_MCAST_25               BIT(0)
 #define  B53_IPMC_FWD_EN               BIT(1)
 #define  B53_UC_FWD_EN                 BIT(6)
 #define  B53_MC_FWD_EN                 BIT(7)