Commit a923378a authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: delete software timer before disabling LPI 



Delete the software timer to ensure that the timer doesn't fire while
we are modifying the LPI register state, potentially re-enabling LPI.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tffd3-003ZHV-6C@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent be258f65

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

+2 −2
Original line number Diff line number Diff line
@@ -447,8 +447,8 @@ static void stmmac_try_to_start_sw_lpi(struct stmmac_priv *priv) 
 */

static void stmmac_stop_sw_lpi(struct stmmac_priv *priv)

{

	stmmac_reset_eee_mode(priv, priv->hw);

	del_timer_sync(&priv->eee_ctrl_timer);

	stmmac_reset_eee_mode(priv, priv->hw);

	priv->tx_path_in_lpi_mode = false;

}
@@ -492,8 +492,8 @@ static void stmmac_eee_init(struct stmmac_priv *priv, bool active) 
		if (priv->eee_enabled) {

			netdev_dbg(priv->dev, "disable EEE\n");

			priv->eee_sw_timer_en = false;

			stmmac_disable_hw_lpi_timer(priv);

			del_timer_sync(&priv->eee_ctrl_timer);

			stmmac_disable_hw_lpi_timer(priv);

			stmmac_set_eee_timer(priv, priv->hw, 0,

					     STMMAC_DEFAULT_TWT_LS);

			if (priv->hw->xpcs)