From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6504E431A3E for ; Mon, 20 Jul 2026 14:40:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784558424; cv=none; b=PTVOGi4lvYtBSI2xZPT3616aFV1KynjpAsnObF1KsWP0MJpXmK2C4ofPBnOZXQdxtAaVE7ip2Njeolv7nKbJ1ml6eA+otCU8FPNeyCyk0AIetXoChdc1OG7icl3bXxrKIDA8w4yW66R4flqpBM2dTFRnUag+63HglbJoJTlMBgI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784558424; c=relaxed/simple; bh=VD2zqeqJXw3ZrSsZzDxhNPyLWznk+NegqdqZguRC4gs=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=P0RCQQxmqJufe+rGa8+/slD/66TmpZKc4mfo5GhOSEDKjzBkfYkyJj87QEjEtuxqsYmZ7e3FY4nBvUO9E6ADpwYA9bT6RwVoTc2ESCsU6QoGilQ/RaU5YZClmvjLI68MlPuqBp8N3SBuzYc/UQvfB7BtcZRn+Pk8WqQFYCH/ius= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=R7bamHGD; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="R7bamHGD" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id DE2DF1A10C3; Mon, 20 Jul 2026 14:40:17 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id AD87560360; Mon, 20 Jul 2026 14:40:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 27F4311BD3D7F; Mon, 20 Jul 2026 16:40:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784558415; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:content-language:in-reply-to:references; bh=QYtCIYb5UxFdCVyUP7gHIgoE53UyvbtqfxqBe9fHsqA=; b=R7bamHGDq5ejMwKZ6s8SMmVuLuVk0hU9b2xLmL74byZ3w1266aWhFCnOPf2rvgxKKz4he8 +izN91RNWfQjE4N1dQtY5ZpgiR3qLxK/eut+ylZ14ORAnjBtgtQzS9Z5zQVVTCfHqZkMN8 F27y74XmXfrqV/ZmfKreojMBjGofULWjXuUi3wLYhRGLMJ0a8zWhTt+INcBe/ERDdHebOP m/nE6tC9tPc1ykTnZQcvFkscFU/36HyUi4tdoHDspl4m/vspru77bfQaZwJm17FmcKfltk xQmqNCctYFeEuB+4L/MVLoTbnnxPxqzwIS4vQVwBt4RX/h1MwjGNCl+LLsbigg== Message-ID: Date: Mon, 20 Jul 2026 16:40:09 +0200 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net v2] net: stmmac: dwmac4: mask interrupts when stopping DMA in suspend To: Luis Lang , netdev@vger.kernel.org Cc: Andrew Lunn , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , "Russell King (Oracle)" , Oleksij Rempel , Ovidiu Panait , Rohan G Thomas , "moderated list:ARM/STM32 ARCHITECTURE" , "moderated list:ARM/STM32 ARCHITECTURE" , open list References: <20260720111534.163416-1-luis.la@mail.de> From: Maxime Chevallier Content-Language: en-US In-Reply-To: <20260720111534.163416-1-luis.la@mail.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Last-TLS-Session-Version: TLSv1.3 Hi Luis, On 7/20/26 13:15, Luis Lang wrote: > Since commit 1b9707e6f1a9 ("net: stmmac: enable RPS and RBU > interrupts"), suspending causes an interrupt storm from the RPS > interrupt. > Fix this by adding a deinit_chan() op to stmmac_dma_ops, which > masks all default dma channel interrupts. This is called from > stmmac_stop_all_dma(), so interrupts don't trigger while suspending. > > Fixes: 1b9707e6f1a9 ("net: stmmac: enable RPS and RBU interrupts") > Suggested-by: Andrew Lunn > Suggested-by: Maxime Chevallier > Signed-off-by: Luis Lang I wasn't able to reproduce the original issue on dwmac4, however I could test that suspend/resume as well as WoL still works on a dwmac4 device with this patch applied. Thanks for the patch ! Tested-by: Maxime Chevallier Reviewed-by: Maxime Chevallier Maxime > --- > .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 24 +++++++++++++++++++ > drivers/net/ethernet/stmicro/stmmac/hwif.h | 4 ++++ > .../net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++++ > 3 files changed, 32 insertions(+) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c > index 829a23bdad01..23ffe1adcd0d 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c > @@ -106,6 +106,17 @@ static void dwmac4_dma_init_channel(struct stmmac_priv *priv, > ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan)); > } > > +static void dwmac4_dma_deinit_channel(struct stmmac_priv *priv, > + void __iomem *ioaddr, u32 chan) > +{ > + const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs; > + u32 value; > + > + value = readl(ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan)); > + value &= ~DMA_CHAN_INTR_DEFAULT_MASK; > + writel(value, ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan)); > +} > + > static void dwmac410_dma_init_channel(struct stmmac_priv *priv, > void __iomem *ioaddr, > struct stmmac_dma_cfg *dma_cfg, u32 chan) > @@ -125,6 +136,17 @@ static void dwmac410_dma_init_channel(struct stmmac_priv *priv, > ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan)); > } > > +static void dwmac410_dma_deinit_channel(struct stmmac_priv *priv, > + void __iomem *ioaddr, u32 chan) > +{ > + const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs; > + u32 value; > + > + value = readl(ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan)); > + value &= ~DMA_CHAN_INTR_DEFAULT_MASK_4_10; > + writel(value, ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan)); > +} > + > static void dwmac4_dma_init(void __iomem *ioaddr, > struct stmmac_dma_cfg *dma_cfg) > { > @@ -548,6 +570,7 @@ const struct stmmac_dma_ops dwmac4_dma_ops = { > .reset = dwmac4_dma_reset, > .init = dwmac4_dma_init, > .init_chan = dwmac4_dma_init_channel, > + .deinit_chan = dwmac4_dma_deinit_channel, > .init_rx_chan = dwmac4_dma_init_rx_chan, > .init_tx_chan = dwmac4_dma_init_tx_chan, > .axi = dwmac4_dma_axi, > @@ -577,6 +600,7 @@ const struct stmmac_dma_ops dwmac410_dma_ops = { > .reset = dwmac4_dma_reset, > .init = dwmac4_dma_init, > .init_chan = dwmac410_dma_init_channel, > + .deinit_chan = dwmac410_dma_deinit_channel, > .init_rx_chan = dwmac4_dma_init_rx_chan, > .init_tx_chan = dwmac4_dma_init_tx_chan, > .axi = dwmac4_dma_axi, > diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h > index e6317b94fff7..04dafec021b4 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h > +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h > @@ -170,6 +170,8 @@ struct stmmac_dma_ops { > void (*init)(void __iomem *ioaddr, struct stmmac_dma_cfg *dma_cfg); > void (*init_chan)(struct stmmac_priv *priv, void __iomem *ioaddr, > struct stmmac_dma_cfg *dma_cfg, u32 chan); > + void (*deinit_chan)(struct stmmac_priv *priv, void __iomem *ioaddr, > + u32 chan); > void (*init_rx_chan)(struct stmmac_priv *priv, void __iomem *ioaddr, > struct stmmac_dma_cfg *dma_cfg, > dma_addr_t phy, u32 chan); > @@ -235,6 +237,8 @@ struct stmmac_dma_ops { > stmmac_do_void_callback(__priv, dma, init, __args) > #define stmmac_init_chan(__priv, __args...) \ > stmmac_do_void_callback(__priv, dma, init_chan, __priv, __args) > +#define stmmac_deinit_chan(__priv, __args...) \ > + stmmac_do_void_callback(__priv, dma, deinit_chan, __priv, __args) > #define stmmac_init_rx_chan(__priv, __args...) \ > stmmac_do_void_callback(__priv, dma, init_rx_chan, __priv, __args) > #define stmmac_init_tx_chan(__priv, __args...) \ > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 2a0d7eff88d3..af29a50ddb89 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -2560,6 +2560,7 @@ static void stmmac_stop_all_dma(struct stmmac_priv *priv) > { > u8 rx_channels_count = priv->plat->rx_queues_to_use; > u8 tx_channels_count = priv->plat->tx_queues_to_use; > + u8 dma_csr_ch = max(rx_channels_count, tx_channels_count); > u8 chan; > > for (chan = 0; chan < rx_channels_count; chan++) > @@ -2567,6 +2568,9 @@ static void stmmac_stop_all_dma(struct stmmac_priv *priv) > > for (chan = 0; chan < tx_channels_count; chan++) > stmmac_stop_tx_dma(priv, chan); > + > + for (chan = 0; chan < dma_csr_ch; chan++) > + stmmac_deinit_chan(priv, priv->ioaddr, chan); > } > > /**