net: stmmac: move stmmac_fpe_cfg to stmmac_priv data

By moving the fpe_cfg field to the stmmac_priv data, stmmac_fpe_cfg
becomes platform-data eventually, instead of a run-time config.

Suggested-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Furong Xu <0x1207@gmail.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Link: https://patch.msgid.link/d9b3d7ecb308c5e39778a4c8ae9df288a2754379.1725631883.git.0x1207@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index 7e90f34b8c882090a628d9dc90dd9c465da9da17..68574798c03ffe078dd7dba58c164b96ee21d792 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -28,6 +28,8 @@
 struct stmmac_extra_stats;
 struct stmmac_priv;
 struct stmmac_safety_stats;
+struct stmmac_fpe_cfg;
+enum stmmac_mpacket_type;
 struct dma_desc;
 struct dma_extended_desc;
 struct dma_edesc;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index b23b920eedb1cdcfde2c3bde868225f3df5c92c8..458d6b16ce21dcaf29e85e5910ab4177318f81ef 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -146,6 +146,33 @@ struct stmmac_channel {
        u32 index;
 };
 
+/* FPE link state */
+enum stmmac_fpe_state {
+       FPE_STATE_OFF = 0,
+       FPE_STATE_CAPABLE = 1,
+       FPE_STATE_ENTERING_ON = 2,
+       FPE_STATE_ON = 3,
+};
+
+/* FPE link-partner hand-shaking mPacket type */
+enum stmmac_mpacket_type {
+       MPACKET_VERIFY = 0,
+       MPACKET_RESPONSE = 1,
+};
+
+enum stmmac_fpe_task_state_t {
+       __FPE_REMOVING,
+       __FPE_TASK_SCHED,
+};
+
+struct stmmac_fpe_cfg {
+       bool enable;                            /* FPE enable */
+       bool hs_enable;                         /* FPE handshake enable */
+       enum stmmac_fpe_state lp_fpe_state;     /* Link Partner FPE state */
+       enum stmmac_fpe_state lo_fpe_state;     /* Local station FPE state */
+       u32 fpe_csr;                            /* MAC_FPE_CTRL_STS reg cache */
+};
+
 struct stmmac_tc_entry {
        bool in_use;
        bool in_hw;
@@ -339,11 +366,12 @@ struct stmmac_priv {
        struct workqueue_struct *wq;
        struct work_struct service_task;
 
-       /* Workqueue for handling FPE hand-shaking */
+       /* Frame Preemption feature (FPE) */
        unsigned long fpe_task_state;
        struct workqueue_struct *fpe_wq;
        struct work_struct fpe_task;
        char wq_name[IFNAMSIZ + 4];
+       struct stmmac_fpe_cfg fpe_cfg;
 
        /* TC Handling */
        unsigned int tc_entries_max;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index d9fca8d1227c515c93777c7b580c41c00e705c8f..529fe31f8b04677fc50392a4018b4f4d6b650c03 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -968,7 +968,7 @@ static void stmmac_mac_config(struct phylink_config *config, unsigned int mode,
 
 static void stmmac_fpe_link_state_handle(struct stmmac_priv *priv, bool is_up)
 {
-       struct stmmac_fpe_cfg *fpe_cfg = priv->plat->fpe_cfg;
+       struct stmmac_fpe_cfg *fpe_cfg = &priv->fpe_cfg;
        enum stmmac_fpe_state *lo_state = &fpe_cfg->lo_fpe_state;
        enum stmmac_fpe_state *lp_state = &fpe_cfg->lp_fpe_state;
        bool *hs_enable = &fpe_cfg->hs_enable;
@@ -3536,7 +3536,7 @@ static int stmmac_hw_setup(struct net_device *dev, bool ptp_register)
        if (priv->dma_cap.fpesel) {
                stmmac_fpe_start_wq(priv);
 
-               if (priv->plat->fpe_cfg->enable)
+               if (priv->fpe_cfg.enable)
                        stmmac_fpe_handshake(priv, true);
        }
 
@@ -5982,7 +5982,7 @@ static int stmmac_set_features(struct net_device *netdev,
 
 static void stmmac_fpe_event_status(struct stmmac_priv *priv, int status)
 {
-       struct stmmac_fpe_cfg *fpe_cfg = priv->plat->fpe_cfg;
+       struct stmmac_fpe_cfg *fpe_cfg = &priv->fpe_cfg;
        enum stmmac_fpe_state *lo_state = &fpe_cfg->lo_fpe_state;
        enum stmmac_fpe_state *lp_state = &fpe_cfg->lp_fpe_state;
        bool *hs_enable = &fpe_cfg->hs_enable;
@@ -7381,7 +7381,7 @@ static void stmmac_fpe_lp_task(struct work_struct *work)
 {
        struct stmmac_priv *priv = container_of(work, struct stmmac_priv,
                                                fpe_task);
-       struct stmmac_fpe_cfg *fpe_cfg = priv->plat->fpe_cfg;
+       struct stmmac_fpe_cfg *fpe_cfg = &priv->fpe_cfg;
        enum stmmac_fpe_state *lo_state = &fpe_cfg->lo_fpe_state;
        enum stmmac_fpe_state *lp_state = &fpe_cfg->lp_fpe_state;
        bool *hs_enable = &fpe_cfg->hs_enable;
@@ -7427,17 +7427,17 @@ static void stmmac_fpe_lp_task(struct work_struct *work)
 
 void stmmac_fpe_handshake(struct stmmac_priv *priv, bool enable)
 {
-       if (priv->plat->fpe_cfg->hs_enable != enable) {
+       if (priv->fpe_cfg.hs_enable != enable) {
                if (enable) {
                        stmmac_fpe_send_mpacket(priv, priv->ioaddr,
-                                               priv->plat->fpe_cfg,
+                                               &priv->fpe_cfg,
                                                MPACKET_VERIFY);
                } else {
-                       priv->plat->fpe_cfg->lo_fpe_state = FPE_STATE_OFF;
-                       priv->plat->fpe_cfg->lp_fpe_state = FPE_STATE_OFF;
+                       priv->fpe_cfg.lo_fpe_state = FPE_STATE_OFF;
+                       priv->fpe_cfg.lp_fpe_state = FPE_STATE_OFF;
                }
 
-               priv->plat->fpe_cfg->hs_enable = enable;
+               priv->fpe_cfg.hs_enable = enable;
        }
 }
 
@@ -7898,7 +7898,7 @@ int stmmac_suspend(struct device *dev)
        if (priv->dma_cap.fpesel) {
                /* Disable FPE */
                stmmac_fpe_configure(priv, priv->ioaddr,
-                                    priv->plat->fpe_cfg,
+                                    &priv->fpe_cfg,
                                     priv->plat->tx_queues_to_use,
                                     priv->plat->rx_queues_to_use, false);
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
index 996f2bcd07a2438e7ca0fb3fd9d2cafb02a91283..9cc41ed018822cec0b91251d7e28c27f004e1e32 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
@@ -282,16 +282,6 @@ static int tc_init(struct stmmac_priv *priv)
        if (ret)
                return -ENOMEM;
 
-       if (!priv->plat->fpe_cfg) {
-               priv->plat->fpe_cfg = devm_kzalloc(priv->device,
-                                                  sizeof(*priv->plat->fpe_cfg),
-                                                  GFP_KERNEL);
-               if (!priv->plat->fpe_cfg)
-                       return -ENOMEM;
-       } else {
-               memset(priv->plat->fpe_cfg, 0, sizeof(*priv->plat->fpe_cfg));
-       }
-
        /* Fail silently as we can still use remaining features, e.g. CBS */
        if (!dma_cap->frpsel)
                return 0;
@@ -1076,7 +1066,7 @@ static int tc_taprio_configure(struct stmmac_priv *priv,
        /* Actual FPE register configuration will be done after FPE handshake
         * is success.
         */
-       priv->plat->fpe_cfg->enable = fpe;
+       priv->fpe_cfg.enable = fpe;
 
        ret = stmmac_est_configure(priv, priv, priv->est,
                                   priv->plat->clk_ptp_rate);
@@ -1109,9 +1099,9 @@ disable:
                mutex_unlock(&priv->est_lock);
        }
 
-       priv->plat->fpe_cfg->enable = false;
+       priv->fpe_cfg.enable = false;
        stmmac_fpe_configure(priv, priv->ioaddr,
-                            priv->plat->fpe_cfg,
+                            &priv->fpe_cfg,
                             priv->plat->tx_queues_to_use,
                             priv->plat->rx_queues_to_use,
                             false);

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 338991c08f007287c114f928c75f64e08a9ec029..d79ff252cfdc177053bc745a3625e04b957b2e7c 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -138,33 +138,6 @@ struct stmmac_txq_cfg {
        int tbs_en;
 };
 
-/* FPE link state */
-enum stmmac_fpe_state {
-       FPE_STATE_OFF = 0,
-       FPE_STATE_CAPABLE = 1,
-       FPE_STATE_ENTERING_ON = 2,
-       FPE_STATE_ON = 3,
-};
-
-/* FPE link-partner hand-shaking mPacket type */
-enum stmmac_mpacket_type {
-       MPACKET_VERIFY = 0,
-       MPACKET_RESPONSE = 1,
-};
-
-enum stmmac_fpe_task_state_t {
-       __FPE_REMOVING,
-       __FPE_TASK_SCHED,
-};
-
-struct stmmac_fpe_cfg {
-       bool enable;                            /* FPE enable */
-       bool hs_enable;                         /* FPE handshake enable */
-       enum stmmac_fpe_state lp_fpe_state;     /* Link Partner FPE state */
-       enum stmmac_fpe_state lo_fpe_state;     /* Local station FPE state */
-       u32 fpe_csr;                            /* MAC_FPE_CTRL_STS reg cache */
-};
-
 struct stmmac_safety_feature_cfg {
        u32 tsoee;
        u32 mrxpee;
@@ -232,7 +205,6 @@ struct plat_stmmacenet_data {
        struct fwnode_handle *port_node;
        struct device_node *mdio_node;
        struct stmmac_dma_cfg *dma_cfg;
-       struct stmmac_fpe_cfg *fpe_cfg;
        struct stmmac_safety_feature_cfg *safety_feat_cfg;
        int clk_csr;
        int has_gmac;