From: Julius Bairaktaris <julius@bairaktaris.de>
To: Jeff Johnson <jjohnson@kernel.org>
Cc: ath11k@lists.infradead.org, linux-wireless@vger.kernel.org,
linux-kernel@vger.kernel.org,
Baochen Qiang <baochen.qiang@oss.qualcomm.com>,
Vasanthakumar Thiagarajan
<vasanthakumar.thiagarajan@oss.qualcomm.com>,
Rameshkumar Sundaram <rameshkumar.sundaram@oss.qualcomm.com>,
P Praneesh <praneesh.p@oss.qualcomm.com>,
Kalle Valo <kvalo@kernel.org>,
Muhammad Usama Anjum <usama.anjum@arm.com>,
John Crispin <john@phrozen.org>,
Sriram R <sriram.ramachandran@oss.qualcomm.com>
Subject: [PATCH ath-next v2 3/5] wifi: ath11k: keep the srng allocations when a firmware recovery fails
Date: Sun, 18 Oct 2026 23:01:51 +0200 [thread overview]
Message-ID: <20261018210153.1925962-4-julius@bairaktaris.de> (raw)
In-Reply-To: <20261018210153.1925962-1-julius@bairaktaris.de>
Since commit 32be3ca4cf78 ("wifi: ath11k: HAL SRNG: don't deinitialize
and re-initialize again") recovery zeroes the hal state instead of
freeing and reallocating it, but a failed recovery still calls
ath11k_hal_srng_deinit(). This frees the ring pointer buffers and the
ring configuration, which only probe allocates, while the rings still
point into them. Driver removal then walks the copy engine rings through
the freed buffers:
ath11k c000000.wifi: failed to reconfigure driver on crash recovery
...
Unable to handle kernel paging request at virtual address
ffffffc080ee5090
pc : ath11k_hal_srng_access_begin+0xc/0x60 [ath11k]
Call trace:
ath11k_hal_srng_access_begin+0xc/0x60 [ath11k] (P)
ath11k_ce_cleanup_pipes+0x16c/0x4cc [ath11k]
ath11k_ahb_stop+0x2c/0x3c [ath11k_ahb]
ath11k_core_deinit+0xec/0x168 [ath11k]
ath11k_ahb_remove+0x30/0x90 [ath11k_ahb]
Return the error and keep the allocations for ath11k_ahb_remove() and
ath11k_pci_remove() to free.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.9.0.1-02146-QCAHKSWPL_SILICONZ-1
Fixes: 32be3ca4cf78 ("wifi: ath11k: HAL SRNG: don't deinitialize and re-initialize again")
Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Julius Bairaktaris <julius@bairaktaris.de>
---
drivers/net/wireless/ath/ath11k/core.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index dd256853bab57..daa3751d75233 100644
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -2352,15 +2352,11 @@ static int ath11k_core_reconfigure_on_crash(struct ath11k_base *ab)
ret = ath11k_core_qmi_firmware_ready(ab);
if (ret)
- goto err_hal_srng_deinit;
+ return ret;
clear_bit(ATH11K_FLAG_RECOVERY, &ab->dev_flags);
return 0;
-
-err_hal_srng_deinit:
- ath11k_hal_srng_deinit(ab);
- return ret;
}
void ath11k_core_halt(struct ath11k *ar)
--
2.53.0
next prev parent reply other threads:[~2026-10-18 21:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-18 21:01 [PATCH ath-next v2 0/5] wifi: ath11k: firmware crash recovery fixes Julius Bairaktaris
2026-10-18 21:01 ` [PATCH ath-next v2 1/5] wifi: ath11k: initialise the CE descriptor waitqueue once per device Julius Bairaktaris
2026-10-18 21:01 ` [PATCH ath-next v2 2/5] wifi: ath11k: keep the radios when a firmware recovery fails Julius Bairaktaris
2026-10-18 21:01 ` Julius Bairaktaris [this message]
2026-10-18 21:01 ` [PATCH ath-next v2 4/5] wifi: ath11k: clear CRASH_FLUSH only after recovery rebuilds the rings Julius Bairaktaris
2026-10-18 21:01 ` [PATCH ath-next v2 5/5] wifi: ath11k: hold back WMI commands while the firmware restarts Julius Bairaktaris
2026-11-01 13:15 ` [PATCH ath-next v2 0/5] wifi: ath11k: firmware crash recovery fixes Florian Maurer
2026-11-01 16:47 ` Julius Bairaktaris
2026-11-06 0:58 ` Florian Maurer
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=20261018210153.1925962-4-julius@bairaktaris.de \
--to=julius@bairaktaris.de \
--cc=ath11k@lists.infradead.org \
--cc=baochen.qiang@oss.qualcomm.com \
--cc=jjohnson@kernel.org \
--cc=john@phrozen.org \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=praneesh.p@oss.qualcomm.com \
--cc=rameshkumar.sundaram@oss.qualcomm.com \
--cc=sriram.ramachandran@oss.qualcomm.com \
--cc=usama.anjum@arm.com \
--cc=vasanthakumar.thiagarajan@oss.qualcomm.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
all inboxes | Powered by JetHome®