]> git.dujemihanovic.xyz Git - linux.git/commitdiff
net: ti: icssg-prueth: Add multicast filtering support in HSR mode
authorMD Danish Anwar <danishanwar@ti.com>
Wed, 11 Sep 2024 08:16:03 +0000 (13:46 +0530)
committerJakub Kicinski <kuba@kernel.org>
Sat, 14 Sep 2024 22:14:07 +0000 (15:14 -0700)
Add support for multicast filtering in HSR mode

Reviewed-by: Roger Quadros <rogerq@kernel.org>
Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
Link: https://patch.msgid.link/20240911081603.2521729-6-danishanwar@ti.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/ti/icssg/icssg_prueth.c

index d128764982ae42cadb8ca8d968e0877b5cef42d8..5fd9902ab181e9db23e928f4da3ea7bdde8dbe7a 100644 (file)
@@ -492,6 +492,36 @@ static int icssg_prueth_del_mcast(struct net_device *ndev, const u8 *addr)
        return 0;
 }
 
+static int icssg_prueth_hsr_add_mcast(struct net_device *ndev, const u8 *addr)
+{
+       struct prueth_emac *emac = netdev_priv(ndev);
+       struct prueth *prueth = emac->prueth;
+
+       icssg_fdb_add_del(emac, addr, prueth->default_vlan,
+                         ICSSG_FDB_ENTRY_P0_MEMBERSHIP |
+                         ICSSG_FDB_ENTRY_P1_MEMBERSHIP |
+                         ICSSG_FDB_ENTRY_P2_MEMBERSHIP |
+                         ICSSG_FDB_ENTRY_BLOCK, true);
+
+       icssg_vtbl_modify(emac, emac->port_vlan, BIT(emac->port_id),
+                         BIT(emac->port_id), true);
+       return 0;
+}
+
+static int icssg_prueth_hsr_del_mcast(struct net_device *ndev, const u8 *addr)
+{
+       struct prueth_emac *emac = netdev_priv(ndev);
+       struct prueth *prueth = emac->prueth;
+
+       icssg_fdb_add_del(emac, addr, prueth->default_vlan,
+                         ICSSG_FDB_ENTRY_P0_MEMBERSHIP |
+                         ICSSG_FDB_ENTRY_P1_MEMBERSHIP |
+                         ICSSG_FDB_ENTRY_P2_MEMBERSHIP |
+                         ICSSG_FDB_ENTRY_BLOCK, false);
+
+       return 0;
+}
+
 /**
  * emac_ndo_open - EMAC device open
  * @ndev: network adapter device
@@ -652,7 +682,10 @@ static int emac_ndo_stop(struct net_device *ndev)
 
        icssg_class_disable(prueth->miig_rt, prueth_emac_slice(emac));
 
-       __dev_mc_unsync(ndev, icssg_prueth_del_mcast);
+       if (emac->prueth->is_hsr_offload_mode)
+               __dev_mc_unsync(ndev, icssg_prueth_hsr_del_mcast);
+       else
+               __dev_mc_unsync(ndev, icssg_prueth_del_mcast);
 
        atomic_set(&emac->tdown_cnt, emac->tx_ch_num);
        /* ensure new tdown_cnt value is visible */
@@ -730,7 +763,12 @@ static void emac_ndo_set_rx_mode_work(struct work_struct *work)
                return;
        }
 
-       __dev_mc_sync(ndev, icssg_prueth_add_mcast, icssg_prueth_del_mcast);
+       if (emac->prueth->is_hsr_offload_mode)
+               __dev_mc_sync(ndev, icssg_prueth_hsr_add_mcast,
+                             icssg_prueth_hsr_del_mcast);
+       else
+               __dev_mc_sync(ndev, icssg_prueth_add_mcast,
+                             icssg_prueth_del_mcast);
 }
 
 /**