Package: linux-image-6.1.0-41-amd64
Severity: important
Dear Maintainer,
* What led up to the situation?
Installing linux-image-6.1.0-41-amd64
* What exactly did you do (or not do) that was effective (or
ineffective)?
Installing linux-image-6.1.0-41-amd64 and reeboting broke my wifi
* What was the outcome of this action?
After updating to this kernel image linux-image-6.1.0-41-amd64 my wifi cards
disappeared
and my two hostapd instances (2,4GHz and 5GHz) of my router and access point
did not start.
* What outcome did you expect instead?
that the wifi cards and hostapd instances work as with previous kernel
linux-image-6.1.0-40-amd64.
After checking the latest commits to drivers/net/wireless of kernel.org and
cherrypicking
and applying to my 6.1.158 kernel source (same version as for
linux-image-6.1.0-41-amd64)
I was able to build a kernel that worked again. The commit is:
>From 2469bb6a6af944755a7d7daf66be90f3b8decbf9 Mon Sep 17 00:00:00 2001
From: Baochen Qiang <[email protected]>
Date: Mon, 27 Oct 2025 09:49:12 +0800
Subject: Revert "wifi: ath10k: avoid unnecessary wait for service ready
message"
This reverts commit 51a73f1b2e56b0324b4a3bb8cebc4221b5be4c7a.
Although this commit benefits QCA6174, it breaks QCA988x and
QCA9984 [1][2]. Since it is not likely to root cause/fix this
issue in a short time, revert it to get those chips back.
Compile tested only.
-- System Information:
Debian Release: 12.11
merged-usr: no
Architecture: amd64 (x86_64)
Kernel: Linux 6.1.158-custom (SMP w/4 CPU threads; PREEMPT)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.UTF-8), LANGUAGE=en_US:en
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
>From 2469bb6a6af944755a7d7daf66be90f3b8decbf9 Mon Sep 17 00:00:00 2001
From: Baochen Qiang <[email protected]>
Date: Mon, 27 Oct 2025 09:49:12 +0800
Subject: Revert "wifi: ath10k: avoid unnecessary wait for service ready
message"
This reverts commit 51a73f1b2e56b0324b4a3bb8cebc4221b5be4c7a.
Although this commit benefits QCA6174, it breaks QCA988x and
QCA9984 [1][2]. Since it is not likely to root cause/fix this
issue in a short time, revert it to get those chips back.
Compile tested only.
Fixes: 51a73f1b2e56 ("wifi: ath10k: avoid unnecessary wait for service ready
message")
Link:
https://lore.kernel.org/ath10k/[email protected]
# [1]
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220671 # [2]
Signed-off-by: Baochen Qiang <[email protected]>
Reviewed-by: Vasanthakumar Thiagarajan
<[email protected]>
Cc: [email protected]
Link:
https://patch.msgid.link/20251027-ath10k-revert-polling-first-change-v1-1-89aaf3bcb...@oss.qualcomm.com
Signed-off-by: Jeff Johnson <[email protected]>
---
drivers/net/wireless/ath/ath10k/wmi.c | 39 ++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 19 deletions(-)
(limited to 'drivers/net/wireless')
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c
b/drivers/net/wireless/ath/ath10k/wmi.c
index b3b00d324075bd..b4aad6604d6d9d 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -1764,32 +1764,33 @@ void ath10k_wmi_put_wmi_channel(struct ath10k *ar,
struct wmi_channel *ch,
int ath10k_wmi_wait_for_service_ready(struct ath10k *ar)
{
- unsigned long timeout = jiffies + WMI_SERVICE_READY_TIMEOUT_HZ;
unsigned long time_left, i;
- /* Sometimes the PCI HIF doesn't receive interrupt
- * for the service ready message even if the buffer
- * was completed. PCIe sniffer shows that it's
- * because the corresponding CE ring doesn't fires
- * it. Workaround here by polling CE rings. Since
- * the message could arrive at any time, continue
- * polling until timeout.
- */
- do {
+ time_left = wait_for_completion_timeout(&ar->wmi.service_ready,
+ WMI_SERVICE_READY_TIMEOUT_HZ);
+ if (!time_left) {
+ /* Sometimes the PCI HIF doesn't receive interrupt
+ * for the service ready message even if the buffer
+ * was completed. PCIe sniffer shows that it's
+ * because the corresponding CE ring doesn't fires
+ * it. Workaround here by polling CE rings once.
+ */
+ ath10k_warn(ar, "failed to receive service ready completion,
polling..\n");
+
for (i = 0; i < CE_COUNT; i++)
ath10k_hif_send_complete_check(ar, i, 1);
- /* The 100 ms granularity is a tradeoff considering scheduler
- * overhead and response latency
- */
time_left = wait_for_completion_timeout(&ar->wmi.service_ready,
- msecs_to_jiffies(100));
- if (time_left)
- return 0;
- } while (time_before(jiffies, timeout));
+
WMI_SERVICE_READY_TIMEOUT_HZ);
+ if (!time_left) {
+ ath10k_warn(ar, "polling timed out\n");
+ return -ETIMEDOUT;
+ }
+
+ ath10k_warn(ar, "service ready completion received, continuing
normally\n");
+ }
- ath10k_warn(ar, "failed to receive service ready completion\n");
- return -ETIMEDOUT;
+ return 0;
}
int ath10k_wmi_wait_for_unified_ready(struct ath10k *ar)
--
cgit 1.2.3-korg
