net: sparx5: move stats initialization and add deinit function

The sparx5_stats_init() function starts a worker thread which needs to
be cleaned up. Move the initialization code to probe() and add a
deinit() function for proper teardown.

Also, rename sparx_stats_init() to sparx5_stats_init() to match the
driver naming convention.

Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
Link: https://patch.msgid.link/20260227-sparx5-init-deinit-v2-4-10ba54ccf005@microchip.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c b/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c
index 049541eeaae0de19baa40fb0074cc5939a1c5ea2..d42c57bead89d9166248c48d64398dbdeecb6540 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c
@@ -1244,7 +1244,7 @@ const struct ethtool_ops sparx5_ethtool_ops = {
        .set_pauseparam         = sparx5_set_pauseparam,
 };
 
-int sparx_stats_init(struct sparx5 *sparx5)
+int sparx5_stats_init(struct sparx5 *sparx5)
 {
        const struct sparx5_consts *consts = sparx5->data->consts;
        char queue_name[32];
@@ -1278,3 +1278,10 @@ int sparx_stats_init(struct sparx5 *sparx5)
 
        return 0;
 }
+
+void sparx5_stats_deinit(struct sparx5 *sparx5)
+{
+       cancel_delayed_work_sync(&sparx5->stats_work);
+       destroy_workqueue(sparx5->stats_queue);
+       mutex_destroy(&sparx5->queue_stats_lock);
+}

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
index e7281514666b56f56b080abba67b80686e4d0250..cc0c32d7e886f09034506d793e53937898104219 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
@@ -743,11 +743,6 @@ static int sparx5_start(struct sparx5 *sparx5)
        if (err)
                return err;
 
-       /* Init stats */
-       err = sparx_stats_init(sparx5);
-       if (err)
-               return err;
-
        sparx5_board_init(sparx5);
 
        /* Start Frame DMA with fallback to register based INJ/XTR */
@@ -985,12 +980,18 @@ static int mchp_sparx5_probe(struct platform_device *pdev)
                goto cleanup_vcap;
        }
 
+       err = sparx5_stats_init(sparx5);
+       if (err) {
+               dev_err(sparx5->dev, "Failed to initialize stats\n");
+               goto cleanup_mact;
+       }
+
        INIT_LIST_HEAD(&sparx5->mall_entries);
 
        err = sparx5_register_netdevs(sparx5);
        if (err) {
                dev_err(sparx5->dev, "Failed to register net devices\n");
-               goto cleanup_mact;
+               goto cleanup_stats;
        }
 
        err = sparx5_register_notifier_blocks(sparx5);
@@ -1003,6 +1004,8 @@ static int mchp_sparx5_probe(struct platform_device *pdev)
 
 cleanup_netdevs:
        sparx5_unregister_netdevs(sparx5);
+cleanup_stats:
+       sparx5_stats_deinit(sparx5);
 cleanup_mact:
        sparx5_mact_deinit(sparx5);
 cleanup_vcap:
@@ -1034,6 +1037,7 @@ static void mchp_sparx5_remove(struct platform_device *pdev)
        }
        sparx5_unregister_notifier_blocks(sparx5);
        sparx5_unregister_netdevs(sparx5);
+       sparx5_stats_deinit(sparx5);
        sparx5_mact_deinit(sparx5);
        sparx5_vcap_deinit(sparx5);
        sparx5_ptp_deinit(sparx5);

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
index e4c39cca7b2668d09800dc691dd4b8b817f36216..97d53e229ad6973ccf19112d378286189d35e3ce 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
@@ -514,7 +514,8 @@ enum sparx5_cal_bw sparx5_get_port_cal_speed(struct sparx5 *sparx5, u32 portno);
 
 /* sparx5_ethtool.c */
 void sparx5_get_stats64(struct net_device *ndev, struct rtnl_link_stats64 *stats);
-int sparx_stats_init(struct sparx5 *sparx5);
+int sparx5_stats_init(struct sparx5 *sparx5);
+void sparx5_stats_deinit(struct sparx5 *sparx5);
 
 /* sparx5_dcb.c */
 #ifdef CONFIG_SPARX5_DCB