From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Jose Abreu <joabreu@synopsys.com>,
linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
netdev@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>
Subject: [PATCH net-next v3 17/18] net: stmmac: split hardware LPI timer control
Date: Tue, 07 Jan 2025 16:29:54 +0000 [thread overview]
Message-ID: <E1tVCSo-007Y4X-2A@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <Z31V9O8SATRbu2L3@shell.armlinux.org.uk>
Provide stmmac_disable_hw_lpi_timer() and stmmac_enable_hw_lpi_timer()
to control the hardware transmit LPI timer.
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 0a1e2587f8c7..5b2ce5305b4b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -390,14 +390,24 @@ static inline u32 stmmac_rx_dirty(struct stmmac_priv *priv, u32 queue)
return dirty;
}
-static void stmmac_lpi_entry_timer_config(struct stmmac_priv *priv, bool en)
+static void stmmac_disable_hw_lpi_timer(struct stmmac_priv *priv)
+{
+ stmmac_set_eee_lpi_timer(priv, priv->hw, 0);
+}
+
+static void stmmac_enable_hw_lpi_timer(struct stmmac_priv *priv)
{
- u32 tx_lpi_timer;
+ stmmac_set_eee_lpi_timer(priv, priv->hw, priv->tx_lpi_timer);
+}
+static void stmmac_lpi_entry_timer_config(struct stmmac_priv *priv, bool en)
+{
/* 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);
+ if (en)
+ stmmac_enable_hw_lpi_timer(priv);
+ else
+ stmmac_disable_hw_lpi_timer(priv);
}
/**
--
2.30.2
next prev parent reply other threads:[~2025-01-07 16:30 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-07 16:27 [PATCH net-next v3 00/18] net: stmmac: clean up and fix EEE implementation Russell King (Oracle)
2025-01-07 16:28 ` [PATCH net-next v3 01/18] net: phy: add configuration of rx clock stop mode Russell King (Oracle)
2025-01-07 16:28 ` [PATCH net-next v3 02/18] net: stmmac: move tx_lpi_timer tracking to phylib Russell King (Oracle)
2025-01-08 7:36 ` Choong Yong Liang
2025-01-08 10:07 ` Russell King (Oracle)
2025-01-08 10:40 ` Russell King (Oracle)
2025-01-08 10:58 ` Choong Yong Liang
2025-01-07 16:28 ` [PATCH net-next v3 03/18] net: stmmac: use correct type for tx_lpi_timer Russell King (Oracle)
2025-01-07 16:28 ` [PATCH net-next v3 04/18] net: stmmac: use unsigned int for eee_timer Russell King (Oracle)
2025-01-08 10:10 ` Simon Horman
2025-01-07 16:28 ` [PATCH net-next v3 05/18] net: stmmac: make EEE depend on phy->enable_tx_lpi Russell King (Oracle)
2025-01-07 16:28 ` [PATCH net-next v3 06/18] net: stmmac: remove redundant code from ethtool EEE ops Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 07/18] net: stmmac: clean up stmmac_disable_eee_mode() Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 08/18] net: stmmac: remove priv->tx_lpi_enabled Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 09/18] net: stmmac: report EEE error statistics if EEE is supported Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 10/18] net: stmmac: convert to use phy_eee_rx_clock_stop() Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 11/18] net: stmmac: remove priv->eee_tw_timer Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 12/18] net: stmmac: move priv->eee_enabled into stmmac_eee_init() Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 13/18] net: stmmac: move priv->eee_active " Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 14/18] net: stmmac: use boolean for eee_enabled and eee_active Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 15/18] net: stmmac: move setup of eee_ctrl_timer to stmmac_dvr_probe() Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 16/18] net: stmmac: remove unnecessary EEE handling in stmmac_release() Russell King (Oracle)
2025-01-07 16:29 ` Russell King (Oracle) [this message]
2025-01-07 16:29 ` [PATCH net-next v3 18/18] net: stmmac: remove stmmac_lpi_entry_timer_config() Russell King (Oracle)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1tVCSo-007Y4X-2A@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--cc=alexandre.torgue@foss.st.com \
--cc=andrew+netdev@lunn.ch \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=joabreu@synopsys.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).