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

net: stmmac: split stmmac_init_eee() and move to phylink methods 



Move the appropriate parts of stmmac_init_eee() into the phylink
mac_enable_tx_lpi() and mac_disable_tx_lpi() methods.

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


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

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

+63 −70
Original line number Diff line number Diff line
@@ -466,74 +466,6 @@ static void stmmac_eee_ctrl_timer(struct timer_list *t) 
	stmmac_try_to_start_sw_lpi(priv);

}



/**

 * stmmac_eee_init - init EEE

 * @priv: driver private structure

 * @active: indicates whether EEE should be enabled.

 * Description:

 *  if the GMAC supports the EEE (from the HW cap reg) and the phy device

 *  can also manage EEE, this function enable the LPI state and start related

 *  timer.

 */

static void stmmac_eee_init(struct stmmac_priv *priv, bool active)

{

	priv->eee_active = active;



	/* Check if MAC core supports the EEE feature. */

	if (!priv->dma_cap.eee) {

		priv->eee_enabled = false;

		return;

	}



	mutex_lock(&priv->lock);



	/* Check if it needs to be deactivated */

	if (!priv->eee_active) {

		if (priv->eee_enabled) {

			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_eee_timer(priv, priv->hw, 0,

					     STMMAC_DEFAULT_TWT_LS);

			if (priv->hw->xpcs)

				xpcs_config_eee(priv->hw->xpcs,

						priv->plat->mult_fact_100ns,

						false);

		}

		priv->eee_enabled = false;

		mutex_unlock(&priv->lock);

		return;

	}



	if (priv->eee_active && !priv->eee_enabled) {

		stmmac_set_eee_timer(priv, priv->hw, STMMAC_DEFAULT_LIT_LS,

				     STMMAC_DEFAULT_TWT_LS);

		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) {

		/* Use hardware LPI mode */

		del_timer_sync(&priv->eee_ctrl_timer);

		priv->tx_path_in_lpi_mode = false;

		priv->eee_sw_timer_en = false;

		stmmac_enable_hw_lpi_timer(priv);

	} else {

		/* Use software LPI mode */

		priv->eee_sw_timer_en = true;

		stmmac_disable_hw_lpi_timer(priv);

		stmmac_restart_sw_lpi_timer(priv);

	}



	priv->eee_enabled = true;



	mutex_unlock(&priv->lock);

	netdev_dbg(priv->dev, "Energy-Efficient Ethernet initialized\n");

}



/* stmmac_get_tx_hwtstamp - get HW TX timestamps

 * @priv: driver private structure

 * @p : descriptor pointer
@@ -1110,7 +1042,33 @@ static void stmmac_mac_disable_tx_lpi(struct phylink_config *config) 
{

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



	stmmac_eee_init(priv, false);

	priv->eee_active = false;



	/* Check if MAC core supports the EEE feature. */

	if (!priv->dma_cap.eee) {

		priv->eee_enabled = false;

		return;

	}



	mutex_lock(&priv->lock);



	/* Check if it needs to be deactivated */

	if (!priv->eee_active) {

		if (priv->eee_enabled) {

			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_eee_timer(priv, priv->hw, 0,

					     STMMAC_DEFAULT_TWT_LS);

			if (priv->hw->xpcs)

				xpcs_config_eee(priv->hw->xpcs,

						priv->plat->mult_fact_100ns,

						false);

		}

		priv->eee_enabled = false;

	}

	mutex_unlock(&priv->lock);

}



static int stmmac_mac_enable_tx_lpi(struct phylink_config *config, u32 timer,
@@ -1119,7 +1077,42 @@ static int stmmac_mac_enable_tx_lpi(struct phylink_config *config, u32 timer, 
	struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev));



	priv->tx_lpi_timer = timer;

	stmmac_eee_init(priv, true);

	priv->eee_active = true;



	/* Check if MAC core supports the EEE feature. */

	if (!priv->dma_cap.eee) {

		priv->eee_enabled = false;

		return 0;

	}



	mutex_lock(&priv->lock);



	if (priv->eee_active && !priv->eee_enabled) {

		stmmac_set_eee_timer(priv, priv->hw, STMMAC_DEFAULT_LIT_LS,

				     STMMAC_DEFAULT_TWT_LS);

		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) {

		/* Use hardware LPI mode */

		del_timer_sync(&priv->eee_ctrl_timer);

		priv->tx_path_in_lpi_mode = false;

		priv->eee_sw_timer_en = false;

		stmmac_enable_hw_lpi_timer(priv);

	} else {

		/* Use software LPI mode */

		priv->eee_sw_timer_en = true;

		stmmac_disable_hw_lpi_timer(priv);

		stmmac_restart_sw_lpi_timer(priv);

	}



	priv->eee_enabled = true;



	mutex_unlock(&priv->lock);

	netdev_dbg(priv->dev, "Energy-Efficient Ethernet initialized\n");



	return 0;

}