[PATCH 0/3] wifi: ath10k/ath11k: firmware recovery deadlock and stale scan timeouts

From: Christopher Griffin via B4 Relay

Date: Thu Nov 05 2026 - 14:12:31 EST


On an Arista C-360 (IPQ8074 with two QCN9074), a QCN9074 firmware crash
was never recovered. Patch 1 removes a conf_mutex deadlock between
ath11k_mac_op_start() and the restart work, which makes every recovery
time out when CONFIG_ATH11K_SPECTRAL is set.

The same crash left a scan timeout pending for a scan that had failed to
start, and it fired on freed memory after the driver was bound again.
Patch 2 stops arming it, and patch 3 does the same in ath10k, which has
the same code.

Tested on an Arista C-360 with the series applied to the ath11k of
OpenWrt's backports-7.2: before patch 1, two simulated asserts of the
QCN9074 firmware both ended in "Hardware became unavailable during
restart"; with it, two of two recovered in about 3 s. Patches 2
and 3 are compile-tested only (W=1); no scan failed to start in these
runs.

---
Christopher Griffin (3):
wifi: ath11k: don't hold conf_mutex while waiting for recovery
wifi: ath11k: don't arm the scan timeout for a scan that did not start
wifi: ath10k: don't arm the scan timeout for a scan that did not start

drivers/net/wireless/ath/ath10k/mac.c | 1 +
drivers/net/wireless/ath/ath11k/mac.c | 6 ++++++
2 files changed, 7 insertions(+)
---
base-commit: 5c8eab13e391aaabd5a1ad58f3ee4bb10ce7573e
change-id: 20261105-ath-recovery-scan-timeout-57a3b3dd7a6f

Best regards,
--
Christopher Griffin <christophergriffin05@xxxxxxxxx>