net: xilinx: axienet: Fix dangling multicast addresses

[ Upstream commit 797a68c9de0f5a5447baf4bd3bb9c10a3993435b ]

If a multicast address is removed but there are still some multicast
addresses, that address would remain programmed into the frame filter.
Fix this by explicitly setting the enable bit for each filter.

Fixes: 8a3b7a252dca ("drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver")
Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20240822154059.1066595-3-sean.anderson@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h
index c0c93d0e3c7f9c0c89b9e671ef1c2b1fb5bd046d..071822028ea5e2ef871b566db0bbc8f985b11bf1 100644 (file)
--- a/drivers/net/ethernet/xilinx/xilinx_axienet.h
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h
@@ -169,6 +169,7 @@
 #define XAE_UAW0_OFFSET                0x00000700 /* Unicast address word 0 */
 #define XAE_UAW1_OFFSET                0x00000704 /* Unicast address word 1 */
 #define XAE_FMI_OFFSET         0x00000708 /* Frame Filter Control */
+#define XAE_FFE_OFFSET         0x0000070C /* Frame Filter Enable */
 #define XAE_AF0_OFFSET         0x00000710 /* Address Filter 0 */
 #define XAE_AF1_OFFSET         0x00000714 /* Address Filter 1 */
 

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index b814ef1da3c738c04e01547c2f12feb69f5a5482..3253ace2b6014fd9c0bccaf98552b73d3c5da672 100644 (file)
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -409,7 +409,7 @@ static int netdev_set_mac_address(struct net_device *ndev, void *p)
  */
 static void axienet_set_multicast_list(struct net_device *ndev)
 {
-       int i;
+       int i = 0;
        u32 reg, af0reg, af1reg;
        struct axienet_local *lp = netdev_priv(ndev);
 
@@ -431,7 +431,6 @@ static void axienet_set_multicast_list(struct net_device *ndev)
                reg &= ~XAE_FMI_PM_MASK;
                axienet_iow(lp, XAE_FMI_OFFSET, reg);
 
-               i = 0;
                netdev_for_each_mc_addr(ha, ndev) {
                        if (i >= XAE_MULTICAST_CAM_TABLE_NUM)
                                break;
@@ -450,6 +449,7 @@ static void axienet_set_multicast_list(struct net_device *ndev)
                        axienet_iow(lp, XAE_FMI_OFFSET, reg);
                        axienet_iow(lp, XAE_AF0_OFFSET, af0reg);
                        axienet_iow(lp, XAE_AF1_OFFSET, af1reg);
+                       axienet_iow(lp, XAE_FFE_OFFSET, 1);
                        i++;
                }
        } else {
@@ -457,18 +457,15 @@ static void axienet_set_multicast_list(struct net_device *ndev)
                reg &= ~XAE_FMI_PM_MASK;
 
                axienet_iow(lp, XAE_FMI_OFFSET, reg);
-
-               for (i = 0; i < XAE_MULTICAST_CAM_TABLE_NUM; i++) {
-                       reg = axienet_ior(lp, XAE_FMI_OFFSET) & 0xFFFFFF00;
-                       reg |= i;
-
-                       axienet_iow(lp, XAE_FMI_OFFSET, reg);
-                       axienet_iow(lp, XAE_AF0_OFFSET, 0);
-                       axienet_iow(lp, XAE_AF1_OFFSET, 0);
-               }
-
                dev_info(&ndev->dev, "Promiscuous mode disabled.\n");
        }
+
+       for (; i < XAE_MULTICAST_CAM_TABLE_NUM; i++) {
+               reg = axienet_ior(lp, XAE_FMI_OFFSET) & 0xFFFFFF00;
+               reg |= i;
+               axienet_iow(lp, XAE_FMI_OFFSET, reg);
+               axienet_iow(lp, XAE_FFE_OFFSET, 0);
+       }
 }
 
 /**