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

net: stmmac: use stmmac_set_lpi_mode() 



Use the new stmmac_set_lpi_mode() API to configure the parameters of
the desired LPI mode rather than the older methods.

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


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

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

+15 −14
Original line number Diff line number Diff line
@@ -390,11 +390,6 @@ static inline u32 stmmac_rx_dirty(struct stmmac_priv *priv, u32 queue) 
	return dirty;

}



static void stmmac_enable_hw_lpi_timer(struct stmmac_priv *priv)

{

	stmmac_set_eee_lpi_timer(priv, priv->hw, priv->tx_lpi_timer);

}



static bool stmmac_eee_tx_busy(struct stmmac_priv *priv)

{

	u32 tx_cnt = priv->plat->tx_queues_to_use;
@@ -431,8 +426,9 @@ static void stmmac_try_to_start_sw_lpi(struct stmmac_priv *priv) 


	/* Check and enter in LPI mode */

	if (!priv->tx_path_in_lpi_mode)

		stmmac_set_eee_mode(priv, priv->hw,

			priv->plat->flags & STMMAC_FLAG_EN_TX_LPI_CLOCKGATING);

		stmmac_set_lpi_mode(priv, priv->hw, STMMAC_LPI_FORCED,

			priv->plat->flags & STMMAC_FLAG_EN_TX_LPI_CLOCKGATING,

			0);

}



/**
@@ -443,7 +439,7 @@ static void stmmac_try_to_start_sw_lpi(struct stmmac_priv *priv) 
static void stmmac_stop_sw_lpi(struct stmmac_priv *priv)

{

	del_timer_sync(&priv->eee_ctrl_timer);

	stmmac_reset_eee_mode(priv, priv->hw);

	stmmac_set_lpi_mode(priv, priv->hw, STMMAC_LPI_DISABLE, false, 0);

	priv->tx_path_in_lpi_mode = false;

}
@@ -1046,7 +1042,7 @@ static void stmmac_mac_disable_tx_lpi(struct phylink_config *config) 
	netdev_dbg(priv->dev, "disable EEE\n");

	priv->eee_sw_timer_en = false;

	del_timer_sync(&priv->eee_ctrl_timer);

	stmmac_reset_eee_mode(priv, priv->hw);

	stmmac_set_lpi_mode(priv, priv->hw, STMMAC_LPI_DISABLE, false, 0);

	priv->tx_path_in_lpi_mode = false;



	stmmac_set_eee_timer(priv, priv->hw, 0, STMMAC_DEFAULT_TWT_LS);
@@ -1061,6 +1057,7 @@ static int stmmac_mac_enable_tx_lpi(struct phylink_config *config, u32 timer, 
				    bool tx_clk_stop)

{

	struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev));

	int ret;



	priv->tx_lpi_timer = timer;

	priv->eee_active = true;
@@ -1075,11 +1072,15 @@ static int stmmac_mac_enable_tx_lpi(struct phylink_config *config, u32 timer, 
		xpcs_config_eee(priv->hw->xpcs, priv->plat->mult_fact_100ns,

				true);



	if (priv->plat->has_gmac4 && priv->tx_lpi_timer <= STMMAC_ET_MAX) {

		/* Use hardware LPI mode */

		stmmac_enable_hw_lpi_timer(priv);

	} else {

		/* Use software LPI mode */

	/* Try to cnfigure the hardware timer. */

	ret = stmmac_set_lpi_mode(priv, priv->hw, STMMAC_LPI_TIMER,

				  priv->plat->flags & STMMAC_FLAG_EN_TX_LPI_CLOCKGATING,

				  priv->tx_lpi_timer);



	if (ret) {

		/* Hardware timer mode not supported, or value out of range.

		 * Fall back to using software LPI mode

		 */

		priv->eee_sw_timer_en = true;

		stmmac_restart_sw_lpi_timer(priv);

	}