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>,
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>,
Vladimir Oltean <olteanv@gmail.com>,
Jiawen Wu <jiawenwu@trustnetic.com>
Subject: [PATCH RFC net-next 09/22] net: stmmac: remove unnecessary LPI disable when enabling LPI
Date: Tue, 28 Jan 2025 15:47:30 +0000 [thread overview]
Message-ID: <E1tcnoI-0037Gu-UM@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <Z5j7yCYSsQ7beznD@shell.armlinux.org.uk>
Remove the unnecessary LPI disable when enabling LPI - as noted in
previous commits, there will never be two consecutive calls to
stmmac_mac_enable_tx_lpi() without an intervening
stmmac_mac_disable_tx_lpi.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 40b9e387446e..aafd9cee304e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -390,11 +390,6 @@ static inline u32 stmmac_rx_dirty(struct stmmac_priv *priv, u32 queue)
return dirty;
}
-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)
{
stmmac_set_eee_lpi_timer(priv, priv->hw, priv->tx_lpi_timer);
@@ -1082,14 +1077,10 @@ static int stmmac_mac_enable_tx_lpi(struct phylink_config *config, u32 timer,
if (priv->plat->has_gmac4 && priv->tx_lpi_timer <= STMMAC_ET_MAX) {
/* Use hardware LPI mode */
- del_timer_sync(&priv->eee_ctrl_timer);
- priv->tx_path_in_lpi_mode = false;
- priv->eee_sw_timer_en = false;
stmmac_enable_hw_lpi_timer(priv);
} else {
/* Use software LPI mode */
priv->eee_sw_timer_en = true;
- stmmac_disable_hw_lpi_timer(priv);
stmmac_restart_sw_lpi_timer(priv);
}
--
2.30.2
next prev parent reply other threads:[~2025-01-28 15:47 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-28 15:46 [PATCH RFC net-next 00/22] net: stmmac/xpcs: further EEE work Russell King (Oracle)
2025-01-28 15:46 ` [PATCH RFC net-next 01/22] net: stmmac: delete software timer before disabling LPI Russell King (Oracle)
2025-01-28 15:46 ` [PATCH RFC net-next 02/22] net: stmmac: ensure LPI is disabled when disabling EEE Russell King (Oracle)
2025-01-28 15:47 ` [PATCH RFC net-next 03/22] net: stmmac: dwmac4: ensure LPIATE is cleared Russell King (Oracle)
2025-01-28 15:47 ` [PATCH RFC net-next 04/22] net: stmmac: split stmmac_init_eee() and move to phylink methods Russell King (Oracle)
2025-01-28 15:47 ` [PATCH RFC net-next 05/22] net: stmmac: remove priv->dma_cap.eee test in tx_lpi methods Russell King (Oracle)
2025-01-28 15:47 ` [PATCH RFC net-next 06/22] net: stmmac: remove unnecessary priv->eee_active tests Russell King (Oracle)
2025-01-28 15:47 ` [PATCH RFC net-next 07/22] net: stmmac: remove unnecessary priv->eee_enabled tests Russell King (Oracle)
2025-01-28 15:47 ` [PATCH RFC net-next 08/22] net: stmmac: clear priv->tx_path_in_lpi_mode when disabling LPI Russell King (Oracle)
2025-01-28 15:47 ` Russell King (Oracle) [this message]
2025-01-28 15:47 ` [PATCH RFC net-next 10/22] net: stmmac: use common LPI_CTRL_STATUS bit definitions Russell King (Oracle)
2025-01-28 15:47 ` [PATCH RFC net-next 11/22] net: stmmac: add new MAC method set_lpi_mode() Russell King (Oracle)
2025-01-28 15:47 ` [PATCH RFC net-next 12/22] net: stmmac: dwmac4: clear LPI_CTRL_STATUS_LPITCSE too Russell King (Oracle)
2025-01-28 15:47 ` [PATCH RFC net-next 13/22] net: stmmac: use stmmac_set_lpi_mode() Russell King (Oracle)
2025-01-28 15:47 ` [PATCH RFC net-next 14/22] net: stmmac: remove old EEE methods Russell King (Oracle)
2025-01-28 15:48 ` [PATCH RFC net-next 15/22] net: phylink: add support for notifying PCS about EEE Russell King (Oracle)
2025-01-28 15:48 ` [PATCH RFC net-next 16/22] net: xpcs: add function to configure EEE clock multiplying factor Russell King (Oracle)
2025-01-28 15:48 ` [PATCH RFC net-next 17/22] net: stmmac: call xpcs_config_eee_mult_fact() Russell King (Oracle)
2025-01-28 15:48 ` [PATCH RFC net-next 18/22] net: xpcs: convert to phylink managed EEE Russell King (Oracle)
2025-01-28 15:48 ` [PATCH RFC net-next 19/22] net: stmmac: remove calls to xpcs_config_eee() Russell King (Oracle)
2025-01-28 15:48 ` [PATCH RFC net-next 20/22] net: xpcs: remove xpcs_config_eee() from global scope Russell King (Oracle)
2025-01-28 15:48 ` [PATCH RFC net-next 21/22] net: xpcs: clean up xpcs_config_eee() Russell King (Oracle)
2025-01-28 15:48 ` [PATCH RFC net-next 22/22] net: xpcs: group EEE code together 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=E1tcnoI-0037Gu-UM@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=jiawenwu@trustnetic.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=olteanv@gmail.com \
--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).