net: dsa: tag_8021q: absorb dsa_8021q_setup into dsa_tag_8021q_{,un}register

Right now, setting up tag_8021q is a 2-step operation for a driver,
first the context structure needs to be created, then the VLANs need to
be installed on the ports. A similar thing is true for teardown.

Merge the 2 steps into the register/unregister methods, to be as
transparent as possible for the driver as to what tag_8021q does behind
the scenes. This also gets rid of the funny "bool setup == true means
setup, == false means teardown" API that tag_8021q used to expose.

Note that dsa_tag_8021q_register() must be called at least in the
.setup() driver method and never earlier (like in the driver probe
function). This is because the DSA switch tree is not initialized at
probe time, and the cross-chip notifiers will not work.

For symmetry with .setup(), the unregister method should be put in
.teardown().

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index b6ab28d2f15555c3f1212c2dbe5157dfc0e0e59e..583a22d901b38ad06033fc60356547067b9df4d7 100644 (file)
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -424,18 +424,12 @@ static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu)
        if (err)
                return err;
 
-       err = dsa_8021q_setup(ds, true);
-       if (err)
-               goto out_tag_8021q_unregister;
-
        err = felix_setup_mmio_filtering(felix);
        if (err)
-               goto out_teardown_dsa_8021q;
+               goto out_tag_8021q_unregister;
 
        return 0;
 
-out_teardown_dsa_8021q:
-       dsa_8021q_setup(ds, false);
 out_tag_8021q_unregister:
        dsa_tag_8021q_unregister(ds);
        return err;
@@ -452,10 +446,6 @@ static void felix_teardown_tag_8021q(struct dsa_switch *ds, int cpu)
                dev_err(ds->dev, "felix_teardown_mmio_filtering returned %d",
                        err);
 
-       err = dsa_8021q_setup(ds, false);
-       if (err)
-               dev_err(ds->dev, "dsa_8021q_setup returned %d", err);
-
        dsa_tag_8021q_unregister(ds);
 
        for (port = 0; port < ds->num_ports; port++) {

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index 0c04f6caccdf7b691a82aa56f4c1f517ed55e0c8..6b56c1ada3eefd5afc486d3adde4819154a899d2 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -2045,19 +2045,6 @@ static void sja1105_crosschip_bridge_leave(struct dsa_switch *ds,
        }
 }
 
-static int sja1105_setup_8021q_tagging(struct dsa_switch *ds, bool enabled)
-{
-       int rc;
-
-       rc = dsa_8021q_setup(ds, enabled);
-       if (rc)
-               return rc;
-
-       dev_info(ds->dev, "%s switch tagging\n",
-                enabled ? "Enabled" : "Disabled");
-       return 0;
-}
-
 static enum dsa_tag_protocol
 sja1105_get_tag_protocol(struct dsa_switch *ds, int port,
                         enum dsa_tag_protocol mp)
@@ -2635,12 +2622,8 @@ static int sja1105_setup(struct dsa_switch *ds)
        if (rc < 0)
                goto out_static_config_free;
 
-       /* The DSA/switchdev model brings up switch ports in standalone mode by
-        * default, and that means vlan_filtering is 0 since they're not under
-        * a bridge, so it's safe to set up switch tagging at this time.
-        */
        rtnl_lock();
-       rc = sja1105_setup_8021q_tagging(ds, true);
+       rc = dsa_tag_8021q_register(ds, htons(ETH_P_8021Q));
        rtnl_unlock();
        if (rc)
                goto out_devlink_teardown;
@@ -2665,6 +2648,10 @@ static void sja1105_teardown(struct dsa_switch *ds)
        struct sja1105_bridge_vlan *v, *n;
        int port;
 
+       rtnl_lock();
+       dsa_tag_8021q_unregister(ds);
+       rtnl_unlock();
+
        for (port = 0; port < ds->num_ports; port++) {
                struct sja1105_port *sp = &priv->ports[port];
 
@@ -3293,10 +3280,6 @@ static int sja1105_probe(struct spi_device *spi)
        mutex_init(&priv->ptp_data.lock);
        mutex_init(&priv->mgmt_lock);
 
-       rc = dsa_tag_8021q_register(ds, htons(ETH_P_8021Q));
-       if (rc)
-               return rc;
-
        INIT_LIST_HEAD(&priv->bridge_vlans);
        INIT_LIST_HEAD(&priv->dsa_8021q_vlans);
 
@@ -3305,7 +3288,7 @@ static int sja1105_probe(struct spi_device *spi)
 
        rc = dsa_register_switch(priv->ds);
        if (rc)
-               goto out_tag_8021q_unregister;
+               return rc;
 
        if (IS_ENABLED(CONFIG_NET_SCH_CBS)) {
                priv->cbs = devm_kcalloc(dev, priv->info->num_cbs_shapers,
@@ -3358,8 +3341,6 @@ out_destroy_workers:
 
 out_unregister_switch:
        dsa_unregister_switch(ds);
-out_tag_8021q_unregister:
-       dsa_tag_8021q_unregister(ds);
 
        return rc;
 }
@@ -3370,7 +3351,6 @@ static int sja1105_remove(struct spi_device *spi)
        struct dsa_switch *ds = priv->ds;
 
        dsa_unregister_switch(ds);
-       dsa_tag_8021q_unregister(ds);
 
        return 0;
 }

diff --git a/include/linux/dsa/8021q.h b/include/linux/dsa/8021q.h
index 0bda08fb2f16144238a39a6e5623f63d11ab7876..9cf2c99eb668a73dbb657c4473df715a819a7778 100644 (file)
--- a/include/linux/dsa/8021q.h
+++ b/include/linux/dsa/8021q.h
@@ -32,8 +32,6 @@ int dsa_tag_8021q_register(struct dsa_switch *ds, __be16 proto);
 
 void dsa_tag_8021q_unregister(struct dsa_switch *ds);
 
-int dsa_8021q_setup(struct dsa_switch *ds, bool enabled);
-
 int dsa_8021q_crosschip_bridge_join(struct dsa_switch *ds, int port,
                                    struct dsa_switch *other_ds,
                                    int other_port);

diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c
index 4a11c5004783d3bb0bd43bfc6377cd74c0b41365..9785c8497039f86329669009e215b3b68c7c9dae 100644 (file)
--- a/net/dsa/tag_8021q.c
+++ b/net/dsa/tag_8021q.c
@@ -257,7 +257,7 @@ static int dsa_8021q_setup_port(struct dsa_switch *ds, int port, bool enabled)
        return err;
 }
 
-int dsa_8021q_setup(struct dsa_switch *ds, bool enabled)
+static int dsa_8021q_setup(struct dsa_switch *ds, bool enabled)
 {
        int err, port;
 
@@ -275,7 +275,6 @@ int dsa_8021q_setup(struct dsa_switch *ds, bool enabled)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(dsa_8021q_setup);
 
 static int dsa_8021q_crosschip_link_apply(struct dsa_switch *ds, int port,
                                          struct dsa_switch *other_ds,
@@ -427,7 +426,7 @@ int dsa_tag_8021q_register(struct dsa_switch *ds, __be16 proto)
 
        ds->tag_8021q_ctx = ctx;
 
-       return 0;
+       return dsa_8021q_setup(ds, true);
 }
 EXPORT_SYMBOL_GPL(dsa_tag_8021q_register);
 
@@ -435,6 +434,12 @@ void dsa_tag_8021q_unregister(struct dsa_switch *ds)
 {
        struct dsa_8021q_context *ctx = ds->tag_8021q_ctx;
        struct dsa_8021q_crosschip_link *c, *n;
+       int err;
+
+       err = dsa_8021q_setup(ds, false);
+       if (err)
+               dev_err(ds->dev, "failed to tear down tag_8021q VLANs: %pe\n",
+                       ERR_PTR(err));
 
        list_for_each_entry_safe(c, n, &ctx->crosschip_links, list) {
                list_del(&c->list);