Commit 9997080d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'stmmac-eee-fix' 



Wong Vee Khee says:

====================
net: stmmac: Turn off EEE on MAC link down

This patch series ensure PCS EEE is turned off on the event of MAC
link down.

Tested on Intel AlderLake-S (STMMAC + MaxLinear GPY211 PHY).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7707a4d0 d4aeaed8

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

+5 −1
Original line number Diff line number Diff line
@@ -477,6 +477,10 @@ bool stmmac_eee_init(struct stmmac_priv *priv) 
			stmmac_lpi_entry_timer_config(priv, 0);

			del_timer_sync(&priv->eee_ctrl_timer);

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

			if (priv->hw->xpcs)

				xpcs_config_eee(priv->hw->xpcs,

						priv->plat->mult_fact_100ns,

						false);

		}

		mutex_unlock(&priv->lock);

		return false;
@@ -1038,7 +1042,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);

	priv->eee_enabled = stmmac_eee_init(priv);

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



	if (priv->dma_cap.fpesel)

drivers/net/pcs/pcs-xpcs.c

+9 −4
Original line number Diff line number Diff line
@@ -666,6 +666,10 @@ int xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns, int enable) 
{

	int ret;



	ret = xpcs_read(xpcs, MDIO_MMD_VEND2, DW_VR_MII_EEE_MCTRL0);

	if (ret < 0)

		return ret;



	if (enable) {

	/* Enable EEE */

		ret = DW_VR_MII_EEE_LTX_EN | DW_VR_MII_EEE_LRX_EN |
@@ -673,9 +677,6 @@ int xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns, int enable) 
		      DW_VR_MII_EEE_TX_EN_CTRL | DW_VR_MII_EEE_RX_EN_CTRL |

		      mult_fact_100ns << DW_VR_MII_EEE_MULT_FACT_100NS_SHIFT;

	} else {

		ret = xpcs_read(xpcs, MDIO_MMD_VEND2, DW_VR_MII_EEE_MCTRL0);

		if (ret < 0)

			return ret;

		ret &= ~(DW_VR_MII_EEE_LTX_EN | DW_VR_MII_EEE_LRX_EN |

		       DW_VR_MII_EEE_TX_QUIET_EN | DW_VR_MII_EEE_RX_QUIET_EN |

		       DW_VR_MII_EEE_TX_EN_CTRL | DW_VR_MII_EEE_RX_EN_CTRL |
@@ -690,7 +691,11 @@ int xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns, int enable) 
	if (ret < 0)

		return ret;



	if (enable)

		ret |= DW_VR_MII_EEE_TRN_LPI;

	else

		ret &= ~DW_VR_MII_EEE_TRN_LPI;



	return xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_EEE_MCTRL1, ret);

}

EXPORT_SYMBOL_GPL(xpcs_config_eee);