From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
To: ath12k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org, jeff.johnson@oss.qualcomm.com,
Nazar Mokrynskyi <nazar@mokrynskyi.com>
Subject: [PATCH 2/2] wifi: ath12k: skip unknown direct buffer ring module IDs
Date: Tue, 5 May 2026 20:24:15 +0300 [thread overview]
Message-ID: <20260505172415.566328-3-nazar@mokrynskyi.com> (raw)
In-Reply-To: <20260505172415.566328-1-nazar@mokrynskyi.com>
The firmware may advertise direct buffer ring capabilities for module
IDs beyond what the driver currently knows about (WMI_DIRECT_BUF_MAX).
This happens with newer firmware versions that support additional ring
types not yet implemented in the driver.
The current code treats an unknown module_id as a fatal error, returning
-EINVAL and tearing down the entire driver initialization. This is
incorrect: the driver only needs to set up rings for types it uses
(SPECTRAL=0, CFR=1) and can safely ignore capability advertisements for
unknown types.
Change the unknown module_id handling to skip the entry with a debug
message rather than failing, allowing initialization to proceed.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.6-01243-QCAHKSWPL_SILICONZ-1
Signed-off-by: Nazar Mokrynskyi <nazar@mokrynskyi.com>
---
drivers/net/wireless/ath/ath12k/wmi.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
index 484fdd3b1..0e776a8d8 100644
--- a/drivers/net/wireless/ath/ath12k/wmi.c
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
@@ -4814,10 +4814,10 @@ static int ath12k_wmi_dma_ring_caps(struct ath12k_base *ab,
dir_buff_caps = ab->db_caps;
for (i = 0; i < dma_caps_parse->n_dma_ring_caps; i++) {
if (le32_to_cpu(dma_caps[i].module_id) >= WMI_DIRECT_BUF_MAX) {
- ath12k_warn(ab, "Invalid module id %d\n",
- le32_to_cpu(dma_caps[i].module_id));
- ret = -EINVAL;
- goto free_dir_buff;
+ ath12k_dbg(ab, ATH12K_DBG_WMI,
+ "Skipping unknown direct buf ring module id %d\n",
+ le32_to_cpu(dma_caps[i].module_id));
+ continue;
}
dir_buff_caps[i].id = le32_to_cpu(dma_caps[i].module_id);
@@ -4829,10 +4829,6 @@ static int ath12k_wmi_dma_ring_caps(struct ath12k_base *ab,
}
return 0;
-
-free_dir_buff:
- ath12k_wmi_free_dbring_caps(ab);
- return ret;
}
static void
--
2.43.0
next prev parent reply other threads:[~2026-05-05 17:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-05 17:24 [PATCH 0/2] wifi: ath12k: Fix operation under virtio Nazar Mokrynskyi
2026-05-05 17:24 ` [PATCH 1/2] wifi: ath12k: skip PCIe global reset on initial power-up Nazar Mokrynskyi
2026-05-05 17:24 ` Nazar Mokrynskyi [this message]
2026-05-11 19:02 ` [PATCH 2/2] wifi: ath12k: skip unknown direct buffer ring module IDs Jeff Johnson
2026-05-11 20:10 ` Nazar Mokrynskyi
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=20260505172415.566328-3-nazar@mokrynskyi.com \
--to=nazar@mokrynskyi.com \
--cc=ath12k@lists.infradead.org \
--cc=jeff.johnson@oss.qualcomm.com \
--cc=linux-wireless@vger.kernel.org \
/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