net: dsa: microchip: update the ksz_port_mdb_add/del

ksz_mdb_add/del in ksz_common.c is specific for the ksz8795.c file. The
ksz9477 has its separate ksz9477_port_mdb_add/del functions.  This patch
moves the ksz8795 specific mdb functionality from ksz_common to ksz8795.
And this dsa_switch_ops hooks for ksz8795/ksz9477 are invoked through
the ksz_port_mdb_add/del.

Signed-off-by: Arun Ramadoss <arun.ramadoss@microchip.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index 440779a2cca6a801341f79e9b2f5ad57e2b463ee..7ebed00777b9b5104d216aaef507b02aa709a60c 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -953,6 +953,80 @@ static void ksz8_flush_dyn_mac_table(struct ksz_device *dev, int port)
        }
 }
 
+static int ksz8_mdb_add(struct ksz_device *dev, int port,
+                       const struct switchdev_obj_port_mdb *mdb,
+                       struct dsa_db db)
+{
+       struct alu_struct alu;
+       int index;
+       int empty = 0;
+
+       alu.port_forward = 0;
+       for (index = 0; index < dev->info->num_statics; index++) {
+               if (!dev->dev_ops->r_sta_mac_table(dev, index, &alu)) {
+                       /* Found one already in static MAC table. */
+                       if (!memcmp(alu.mac, mdb->addr, ETH_ALEN) &&
+                           alu.fid == mdb->vid)
+                               break;
+               /* Remember the first empty entry. */
+               } else if (!empty) {
+                       empty = index + 1;
+               }
+       }
+
+       /* no available entry */
+       if (index == dev->info->num_statics && !empty)
+               return -ENOSPC;
+
+       /* add entry */
+       if (index == dev->info->num_statics) {
+               index = empty - 1;
+               memset(&alu, 0, sizeof(alu));
+               memcpy(alu.mac, mdb->addr, ETH_ALEN);
+               alu.is_static = true;
+       }
+       alu.port_forward |= BIT(port);
+       if (mdb->vid) {
+               alu.is_use_fid = true;
+
+               /* Need a way to map VID to FID. */
+               alu.fid = mdb->vid;
+       }
+       dev->dev_ops->w_sta_mac_table(dev, index, &alu);
+
+       return 0;
+}
+
+static int ksz8_mdb_del(struct ksz_device *dev, int port,
+                       const struct switchdev_obj_port_mdb *mdb,
+                       struct dsa_db db)
+{
+       struct alu_struct alu;
+       int index;
+
+       for (index = 0; index < dev->info->num_statics; index++) {
+               if (!dev->dev_ops->r_sta_mac_table(dev, index, &alu)) {
+                       /* Found one already in static MAC table. */
+                       if (!memcmp(alu.mac, mdb->addr, ETH_ALEN) &&
+                           alu.fid == mdb->vid)
+                               break;
+               }
+       }
+
+       /* no available entry */
+       if (index == dev->info->num_statics)
+               goto exit;
+
+       /* clear port */
+       alu.port_forward &= ~BIT(port);
+       if (!alu.port_forward)
+               alu.is_static = false;
+       dev->dev_ops->w_sta_mac_table(dev, index, &alu);
+
+exit:
+       return 0;
+}
+
 static int ksz8_port_vlan_filtering(struct ksz_device *dev, int port, bool flag,
                                    struct netlink_ext_ack *extack)
 {
@@ -1449,6 +1523,8 @@ static const struct ksz_dev_ops ksz8_dev_ops = {
        .r_mib_pkt = ksz8_r_mib_pkt,
        .freeze_mib = ksz8_freeze_mib,
        .port_init_cnt = ksz8_port_init_cnt,
+       .mdb_add = ksz8_mdb_add,
+       .mdb_del = ksz8_mdb_del,
        .vlan_filtering = ksz8_port_vlan_filtering,
        .vlan_add = ksz8_port_vlan_add,
        .vlan_del = ksz8_port_vlan_del,

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index c90a807610c006ad77f695ef1dedbaa4508a036d..95e1c7b20190d2e430e950fa27ffba4ab2ab7668 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -653,11 +653,10 @@ exit:
        return ret;
 }
 
-static int ksz9477_port_mdb_add(struct dsa_switch *ds, int port,
-                               const struct switchdev_obj_port_mdb *mdb,
-                               struct dsa_db db)
+static int ksz9477_mdb_add(struct ksz_device *dev, int port,
+                          const struct switchdev_obj_port_mdb *mdb,
+                          struct dsa_db db)
 {
-       struct ksz_device *dev = ds->priv;
        u32 static_table[4];
        u32 data;
        int index;
@@ -729,11 +728,10 @@ exit:
        return err;
 }
 
-static int ksz9477_port_mdb_del(struct dsa_switch *ds, int port,
-                               const struct switchdev_obj_port_mdb *mdb,
-                               struct dsa_db db)
+static int ksz9477_mdb_del(struct ksz_device *dev, int port,
+                          const struct switchdev_obj_port_mdb *mdb,
+                          struct dsa_db db)
 {
-       struct ksz_device *dev = ds->priv;
        u32 static_table[4];
        u32 data;
        int index;
@@ -1315,8 +1313,8 @@ static const struct dsa_switch_ops ksz9477_switch_ops = {
        .port_fdb_dump          = ksz9477_port_fdb_dump,
        .port_fdb_add           = ksz9477_port_fdb_add,
        .port_fdb_del           = ksz9477_port_fdb_del,
-       .port_mdb_add           = ksz9477_port_mdb_add,
-       .port_mdb_del           = ksz9477_port_mdb_del,
+       .port_mdb_add           = ksz_port_mdb_add,
+       .port_mdb_del           = ksz_port_mdb_del,
        .port_mirror_add        = ksz_port_mirror_add,
        .port_mirror_del        = ksz_port_mirror_del,
        .get_stats64            = ksz_get_stats64,
@@ -1399,6 +1397,8 @@ static const struct ksz_dev_ops ksz9477_dev_ops = {
        .mirror_add = ksz9477_port_mirror_add,
        .mirror_del = ksz9477_port_mirror_del,
        .get_caps = ksz9477_get_caps,
+       .mdb_add = ksz9477_mdb_add,
+       .mdb_del = ksz9477_mdb_del,
        .shutdown = ksz9477_reset_switch,
        .init = ksz9477_switch_init,
        .exit = ksz9477_switch_exit,

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 827ca7522a206f6a6f337a3d31e1c332cb470d74..ce3037e9d548fd989bbabcc23a6822a17166e612 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -814,44 +814,11 @@ int ksz_port_mdb_add(struct dsa_switch *ds, int port,
                     struct dsa_db db)
 {
        struct ksz_device *dev = ds->priv;
-       struct alu_struct alu;
-       int index;
-       int empty = 0;
-
-       alu.port_forward = 0;
-       for (index = 0; index < dev->info->num_statics; index++) {
-               if (!dev->dev_ops->r_sta_mac_table(dev, index, &alu)) {
-                       /* Found one already in static MAC table. */
-                       if (!memcmp(alu.mac, mdb->addr, ETH_ALEN) &&
-                           alu.fid == mdb->vid)
-                               break;
-               /* Remember the first empty entry. */
-               } else if (!empty) {
-                       empty = index + 1;
-               }
-       }
-
-       /* no available entry */
-       if (index == dev->info->num_statics && !empty)
-               return -ENOSPC;
 
-       /* add entry */
-       if (index == dev->info->num_statics) {
-               index = empty - 1;
-               memset(&alu, 0, sizeof(alu));
-               memcpy(alu.mac, mdb->addr, ETH_ALEN);
-               alu.is_static = true;
-       }
-       alu.port_forward |= BIT(port);
-       if (mdb->vid) {
-               alu.is_use_fid = true;
-
-               /* Need a way to map VID to FID. */
-               alu.fid = mdb->vid;
-       }
-       dev->dev_ops->w_sta_mac_table(dev, index, &alu);
+       if (!dev->dev_ops->mdb_add)
+               return -EOPNOTSUPP;
 
-       return 0;
+       return dev->dev_ops->mdb_add(dev, port, mdb, db);
 }
 EXPORT_SYMBOL_GPL(ksz_port_mdb_add);
 
@@ -860,30 +827,11 @@ int ksz_port_mdb_del(struct dsa_switch *ds, int port,
                     struct dsa_db db)
 {
        struct ksz_device *dev = ds->priv;
-       struct alu_struct alu;
-       int index;
-
-       for (index = 0; index < dev->info->num_statics; index++) {
-               if (!dev->dev_ops->r_sta_mac_table(dev, index, &alu)) {
-                       /* Found one already in static MAC table. */
-                       if (!memcmp(alu.mac, mdb->addr, ETH_ALEN) &&
-                           alu.fid == mdb->vid)
-                               break;
-               }
-       }
 
-       /* no available entry */
-       if (index == dev->info->num_statics)
-               goto exit;
-
-       /* clear port */
-       alu.port_forward &= ~BIT(port);
-       if (!alu.port_forward)
-               alu.is_static = false;
-       dev->dev_ops->w_sta_mac_table(dev, index, &alu);
+       if (!dev->dev_ops->mdb_del)
+               return -EOPNOTSUPP;
 
-exit:
-       return 0;
+       return dev->dev_ops->mdb_del(dev, port, mdb, db);
 }
 EXPORT_SYMBOL_GPL(ksz_port_mdb_del);
 

diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index af5f37dbb2ab3aaea3f0db9a15f5ba1d5ae71789..4bc10165460f8e9e13284dbac6384329a97dc1c8 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -193,6 +193,12 @@ struct ksz_dev_ops {
                          bool ingress, struct netlink_ext_ack *extack);
        void (*mirror_del)(struct ksz_device *dev, int port,
                           struct dsa_mall_mirror_tc_entry *mirror);
+       int (*mdb_add)(struct ksz_device *dev, int port,
+                      const struct switchdev_obj_port_mdb *mdb,
+                      struct dsa_db db);
+       int (*mdb_del)(struct ksz_device *dev, int port,
+                      const struct switchdev_obj_port_mdb *mdb,
+                      struct dsa_db db);
        void (*get_caps)(struct ksz_device *dev, int port,
                         struct phylink_config *config);
        void (*freeze_mib)(struct ksz_device *dev, int port, bool freeze);