net: dsa: Initialize all CPU and enabled ports masks in dsa_ds_parse()

There was no reason for duplicating the code that initializes
ds->enabled_port_mask in both dsa_parse_ports_dn() and
dsa_parse_ports(), instead move this to dsa_ds_parse() which is early
enough before ops->setup() has run.

While at it, we can now make dsa_is_cpu_port() check ds->cpu_port_mask
which is a step towards being multi-CPU port capable.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 448d8bc777076c98626e414ae256e6d8bf0cb605..2effb0af9d7cb607d891af7e098033221e0eb1b9 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -254,7 +254,7 @@ struct dsa_switch {
 
 static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p)
 {
-       return ds->dst->cpu_dp == &ds->ports[p];
+       return !!(ds->cpu_port_mask & (1 << p));
 }
 
 static inline bool dsa_is_dsa_port(struct dsa_switch *ds, int p)

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 067daec644c13f875431d0d4d6e47490a8e41078..cd13bb54a30c10040f196ae3b6f5d88a565b4153 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -250,8 +250,6 @@ static int dsa_cpu_port_apply(struct dsa_port *port)
                return err;
        }
 
-       ds->cpu_port_mask |= BIT(port->index);
-
        memset(&port->devlink_port, 0, sizeof(port->devlink_port));
        err = devlink_port_register(ds->devlink, &port->devlink_port,
                                    port->index);
@@ -522,6 +520,12 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index,
 
        dst->rcv = dst->tag_ops->rcv;
 
+       /* Initialize cpu_port_mask now for drv->setup()
+        * to have access to a correct value, just like what
+        * net/dsa/dsa.c::dsa_switch_setup_one does.
+        */
+       ds->cpu_port_mask |= BIT(index);
+
        return 0;
 }
 
@@ -533,14 +537,22 @@ static int dsa_ds_parse(struct dsa_switch_tree *dst, struct dsa_switch *ds)
 
        for (index = 0; index < ds->num_ports; index++) {
                port = &ds->ports[index];
-               if (!dsa_port_is_valid(port))
+               if (!dsa_port_is_valid(port) ||
+                   dsa_port_is_dsa(port))
                        continue;
 
                if (dsa_port_is_cpu(port)) {
                        err = dsa_cpu_parse(port, index, dst, ds);
                        if (err)
                                return err;
+               } else {
+                       /* Initialize enabled_port_mask now for drv->setup()
+                        * to have access to a correct value, just like what
+                        * net/dsa/dsa.c::dsa_switch_setup_one does.
+                        */
+                       ds->enabled_port_mask |= BIT(index);
                }
+
        }
 
        pr_info("DSA: switch %d %d parsed\n", dst->tree, ds->index);
@@ -589,13 +601,6 @@ static int dsa_parse_ports_dn(struct device_node *ports, struct dsa_switch *ds)
                        return -EINVAL;
 
                ds->ports[reg].dn = port;
-
-               /* Initialize enabled_port_mask now for ops->setup()
-                * to have access to a correct value, just like what
-                * net/dsa/dsa.c::dsa_switch_setup_one does.
-                */
-               if (!dsa_port_is_cpu(&ds->ports[reg]))
-                       ds->enabled_port_mask |= 1 << reg;
        }
 
        return 0;
@@ -611,14 +616,6 @@ static int dsa_parse_ports(struct dsa_chip_data *cd, struct dsa_switch *ds)
                        continue;
 
                ds->ports[i].name = cd->port_names[i];
-
-               /* Initialize enabled_port_mask now for drv->setup()
-                * to have access to a correct value, just like what
-                * net/dsa/dsa.c::dsa_switch_setup_one does.
-                */
-               if (!dsa_port_is_cpu(&ds->ports[i]))
-                       ds->enabled_port_mask |= 1 << i;
-
                valid_name_found = true;
        }