Skip to content

Commit 59dd7fc

Browse files
Furong Xukuba-moo
authored andcommitted
net: stmmac: drop stmmac_fpe_handshake
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 <[email protected]> Reviewed-by: Vladimir Oltean <[email protected]> Link: https://patch.msgid.link/42018b1a15eb3ced567fd6a73798c7cd4e08799a.1725631883.git.0x1207@gmail.com Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 070a5e6 commit 59dd7fc

File tree

3 files changed

+1
-31
lines changed

3 files changed

+1
-31
lines changed

drivers/net/ethernet/stmicro/stmmac/stmmac.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@ bool stmmac_eee_init(struct stmmac_priv *priv);
425425
int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt);
426426
int stmmac_reinit_ringparam(struct net_device *dev, u32 rx_size, u32 tx_size);
427427
int stmmac_bus_clks_config(struct stmmac_priv *priv, bool enabled);
428-
void stmmac_fpe_handshake(struct stmmac_priv *priv, bool enable);
429428

430429
static inline bool stmmac_xdp_is_enabled(struct stmmac_priv *priv)
431430
{

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3533,13 +3533,9 @@ static int stmmac_hw_setup(struct net_device *dev, bool ptp_register)
35333533

35343534
stmmac_set_hw_vlan_mode(priv, priv->hw);
35353535

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

3539-
if (priv->fpe_cfg.enable)
3540-
stmmac_fpe_handshake(priv, true);
3541-
}
3542-
35433539
return 0;
35443540
}
35453541

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

7428-
void stmmac_fpe_handshake(struct stmmac_priv *priv, bool enable)
7429-
{
7430-
if (priv->fpe_cfg.hs_enable != enable) {
7431-
if (enable) {
7432-
stmmac_fpe_send_mpacket(priv, priv->ioaddr,
7433-
&priv->fpe_cfg,
7434-
MPACKET_VERIFY);
7435-
} else {
7436-
priv->fpe_cfg.lo_fpe_state = FPE_STATE_OFF;
7437-
priv->fpe_cfg.lp_fpe_state = FPE_STATE_OFF;
7438-
}
7439-
7440-
priv->fpe_cfg.hs_enable = enable;
7441-
}
7442-
}
7443-
74447424
static int stmmac_xdp_rx_timestamp(const struct xdp_md *_ctx, u64 *timestamp)
74457425
{
74467426
const struct stmmac_xdp_buff *ctx = (void *)_ctx;
@@ -7902,7 +7882,6 @@ int stmmac_suspend(struct device *dev)
79027882
priv->plat->tx_queues_to_use,
79037883
priv->plat->rx_queues_to_use, false);
79047884

7905-
stmmac_fpe_handshake(priv, false);
79067885
stmmac_fpe_stop_wq(priv);
79077886
}
79087887

drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,11 +1078,6 @@ static int tc_taprio_configure(struct stmmac_priv *priv,
10781078

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

1081-
if (fpe) {
1082-
stmmac_fpe_handshake(priv, true);
1083-
netdev_info(priv->dev, "start FPE handshake\n");
1084-
}
1085-
10861081
return 0;
10871082

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

1110-
stmmac_fpe_handshake(priv, false);
1111-
netdev_info(priv->dev, "stop FPE handshake\n");
1112-
11131105
return ret;
11141106
}
11151107

0 commit comments

Comments
 (0)