]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ath10k: snoc: fix unbalanced IRQ enable in crash recovery
authorCaleb Connolly <caleb.connolly@linaro.org>
Tue, 18 Mar 2025 20:50:27 +0000 (20:50 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:04:08 +0000 (11:04 +0100)
[ Upstream commit 1650d32b92b01db03a1a95d69ee74fcbc34d4b00 ]

In ath10k_snoc_hif_stop() we skip disabling the IRQs in the crash
recovery flow, but we still unconditionally call enable again in
ath10k_snoc_hif_start().

We can't check the ATH10K_FLAG_CRASH_FLUSH bit since it is cleared
before hif_start() is called, so instead check the
ATH10K_SNOC_FLAG_RECOVERY flag and skip enabling the IRQs during crash
recovery.

This fixes unbalanced IRQ enable splats that happen after recovering from
a crash.

Fixes: 0e622f67e041 ("ath10k: add support for WCN3990 firmware crash recovery")
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
Tested-by: Loic Poulain <loic.poulain@oss.qualcomm.com>
Link: https://patch.msgid.link/20250318205043.1043148-1-caleb.connolly@linaro.org
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/ath/ath10k/snoc.c

index 513794099f03fb5b717e4858d383c0a57905d23f..616fcaed061f9d3a28c01638756dbd87c9b249be 100644 (file)
@@ -935,7 +935,9 @@ static int ath10k_snoc_hif_start(struct ath10k *ar)
        bitmap_clear(ar_snoc->pending_ce_irqs, 0, CE_COUNT_MAX);
 
        ath10k_core_napi_enable(ar);
-       ath10k_snoc_irq_enable(ar);
+       /* IRQs are left enabled when we restart due to a firmware crash */
+       if (!test_bit(ATH10K_SNOC_FLAG_RECOVERY, &ar_snoc->flags))
+               ath10k_snoc_irq_enable(ar);
        ath10k_snoc_rx_post(ar);
 
        clear_bit(ATH10K_SNOC_FLAG_RECOVERY, &ar_snoc->flags);