[PATCH net-next v10 2/7] net: stmmac: drop stmmac_fpe_handshake

Furong Xu
2024-09-06T14:30:51Z

ethtool --set-mm can trigger FPE verification process by calling
stmmac_fpe_send_mpacket, stmmac_fpe_handshake should be gone.

Signed-off-by: Furong Xu <0x1207@gmail.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 -
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 23 +------------------
.../net/ethernet/stmicro/stmmac/stmmac_tc.c | 8 -------
3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index 458d6b16ce21..3ad182ef8e97 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -425,7 +425,6 @@ bool stmmac_eee_init(struct stmmac_priv *priv);
int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt);
int stmmac_reinit_ringparam(struct net_device *dev, u32 rx_size, u32 tx_size);
int stmmac_bus_clks_config(struct stmmac_priv *priv, bool enabled);
-void stmmac_fpe_handshake(struct stmmac_priv *priv, bool enable);

static inline bool stmmac_xdp_is_enabled(struct stmmac_priv *priv)
{
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 529fe31f8b04..3072ad33b105 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3533,13 +3533,9 @@ static int stmmac_hw_setup(struct net_device *dev, bool ptp_register)

stmmac_set_hw_vlan_mode(priv, priv->hw);

- if (priv->dma_cap.fpesel) {
+ if (priv->dma_cap.fpesel)
stmmac_fpe_start_wq(priv);

- if (priv->fpe_cfg.enable)
- stmmac_fpe_handshake(priv, true);
- }
-
return 0;
}

@@ -7425,22 +7421,6 @@ static void stmmac_fpe_lp_task(struct work_struct *work)
clear_bit(__FPE_TASK_SCHED, &priv->fpe_task_state);
}

-void stmmac_fpe_handshake(struct stmmac_priv *priv, bool enable)
-{
- if (priv->fpe_cfg.hs_enable != enable) {
- if (enable) {
- stmmac_fpe_send_mpacket(priv, priv->ioaddr,
- &priv->fpe_cfg,
- MPACKET_VERIFY);
- } else {
- priv->fpe_cfg.lo_fpe_state = FPE_STATE_OFF;
- priv->fpe_cfg.lp_fpe_state = FPE_STATE_OFF;
- }
-
- priv->fpe_cfg.hs_enable = enable;
- }
-}
-
static int stmmac_xdp_rx_timestamp(const struct xdp_md *_ctx, u64 *timestamp)
{
const struct stmmac_xdp_buff *ctx = (void *)_ctx;
@@ -7902,7 +7882,6 @@ int stmmac_suspend(struct device *dev)
priv->plat->tx_queues_to_use,
priv->plat->rx_queues_to_use, false);

- stmmac_fpe_handshake(priv, false);
stmmac_fpe_stop_wq(priv);
}

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
index 9cc41ed01882..b0cc45331ff7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
@@ -1078,11 +1078,6 @@ static int tc_taprio_configure(struct stmmac_priv *priv,

netdev_info(priv->dev, "configured EST\n");

- if (fpe) {
- stmmac_fpe_handshake(priv, true);
- netdev_info(priv->dev, "start FPE handshake\n");
- }
-
return 0;

disable:
@@ -1107,9 +1102,6 @@ static int tc_taprio_configure(struct stmmac_priv *priv,
false);
netdev_info(priv->dev, "disabled FPE\n");

- stmmac_fpe_handshake(priv, false);
- netdev_info(priv->dev, "stop FPE handshake\n");
-
return ret;
}

--
2.34.1