| Message ID | 20210930064436.1502516-1-vee.khee.wong@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [net,v1,1/1] net: stmmac: fix EEE init issue when paired with EEE capable PHYs | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Thu, 30 Sep 2021 14:44:36 +0800 you wrote: > When STMMAC is paired with Energy-Efficient Ethernet(EEE) capable PHY, > and the PHY is advertising EEE by default, we need to enable EEE on the > xPCS side too, instead of having user to manually trigger the enabling > config via ethtool. > > Fixed this by adding xpcs_config_eee() call in stmmac_eee_init(). > > [...] Here is the summary with links: - [net,v1,1/1] net: stmmac: fix EEE init issue when paired with EEE capable PHYs https://git.kernel.org/netdev/net/c/656ed8b015f1 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
On Thu, Sep 30, 2021 at 02:44:36PM +0800, Wong Vee Khee wrote: > When STMMAC is paired with Energy-Efficient Ethernet(EEE) capable PHY, > and the PHY is advertising EEE by default, we need to enable EEE on the > xPCS side too, instead of having user to manually trigger the enabling > config via ethtool. > > Fixed this by adding xpcs_config_eee() call in stmmac_eee_init(). > > Fixes: 7617af3d1a5e ("net: pcs: Introducing support for DWC xpcs Energy Efficient Ethernet") > Cc: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com> > Signed-off-by: Wong Vee Khee <vee.khee.wong@linux.intel.com> > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 553c4403258a..981ccf47dcea 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -486,6 +486,10 @@ bool stmmac_eee_init(struct stmmac_priv *priv) > timer_setup(&priv->eee_ctrl_timer, stmmac_eee_ctrl_timer, 0); > stmmac_set_eee_timer(priv, priv->hw, STMMAC_DEFAULT_LIT_LS, > eee_tw_timer); > + if (priv->hw->xpcs) > + xpcs_config_eee(priv->hw->xpcs, > + priv->plat->mult_fact_100ns, > + true); > } /* Check if it needs to be deactivated */ if (!priv->eee_active) { if (priv->eee_enabled) { netdev_dbg(priv->dev, "disable EEE\n"); 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); } mutex_unlock(&priv->lock); return false; } Don't you want to turn it of in here? Andrew
On Fri, Oct 01, 2021 at 01:31:36AM +0200, Andrew Lunn wrote: > On Thu, Sep 30, 2021 at 02:44:36PM +0800, Wong Vee Khee wrote: > > When STMMAC is paired with Energy-Efficient Ethernet(EEE) capable PHY, > > and the PHY is advertising EEE by default, we need to enable EEE on the > > xPCS side too, instead of having user to manually trigger the enabling > > config via ethtool. > > > > Fixed this by adding xpcs_config_eee() call in stmmac_eee_init(). > > > > Fixes: 7617af3d1a5e ("net: pcs: Introducing support for DWC xpcs Energy Efficient Ethernet") > > Cc: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com> > > Signed-off-by: Wong Vee Khee <vee.khee.wong@linux.intel.com> > > --- > > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > > index 553c4403258a..981ccf47dcea 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > > @@ -486,6 +486,10 @@ bool stmmac_eee_init(struct stmmac_priv *priv) > > timer_setup(&priv->eee_ctrl_timer, stmmac_eee_ctrl_timer, 0); > > stmmac_set_eee_timer(priv, priv->hw, STMMAC_DEFAULT_LIT_LS, > > eee_tw_timer); > > + if (priv->hw->xpcs) > > + xpcs_config_eee(priv->hw->xpcs, > > + priv->plat->mult_fact_100ns, > > + true); > > } > > > /* Check if it needs to be deactivated */ > if (!priv->eee_active) { > if (priv->eee_enabled) { > netdev_dbg(priv->dev, "disable EEE\n"); > 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); > } > mutex_unlock(&priv->lock); > return false; > } > > Don't you want to turn it of in here? > > Andrew You're right. Will introduce a new patch for that. Regards, Vee Khee
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 553c4403258a..981ccf47dcea 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -486,6 +486,10 @@ bool stmmac_eee_init(struct stmmac_priv *priv) timer_setup(&priv->eee_ctrl_timer, stmmac_eee_ctrl_timer, 0); stmmac_set_eee_timer(priv, priv->hw, STMMAC_DEFAULT_LIT_LS, eee_tw_timer); + if (priv->hw->xpcs) + xpcs_config_eee(priv->hw->xpcs, + priv->plat->mult_fact_100ns, + true); } if (priv->plat->has_gmac4 && priv->tx_lpi_timer <= STMMAC_ET_MAX) {
When STMMAC is paired with Energy-Efficient Ethernet(EEE) capable PHY, and the PHY is advertising EEE by default, we need to enable EEE on the xPCS side too, instead of having user to manually trigger the enabling config via ethtool. Fixed this by adding xpcs_config_eee() call in stmmac_eee_init(). Fixes: 7617af3d1a5e ("net: pcs: Introducing support for DWC xpcs Energy Efficient Ethernet") Cc: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com> Signed-off-by: Wong Vee Khee <vee.khee.wong@linux.intel.com> --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++++ 1 file changed, 4 insertions(+)