net: stmmac: dwmac4: ensure LPIATE is cleared

LPIATE enables the hardware timer for entering LPI mode. To sure that
the correct mode is used, clear LPIATE when using manual/software-timed
mode to prevent the hardware using the timer.

stmmac_main.c avoids this being a problem at the moment by calling
stmmac_set_eee_lpi_timer(..., 0) before switching to software mode.

We no longer need to call stmmac_set_eee_lpi_timer(..., 0) when
disabling EEE as stmmac_reset_eee_mode() will now clear all LPI
settings.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tffdD-003ZHh-Ew@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index 9ed8620580a868099af984149344d9c588f0fdda..17bf836eba7fa76c9f51bf6768fee14aa0eef3b2 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -387,6 +387,7 @@ static void dwmac4_set_eee_mode(struct mac_device_info *hw,
         * state.
         */
        value = readl(ioaddr + GMAC4_LPI_CTRL_STATUS);
+       value &= ~GMAC4_LPI_CTRL_STATUS_LPIATE;
        value |= GMAC4_LPI_CTRL_STATUS_LPIEN | GMAC4_LPI_CTRL_STATUS_LPITXA;
 
        if (en_tx_lpi_clockgating)
@@ -401,7 +402,8 @@ static void dwmac4_reset_eee_mode(struct mac_device_info *hw)
        u32 value;
 
        value = readl(ioaddr + GMAC4_LPI_CTRL_STATUS);
-       value &= ~(GMAC4_LPI_CTRL_STATUS_LPIEN | GMAC4_LPI_CTRL_STATUS_LPITXA);
+       value &= ~(GMAC4_LPI_CTRL_STATUS_LPIATE | GMAC4_LPI_CTRL_STATUS_LPIEN |
+                  GMAC4_LPI_CTRL_STATUS_LPITXA);
        writel(value, ioaddr + GMAC4_LPI_CTRL_STATUS);
 }
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index edcdd880f6f14d4a0391465584a384ce6582a234..a42a3da92400c11c3ad77c7efdf28e110df2f028 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -493,7 +493,6 @@ static void stmmac_eee_init(struct stmmac_priv *priv, bool active)
                        netdev_dbg(priv->dev, "disable EEE\n");
                        priv->eee_sw_timer_en = false;
                        del_timer_sync(&priv->eee_ctrl_timer);
-                       stmmac_disable_hw_lpi_timer(priv);
                        stmmac_reset_eee_mode(priv, priv->hw);
                        stmmac_set_eee_timer(priv, priv->hw, 0,
                                             STMMAC_DEFAULT_TWT_LS);