2021-10-05 11:47:31

by Wong Vee Khee

Subject: [PATCH net 0/2] net: stmmac: Turn off EEE on MAC link down

This patch series ensure PCS EEE is turned off on the event of MAC
link down.

Tested on Intel AlderLake-S (STMMAC + MaxLinear GPY211 PHY).

Wong Vee Khee (2):
net: pcs: xpcs: fix incorrect steps on disable EEE
net: stmmac: trigger PCS EEE to turn off on link down

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++++-
drivers/net/pcs/pcs-xpcs.c | 13 +++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)

--
2.25.1

2021-10-05 11:47:52

by Wong Vee Khee

Subject: [PATCH net 2/2] net: stmmac: trigger PCS EEE to turn off on link down

The current implementation enable PCS EEE feature in the event of link
up, but PCS EEE feature is not disabled on link down.

This patch makes sure PCE EEE feature is disabled on link down.

Fixes: 656ed8b015f1 ("net: stmmac: fix EEE init issue when paired with EEE capable PHYs")
Signed-off-by: Wong Vee Khee <[email protected]>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 981ccf47dcea..eb3b7bf771d7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -477,6 +477,10 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
stmmac_lpi_entry_timer_config(priv, 0);
del_timer_sync(&priv->eee_ctrl_timer);
stmmac_set_eee_timer(priv, priv->hw, 0, eee_tw_timer);
+ if (priv->hw->xpcs)
+ xpcs_config_eee(priv->hw->xpcs,
+ priv->plat->mult_fact_100ns,
+ false);
}
mutex_unlock(&priv->lock);
return false;
@@ -1038,7 +1042,7 @@ static void stmmac_mac_link_down(struct phylink_config *config,
stmmac_mac_set(priv, priv->ioaddr, false);
priv->eee_active = false;
priv->tx_lpi_enabled = false;
- stmmac_eee_init(priv);
+ priv->eee_enabled = stmmac_eee_init(priv);
stmmac_set_eee_pls(priv, priv->hw, false);

if (priv->dma_cap.fpesel)
--
2.25.1

2021-10-06 10:22:17

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net 0/2] net: stmmac: Turn off EEE on MAC link down

Hello:

This series was applied to netdev/net.git (refs/heads/master):

On Tue, 5 Oct 2021 19:50:58 +0800 you wrote:
> This patch series ensure PCS EEE is turned off on the event of MAC
> link down.
>
> Tested on Intel AlderLake-S (STMMAC + MaxLinear GPY211 PHY).
>
> Wong Vee Khee (2):
> net: pcs: xpcs: fix incorrect steps on disable EEE
> net: stmmac: trigger PCS EEE to turn off on link down
>
> [...]

Here is the summary with links:
- [net,1/2] net: pcs: xpcs: fix incorrect steps on disable EEE
https://git.kernel.org/netdev/net/c/590df78bc7d1
- [net,2/2] net: stmmac: trigger PCS EEE to turn off on link down
https://git.kernel.org/netdev/net/c/d4aeaed80b0e

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html