net: dsa: microchip: bypass dev_ops for FDB and MDB operations

FDB and MDB operations are handled through a common function that
redirects the treatment to ksz_dev_ops callbacks. This layer of
indirection isn't needed since we now have a dsa_switch_ops for each kind
of switch.

Remove one indirection layer for KSZ switches, by connecting the
ksz_dev_ops :: fdb_dump(), fdb_add(), fdb_del(), mdb_add() and mdb_del()
operations directly to dsa_switch_ops.
Remove the FDB and MDB operations from ksz_dev_ops.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
Link: https://patch.msgid.link/20260512-clean-ksz-2nd-series-v1-5-c00f6ce037fa@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/ksz8.c
index 94c8034a192a95880ccb7f1addde7e9bddc32d17..83795fd66aab232d8845d7ab52110f0c05fd33df 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8.c
+++ b/drivers/net/dsa/microchip/ksz8.c
@@ -1315,9 +1315,10 @@ static void ksz8_flush_dyn_mac_table(struct dsa_switch *ds, int port)
        }
 }
 
-static int ksz8_fdb_dump(struct ksz_device *dev, int port,
+static int ksz8_fdb_dump(struct dsa_switch *ds, int port,
                         dsa_fdb_dump_cb_t *cb, void *data)
 {
+       struct ksz_device *dev = ds->priv;
        u8 mac[ETH_ALEN];
        u8 src_port, fid;
        u16 entries = 0;
@@ -1420,30 +1421,30 @@ static int ksz8_del_sta_mac(struct ksz_device *dev, int port,
        return ksz8_w_sta_mac_table(dev, index, &alu);
 }
 
-static int ksz8_mdb_add(struct ksz_device *dev, int port,
+static int ksz8_mdb_add(struct dsa_switch *ds, int port,
                        const struct switchdev_obj_port_mdb *mdb,
                        struct dsa_db db)
 {
-       return ksz8_add_sta_mac(dev, port, mdb->addr, mdb->vid);
+       return ksz8_add_sta_mac(ds->priv, port, mdb->addr, mdb->vid);
 }
 
-static int ksz8_mdb_del(struct ksz_device *dev, int port,
+static int ksz8_mdb_del(struct dsa_switch *ds, int port,
                        const struct switchdev_obj_port_mdb *mdb,
                        struct dsa_db db)
 {
-       return ksz8_del_sta_mac(dev, port, mdb->addr, mdb->vid);
+       return ksz8_del_sta_mac(ds->priv, port, mdb->addr, mdb->vid);
 }
 
-static int ksz8_fdb_add(struct ksz_device *dev, int port,
+static int ksz8_fdb_add(struct dsa_switch *ds, int port,
                        const unsigned char *addr, u16 vid, struct dsa_db db)
 {
-       return ksz8_add_sta_mac(dev, port, addr, vid);
+       return ksz8_add_sta_mac(ds->priv, port, addr, vid);
 }
 
-static int ksz8_fdb_del(struct ksz_device *dev, int port,
+static int ksz8_fdb_del(struct dsa_switch *ds, int port,
                        const unsigned char *addr, u16 vid, struct dsa_db db)
 {
-       return ksz8_del_sta_mac(dev, port, addr, vid);
+       return ksz8_del_sta_mac(ds->priv, port, addr, vid);
 }
 
 static int ksz8_port_vlan_filtering(struct dsa_switch *ds, int port, bool flag,
@@ -2215,11 +2216,6 @@ const struct ksz_dev_ops ksz8463_dev_ops = {
        .r_mib_stat64 = ksz88xx_r_mib_stats64,
        .freeze_mib = ksz8_freeze_mib,
        .port_init_cnt = ksz8_port_init_cnt,
-       .fdb_dump = ksz8_fdb_dump,
-       .fdb_add = ksz8_fdb_add,
-       .fdb_del = ksz8_fdb_del,
-       .mdb_add = ksz8_mdb_add,
-       .mdb_del = ksz8_mdb_del,
        .mirror_add = ksz8_port_mirror_add,
        .mirror_del = ksz8_port_mirror_del,
        .get_caps = ksz8_get_caps,
@@ -2242,11 +2238,6 @@ const struct ksz_dev_ops ksz87xx_dev_ops = {
        .r_mib_stat64 = ksz_r_mib_stats64,
        .freeze_mib = ksz8_freeze_mib,
        .port_init_cnt = ksz8_port_init_cnt,
-       .fdb_dump = ksz8_fdb_dump,
-       .fdb_add = ksz8_fdb_add,
-       .fdb_del = ksz8_fdb_del,
-       .mdb_add = ksz8_mdb_add,
-       .mdb_del = ksz8_mdb_del,
        .mirror_add = ksz8_port_mirror_add,
        .mirror_del = ksz8_port_mirror_del,
        .get_caps = ksz8_get_caps,
@@ -2272,11 +2263,6 @@ const struct ksz_dev_ops ksz88xx_dev_ops = {
        .r_mib_stat64 = ksz88xx_r_mib_stats64,
        .freeze_mib = ksz8_freeze_mib,
        .port_init_cnt = ksz8_port_init_cnt,
-       .fdb_dump = ksz8_fdb_dump,
-       .fdb_add = ksz8_fdb_add,
-       .fdb_del = ksz8_fdb_del,
-       .mdb_add = ksz8_mdb_add,
-       .mdb_del = ksz8_mdb_del,
        .mirror_add = ksz8_port_mirror_add,
        .mirror_del = ksz8_port_mirror_del,
        .get_caps = ksz8_get_caps,
@@ -2316,11 +2302,11 @@ const struct dsa_switch_ops ksz8463_switch_ops = {
        .port_vlan_filtering    = ksz8_port_vlan_filtering,
        .port_vlan_add          = ksz8_port_vlan_add,
        .port_vlan_del          = ksz8_port_vlan_del,
-       .port_fdb_dump          = ksz_port_fdb_dump,
-       .port_fdb_add           = ksz_port_fdb_add,
-       .port_fdb_del           = ksz_port_fdb_del,
-       .port_mdb_add           = ksz_port_mdb_add,
-       .port_mdb_del           = ksz_port_mdb_del,
+       .port_fdb_dump          = ksz8_fdb_dump,
+       .port_fdb_add           = ksz8_fdb_add,
+       .port_fdb_del           = ksz8_fdb_del,
+       .port_mdb_add           = ksz8_mdb_add,
+       .port_mdb_del           = ksz8_mdb_del,
        .port_mirror_add        = ksz_port_mirror_add,
        .port_mirror_del        = ksz_port_mirror_del,
        .get_stats64            = ksz_get_stats64,
@@ -2376,11 +2362,11 @@ const struct dsa_switch_ops ksz87xx_switch_ops = {
        .port_vlan_filtering    = ksz8_port_vlan_filtering,
        .port_vlan_add          = ksz8_port_vlan_add,
        .port_vlan_del          = ksz8_port_vlan_del,
-       .port_fdb_dump          = ksz_port_fdb_dump,
-       .port_fdb_add           = ksz_port_fdb_add,
-       .port_fdb_del           = ksz_port_fdb_del,
-       .port_mdb_add           = ksz_port_mdb_add,
-       .port_mdb_del           = ksz_port_mdb_del,
+       .port_fdb_dump          = ksz8_fdb_dump,
+       .port_fdb_add           = ksz8_fdb_add,
+       .port_fdb_del           = ksz8_fdb_del,
+       .port_mdb_add           = ksz8_mdb_add,
+       .port_mdb_del           = ksz8_mdb_del,
        .port_mirror_add        = ksz_port_mirror_add,
        .port_mirror_del        = ksz_port_mirror_del,
        .get_stats64            = ksz_get_stats64,
@@ -2436,11 +2422,11 @@ const struct dsa_switch_ops ksz88xx_switch_ops = {
        .port_vlan_filtering    = ksz8_port_vlan_filtering,
        .port_vlan_add          = ksz8_port_vlan_add,
        .port_vlan_del          = ksz8_port_vlan_del,
-       .port_fdb_dump          = ksz_port_fdb_dump,
-       .port_fdb_add           = ksz_port_fdb_add,
-       .port_fdb_del           = ksz_port_fdb_del,
-       .port_mdb_add           = ksz_port_mdb_add,
-       .port_mdb_del           = ksz_port_mdb_del,
+       .port_fdb_dump          = ksz8_fdb_dump,
+       .port_fdb_add           = ksz8_fdb_add,
+       .port_fdb_del           = ksz8_fdb_del,
+       .port_mdb_add           = ksz8_mdb_add,
+       .port_mdb_del           = ksz8_mdb_del,
        .port_mirror_add        = ksz_port_mirror_add,
        .port_mirror_del        = ksz_port_mirror_del,
        .get_stats64            = ksz_get_stats64,

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 959229185df973f404eb4d7e6a5f08d9033a6d7b..69a4fb683b3a16b8b547bc05cb50de83a09b453e 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -718,9 +718,10 @@ int ksz9477_port_vlan_del(struct dsa_switch *ds, int port,
        return 0;
 }
 
-int ksz9477_fdb_add(struct ksz_device *dev, int port,
+int ksz9477_fdb_add(struct dsa_switch *ds, int port,
                    const unsigned char *addr, u16 vid, struct dsa_db db)
 {
+       struct ksz_device *dev = ds->priv;
        u32 alu_table[4];
        u32 data;
        int ret = 0;
@@ -774,9 +775,10 @@ exit:
        return ret;
 }
 
-int ksz9477_fdb_del(struct ksz_device *dev, int port,
+int ksz9477_fdb_del(struct dsa_switch *ds, int port,
                    const unsigned char *addr, u16 vid, struct dsa_db db)
 {
+       struct ksz_device *dev = ds->priv;
        u32 alu_table[4];
        u32 data;
        int ret = 0;
@@ -863,13 +865,14 @@ static void ksz9477_convert_alu(struct alu_struct *alu, u32 *alu_table)
        alu->mac[5] = alu_table[3] & 0xFF;
 }
 
-int ksz9477_fdb_dump(struct ksz_device *dev, int port,
+int ksz9477_fdb_dump(struct dsa_switch *ds, int port,
                     dsa_fdb_dump_cb_t *cb, void *data)
 {
-       int ret = 0;
-       u32 ksz_data;
-       u32 alu_table[4];
+       struct ksz_device *dev = ds->priv;
        struct alu_struct alu;
+       u32 alu_table[4];
+       u32 ksz_data;
+       int ret = 0;
        int timeout;
 
        mutex_lock(&dev->alu_mutex);
@@ -917,9 +920,10 @@ exit:
        return ret;
 }
 
-int ksz9477_mdb_add(struct ksz_device *dev, int port,
+int ksz9477_mdb_add(struct dsa_switch *ds, int port,
                    const struct switchdev_obj_port_mdb *mdb, struct dsa_db db)
 {
+       struct ksz_device *dev = ds->priv;
        u32 static_table[4];
        const u8 *shifts;
        const u32 *masks;
@@ -996,16 +1000,17 @@ exit:
        return err;
 }
 
-int ksz9477_mdb_del(struct ksz_device *dev, int port,
+int ksz9477_mdb_del(struct dsa_switch *ds, int port,
                    const struct switchdev_obj_port_mdb *mdb, struct dsa_db db)
 {
+       struct ksz_device *dev = ds->priv;
        u32 static_table[4];
+       u32 mac_hi, mac_lo;
        const u8 *shifts;
        const u32 *masks;
-       u32 data;
-       int index;
        int ret = 0;
-       u32 mac_hi, mac_lo;
+       int index;
+       u32 data;
 
        shifts = dev->info->shifts;
        masks = dev->info->masks;
@@ -1787,11 +1792,6 @@ 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,
-       .fdb_dump = ksz9477_fdb_dump,
-       .fdb_add = ksz9477_fdb_add,
-       .fdb_del = ksz9477_fdb_del,
-       .mdb_add = ksz9477_mdb_add,
-       .mdb_del = ksz9477_mdb_del,
        .pme_write8 = ksz_write8,
        .pme_pread8 = ksz_pread8,
        .pme_pwrite8 = ksz_pwrite8,
@@ -1831,11 +1831,11 @@ const struct dsa_switch_ops ksz9477_switch_ops = {
        .port_vlan_filtering    = ksz9477_port_vlan_filtering,
        .port_vlan_add          = ksz9477_port_vlan_add,
        .port_vlan_del          = ksz9477_port_vlan_del,
-       .port_fdb_dump          = ksz_port_fdb_dump,
-       .port_fdb_add           = ksz_port_fdb_add,
-       .port_fdb_del           = ksz_port_fdb_del,
-       .port_mdb_add           = ksz_port_mdb_add,
-       .port_mdb_del           = ksz_port_mdb_del,
+       .port_fdb_dump          = ksz9477_fdb_dump,
+       .port_fdb_add           = ksz9477_fdb_add,
+       .port_fdb_del           = ksz9477_fdb_del,
+       .port_mdb_add           = ksz9477_mdb_add,
+       .port_mdb_del           = ksz9477_mdb_del,
        .port_mirror_add        = ksz_port_mirror_add,
        .port_mirror_del        = ksz_port_mirror_del,
        .get_stats64            = ksz_get_stats64,

diff --git a/drivers/net/dsa/microchip/ksz9477.h b/drivers/net/dsa/microchip/ksz9477.h
index 75a7b2bfc7976b36d3467d2af65b9a5ff920c78b..39f042e56f36532d02d0568313daf5389ecb5ff7 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477.h
+++ b/drivers/net/dsa/microchip/ksz9477.h
@@ -33,15 +33,15 @@ void ksz9477_port_mirror_del(struct ksz_device *dev, int port,
                             struct dsa_mall_mirror_tc_entry *mirror);
 int ksz9477_errata_monitor(struct ksz_device *dev, int port,
                           u64 tx_late_col);
-int ksz9477_fdb_dump(struct ksz_device *dev, int port,
+int ksz9477_fdb_dump(struct dsa_switch *ds, int port,
                     dsa_fdb_dump_cb_t *cb, void *data);
-int ksz9477_fdb_add(struct ksz_device *dev, int port,
+int ksz9477_fdb_add(struct dsa_switch *ds, int port,
                    const unsigned char *addr, u16 vid, struct dsa_db db);
-int ksz9477_fdb_del(struct ksz_device *dev, int port,
+int ksz9477_fdb_del(struct dsa_switch *ds, int port,
                    const unsigned char *addr, u16 vid, struct dsa_db db);
-int ksz9477_mdb_add(struct ksz_device *dev, int port,
+int ksz9477_mdb_add(struct dsa_switch *ds, int port,
                    const struct switchdev_obj_port_mdb *mdb, struct dsa_db db);
-int ksz9477_mdb_del(struct ksz_device *dev, int port,
+int ksz9477_mdb_del(struct dsa_switch *ds, int port,
                    const struct switchdev_obj_port_mdb *mdb, struct dsa_db db);
 int ksz9477_enable_stp_addr(struct ksz_device *dev);
 void ksz9477_port_queue_split(struct ksz_device *dev, int port);

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 07d1d58113f05a276105e605319437027d0d923d..d17ce88d49471e47c6c9c4159d10228c35c3fd78 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -3085,65 +3085,6 @@ void ksz_port_bridge_leave(struct dsa_switch *ds, int port,
         */
 }
 
-int ksz_port_fdb_add(struct dsa_switch *ds, int port,
-                    const unsigned char *addr, u16 vid,
-                    struct dsa_db db)
-{
-       struct ksz_device *dev = ds->priv;
-
-       if (!dev->dev_ops->fdb_add)
-               return -EOPNOTSUPP;
-
-       return dev->dev_ops->fdb_add(dev, port, addr, vid, db);
-}
-
-int ksz_port_fdb_del(struct dsa_switch *ds, int port,
-                    const unsigned char *addr,
-                    u16 vid, struct dsa_db db)
-{
-       struct ksz_device *dev = ds->priv;
-
-       if (!dev->dev_ops->fdb_del)
-               return -EOPNOTSUPP;
-
-       return dev->dev_ops->fdb_del(dev, port, addr, vid, db);
-}
-
-int ksz_port_fdb_dump(struct dsa_switch *ds, int port,
-                     dsa_fdb_dump_cb_t *cb, void *data)
-{
-       struct ksz_device *dev = ds->priv;
-
-       if (!dev->dev_ops->fdb_dump)
-               return -EOPNOTSUPP;
-
-       return dev->dev_ops->fdb_dump(dev, port, cb, data);
-}
-
-int ksz_port_mdb_add(struct dsa_switch *ds, int port,
-                    const struct switchdev_obj_port_mdb *mdb,
-                    struct dsa_db db)
-{
-       struct ksz_device *dev = ds->priv;
-
-       if (!dev->dev_ops->mdb_add)
-               return -EOPNOTSUPP;
-
-       return dev->dev_ops->mdb_add(dev, port, mdb, db);
-}
-
-int ksz_port_mdb_del(struct dsa_switch *ds, int port,
-                    const struct switchdev_obj_port_mdb *mdb,
-                    struct dsa_db db)
-{
-       struct ksz_device *dev = ds->priv;
-
-       if (!dev->dev_ops->mdb_del)
-               return -EOPNOTSUPP;
-
-       return dev->dev_ops->mdb_del(dev, port, mdb, db);
-}
-
 static int ksz9477_set_default_prio_queue_mapping(struct ksz_device *dev,
                                                  int port)
 {

diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index d07b3f5918f8e8caed521130e2314bee6a0b6c23..fe3b2dad3d684a62cb9ceea349dc094f651e9489 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -413,18 +413,6 @@ 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 (*fdb_add)(struct ksz_device *dev, int port,
-                      const unsigned char *addr, u16 vid, struct dsa_db db);
-       int (*fdb_del)(struct ksz_device *dev, int port,
-                      const unsigned char *addr, u16 vid, struct dsa_db db);
-       int (*fdb_dump)(struct ksz_device *dev, int port,
-                       dsa_fdb_dump_cb_t *cb, void *data);
-       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);
        int (*pme_write8)(struct ksz_device *dev, u32 reg, u8 value);
@@ -498,20 +486,6 @@ int ksz_port_pre_bridge_flags(struct dsa_switch *ds, int port,
 int ksz_port_bridge_flags(struct dsa_switch *ds, int port,
                          struct switchdev_brport_flags flags,
                          struct netlink_ext_ack *extack);
-int ksz_port_fdb_add(struct dsa_switch *ds, int port,
-                    const unsigned char *addr, u16 vid,
-                    struct dsa_db db);
-int ksz_port_fdb_del(struct dsa_switch *ds, int port,
-                    const unsigned char *addr,
-                    u16 vid, struct dsa_db db);
-int ksz_port_fdb_dump(struct dsa_switch *ds, int port,
-                     dsa_fdb_dump_cb_t *cb, void *data);
-int ksz_port_mdb_add(struct dsa_switch *ds, int port,
-                    const struct switchdev_obj_port_mdb *mdb,
-                    struct dsa_db db);
-int ksz_port_mdb_del(struct dsa_switch *ds, int port,
-                    const struct switchdev_obj_port_mdb *mdb,
-                    struct dsa_db db);
 
 void ksz_phylink_get_caps(struct dsa_switch *ds, int port,
                          struct phylink_config *config);

diff --git a/drivers/net/dsa/microchip/lan937x_main.c b/drivers/net/dsa/microchip/lan937x_main.c
index be6a457ee8e4b7bf94a38cb8b7cc7d4700d2db0e..aa428353818d82bc84cdcdf2e3e617a8cc4fdde9 100644 (file)
--- a/drivers/net/dsa/microchip/lan937x_main.c
+++ b/drivers/net/dsa/microchip/lan937x_main.c
@@ -717,11 +717,6 @@ const struct ksz_dev_ops lan937x_dev_ops = {
        .mirror_del = ksz9477_port_mirror_del,
        .get_caps = lan937x_phylink_get_caps,
        .setup_rgmii_delay = lan937x_setup_rgmii_delay,
-       .fdb_dump = ksz9477_fdb_dump,
-       .fdb_add = ksz9477_fdb_add,
-       .fdb_del = ksz9477_fdb_del,
-       .mdb_add = ksz9477_mdb_add,
-       .mdb_del = ksz9477_mdb_del,
        .config_cpu_port = lan937x_config_cpu_port,
        .tc_cbs_set_cinc = lan937x_tc_cbs_set_cinc,
        .enable_stp_addr = ksz9477_enable_stp_addr,
@@ -757,11 +752,11 @@ const struct dsa_switch_ops lan937x_switch_ops = {
        .port_vlan_filtering    = ksz9477_port_vlan_filtering,
        .port_vlan_add          = ksz9477_port_vlan_add,
        .port_vlan_del          = ksz9477_port_vlan_del,
-       .port_fdb_dump          = ksz_port_fdb_dump,
-       .port_fdb_add           = ksz_port_fdb_add,
-       .port_fdb_del           = ksz_port_fdb_del,
-       .port_mdb_add           = ksz_port_mdb_add,
-       .port_mdb_del           = ksz_port_mdb_del,
+       .port_fdb_dump          = ksz9477_fdb_dump,
+       .port_fdb_add           = ksz9477_fdb_add,
+       .port_fdb_del           = ksz9477_fdb_del,
+       .port_mdb_add           = ksz9477_mdb_add,
+       .port_mdb_del           = ksz9477_mdb_del,
        .port_mirror_add        = ksz_port_mirror_add,
        .port_mirror_del        = ksz_port_mirror_del,
        .get_stats64            = ksz_get_stats64,