Commit 388e201d authored by Vineetha G. Jaya Kumaran's avatar Vineetha G. Jaya Kumaran Committed by David S. Miller
Browse files

net: stmmac: Modify configuration method of EEE timers 



Ethtool manual stated that the tx-timer is the "the amount of time the
device should stay in idle mode prior to asserting its Tx LPI". The
previous implementation for "ethtool --set-eee tx-timer" sets the LPI TW
timer duration which is not correct. Hence, this patch fixes the
"ethtool --set-eee tx-timer" to configure the EEE LPI timer.

The LPI TW Timer will be using the defined default value instead of
"ethtool --set-eee tx-timer" which follows the EEE LS timer implementation.

Changelog V2
*Not removing/modifying the eee_timer.
*EEE LPI timer can be configured through ethtool and also the eee_timer
module param.
*EEE TW Timer will be configured with default value only, not able to be
configured through ethtool or module param. This follows the implementation
of the EEE LS Timer.

Fixes: d765955d ("stmmac: add the Energy Efficient Ethernet support")
Signed-off-by: default avatarVineetha G. Jaya Kumaran <vineetha.g.jaya.kumaran@intel.com>
Signed-off-by: default avatarVoon Weifeng <weifeng.voon@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ab0faf5f

drivers/net/ethernet/stmicro/stmmac/stmmac.h

+2 −0
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ struct stmmac_priv { 
	int eee_enabled;

	int eee_active;

	int tx_lpi_timer;

	int tx_lpi_enabled;

	int eee_tw_timer;

	unsigned int mode;

	unsigned int chain_mode;

	int extend_desc;

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

+11 −1
Original line number Diff line number Diff line
@@ -665,6 +665,7 @@ static int stmmac_ethtool_op_get_eee(struct net_device *dev, 
	edata->eee_enabled = priv->eee_enabled;

	edata->eee_active = priv->eee_active;

	edata->tx_lpi_timer = priv->tx_lpi_timer;

	edata->tx_lpi_enabled = priv->tx_lpi_enabled;



	return phylink_ethtool_get_eee(priv->phylink, edata);

}
@@ -678,6 +679,10 @@ static int stmmac_ethtool_op_set_eee(struct net_device *dev, 
	if (!priv->dma_cap.eee)

		return -EOPNOTSUPP;



	if (priv->tx_lpi_enabled != edata->tx_lpi_enabled)

		netdev_warn(priv->dev,

			    "Setting EEE tx-lpi is not supported\n");



	if (!edata->eee_enabled)

		stmmac_disable_eee_mode(priv);
@@ -685,7 +690,12 @@ static int stmmac_ethtool_op_set_eee(struct net_device *dev, 
	if (ret)

		return ret;



	if (edata->eee_enabled &&

	    priv->tx_lpi_timer != edata->tx_lpi_timer) {

		priv->tx_lpi_timer = edata->tx_lpi_timer;

		stmmac_eee_init(priv);

	}



	return 0;

}

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

+15 −8
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static const u32 default_msg_level = (NETIF_MSG_DRV | NETIF_MSG_PROBE | 
static int eee_timer = STMMAC_DEFAULT_LPI_TIMER;

module_param(eee_timer, int, 0644);

MODULE_PARM_DESC(eee_timer, "LPI tx expiration time in msec");

#define STMMAC_LPI_T(x) (jiffies + msecs_to_jiffies(x))

#define STMMAC_LPI_T(x) (jiffies + usecs_to_jiffies(x))



/* By default the driver will use the ring mode to manage tx and rx descriptors,

 * but allow user to force to use the chain instead of the ring
@@ -370,7 +370,7 @@ static void stmmac_eee_ctrl_timer(struct timer_list *t) 
	struct stmmac_priv *priv = from_timer(priv, t, eee_ctrl_timer);



	stmmac_enable_eee_mode(priv);

	mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_T(eee_timer));

	mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_T(priv->tx_lpi_timer));

}



/**
@@ -383,7 +383,7 @@ static void stmmac_eee_ctrl_timer(struct timer_list *t) 
 */

bool stmmac_eee_init(struct stmmac_priv *priv)

{

	int tx_lpi_timer = priv->tx_lpi_timer;

	int eee_tw_timer = priv->eee_tw_timer;



	/* Using PCS we cannot dial with the phy registers at this stage

	 * so we do not support extra feature like EEE.
@@ -403,7 +403,7 @@ bool stmmac_eee_init(struct stmmac_priv *priv) 
		if (priv->eee_enabled) {

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

			del_timer_sync(&priv->eee_ctrl_timer);

			stmmac_set_eee_timer(priv, priv->hw, 0, tx_lpi_timer);

			stmmac_set_eee_timer(priv, priv->hw, 0, eee_tw_timer);

		}

		mutex_unlock(&priv->lock);

		return false;
@@ -411,11 +411,12 @@ bool stmmac_eee_init(struct stmmac_priv *priv) 


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

		timer_setup(&priv->eee_ctrl_timer, stmmac_eee_ctrl_timer, 0);

		mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_T(eee_timer));

		stmmac_set_eee_timer(priv, priv->hw, STMMAC_DEFAULT_LIT_LS,

				     tx_lpi_timer);

				     eee_tw_timer);

	}



	mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_T(priv->tx_lpi_timer));



	mutex_unlock(&priv->lock);

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

	return true;
@@ -930,6 +931,7 @@ static void stmmac_mac_link_down(struct phylink_config *config, 


	stmmac_mac_set(priv, priv->ioaddr, false);

	priv->eee_active = false;

	priv->tx_lpi_enabled = false;

	stmmac_eee_init(priv);

	stmmac_set_eee_pls(priv, priv->hw, false);

}
@@ -1027,6 +1029,7 @@ static void stmmac_mac_link_up(struct phylink_config *config, 
	if (phy && priv->dma_cap.eee) {

		priv->eee_active = phy_init_eee(phy, 1) >= 0;

		priv->eee_enabled = stmmac_eee_init(priv);

		priv->tx_lpi_enabled = priv->eee_enabled;

		stmmac_set_eee_pls(priv, priv->hw, true);

	}

}
@@ -2061,7 +2064,7 @@ static int stmmac_tx_clean(struct stmmac_priv *priv, int budget, u32 queue) 


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

		stmmac_enable_eee_mode(priv);

		mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_T(eee_timer));

		mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_T(priv->tx_lpi_timer));

	}



	/* We still have pending packets, let's call for a new scheduling */
@@ -2694,7 +2697,11 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) 
			netdev_warn(priv->dev, "PTP init failed\n");

	}



	priv->tx_lpi_timer = STMMAC_DEFAULT_TWT_LS;

	priv->eee_tw_timer = STMMAC_DEFAULT_TWT_LS;



	/* Convert the timer from msec to usec */

	if (!priv->tx_lpi_timer)

		priv->tx_lpi_timer = eee_timer * 1000;



	if (priv->use_riwt) {

		if (!priv->rx_riwt)

CRA Git | Maintained and supported by SUSTech CRA and CCSE