net: stmmac: Enable EEE HW LPI timer with auto SW/HW auto switch
Subsystems (4)
PATCH 1/1 net: stmmac: Enable EEE HW LPI timer with auto SW/HW auto switch
From: "Vineetha G. Jaya Kumaran" <[email protected]>
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.
--- drivers/net/ethernet/stmicro/stmmac/common.h | 3 ++ drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 2 ++ .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 24 +++++++++++++++ drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 ++ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 30 +++++++++++++++++-- include/linux/stmmac.h | 1 + 7 files changed, 62 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/common.h +3 -0
@@ -402,6 +402,9 @@ struct dma_features {/* Default LPI timers */ #define STMMAC_DEFAULT_LIT_LS 0x3E8#define STMMAC_DEFAULT_TWT_LS 0x1E +#define STMMAC_ET_MAX 0xFFFFF +#define LPI_ET_ENABLE 1 +#define LPI_ET_DISABLE 0#define STMMAC_CHAIN_MODE 0x1#define STMMAC_RING_MODE 0x2
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +2 -0
@@ -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
@@ -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
@@ -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
@@ -266,6 +266,7 @@ int stmmac_dvr_probe(struct device *device, struct stmmac_resources *res);void stmmac_disable_eee_mode (struct stmmac_priv *priv);bool stmmac_eee_init (struct stmmac_priv *priv); +void stmmac_lpi_entry_timer_enable (struct stmmac_priv *priv,bool en);int stmmac_reinit_queues (struct net_device *dev,u32 rx_cnt,u32 tx_cnt);int stmmac_reinit_ringparam (struct net_device *dev,u32 rx_size,u32 tx_size);
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +28 -2
@@ -327,6 +327,11 @@ static void stmmac_enable_eee_mode(struct stmmac_priv *priv)*/ void stmmac_disable_eee_mode (struct stmmac_priv *priv) { +if (!priv->plat->eee_timer) { +stmmac_lpi_entry_timer_enable (priv,LPI_ET_DISABLE ); +return ; + } +stmmac_reset_eee_mode (priv, priv->hw);del_timer_sync (&priv->eee_ctrl_timer); priv->tx_path_in_lpi_mode = false;
@@ -347,6 +352,16 @@ static void stmmac_eee_ctrl_timer(struct timer_list *t)mod_timer (&priv->eee_ctrl_timer,STMMAC_LPI_T (eee_timer)); } +void stmmac_lpi_entry_timer_enable (struct stmmac_priv *priv,bool en) +{ +int tx_lpi_timer; + +/* Clear/set the SW EEE timer flag based on LPI ET enablement */ + priv->plat->eee_timer = en ?0 :1 ; + tx_lpi_timer = en ? priv->tx_lpi_timer :0 ; +stmmac_set_eee_lpi_timer (priv, priv->hw, tx_lpi_timer); +} +/** * stmmac_eee_init - init EEE * @priv: driver private structure
@@ -376,6 +391,7 @@ bool stmmac_eee_init(struct stmmac_priv *priv)if (!priv->eee_active) {if (priv->eee_enabled) {netdev_dbg (priv->dev,"disable EEE\n" ); +stmmac_lpi_entry_timer_enable (priv,LPI_ET_DISABLE );del_timer_sync (&priv->eee_ctrl_timer);stmmac_set_eee_timer (priv, priv->hw,0 , tx_lpi_timer); }
@@ -390,6 +406,15 @@ bool stmmac_eee_init(struct stmmac_priv *priv) tx_lpi_timer); } +if (priv->plat->has_gmac4 && priv->tx_lpi_timer <=STMMAC_ET_MAX ) { +del_timer_sync (&priv->eee_ctrl_timer); + priv->tx_path_in_lpi_mode = false; +stmmac_lpi_entry_timer_enable (priv,LPI_ET_ENABLE ); + }else { +stmmac_lpi_entry_timer_enable (priv,LPI_ET_DISABLE ); +mod_timer (&priv->eee_ctrl_timer,STMMAC_LPI_T (tx_lpi_timer)); + } +mutex_unlock (&priv->lock);netdev_dbg (priv->dev,"Energy-Efficient Ethernet initialized\n" );return true;
@@ -2041,7 +2066,8 @@ static int stmmac_tx_clean(struct stmmac_priv *priv, int budget, u32 queue)netif_tx_wake_queue (netdev_get_tx_queue (priv->dev, queue)); } -if ((priv->eee_enabled) && (!priv->tx_path_in_lpi_mode)) { +if (priv->eee_enabled && !priv->tx_path_in_lpi_mode && + priv->plat->eee_timer) {stmmac_enable_eee_mode (priv);mod_timer (&priv->eee_ctrl_timer,STMMAC_LPI_T (eee_timer)); }
@@ -3299,7 +3325,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) tx_q = &priv->tx_queue[queue]; first_tx = tx_q->cur_tx; -if (priv->tx_path_in_lpi_mode) +if (priv->tx_path_in_lpi_mode && priv->plat->eee_timer)stmmac_disable_eee_mode (priv);/* Manage oversized TCP frames for GMAC4 device */
include/linux/stmmac.h +1 -0
@@ -200,5 +200,6 @@ struct plat_stmmacenet_data {int has_xgmac;bool vlan_fail_q_en;u8 vlan_fail_q; + bool eee_timer; };#endif
Signature · 1 line
2.17.1
PATCH 1/1 net: stmmac: Enable EEE HW LPI timer with auto SW/HW switching
From: "Vineetha G. Jaya Kumaran" <[email protected]>
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.
--- drivers/net/ethernet/stmicro/stmmac/common.h | 3 ++ drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 2 ++ .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 24 ++++++++++++++ drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 ++ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 ++ .../net/ethernet/stmicro/stmmac/stmmac_main.c | 31 +++++++++++++++++-- 6 files changed, 62 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/common.h +3 -0
@@ -402,6 +402,9 @@ struct dma_features {/* Default LPI timers */ #define STMMAC_DEFAULT_LIT_LS 0x3E8#define STMMAC_DEFAULT_TWT_LS 0x1E +#define STMMAC_ET_MAX 0xFFFFF +#define LPI_ET_ENABLE 1 +#define LPI_ET_DISABLE 0#define STMMAC_CHAIN_MODE 0x1#define STMMAC_RING_MODE 0x2
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +2 -0
@@ -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
@@ -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
@@ -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 +2 -0
@@ -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;
@@ -268,6 +269,7 @@ int stmmac_dvr_probe(struct device *device, struct stmmac_resources *res);void stmmac_disable_eee_mode (struct stmmac_priv *priv);bool stmmac_eee_init (struct stmmac_priv *priv); +void stmmac_lpi_entry_timer_enable (struct stmmac_priv *priv,bool en);int stmmac_reinit_queues (struct net_device *dev,u32 rx_cnt,u32 tx_cnt);int stmmac_reinit_ringparam (struct net_device *dev,u32 rx_size,u32 tx_size);
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +28 -3
@@ -327,6 +327,11 @@ static void stmmac_enable_eee_mode(struct stmmac_priv *priv)*/ void stmmac_disable_eee_mode (struct stmmac_priv *priv) { +if (!priv->eee_sw_timer_en) { +stmmac_lpi_entry_timer_enable (priv,LPI_ET_DISABLE ); +return ; + } +stmmac_reset_eee_mode (priv, priv->hw);del_timer_sync (&priv->eee_ctrl_timer); priv->tx_path_in_lpi_mode = false;
@@ -347,6 +352,16 @@ static void stmmac_eee_ctrl_timer(struct timer_list *t)mod_timer (&priv->eee_ctrl_timer,STMMAC_LPI_T (priv->tx_lpi_timer)); } +void stmmac_lpi_entry_timer_enable (struct stmmac_priv *priv,bool en) +{ +int tx_lpi_timer; + +/* Clear/set the SW EEE timer flag based on LPI ET enablement */ + priv->eee_sw_timer_en = en ?0 :1 ; + tx_lpi_timer = en ? priv->tx_lpi_timer :0 ; +stmmac_set_eee_lpi_timer (priv, priv->hw, tx_lpi_timer); +} +/** * stmmac_eee_init - init EEE * @priv: driver private structure
@@ -376,6 +391,7 @@ bool stmmac_eee_init(struct stmmac_priv *priv)if (!priv->eee_active) {if (priv->eee_enabled) {netdev_dbg (priv->dev,"disable EEE\n" ); +stmmac_lpi_entry_timer_enable (priv,LPI_ET_DISABLE );del_timer_sync (&priv->eee_ctrl_timer);stmmac_set_eee_timer (priv, priv->hw,0 , eee_tw_timer); }
@@ -389,7 +405,15 @@ bool stmmac_eee_init(struct stmmac_priv *priv) eee_tw_timer); } -mod_timer (&priv->eee_ctrl_timer,STMMAC_LPI_T (priv->tx_lpi_timer)); +if (priv->plat->has_gmac4 && priv->tx_lpi_timer <=STMMAC_ET_MAX ) { +del_timer_sync (&priv->eee_ctrl_timer); + priv->tx_path_in_lpi_mode = false; +stmmac_lpi_entry_timer_enable (priv,LPI_ET_ENABLE ); + }else { +stmmac_lpi_entry_timer_enable (priv,LPI_ET_DISABLE ); +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" );
@@ -2044,7 +2068,8 @@ static int stmmac_tx_clean(struct stmmac_priv *priv, int budget, u32 queue)netif_tx_wake_queue (netdev_get_tx_queue (priv->dev, queue)); } -if ((priv->eee_enabled) && (!priv->tx_path_in_lpi_mode)) { +if (priv->eee_enabled && !priv->tx_path_in_lpi_mode && + priv->eee_sw_timer_en) {stmmac_enable_eee_mode (priv);mod_timer (&priv->eee_ctrl_timer,STMMAC_LPI_T (priv->tx_lpi_timer)); }
@@ -3306,7 +3331,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) tx_q = &priv->tx_queue[queue]; first_tx = tx_q->cur_tx; -if (priv->tx_path_in_lpi_mode) +if (priv->tx_path_in_lpi_mode && priv->eee_sw_timer_en)stmmac_disable_eee_mode (priv);/* Manage oversized TCP frames for GMAC4 device */
Signature · 1 line
2.17.1
Quoted 11 lines
From: "Vineetha G. Jaya Kumaran" <[email protected]>
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 Vineetha G. Jaya Kumaran <[email protected]>Signed-off-by Voon Weifeng <[email protected]>---
Please drop this patch. Sorry for accidentally sending out this patch.