net: lan966x: Split lan966x_fdb_event_work

Split the function lan966x_fdb_event_work. One case for when the
orig_dev is a bridge and one case when orig_dev is lan966x port.
This is preparation for lag support. There is no functional change.

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_fdb.c b/drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c
index da5ca718867915b74e1b55ab9e1afbc21a563578..c760f73c0621551e3aea7fb3570a3dae7b398735 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c
@@ -8,6 +8,7 @@ struct lan966x_fdb_event_work {
        struct work_struct work;
        struct switchdev_notifier_fdb_info fdb_info;
        struct net_device *dev;
+       struct net_device *orig_dev;
        struct lan966x *lan966x;
        unsigned long event;
 };
@@ -127,75 +128,86 @@ void lan966x_fdb_deinit(struct lan966x *lan966x)
        lan966x_fdb_purge_entries(lan966x);
 }
 
-static void lan966x_fdb_event_work(struct work_struct *work)
+static void lan966x_fdb_port_event_work(struct lan966x_fdb_event_work *fdb_work)
 {
-       struct lan966x_fdb_event_work *fdb_work =
-               container_of(work, struct lan966x_fdb_event_work, work);
        struct switchdev_notifier_fdb_info *fdb_info;
-       struct net_device *dev = fdb_work->dev;
        struct lan966x_port *port;
        struct lan966x *lan966x;
-       int ret;
 
-       fdb_info = &fdb_work->fdb_info;
        lan966x = fdb_work->lan966x;
+       port = netdev_priv(fdb_work->orig_dev);
+       fdb_info = &fdb_work->fdb_info;
 
-       if (lan966x_netdevice_check(dev)) {
-               port = netdev_priv(dev);
-
-               switch (fdb_work->event) {
-               case SWITCHDEV_FDB_ADD_TO_DEVICE:
-                       if (!fdb_info->added_by_user)
-                               break;
-                       lan966x_mac_add_entry(lan966x, port, fdb_info->addr,
-                                             fdb_info->vid);
+       switch (fdb_work->event) {
+       case SWITCHDEV_FDB_ADD_TO_DEVICE:
+               if (!fdb_info->added_by_user)
                        break;
-               case SWITCHDEV_FDB_DEL_TO_DEVICE:
-                       if (!fdb_info->added_by_user)
-                               break;
-                       lan966x_mac_del_entry(lan966x, fdb_info->addr,
-                                             fdb_info->vid);
+               lan966x_mac_add_entry(lan966x, port, fdb_info->addr,
+                                     fdb_info->vid);
+               break;
+       case SWITCHDEV_FDB_DEL_TO_DEVICE:
+               if (!fdb_info->added_by_user)
                        break;
-               }
-       } else {
-               if (!netif_is_bridge_master(dev))
-                       goto out;
-
-               /* In case the bridge is called */
-               switch (fdb_work->event) {
-               case SWITCHDEV_FDB_ADD_TO_DEVICE:
-                       /* If there is no front port in this vlan, there is no
-                        * point to copy the frame to CPU because it would be
-                        * just dropped at later point. So add it only if
-                        * there is a port but it is required to store the fdb
-                        * entry for later point when a port actually gets in
-                        * the vlan.
-                        */
-                       lan966x_fdb_add_entry(lan966x, fdb_info);
-                       if (!lan966x_vlan_cpu_member_cpu_vlan_mask(lan966x,
-                                                                  fdb_info->vid))
-                               break;
-
-                       lan966x_mac_cpu_learn(lan966x, fdb_info->addr,
-                                             fdb_info->vid);
+               lan966x_mac_del_entry(lan966x, fdb_info->addr,
+                                     fdb_info->vid);
+               break;
+       }
+}
+
+static void lan966x_fdb_bridge_event_work(struct lan966x_fdb_event_work *fdb_work)
+{
+       struct switchdev_notifier_fdb_info *fdb_info;
+       struct lan966x *lan966x;
+       int ret;
+
+       lan966x = fdb_work->lan966x;
+       fdb_info = &fdb_work->fdb_info;
+
+       /* In case the bridge is called */
+       switch (fdb_work->event) {
+       case SWITCHDEV_FDB_ADD_TO_DEVICE:
+               /* If there is no front port in this vlan, there is no
+                * point to copy the frame to CPU because it would be
+                * just dropped at later point. So add it only if
+                * there is a port but it is required to store the fdb
+                * entry for later point when a port actually gets in
+                * the vlan.
+                */
+               lan966x_fdb_add_entry(lan966x, fdb_info);
+               if (!lan966x_vlan_cpu_member_cpu_vlan_mask(lan966x,
+                                                          fdb_info->vid))
                        break;
-               case SWITCHDEV_FDB_DEL_TO_DEVICE:
-                       ret = lan966x_fdb_del_entry(lan966x, fdb_info);
-                       if (!lan966x_vlan_cpu_member_cpu_vlan_mask(lan966x,
-                                                                  fdb_info->vid))
-                               break;
-
-                       if (ret)
-                               lan966x_mac_cpu_forget(lan966x, fdb_info->addr,
-                                                      fdb_info->vid);
+
+               lan966x_mac_cpu_learn(lan966x, fdb_info->addr,
+                                     fdb_info->vid);
+               break;
+       case SWITCHDEV_FDB_DEL_TO_DEVICE:
+               ret = lan966x_fdb_del_entry(lan966x, fdb_info);
+               if (!lan966x_vlan_cpu_member_cpu_vlan_mask(lan966x,
+                                                          fdb_info->vid))
                        break;
-               }
+
+               if (ret)
+                       lan966x_mac_cpu_forget(lan966x, fdb_info->addr,
+                                              fdb_info->vid);
+               break;
        }
+}
+
+static void lan966x_fdb_event_work(struct work_struct *work)
+{
+       struct lan966x_fdb_event_work *fdb_work =
+               container_of(work, struct lan966x_fdb_event_work, work);
+
+       if (lan966x_netdevice_check(fdb_work->orig_dev))
+               lan966x_fdb_port_event_work(fdb_work);
+       else if (netif_is_bridge_master(fdb_work->orig_dev))
+               lan966x_fdb_bridge_event_work(fdb_work);
 
-out:
        kfree(fdb_work->fdb_info.addr);
+       dev_put(fdb_work->dev);
+       dev_put(fdb_work->orig_dev);
        kfree(fdb_work);
-       dev_put(dev);
 }
 
 int lan966x_handle_fdb(struct net_device *dev,
@@ -221,7 +233,8 @@ int lan966x_handle_fdb(struct net_device *dev,
                if (!fdb_work)
                        return -ENOMEM;
 
-               fdb_work->dev = orig_dev;
+               fdb_work->dev = dev;
+               fdb_work->orig_dev = orig_dev;
                fdb_work->lan966x = lan966x;
                fdb_work->event = event;
                INIT_WORK(&fdb_work->work, lan966x_fdb_event_work);
@@ -231,6 +244,7 @@ int lan966x_handle_fdb(struct net_device *dev,
                        goto err_addr_alloc;
 
                ether_addr_copy((u8 *)fdb_work->fdb_info.addr, fdb_info->addr);
+               dev_hold(dev);
                dev_hold(orig_dev);
 
                queue_work(lan966x->fdb_work, &fdb_work->work);