stmmac_suspend() stops the Tx queues in netif_device_detach() and
disables the Tx NAPI afterwards in stmmac_disable_all_queues(). A Tx
completion in flight can wake a queue from stmmac_tx_clean() in between,
so a later stmmac_xmit() writes the Tx tail pointer after the platform
suspend callback has gated the clocks.
Call netif_tx_disable() once NAPI is disabled, as done for bcmgenet in
commit 7e87508b5c4d ("net: bcmgenet: stop Tx NAPI before disabling the
queues").
SError Interrupt on CPU2, code 0x00000000be000011 -- SError
stmmac_tx_timer_arm+0x20/0xa4 (P)
stmmac_xmit+0xd4c/0x1650
dev_hard_start_xmit+0x8c/0x104
sch_direct_xmit+0x8c/0x35c
__dev_queue_xmit+0x808/0xf2c
Fixes: 47dd7a540b8a ("net: add support for STMicroelectronics Ethernet controllers.")
Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 550a0bd647e1..7dac41b05cfa 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -8525,6 +8525,9 @@ int stmmac_suspend(struct device *dev)
stmmac_disable_all_queues(priv);
+ /* NAPI may have woken a TX queue after netif_device_detach() */
+ netif_tx_disable(ndev);
+
for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
hrtimer_cancel(&priv->dma_conf.tx_queue[chan].txtimer);
---
base-commit: aa40afa831ebfe45e40a23721711059f2ac584d4
change-id: 20261116-tm-stmmac-eth-s2idle-07df298cf01f
prerequisite-message-id: [ref]
prerequisite-patch-id: ab0e628f44dfcf5418f268d42521ee9cbb65f167
prerequisite-patch-id: 2eba4552886f22cc596278c6dae42bc85b5771c4
prerequisite-patch-id: 523947458d15820f92f68f7c33766ed5142502c9
prerequisite-patch-id: 0aac69a82a0325455096278b2cf4a9bae70862d6
Best regards,
--
Tommaso Merciai [off-list ref]