net: dsa: remove port argument from ->change_tag_protocol()

DSA has not supported (and probably will not support in the future
either) independent tagging protocols per CPU port.

Different switch drivers have different requirements, some may need to
replicate some settings for each CPU port, some may need to apply some
settings on a single CPU port, while some may have to configure some
global settings and then some per-CPU-port settings.

In any case, the current model where DSA calls ->change_tag_protocol for
each CPU port turns out to be impractical for drivers where there are
global things to be done. For example, felix calls dsa_tag_8021q_register(),
which makes no sense per CPU port, so it suppresses the second call.

Let drivers deal with replication towards all CPU ports, and remove the
CPU port argument from the function prototype.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Acked-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 53fd12e7a21ce704b2209119db37660c5430b6ad..5d2c57a7c708e8fe452417fc4965890c7ac5cf95 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -6329,11 +6329,12 @@ static enum dsa_tag_protocol mv88e6xxx_get_tag_protocol(struct dsa_switch *ds,
        return chip->tag_protocol;
 }
 
-static int mv88e6xxx_change_tag_protocol(struct dsa_switch *ds, int port,
+static int mv88e6xxx_change_tag_protocol(struct dsa_switch *ds,
                                         enum dsa_tag_protocol proto)
 {
        struct mv88e6xxx_chip *chip = ds->priv;
        enum dsa_tag_protocol old_protocol;
+       struct dsa_port *cpu_dp;
        int err;
 
        switch (proto) {
@@ -6358,11 +6359,24 @@ static int mv88e6xxx_change_tag_protocol(struct dsa_switch *ds, int port,
        chip->tag_protocol = proto;
 
        mv88e6xxx_reg_lock(chip);
-       err = mv88e6xxx_setup_port_mode(chip, port);
+       dsa_switch_for_each_cpu_port(cpu_dp, ds) {
+               err = mv88e6xxx_setup_port_mode(chip, cpu_dp->index);
+               if (err) {
+                       mv88e6xxx_reg_unlock(chip);
+                       goto unwind;
+               }
+       }
        mv88e6xxx_reg_unlock(chip);
 
-       if (err)
-               chip->tag_protocol = old_protocol;
+       return 0;
+
+unwind:
+       chip->tag_protocol = old_protocol;
+
+       mv88e6xxx_reg_lock(chip);
+       dsa_switch_for_each_cpu_port_continue_reverse(cpu_dp, ds)
+               mv88e6xxx_setup_port_mode(chip, cpu_dp->index);
+       mv88e6xxx_reg_unlock(chip);
 
        return err;
 }

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index 6b67ab4e05ab1881aa1202763e215a7050f940c3..0edec7c2b847e3d0ea9878d2a2adec21210bb477 100644 (file)
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -575,14 +575,13 @@ static void felix_del_tag_protocol(struct dsa_switch *ds, int cpu,
  * tag_8021q setup can fail, the NPI setup can't. So either the change is made,
  * or the restoration is guaranteed to work.
  */
-static int felix_change_tag_protocol(struct dsa_switch *ds, int cpu,
+static int felix_change_tag_protocol(struct dsa_switch *ds,
                                     enum dsa_tag_protocol proto)
 {
        struct ocelot *ocelot = ds->priv;
        struct felix *felix = ocelot_to_felix(ocelot);
        enum dsa_tag_protocol old_proto = felix->tag_proto;
-       bool cpu_port_active = false;
-       struct dsa_port *dp;
+       struct dsa_port *cpu_dp;
        int err;
 
        if (proto != DSA_TAG_PROTO_SEVILLE &&
@@ -590,33 +589,17 @@ static int felix_change_tag_protocol(struct dsa_switch *ds, int cpu,
            proto != DSA_TAG_PROTO_OCELOT_8021Q)
                return -EPROTONOSUPPORT;
 
-       /* We don't support multiple CPU ports, yet the DT blob may have
-        * multiple CPU ports defined. The first CPU port is the active one,
-        * the others are inactive. In this case, DSA will call
-        * ->change_tag_protocol() multiple times, once per CPU port.
-        * Since we implement the tagging protocol change towards "ocelot" or
-        * "seville" as effectively initializing the NPI port, what we are
-        * doing is effectively changing who the NPI port is to the last @cpu
-        * argument passed, which is an unused DSA CPU port and not the one
-        * that should actively pass traffic.
-        * Suppress DSA's calls on CPU ports that are inactive.
-        */
-       dsa_switch_for_each_user_port(dp, ds) {
-               if (dp->cpu_dp->index == cpu) {
-                       cpu_port_active = true;
-                       break;
-               }
-       }
-
-       if (!cpu_port_active)
-               return 0;
+       dsa_switch_for_each_cpu_port(cpu_dp, ds) {
+               felix_del_tag_protocol(ds, cpu_dp->index, old_proto);
 
-       felix_del_tag_protocol(ds, cpu, old_proto);
+               err = felix_set_tag_protocol(ds, cpu_dp->index, proto);
+               if (err) {
+                       felix_set_tag_protocol(ds, cpu_dp->index, old_proto);
+                       return err;
+               }
 
-       err = felix_set_tag_protocol(ds, cpu, proto);
-       if (err) {
-               felix_set_tag_protocol(ds, cpu, old_proto);
-               return err;
+               /* Stop at first CPU port */
+               break;
        }
 
        felix->tag_proto = proto;

diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c
index 3d70e8a77ecf0244e9025dce156b7abbb3b923d0..3bb42a9f236d2033cf10df9132e7d3b511c6f3fb 100644 (file)
--- a/drivers/net/dsa/realtek/rtl8365mb.c
+++ b/drivers/net/dsa/realtek/rtl8365mb.c
@@ -1778,7 +1778,7 @@ static int rtl8365mb_cpu_config(struct realtek_priv *priv)
        return 0;
 }
 
-static int rtl8365mb_change_tag_protocol(struct dsa_switch *ds, int cpu_index,
+static int rtl8365mb_change_tag_protocol(struct dsa_switch *ds,
                                         enum dsa_tag_protocol proto)
 {
        struct realtek_priv *priv = ds->priv;

diff --git a/include/net/dsa.h b/include/net/dsa.h
index cfb287b0d311a35674323b2ef6db71158da89f33..14f07275852b6791a7a5af5f3a457b3f03f09727 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -579,6 +579,10 @@ static inline bool dsa_is_user_port(struct dsa_switch *ds, int p)
        dsa_switch_for_each_port((_dp), (_ds)) \
                if (dsa_port_is_cpu((_dp)))
 
+#define dsa_switch_for_each_cpu_port_continue_reverse(_dp, _ds) \
+       dsa_switch_for_each_port_continue_reverse((_dp), (_ds)) \
+               if (dsa_port_is_cpu((_dp)))
+
 static inline u32 dsa_user_ports(struct dsa_switch *ds)
 {
        struct dsa_port *dp;
@@ -803,7 +807,7 @@ struct dsa_switch_ops {
        enum dsa_tag_protocol (*get_tag_protocol)(struct dsa_switch *ds,
                                                  int port,
                                                  enum dsa_tag_protocol mprot);
-       int     (*change_tag_protocol)(struct dsa_switch *ds, int port,
+       int     (*change_tag_protocol)(struct dsa_switch *ds,
                                       enum dsa_tag_protocol proto);
        /*
         * Method for switch drivers to connect to the tagging protocol driver

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index cf933225df32492c084567215a2333ed55ada802..d0a2452a1e245953b4a771c49df1cb495bef323f 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -809,22 +809,18 @@ static int dsa_switch_setup_tag_protocol(struct dsa_switch *ds)
 {
        const struct dsa_device_ops *tag_ops = ds->dst->tag_ops;
        struct dsa_switch_tree *dst = ds->dst;
-       struct dsa_port *cpu_dp;
        int err;
 
        if (tag_ops->proto == dst->default_proto)
                goto connect;
 
-       dsa_switch_for_each_cpu_port(cpu_dp, ds) {
-               rtnl_lock();
-               err = ds->ops->change_tag_protocol(ds, cpu_dp->index,
-                                                  tag_ops->proto);
-               rtnl_unlock();
-               if (err) {
-                       dev_err(ds->dev, "Unable to use tag protocol \"%s\": %pe\n",
-                               tag_ops->name, ERR_PTR(err));
-                       return err;
-               }
+       rtnl_lock();
+       err = ds->ops->change_tag_protocol(ds, tag_ops->proto);
+       rtnl_unlock();
+       if (err) {
+               dev_err(ds->dev, "Unable to use tag protocol \"%s\": %pe\n",
+                       tag_ops->name, ERR_PTR(err));
+               return err;
        }
 
 connect:

diff --git a/net/dsa/switch.c b/net/dsa/switch.c
index 704975e5c1c2a787b0fff275bb0848285215d8ad..2b56218fc57c765aa3ba7ac7da8b87e0a43cab0e 100644 (file)
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
@@ -809,14 +809,12 @@ static int dsa_switch_change_tag_proto(struct dsa_switch *ds,
 
        ASSERT_RTNL();
 
-       dsa_switch_for_each_cpu_port(cpu_dp, ds) {
-               err = ds->ops->change_tag_protocol(ds, cpu_dp->index,
-                                                  tag_ops->proto);
-               if (err)
-                       return err;
+       err = ds->ops->change_tag_protocol(ds, tag_ops->proto);
+       if (err)
+               return err;
 
+       dsa_switch_for_each_cpu_port(cpu_dp, ds)
                dsa_port_set_tag_protocol(cpu_dp, tag_ops);
-       }
 
        /* Now that changing the tag protocol can no longer fail, let's update
         * the remaining bits which are "duplicated for faster access", and the