* [PATCH] net: stmmac: Fix unbalanced IRQ wake disable warning on single irq case
@ 2024-11-01 21:17 Nícolas F. R. A. Prado
2024-11-06 9:42 ` Simon Horman
2024-11-07 9:20 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Nícolas F. R. A. Prado @ 2024-11-01 21:17 UTC (permalink / raw)
To: Alexandre Torgue, Jose Abreu, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin,
Simon Horman, Qiang Ma
Cc: kernel, netdev, linux-stm32, linux-arm-kernel, linux-kernel,
AngeloGioacchino Del Regno, Nícolas F. R. A. Prado
Commit a23aa0404218 ("net: stmmac: ethtool: Fixed calltrace caused by
unbalanced disable_irq_wake calls") introduced checks to prevent
unbalanced enable and disable IRQ wake calls. However it only
initialized the auxiliary variable on one of the paths,
stmmac_request_irq_multi_msi(), missing the other,
stmmac_request_irq_single().
Add the same initialization on stmmac_request_irq_single() to prevent
"Unbalanced IRQ <x> wake disable" warnings from being printed the first
time disable_irq_wake() is called on platforms that run on that code
path.
Fixes: a23aa0404218 ("net: stmmac: ethtool: Fixed calltrace caused by unbalanced disable_irq_wake calls")
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 208dbc68aaf9d4a650f167a76d1ef223d5eb6aec..7bf275f127c9d750418db8b4fdb6e650a53dc644 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3780,6 +3780,7 @@ static int stmmac_request_irq_single(struct net_device *dev)
/* Request the Wake IRQ in case of another line
* is used for WoL
*/
+ priv->wol_irq_disabled = true;
if (priv->wol_irq > 0 && priv->wol_irq != dev->irq) {
ret = request_irq(priv->wol_irq, stmmac_interrupt,
IRQF_SHARED, dev->name, dev);
---
base-commit: c88416ba074a8913cf6d61b789dd834bbca6681c
change-id: 20241101-stmmac-unbalanced-wake-single-fix-3dab334ab6eb
Best regards,
--
Nícolas F. R. A. Prado <nfraprado@collabora.com>
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net: stmmac: Fix unbalanced IRQ wake disable warning on single irq case
2024-11-01 21:17 [PATCH] net: stmmac: Fix unbalanced IRQ wake disable warning on single irq case Nícolas F. R. A. Prado
@ 2024-11-06 9:42 ` Simon Horman
2024-11-07 9:20 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2024-11-06 9:42 UTC (permalink / raw)
To: Nícolas F. R. A. Prado
Cc: Alexandre Torgue, Jose Abreu, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin,
Qiang Ma, kernel, netdev, linux-stm32, linux-arm-kernel,
linux-kernel, AngeloGioacchino Del Regno
On Fri, Nov 01, 2024 at 05:17:29PM -0400, Nícolas F. R. A. Prado wrote:
> Commit a23aa0404218 ("net: stmmac: ethtool: Fixed calltrace caused by
> unbalanced disable_irq_wake calls") introduced checks to prevent
> unbalanced enable and disable IRQ wake calls. However it only
> initialized the auxiliary variable on one of the paths,
> stmmac_request_irq_multi_msi(), missing the other,
> stmmac_request_irq_single().
>
> Add the same initialization on stmmac_request_irq_single() to prevent
> "Unbalanced IRQ <x> wake disable" warnings from being printed the first
> time disable_irq_wake() is called on platforms that run on that code
> path.
>
> Fixes: a23aa0404218 ("net: stmmac: ethtool: Fixed calltrace caused by unbalanced disable_irq_wake calls")
> Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: Simon Horman <horms@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net: stmmac: Fix unbalanced IRQ wake disable warning on single irq case
2024-11-01 21:17 [PATCH] net: stmmac: Fix unbalanced IRQ wake disable warning on single irq case Nícolas F. R. A. Prado
2024-11-06 9:42 ` Simon Horman
@ 2024-11-07 9:20 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-11-07 9:20 UTC (permalink / raw)
To: =?utf-8?q?N=C3=ADcolas_F=2E_R=2E_A=2E_Prado_=3Cnfraprado=40collabora=2Ecom?=,
=?utf-8?q?=3E?=
Cc: alexandre.torgue, joabreu, andrew+netdev, davem, edumazet, kuba,
pabeni, mcoquelin.stm32, horms, maqianga, kernel, netdev,
linux-stm32, linux-arm-kernel, linux-kernel,
angelogioacchino.delregno
Hello:
This patch was applied to netdev/net.git (main)
by Paolo Abeni <pabeni@redhat.com>:
On Fri, 01 Nov 2024 17:17:29 -0400 you wrote:
> Commit a23aa0404218 ("net: stmmac: ethtool: Fixed calltrace caused by
> unbalanced disable_irq_wake calls") introduced checks to prevent
> unbalanced enable and disable IRQ wake calls. However it only
> initialized the auxiliary variable on one of the paths,
> stmmac_request_irq_multi_msi(), missing the other,
> stmmac_request_irq_single().
>
> [...]
Here is the summary with links:
- net: stmmac: Fix unbalanced IRQ wake disable warning on single irq case
https://git.kernel.org/netdev/net/c/25d70702142a
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-07 9:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-01 21:17 [PATCH] net: stmmac: Fix unbalanced IRQ wake disable warning on single irq case Nícolas F. R. A. Prado
2024-11-06 9:42 ` Simon Horman
2024-11-07 9:20 ` patchwork-bot+netdevbpf
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).