net: lan966x: Extend MAC to support also lag interfaces.

Extend MAC support to support also lag interfaces:
1. In case an entry is learned on a port that is part of lag interface,
   then notify the upper layers that the entry is learned on the bond
   interface
2. If a port leaves the bond and the port is the first port in the lag
   group, then it is required to update all MAC entries to change the
   destination port.

Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_lag.c b/drivers/net/ethernet/microchip/lan966x/lan966x_lag.c
index e214e8e..41fa252 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_lag.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_lag.c
@@ -123,8 +123,14 @@ int lan966x_lag_port_join(struct lan966x_port *port,
 {
        struct lan966x *lan966x = port->lan966x;
        struct net_device *dev = port->dev;
+       u32 lag_id = -1;
+       u32 bond_mask;
        int err;
 
+       bond_mask = lan966x_lag_get_mask(lan966x, bond);
+       if (bond_mask)
+               lag_id = __ffs(bond_mask);
+
        port->bond = bond;
        lan966x_lag_update_ids(lan966x);
 
@@ -137,6 +143,12 @@ int lan966x_lag_port_join(struct lan966x_port *port,
 
        lan966x_port_stp_state_set(port, br_port_get_stp_state(brport_dev));
 
+       if (lan966x_lag_first_port(port->bond, port->dev) &&
+           lag_id != -1)
+               lan966x_mac_lag_replace_port_entry(lan966x,
+                                                  lan966x->ports[lag_id],
+                                                  port);
+
        return 0;
 
 out:
@@ -149,6 +161,20 @@ out:
 void lan966x_lag_port_leave(struct lan966x_port *port, struct net_device *bond)
 {
        struct lan966x *lan966x = port->lan966x;
+       u32 bond_mask;
+       u32 lag_id;
+
+       if (lan966x_lag_first_port(port->bond, port->dev)) {
+               bond_mask = lan966x_lag_get_mask(lan966x, port->bond);
+               bond_mask &= ~BIT(port->chip_port);
+               if (bond_mask) {
+                       lag_id = __ffs(bond_mask);
+                       lan966x_mac_lag_replace_port_entry(lan966x, port,
+                                                          lan966x->ports[lag_id]);
+               } else {
+                       lan966x_mac_lag_remove_port_entry(lan966x, port);
+               }
+       }
 
        port->bond = NULL;
        lan966x_lag_update_ids(lan966x);

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_mac.c b/drivers/net/ethernet/microchip/lan966x/lan966x_mac.c
index 5893770..baa3a30 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_mac.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_mac.c
@@ -22,6 +22,7 @@ struct lan966x_mac_entry {
        u16 vid;
        u16 port_index;
        int row;
+       bool lag;
 };
 
 struct lan966x_mac_raw_entry {
@@ -69,15 +70,14 @@ static void lan966x_mac_select(struct lan966x *lan966x,
        lan_wr(mach, lan966x, ANA_MACHDATA);
 }
 
-static int __lan966x_mac_learn(struct lan966x *lan966x, int pgid,
-                              bool cpu_copy,
-                              const unsigned char mac[ETH_ALEN],
-                              unsigned int vid,
-                              enum macaccess_entry_type type)
+static int __lan966x_mac_learn_locked(struct lan966x *lan966x, int pgid,
+                                     bool cpu_copy,
+                                     const unsigned char mac[ETH_ALEN],
+                                     unsigned int vid,
+                                     enum macaccess_entry_type type)
 {
-       int ret;
+       lockdep_assert_held(&lan966x->mac_lock);
 
-       spin_lock(&lan966x->mac_lock);
        lan966x_mac_select(lan966x, mac, vid);
 
        /* Issue a write command */
@@ -89,7 +89,19 @@ static int __lan966x_mac_learn(struct lan966x *lan966x, int pgid,
               ANA_MACACCESS_MAC_TABLE_CMD_SET(MACACCESS_CMD_LEARN),
               lan966x, ANA_MACACCESS);
 
-       ret = lan966x_mac_wait_for_completion(lan966x);
+       return lan966x_mac_wait_for_completion(lan966x);
+}
+
+static int __lan966x_mac_learn(struct lan966x *lan966x, int pgid,
+                              bool cpu_copy,
+                              const unsigned char mac[ETH_ALEN],
+                              unsigned int vid,
+                              enum macaccess_entry_type type)
+{
+       int ret;
+
+       spin_lock(&lan966x->mac_lock);
+       ret = __lan966x_mac_learn_locked(lan966x, pgid, cpu_copy, mac, vid, type);
        spin_unlock(&lan966x->mac_lock);
 
        return ret;
@@ -119,6 +131,16 @@ int lan966x_mac_learn(struct lan966x *lan966x, int port,
        return __lan966x_mac_learn(lan966x, port, false, mac, vid, type);
 }
 
+static int lan966x_mac_learn_locked(struct lan966x *lan966x, int port,
+                                   const unsigned char mac[ETH_ALEN],
+                                   unsigned int vid,
+                                   enum macaccess_entry_type type)
+{
+       WARN_ON(type != ENTRYTYPE_NORMAL && type != ENTRYTYPE_LOCKED);
+
+       return __lan966x_mac_learn_locked(lan966x, port, false, mac, vid, type);
+}
+
 static int lan966x_mac_forget_locked(struct lan966x *lan966x,
                                     const unsigned char mac[ETH_ALEN],
                                     unsigned int vid,
@@ -178,8 +200,9 @@ void lan966x_mac_init(struct lan966x *lan966x)
        INIT_LIST_HEAD(&lan966x->mac_entries);
 }
 
-static struct lan966x_mac_entry *lan966x_mac_alloc_entry(const unsigned char *mac,
-                                                        u16 vid, u16 port_index)
+static struct lan966x_mac_entry *lan966x_mac_alloc_entry(struct lan966x_port *port,
+                                                        const unsigned char *mac,
+                                                        u16 vid)
 {
        struct lan966x_mac_entry *mac_entry;
 
@@ -189,8 +212,9 @@ static struct lan966x_mac_entry *lan966x_mac_alloc_entry(const unsigned char *ma
 
        memcpy(mac_entry->mac, mac, ETH_ALEN);
        mac_entry->vid = vid;
-       mac_entry->port_index = port_index;
+       mac_entry->port_index = port->chip_port;
        mac_entry->row = LAN966X_MAC_INVALID_ROW;
+       mac_entry->lag = port->bond ? true : false;
        return mac_entry;
 }
 
@@ -269,7 +293,7 @@ int lan966x_mac_add_entry(struct lan966x *lan966x, struct lan966x_port *port,
                goto mac_learn;
        }
 
-       mac_entry = lan966x_mac_alloc_entry(addr, vid, port->chip_port);
+       mac_entry = lan966x_mac_alloc_entry(port, addr, vid);
        if (!mac_entry) {
                spin_unlock(&lan966x->mac_lock);
                return -ENOMEM;
@@ -278,7 +302,8 @@ int lan966x_mac_add_entry(struct lan966x *lan966x, struct lan966x_port *port,
        list_add_tail(&mac_entry->list, &lan966x->mac_entries);
        spin_unlock(&lan966x->mac_lock);
 
-       lan966x_fdb_call_notifiers(SWITCHDEV_FDB_OFFLOADED, addr, vid, port->dev);
+       lan966x_fdb_call_notifiers(SWITCHDEV_FDB_OFFLOADED, addr, vid,
+                                  port->bond ?: port->dev);
 
 mac_learn:
        lan966x_mac_learn(lan966x, port->chip_port, addr, vid, ENTRYTYPE_LOCKED);
@@ -309,6 +334,50 @@ int lan966x_mac_del_entry(struct lan966x *lan966x, const unsigned char *addr,
        return 0;
 }
 
+void lan966x_mac_lag_replace_port_entry(struct lan966x *lan966x,
+                                       struct lan966x_port *src,
+                                       struct lan966x_port *dst)
+{
+       struct lan966x_mac_entry *mac_entry;
+
+       spin_lock(&lan966x->mac_lock);
+       list_for_each_entry(mac_entry, &lan966x->mac_entries, list) {
+               if (mac_entry->port_index == src->chip_port &&
+                   mac_entry->lag) {
+                       lan966x_mac_forget_locked(lan966x, mac_entry->mac,
+                                                 mac_entry->vid,
+                                                 ENTRYTYPE_LOCKED);
+
+                       lan966x_mac_learn_locked(lan966x, dst->chip_port,
+                                                mac_entry->mac, mac_entry->vid,
+                                                ENTRYTYPE_LOCKED);
+                       mac_entry->port_index = dst->chip_port;
+               }
+       }
+       spin_unlock(&lan966x->mac_lock);
+}
+
+void lan966x_mac_lag_remove_port_entry(struct lan966x *lan966x,
+                                      struct lan966x_port *src)
+{
+       struct lan966x_mac_entry *mac_entry, *tmp;
+
+       spin_lock(&lan966x->mac_lock);
+       list_for_each_entry_safe(mac_entry, tmp, &lan966x->mac_entries,
+                                list) {
+               if (mac_entry->port_index == src->chip_port &&
+                   mac_entry->lag) {
+                       lan966x_mac_forget_locked(lan966x, mac_entry->mac,
+                                                 mac_entry->vid,
+                                                 ENTRYTYPE_LOCKED);
+
+                       list_del(&mac_entry->list);
+                       kfree(mac_entry);
+               }
+       }
+       spin_unlock(&lan966x->mac_lock);
+}
+
 void lan966x_mac_purge_entries(struct lan966x *lan966x)
 {
        struct lan966x_mac_entry *mac_entry, *tmp;
@@ -354,6 +423,7 @@ static void lan966x_mac_irq_process(struct lan966x *lan966x, u32 row,
        struct lan966x_mac_entry *mac_entry, *tmp;
        unsigned char mac[ETH_ALEN] __aligned(2);
        struct list_head mac_deleted_entries;
+       struct lan966x_port *port;
        u32 dest_idx;
        u32 column;
        u16 vid;
@@ -406,9 +476,10 @@ static void lan966x_mac_irq_process(struct lan966x *lan966x, u32 row,
                /* Notify the bridge that the entry doesn't exist
                 * anymore in the HW
                 */
+               port = lan966x->ports[mac_entry->port_index];
                lan966x_mac_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE,
                                      mac_entry->mac, mac_entry->vid,
-                                     lan966x->ports[mac_entry->port_index]->dev);
+                                     port->bond ?: port->dev);
                list_del(&mac_entry->list);
                kfree(mac_entry);
        }
@@ -440,7 +511,8 @@ static void lan966x_mac_irq_process(struct lan966x *lan966x, u32 row,
                        continue;
                }
 
-               mac_entry = lan966x_mac_alloc_entry(mac, vid, dest_idx);
+               port = lan966x->ports[dest_idx];
+               mac_entry = lan966x_mac_alloc_entry(port, mac, vid);
                if (!mac_entry) {
                        spin_unlock(&lan966x->mac_lock);
                        return;
@@ -451,7 +523,7 @@ static void lan966x_mac_irq_process(struct lan966x *lan966x, u32 row,
                spin_unlock(&lan966x->mac_lock);
 
                lan966x_mac_notifiers(SWITCHDEV_FDB_ADD_TO_BRIDGE,
-                                     mac, vid, lan966x->ports[dest_idx]->dev);
+                                     mac, vid, port->bond ?: port->dev);
        }
 }
 

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.h b/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
index 96182ae..6135d31 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
@@ -351,6 +351,11 @@ int lan966x_mac_add_entry(struct lan966x *lan966x,
                          struct lan966x_port *port,
                          const unsigned char *addr,
                          u16 vid);
+void lan966x_mac_lag_replace_port_entry(struct lan966x *lan966x,
+                                       struct lan966x_port *src,
+                                       struct lan966x_port *dst);
+void lan966x_mac_lag_remove_port_entry(struct lan966x *lan966x,
+                                      struct lan966x_port *src);
 void lan966x_mac_purge_entries(struct lan966x *lan966x);
 irqreturn_t lan966x_mac_irq_handler(struct lan966x *lan966x);