Commit be1c7eae authored by Vineetha G. Jaya Kumaran's avatar Vineetha G. Jaya Kumaran Committed by Jakub Kicinski
Browse files

net: stmmac: Enable EEE HW LPI timer with auto SW/HW switching 



This patch enables the HW LPI Timer which controls the automatic entry
and exit of the LPI state.
The EEE LPI timer value is configured through ethtool. The driver will
auto select the LPI HW timer if the value in the HW timer supported range.
Else, the driver will fallback to SW timer.

Signed-off-by: default avatarVineetha G. Jaya Kumaran <vineetha.g.jaya.kumaran@intel.com>
Signed-off-by: default avatarVoon Weifeng <weifeng.voon@intel.com>
Link: https://lore.kernel.org/r/20201027160051.22898-1-weifeng.voon@intel.com


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

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

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ struct dma_features { 
/* Default LPI timers */

#define STMMAC_DEFAULT_LIT_LS	0x3E8

#define STMMAC_DEFAULT_TWT_LS	0x1E

#define STMMAC_ET_MAX		0xFFFFF



#define STMMAC_CHAIN_MODE	0x1

#define STMMAC_RING_MODE	0x2

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

+2 −0
Original line number Diff line number Diff line
@@ -176,9 +176,11 @@ enum power_event { 
 */

#define GMAC4_LPI_CTRL_STATUS	0xd0

#define GMAC4_LPI_TIMER_CTRL	0xd4

#define GMAC4_LPI_ENTRY_TIMER	0xd8



/* LPI control and status defines */

#define GMAC4_LPI_CTRL_STATUS_LPITCSE	BIT(21)	/* LPI Tx Clock Stop Enable */

#define GMAC4_LPI_CTRL_STATUS_LPIATE	BIT(20) /* LPI Timer Enable */

#define GMAC4_LPI_CTRL_STATUS_LPITXA	BIT(19)	/* Enable LPI TX Automate */

#define GMAC4_LPI_CTRL_STATUS_PLS	BIT(17) /* PHY Link Status */

#define GMAC4_LPI_CTRL_STATUS_LPIEN	BIT(16)	/* LPI Enable */

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

+24 −0
Original line number Diff line number Diff line
@@ -379,6 +379,27 @@ static void dwmac4_set_eee_pls(struct mac_device_info *hw, int link) 
	writel(value, ioaddr + GMAC4_LPI_CTRL_STATUS);

}



static void dwmac4_set_eee_lpi_entry_timer(struct mac_device_info *hw, int et)

{

	void __iomem *ioaddr = hw->pcsr;

	int value = et & STMMAC_ET_MAX;

	int regval;



	/* Program LPI entry timer value into register */

	writel(value, ioaddr + GMAC4_LPI_ENTRY_TIMER);



	/* Enable/disable LPI entry timer */

	regval = readl(ioaddr + GMAC4_LPI_CTRL_STATUS);

	regval |= GMAC4_LPI_CTRL_STATUS_LPIEN | GMAC4_LPI_CTRL_STATUS_LPITXA;



	if (et)

		regval |= GMAC4_LPI_CTRL_STATUS_LPIATE;

	else

		regval &= ~GMAC4_LPI_CTRL_STATUS_LPIATE;



	writel(regval, ioaddr + GMAC4_LPI_CTRL_STATUS);

}



static void dwmac4_set_eee_timer(struct mac_device_info *hw, int ls, int tw)

{

	void __iomem *ioaddr = hw->pcsr;
@@ -1164,6 +1185,7 @@ const struct stmmac_ops dwmac4_ops = { 
	.get_umac_addr = dwmac4_get_umac_addr,

	.set_eee_mode = dwmac4_set_eee_mode,

	.reset_eee_mode = dwmac4_reset_eee_mode,

	.set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer,

	.set_eee_timer = dwmac4_set_eee_timer,

	.set_eee_pls = dwmac4_set_eee_pls,

	.pcs_ctrl_ane = dwmac4_ctrl_ane,
@@ -1206,6 +1228,7 @@ const struct stmmac_ops dwmac410_ops = { 
	.get_umac_addr = dwmac4_get_umac_addr,

	.set_eee_mode = dwmac4_set_eee_mode,

	.reset_eee_mode = dwmac4_reset_eee_mode,

	.set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer,

	.set_eee_timer = dwmac4_set_eee_timer,

	.set_eee_pls = dwmac4_set_eee_pls,

	.pcs_ctrl_ane = dwmac4_ctrl_ane,
@@ -1249,6 +1272,7 @@ const struct stmmac_ops dwmac510_ops = { 
	.get_umac_addr = dwmac4_get_umac_addr,

	.set_eee_mode = dwmac4_set_eee_mode,

	.reset_eee_mode = dwmac4_reset_eee_mode,

	.set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer,

	.set_eee_timer = dwmac4_set_eee_timer,

	.set_eee_pls = dwmac4_set_eee_pls,

	.pcs_ctrl_ane = dwmac4_ctrl_ane,

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

+3 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ struct stmmac_ops { 
	void (*set_eee_mode)(struct mac_device_info *hw,

			     bool en_tx_lpi_clockgating);

	void (*reset_eee_mode)(struct mac_device_info *hw);

	void (*set_eee_lpi_entry_timer)(struct mac_device_info *hw, int et);

	void (*set_eee_timer)(struct mac_device_info *hw, int ls, int tw);

	void (*set_eee_pls)(struct mac_device_info *hw, int link);

	void (*debug)(void __iomem *ioaddr, struct stmmac_extra_stats *x,
@@ -439,6 +440,8 @@ struct stmmac_ops { 
	stmmac_do_void_callback(__priv, mac, set_eee_mode, __args)

#define stmmac_reset_eee_mode(__priv, __args...) \

	stmmac_do_void_callback(__priv, mac, reset_eee_mode, __args)

#define stmmac_set_eee_lpi_timer(__priv, __args...) \

	stmmac_do_void_callback(__priv, mac, set_eee_lpi_entry_timer, __args)

#define stmmac_set_eee_timer(__priv, __args...) \

	stmmac_do_void_callback(__priv, mac, set_eee_timer, __args)

#define stmmac_set_eee_pls(__priv, __args...) \

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

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ struct stmmac_priv { 
	int tx_lpi_timer;

	int tx_lpi_enabled;

	int eee_tw_timer;

	bool eee_sw_timer_en;

	unsigned int mode;

	unsigned int chain_mode;

	int extend_desc;