net: dsa: tag_8021q: create dsa_tag_8021q_{register,unregister} helpers

In preparation of moving tag_8021q to core DSA, move all initialization
and teardown related to tag_8021q which is currently done by drivers in
2 functions called "register" and "unregister". These will gather more
functionality in future patches, which will better justify the chosen
naming scheme.

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 a2a15919b9606015522d556cf9f1eaff3a7ce917..b52cc381cdc1e1facd351783e458e349628eb258 100644 (file)
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -425,15 +425,11 @@ static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu)
        ocelot_rmw_rix(ocelot, 0, cpu_flood, ANA_PGID_PGID, PGID_MC);
        ocelot_rmw_rix(ocelot, 0, cpu_flood, ANA_PGID_PGID, PGID_BC);
 
-       felix->dsa_8021q_ctx = kzalloc(sizeof(*felix->dsa_8021q_ctx),
-                                      GFP_KERNEL);
+       felix->dsa_8021q_ctx = dsa_tag_8021q_register(ds, &felix_tag_8021q_ops,
+                                                     htons(ETH_P_8021AD));
        if (!felix->dsa_8021q_ctx)
                return -ENOMEM;
 
-       felix->dsa_8021q_ctx->ops = &felix_tag_8021q_ops;
-       felix->dsa_8021q_ctx->proto = htons(ETH_P_8021AD);
-       felix->dsa_8021q_ctx->ds = ds;
-
        err = dsa_8021q_setup(felix->dsa_8021q_ctx, true);
        if (err)
                goto out_free_dsa_8021_ctx;
@@ -447,7 +443,7 @@ static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu)
 out_teardown_dsa_8021q:
        dsa_8021q_setup(felix->dsa_8021q_ctx, false);
 out_free_dsa_8021_ctx:
-       kfree(felix->dsa_8021q_ctx);
+       dsa_tag_8021q_unregister(felix->dsa_8021q_ctx);
        return err;
 }
 
@@ -466,7 +462,7 @@ static void felix_teardown_tag_8021q(struct dsa_switch *ds, int cpu)
        if (err)
                dev_err(ds->dev, "dsa_8021q_setup returned %d", err);
 
-       kfree(felix->dsa_8021q_ctx);
+       dsa_tag_8021q_unregister(felix->dsa_8021q_ctx);
 
        for (port = 0; port < ds->num_ports; port++) {
                if (dsa_is_unused_port(ds, port))

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index 4514ac468cc8ec31df91efe04a779bd5023baaf3..689f46797d1ca3d59debe9baa731781a12e009ad 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -3306,16 +3306,11 @@ static int sja1105_probe(struct spi_device *spi)
        mutex_init(&priv->ptp_data.lock);
        mutex_init(&priv->mgmt_lock);
 
-       priv->dsa_8021q_ctx = devm_kzalloc(dev, sizeof(*priv->dsa_8021q_ctx),
-                                          GFP_KERNEL);
+       priv->dsa_8021q_ctx = dsa_tag_8021q_register(ds, &sja1105_dsa_8021q_ops,
+                                                    htons(ETH_P_8021Q));
        if (!priv->dsa_8021q_ctx)
                return -ENOMEM;
 
-       priv->dsa_8021q_ctx->ops = &sja1105_dsa_8021q_ops;
-       priv->dsa_8021q_ctx->proto = htons(ETH_P_8021Q);
-       priv->dsa_8021q_ctx->ds = ds;
-
-       INIT_LIST_HEAD(&priv->dsa_8021q_ctx->crosschip_links);
        INIT_LIST_HEAD(&priv->bridge_vlans);
        INIT_LIST_HEAD(&priv->dsa_8021q_vlans);
 
@@ -3324,7 +3319,7 @@ static int sja1105_probe(struct spi_device *spi)
 
        rc = dsa_register_switch(priv->ds);
        if (rc)
-               return rc;
+               goto out_tag_8021q_unregister;
 
        if (IS_ENABLED(CONFIG_NET_SCH_CBS)) {
                priv->cbs = devm_kcalloc(dev, priv->info->num_cbs_shapers,
@@ -3377,6 +3372,8 @@ out_destroy_workers:
 
 out_unregister_switch:
        dsa_unregister_switch(ds);
+out_tag_8021q_unregister:
+       dsa_tag_8021q_unregister(priv->dsa_8021q_ctx);
 
        return rc;
 }
@@ -3384,8 +3381,11 @@ out_unregister_switch:
 static int sja1105_remove(struct spi_device *spi)
 {
        struct sja1105_private *priv = spi_get_drvdata(spi);
+       struct dsa_switch *ds = priv->ds;
+
+       dsa_unregister_switch(ds);
+       dsa_tag_8021q_unregister(priv->dsa_8021q_ctx);
 
-       dsa_unregister_switch(priv->ds);
        return 0;
 }
 

diff --git a/include/linux/dsa/8021q.h b/include/linux/dsa/8021q.h
index 5f01dea7d5b66b218777f4e765c0cfdf5b8a4914..9945898a90c3903e83ce76234ffb94d32156a79f 100644 (file)
--- a/include/linux/dsa/8021q.h
+++ b/include/linux/dsa/8021q.h
@@ -34,6 +34,12 @@ struct dsa_8021q_context {
        __be16 proto;
 };
 
+struct dsa_8021q_context *dsa_tag_8021q_register(struct dsa_switch *ds,
+                                                const struct dsa_8021q_ops *ops,
+                                                __be16 proto);
+
+void dsa_tag_8021q_unregister(struct dsa_8021q_context *ctx);
+
 int dsa_8021q_setup(struct dsa_8021q_context *ctx, bool enabled);
 
 int dsa_8021q_crosschip_bridge_join(struct dsa_8021q_context *ctx, int port,

diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c
index 3a25b7b1ba50317754c36ac6876b55f8f3839128..73966ca23ac3af23962f8156f77d34aef532fe36 100644 (file)
--- a/net/dsa/tag_8021q.c
+++ b/net/dsa/tag_8021q.c
@@ -410,6 +410,39 @@ int dsa_8021q_crosschip_bridge_leave(struct dsa_8021q_context *ctx, int port,
 }
 EXPORT_SYMBOL_GPL(dsa_8021q_crosschip_bridge_leave);
 
+struct dsa_8021q_context *dsa_tag_8021q_register(struct dsa_switch *ds,
+                                                const struct dsa_8021q_ops *ops,
+                                                __be16 proto)
+{
+       struct dsa_8021q_context *ctx;
+
+       ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+       if (!ctx)
+               return NULL;
+
+       ctx->ops = ops;
+       ctx->proto = proto;
+       ctx->ds = ds;
+
+       INIT_LIST_HEAD(&ctx->crosschip_links);
+
+       return ctx;
+}
+EXPORT_SYMBOL_GPL(dsa_tag_8021q_register);
+
+void dsa_tag_8021q_unregister(struct dsa_8021q_context *ctx)
+{
+       struct dsa_8021q_crosschip_link *c, *n;
+
+       list_for_each_entry_safe(c, n, &ctx->crosschip_links, list) {
+               list_del(&c->list);
+               kfree(c);
+       }
+
+       kfree(ctx);
+}
+EXPORT_SYMBOL_GPL(dsa_tag_8021q_unregister);
+
 struct sk_buff *dsa_8021q_xmit(struct sk_buff *skb, struct net_device *netdev,
                               u16 tpid, u16 tci)
 {