net: ethernet: ti: cpsw: fix allmulti cfg in dual_mac mode

Now CPSW ALE will set/clean Host port bit in Unregistered Multicast Flood
Mask (UNREG_MCAST_FLOOD_MASK) for every VLAN without checking if this port
belongs to VLAN or not when ALLMULTI mode flag is set for nedev. This is
working in non dual_mac mode, but in dual_mac - it causes
enabling/disabling ALLMULTI flag for both ports.

Hence fix it by adding additional parameter to cpsw_ale_set_allmulti() to
specify ALE port number for which ALLMULTI has to be enabled and check if
port belongs to VLAN before modifying UNREG_MCAST_FLOOD_MASK.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 4a26c72..071c8ae 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -793,12 +793,17 @@ static int cpsw_purge_all_mc(struct net_device *ndev, const u8 *addr, int num)
 
 static void cpsw_ndo_set_rx_mode(struct net_device *ndev)
 {
-       struct cpsw_common *cpsw = ndev_to_cpsw(ndev);
+       struct cpsw_priv *priv = netdev_priv(ndev);
+       struct cpsw_common *cpsw = priv->cpsw;
+       int slave_port = -1;
+
+       if (cpsw->data.dual_emac)
+               slave_port = priv->emac_port + 1;
 
        if (ndev->flags & IFF_PROMISC) {
                /* Enable promiscuous mode */
                cpsw_set_promiscious(ndev, true);
-               cpsw_ale_set_allmulti(cpsw->ale, IFF_ALLMULTI);
+               cpsw_ale_set_allmulti(cpsw->ale, IFF_ALLMULTI, slave_port);
                return;
        } else {
                /* Disable promiscuous mode */
@@ -806,7 +811,8 @@ static void cpsw_ndo_set_rx_mode(struct net_device *ndev)
        }
 
        /* Restore allmulti on vlans if necessary */
-       cpsw_ale_set_allmulti(cpsw->ale, ndev->flags & IFF_ALLMULTI);
+       cpsw_ale_set_allmulti(cpsw->ale,
+                             ndev->flags & IFF_ALLMULTI, slave_port);
 
        /* add/remove mcast address either for real netdev or for vlan */
        __hw_addr_ref_sync_dev(&ndev->mc, ndev, cpsw_add_mc_addr,

diff --git a/drivers/net/ethernet/ti/cpsw_ale.c b/drivers/net/ethernet/ti/cpsw_ale.c
index 67dc769..f77b588 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw_ale.c
+++ b/drivers/net/ethernet/ti/cpsw_ale.c
@@ -468,24 +468,25 @@ int cpsw_ale_del_vlan(struct cpsw_ale *ale, u16 vid, int port_mask)
        return 0;
 }
 
-void cpsw_ale_set_allmulti(struct cpsw_ale *ale, int allmulti)
+void cpsw_ale_set_allmulti(struct cpsw_ale *ale, int allmulti, int port)
 {
        u32 ale_entry[ALE_ENTRY_WORDS];
-       int type, idx;
        int unreg_mcast = 0;
-
-       /* Only bother doing the work if the setting is actually changing */
-       if (ale->allmulti == allmulti)
-               return;
-
-       /* Remember the new setting to check against next time */
-       ale->allmulti = allmulti;
+       int type, idx;
 
        for (idx = 0; idx < ale->params.ale_entries; idx++) {
+               int vlan_members;
+
                cpsw_ale_read(ale, idx, ale_entry);
                type = cpsw_ale_get_entry_type(ale_entry);
                if (type != ALE_TYPE_VLAN)
                        continue;
+               vlan_members =
+                       cpsw_ale_get_vlan_member_list(ale_entry,
+                                                     ale->vlan_field_bits);
+
+               if (port != -1 && !(vlan_members & BIT(port)))
+                       continue;
 
                unreg_mcast =
                        cpsw_ale_get_vlan_unreg_mcast(ale_entry,

diff --git a/drivers/net/ethernet/ti/cpsw_ale.h b/drivers/net/ethernet/ti/cpsw_ale.h
index 4777d62..370df25 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw_ale.h
+++ b/drivers/net/ethernet/ti/cpsw_ale.h
@@ -30,7 +30,6 @@ struct cpsw_ale {
        struct cpsw_ale_params  params;
        struct timer_list       timer;
        unsigned long           ageout;
-       int                     allmulti;
        u32                     version;
        /* These bits are different on NetCP NU Switch ALE */
        u32                     port_mask_bits;
@@ -109,7 +108,7 @@ int cpsw_ale_del_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask,
 int cpsw_ale_add_vlan(struct cpsw_ale *ale, u16 vid, int port, int untag,
                        int reg_mcast, int unreg_mcast);
 int cpsw_ale_del_vlan(struct cpsw_ale *ale, u16 vid, int port);
-void cpsw_ale_set_allmulti(struct cpsw_ale *ale, int allmulti);
+void cpsw_ale_set_allmulti(struct cpsw_ale *ale, int allmulti, int port);
 
 int cpsw_ale_control_get(struct cpsw_ale *ale, int port, int control);
 int cpsw_ale_control_set(struct cpsw_ale *ale, int port,