From: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
To: Jonathan Wolf <wolf@pi0.com>, ath12k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org, jjohnson@kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH ath-current] wifi: ath12k: parse nested DBS/SBS capability TLVs
Date: Wed, 18 Nov 2026 16:04:26 +0800 [thread overview]
Message-ID: <2ec2efe9-b3dc-4757-85c3-528642ea57ff@oss.qualcomm.com> (raw)
In-Reply-To: <20261118012321.2861920-1-wolf@pi0.com>
On 11/18/2026 9:23 AM, Jonathan Wolf wrote:
> The DBS/SBS capabilities in WMI_SERVICE_READY_EXT2_EVENTID are carried
> in a WMI_TAG_ARRAY_STRUCT containing nested TLVs. The array pointer
> therefore points to an inner TLV header, not directly to struct
> ath12k_wmi_dbs_or_sbs_cap_params.
>
> Casting the array pointer to that structure reads hw_mode_id as
> sbs_lower_band_end_freq. On WCN7850 firmware advertising hardware mode
> 5 and a 5900 MHz cutoff, the driver consequently records 5 MHz as the
> cutoff. This produces invalid SBS ranges such as 4900-5 MHz and makes
> a 5/6 GHz MLO pair appear to occupy the same hardware MAC, triggering
> partner-link deactivation.
>
> Iterate the nested capability TLVs with ath12k_wmi_tlv_iter() and reject
> unexpected tags and payloads shorter than the capability structure.
> Use the first record, matching the vendor host extractor, and leave
> the cutoff at zero when the array is empty. Only store the cutoff
> after the complete array has been validated. This leaves the existing
> hardware-mode and link-selection policy unchanged.
>
> Tested this parser on a Steam Frame with WCN7850 hw2.0, applying the
> patch to Valve's matching 7.2 kernel source. MLO advertisement and
> radio-mapping diagnostics were enabled separately. The cutoff changed
> from 5 to 5900 MHz, the 5200/6135 MHz links mapped to separate MACs,
> and AP-side data counters increased on both links during traffic.
> No driver recovery or association loss was observed during the test.
> An unmodified upstream kernel was not boot-tested.
>
> Fixes: 241d130f1419 ("wifi: ath12k: parse and save sbs_lower_band_end_freq from WMI_SERVICE_READY_EXT2_EVENTID event")
> Link: https://github.com/pi0code/frame-mlo/blob/main/results/final-parser-live-test.txt
> Tested-on: WCN7850 hw2.0 PCI WLAN.IOE_HMT.1.1-00018-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1
Tested-on: is not an official tag so we usually have it at a separate line before official
tags:
<leave a blank line>
Tested-on:
<leave a blank line>
Fixes:
Link:
Signed-off-by:
> Signed-off-by: Jonathan Wolf <wolf@pi0.com>
> ---
> drivers/net/wireless/ath/ath12k/wmi.c | 24 +++++++++++++++++++++---
> drivers/net/wireless/ath/ath12k/wmi.h | 1 +
> 2 files changed, 22 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
> index 75b259990..f43c9a359 100644
> --- a/drivers/net/wireless/ath/ath12k/wmi.c
> +++ b/drivers/net/wireless/ath/ath12k/wmi.c
> @@ -5781,11 +5781,25 @@ static int ath12k_wmi_update_hw_mode_list(struct ath12k_base *ab)
> return 0;
> }
>
> +static int ath12k_wmi_tlv_dbs_sbs_caps(struct ath12k_base *ab, u16 tag,
> + u16 len, const void *ptr, void *data)
> +{
> + const struct ath12k_wmi_dbs_or_sbs_cap_params **first = data;
> +
> + if (tag != WMI_TAG_DBS_OR_SBS_CAP_EXT || len < sizeof(**first))
> + return -EPROTO;
> +
> + if (!*first)
> + *first = ptr;
> +
> + return 0;
> +}
> +
> static int ath12k_wmi_svc_rdy_ext2_parse(struct ath12k_base *ab,
> u16 tag, u16 len,
> const void *ptr, void *data)
> {
> - const struct ath12k_wmi_dbs_or_sbs_cap_params *dbs_or_sbs_caps;
> + const struct ath12k_wmi_dbs_or_sbs_cap_params *caps = NULL;
> struct ath12k_wmi_pdev *wmi_handle = &ab->wmi_ab.wmi[0];
> struct ath12k_wmi_svc_rdy_ext2_parse *parse = data;
> int ret;
> @@ -5840,9 +5854,13 @@ static int ath12k_wmi_svc_rdy_ext2_parse(struct ath12k_base *ab,
> } else if (!parse->htt_msdu_idx_to_qtype_map_done) {
> parse->htt_msdu_idx_to_qtype_map_done = true;
> } else if (!parse->dbs_or_sbs_cap_ext_done) {
> - dbs_or_sbs_caps = ptr;
> + ret = ath12k_wmi_tlv_iter(ab, ptr, len,
> + ath12k_wmi_tlv_dbs_sbs_caps, &caps);
> + if (ret)
> + return ret;
better to leave a warning before return
> +
> ab->wmi_ab.sbs_lower_band_end_freq =
> - __le32_to_cpu(dbs_or_sbs_caps->sbs_lower_band_end_freq);
> + caps ? le32_to_cpu(caps->sbs_lower_band_end_freq) : 0;
>
> ath12k_dbg(ab, ATH12K_DBG_WMI, "sbs_lower_band_end_freq %u\n",
> ab->wmi_ab.sbs_lower_band_end_freq);
to follow the convention, would be better to move the sbs_lower_band_end_freq cache and
debug print into the parser as well
> diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h
> index b508aa759..94bb6854b 100644
> --- a/drivers/net/wireless/ath/ath12k/wmi.h
> +++ b/drivers/net/wireless/ath/ath12k/wmi.h
> @@ -2032,6 +2032,7 @@ enum wmi_tlv_tag {
> WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD = 0x3D8,
> WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD = 0x3D9,
> WMI_TAG_PDEV_SET_BIOS_INTERFACE_CMD = 0x3FB,
> + WMI_TAG_DBS_OR_SBS_CAP_EXT = 0x400,
> WMI_TAG_RSSI_DBM_CONVERSION_PARAMS_INFO_FIXED_PARAM = 0x427,
> WMI_TAG_RSSI_DBM_CONVERSION_PARAMS_INFO,
> WMI_TAG_RSSI_DBM_CONVERSION_TEMP_OFFSET_INFO,
prev parent reply other threads:[~2026-11-18 8:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 1:23 [PATCH ath-current] wifi: ath12k: parse nested DBS/SBS capability TLVs Jonathan Wolf
2026-11-18 8:04 ` Baochen Qiang [this message]
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=2ec2efe9-b3dc-4757-85c3-528642ea57ff@oss.qualcomm.com \
--to=baochen.qiang@oss.qualcomm.com \
--cc=ath12k@lists.infradead.org \
--cc=jjohnson@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=wolf@pi0.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