net: ti: icssg-prueth: Add Multicast Filtering support for VLAN in MAC mode

Add multicast filtering support for VLAN interfaces in dual EMAC mode
for ICSSG driver.

The driver uses vlan_for_each() API to get the list of available
vlans. The driver then sync mc addr of vlan interface with a locally
mainatined list emac->vlan_mcast_list[vid] using __hw_addr_sync_multiple()
API.

__hw_addr_sync_multiple() is used instead of __hw_addr_sync() to sync
vdev->mc with local list because the sync_cnt for addresses in vdev->mc
will already be set by the vlan_dev_set_rx_mode() [net/8021q/vlan_dev.c]
and __hw_addr_sync() only syncs when the sync_cnt == 0. Whereas
__hw_addr_sync_multiple() can sync addresses even if sync_cnt is not 0.
Export __hw_addr_sync_multiple() so that driver can use it.

Once the local list is synced, driver calls __hw_addr_sync_dev() with
the local list, vdev, sync and unsync callbacks.

__hw_addr_sync_dev() is used with the local maintained list as the list
to synchronize instead of using __dev_mc_sync() on vdev because
__dev_mc_sync() on vdev will call __hw_addr_sync_dev() on vdev->mc and
sync_cnt for addresses in vdev->mc will already be set by the
vlan_dev_set_rx_mode() [net/8021q/vlan_dev.c] and __hw_addr_sync_dev()
only syncs if the sync_cnt of addresses in the list (vdev->mc in this case)
is 0. Whereas __hw_addr_sync_dev() on local list will work fine as the
sync_cnt for addresses in the local list will still be 0.

Based on change in addresses in the local list, sync / unsync callbacks
are invoked. In the sync / unsync API in driver, based on whether the ndev
is vlan or not, driver passes appropriate vid to FDB helper functions.

Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
index 1d510c9dabff1574205968c4e1570e2308220872..b2d0d7b7b6d99e137a4d628f4ad8ab5f97ade99c 100644 (file)
--- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c
+++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
@@ -561,30 +561,44 @@ const struct icss_iep_clockops prueth_iep_clockops = {
 
 static int icssg_prueth_add_mcast(struct net_device *ndev, const u8 *addr)
 {
-       struct prueth_emac *emac = netdev_priv(ndev);
-       int port_mask = BIT(emac->port_id);
+       struct net_device *real_dev;
+       struct prueth_emac *emac;
+       int port_mask;
+       u8 vlan_id;
 
-       port_mask |= icssg_fdb_lookup(emac, addr, 0);
-       icssg_fdb_add_del(emac, addr, 0, port_mask, true);
-       icssg_vtbl_modify(emac, 0, port_mask, port_mask, true);
+       vlan_id = is_vlan_dev(ndev) ? vlan_dev_vlan_id(ndev) : PRUETH_DFLT_VLAN_MAC;
+       real_dev = is_vlan_dev(ndev) ? vlan_dev_real_dev(ndev) : ndev;
+       emac = netdev_priv(real_dev);
+
+       port_mask = BIT(emac->port_id) | icssg_fdb_lookup(emac, addr, vlan_id);
+       icssg_fdb_add_del(emac, addr, vlan_id, port_mask, true);
+       icssg_vtbl_modify(emac, vlan_id, port_mask, port_mask, true);
 
        return 0;
 }
 
 static int icssg_prueth_del_mcast(struct net_device *ndev, const u8 *addr)
 {
-       struct prueth_emac *emac = netdev_priv(ndev);
-       int port_mask = BIT(emac->port_id);
+       struct net_device *real_dev;
+       struct prueth_emac *emac;
        int other_port_mask;
+       int port_mask;
+       u8 vlan_id;
+
+       vlan_id = is_vlan_dev(ndev) ? vlan_dev_vlan_id(ndev) : PRUETH_DFLT_VLAN_MAC;
+       real_dev = is_vlan_dev(ndev) ? vlan_dev_real_dev(ndev) : ndev;
+       emac = netdev_priv(real_dev);
 
-       other_port_mask = port_mask ^ icssg_fdb_lookup(emac, addr, 0);
+       port_mask = BIT(emac->port_id);
+       other_port_mask = port_mask ^ icssg_fdb_lookup(emac, addr, vlan_id);
 
-       icssg_fdb_add_del(emac, addr, 0, port_mask, false);
-       icssg_vtbl_modify(emac, 0, port_mask, port_mask, false);
+       icssg_fdb_add_del(emac, addr, vlan_id, port_mask, false);
+       icssg_vtbl_modify(emac, vlan_id, port_mask, port_mask, false);
 
        if (other_port_mask) {
-               icssg_fdb_add_del(emac, addr, 0, other_port_mask, true);
-               icssg_vtbl_modify(emac, 0, other_port_mask, other_port_mask, true);
+               icssg_fdb_add_del(emac, addr, vlan_id, other_port_mask, true);
+               icssg_vtbl_modify(emac, vlan_id, other_port_mask,
+                                 other_port_mask, true);
        }
 
        return 0;
@@ -620,6 +634,25 @@ static int icssg_prueth_hsr_del_mcast(struct net_device *ndev, const u8 *addr)
        return 0;
 }
 
+static int icssg_update_vlan_mcast(struct net_device *vdev, int vid,
+                                  void *args)
+{
+       struct prueth_emac *emac = args;
+
+       if (!vdev || !vid)
+               return 0;
+
+       netif_addr_lock_bh(vdev);
+       __hw_addr_sync_multiple(&emac->vlan_mcast_list[vid], &vdev->mc,
+                               vdev->addr_len);
+       netif_addr_unlock_bh(vdev);
+
+       __hw_addr_sync_dev(&emac->vlan_mcast_list[vid], vdev,
+                          icssg_prueth_add_mcast, icssg_prueth_del_mcast);
+
+       return 0;
+}
+
 /**
  * emac_ndo_open - EMAC device open
  * @ndev: network adapter device
@@ -857,12 +890,17 @@ static void emac_ndo_set_rx_mode_work(struct work_struct *work)
                return;
        }
 
-       if (emac->prueth->is_hsr_offload_mode)
+       if (emac->prueth->is_hsr_offload_mode) {
                __dev_mc_sync(ndev, icssg_prueth_hsr_add_mcast,
                              icssg_prueth_hsr_del_mcast);
-       else
+       } else {
                __dev_mc_sync(ndev, icssg_prueth_add_mcast,
                              icssg_prueth_del_mcast);
+               if (rtnl_trylock()) {
+                       vlan_for_each(ndev, icssg_update_vlan_mcast, emac);
+                       rtnl_unlock();
+               }
+       }
 }
 
 /**
@@ -913,6 +951,7 @@ static int emac_ndo_vlan_rx_add_vid(struct net_device *ndev,
        if (prueth->is_hsr_offload_mode)
                port_mask |= BIT(PRUETH_PORT_HOST);
 
+       __hw_addr_init(&emac->vlan_mcast_list[vid]);
        netdev_dbg(emac->ndev, "VID add vid:%u port_mask:%X untag_mask %X\n",
                   vid, port_mask, untag_mask);
 

diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.h b/drivers/net/ethernet/ti/icssg/icssg_prueth.h
index 5473315ea204069dbe4e581706f05fab22440944..c8f7a22cb253823e3574e99a8f570dbc3dac7b1a 100644 (file)
--- a/drivers/net/ethernet/ti/icssg/icssg_prueth.h
+++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.h
@@ -83,6 +83,10 @@
 #define ICSS_CMD_ADD_FILTER 0x7
 #define ICSS_CMD_ADD_MAC 0x8
 
+/* VLAN Filtering Related MACROs */
+#define PRUETH_DFLT_VLAN_MAC   0
+#define MAX_VLAN_ID            256
+
 /* In switch mode there are 3 real ports i.e. 3 mac addrs.
  * however Linux sees only the host side port. The other 2 ports
  * are the switch ports.
@@ -200,6 +204,8 @@ struct prueth_emac {
        /* RX IRQ Coalescing Related */
        struct hrtimer rx_hrtimer;
        unsigned long rx_pace_timeout_ns;
+
+       struct netdev_hw_addr_list vlan_mcast_list[MAX_VLAN_ID];
 };
 
 /**

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index dd8f6f8991feeac2ff57e864c36d7ce82fb7a87f..bced03fb349e55cb62533230cb824909dbfb1375 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4687,6 +4687,9 @@ int devm_register_netdev(struct device *dev, struct net_device *ndev);
 /* General hardware address lists handling functions */
 int __hw_addr_sync(struct netdev_hw_addr_list *to_list,
                   struct netdev_hw_addr_list *from_list, int addr_len);
+int __hw_addr_sync_multiple(struct netdev_hw_addr_list *to_list,
+                           struct netdev_hw_addr_list *from_list,
+                           int addr_len);
 void __hw_addr_unsync(struct netdev_hw_addr_list *to_list,
                      struct netdev_hw_addr_list *from_list, int addr_len);
 int __hw_addr_sync_dev(struct netdev_hw_addr_list *list,

diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c
index 166e404f7c03cdcd2e2f4375e4549499582bc662..90716bd736f3e40fcc2134ccaff0595a0c968fff 100644 (file)
--- a/net/core/dev_addr_lists.c
+++ b/net/core/dev_addr_lists.c
@@ -242,9 +242,9 @@ static void __hw_addr_unsync_one(struct netdev_hw_addr_list *to_list,
        __hw_addr_del_entry(from_list, ha, false, false);
 }
 
-static int __hw_addr_sync_multiple(struct netdev_hw_addr_list *to_list,
-                                  struct netdev_hw_addr_list *from_list,
-                                  int addr_len)
+int __hw_addr_sync_multiple(struct netdev_hw_addr_list *to_list,
+                           struct netdev_hw_addr_list *from_list,
+                           int addr_len)
 {
        int err = 0;
        struct netdev_hw_addr *ha, *tmp;
@@ -260,6 +260,7 @@ static int __hw_addr_sync_multiple(struct netdev_hw_addr_list *to_list,
        }
        return err;
 }
+EXPORT_SYMBOL(__hw_addr_sync_multiple);
 
 /* This function only works where there is a strict 1-1 relationship
  * between source and destination of they synch. If you ever need to