* Re: [PATCH] wifi: ath11k: Silence remoteproc probe deferral prints
From: Bjorn Andersson @ 2026-02-12 15:16 UTC (permalink / raw)
To: Konrad Dybcio
Cc: Bjorn Andersson, Jeff Johnson, linux-arm-msm, linux-wireless,
ath11k, linux-kernel
In-Reply-To: <f028462c-ae31-4fa5-b414-e03d3a73fdf4@oss.qualcomm.com>
On Thu, Feb 12, 2026 at 04:01:21PM +0100, Konrad Dybcio wrote:
> On 2/12/26 3:52 PM, Bjorn Andersson wrote:
> > Upon failing to resolve the remoteproc phandle one ath11k_dbg() and one
> > ath11k_err() is used to tell the user about the (presumably) temporary
> > failure.
> >
> > Reduce the log spam by removing the duplicate print and switching to
> > dev_err_probe(), in line with how ath12k handles this error.
> >
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@oss.qualcomm.com>
> > ---
> > drivers/net/wireless/ath/ath11k/ahb.c | 10 +++-------
> > 1 file changed, 3 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
> > index 8dfe9b40c12626649639fc1dd9da0e5e0c2dcaf1..08d3a0c8f105b26b1548c5d6006f6ea162fe58ff 100644
> > --- a/drivers/net/wireless/ath/ath11k/ahb.c
> > +++ b/drivers/net/wireless/ath/ath11k/ahb.c
> > @@ -807,10 +807,8 @@ static int ath11k_core_get_rproc(struct ath11k_base *ab)
> > }
> >
> > prproc = rproc_get_by_phandle(rproc_phandle);
> > - if (!prproc) {
> > - ath11k_dbg(ab, ATH11K_DBG_AHB, "failed to get rproc, deferring\n");
> > - return -EPROBE_DEFER;
> > - }
> > + if (!prproc)
> > + return dev_err_probe(&ab->pdev->dev, -EPROBE_DEFER, "failed to get rproc\n");
>
> I'd like to think this doesn't really change the behavior, but I'd rather
> see this that in-house print functions..
>
I'm having problems parsing your sentence. Are you saying you rather see
us keep using the ath11k_* functions?
>
> > ab_ahb->tgt_rproc = prproc;
> >
> > return 0;
> > @@ -1190,10 +1188,8 @@ static int ath11k_ahb_probe(struct platform_device *pdev)
> > ath11k_ahb_init_qmi_ce_config(ab);
> >
> > ret = ath11k_core_get_rproc(ab);
> > - if (ret) {
> > - ath11k_err(ab, "failed to get rproc: %d\n", ret);
> > + if (ret)
> > goto err_ce_free;
> > - }
>
> If the rproc handle is unavailable at this point, we undo quite a bit of work
> in .probe.. would it make sense to move this check way above?
>
Given that devlink doesn't covers this, but presumably cover several of
the above resources, I think that would make sense. It would be a
separate patch regardless...
Regards,
Bjorn
> Konrad
^ permalink raw reply
* Re: [PATCH] wifi: ath11k: Silence remoteproc probe deferral prints
From: Konrad Dybcio @ 2026-02-12 15:24 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Bjorn Andersson, Jeff Johnson, linux-arm-msm, linux-wireless,
ath11k, linux-kernel
In-Reply-To: <zpddlyuwrxr2rwjsyzsucgm3irtxmetyhhajptveojnmo7vcni@ntyqoahm6xtq>
On 2/12/26 4:16 PM, Bjorn Andersson wrote:
> On Thu, Feb 12, 2026 at 04:01:21PM +0100, Konrad Dybcio wrote:
>> On 2/12/26 3:52 PM, Bjorn Andersson wrote:
>>> Upon failing to resolve the remoteproc phandle one ath11k_dbg() and one
>>> ath11k_err() is used to tell the user about the (presumably) temporary
>>> failure.
>>>
>>> Reduce the log spam by removing the duplicate print and switching to
>>> dev_err_probe(), in line with how ath12k handles this error.
>>>
>>> Signed-off-by: Bjorn Andersson <bjorn.andersson@oss.qualcomm.com>
>>> ---
>>> drivers/net/wireless/ath/ath11k/ahb.c | 10 +++-------
>>> 1 file changed, 3 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
>>> index 8dfe9b40c12626649639fc1dd9da0e5e0c2dcaf1..08d3a0c8f105b26b1548c5d6006f6ea162fe58ff 100644
>>> --- a/drivers/net/wireless/ath/ath11k/ahb.c
>>> +++ b/drivers/net/wireless/ath/ath11k/ahb.c
>>> @@ -807,10 +807,8 @@ static int ath11k_core_get_rproc(struct ath11k_base *ab)
>>> }
>>>
>>> prproc = rproc_get_by_phandle(rproc_phandle);
>>> - if (!prproc) {
>>> - ath11k_dbg(ab, ATH11K_DBG_AHB, "failed to get rproc, deferring\n");
>>> - return -EPROBE_DEFER;
>>> - }
>>> + if (!prproc)
>>> + return dev_err_probe(&ab->pdev->dev, -EPROBE_DEFER, "failed to get rproc\n");
>>
>> I'd like to think this doesn't really change the behavior, but I'd rather
>> see this that in-house print functions..
>>
>
> I'm having problems parsing your sentence. Are you saying you rather see
> us keep using the ath11k_* functions?
s/that/than
i.e. "no"
>
>>
>>> ab_ahb->tgt_rproc = prproc;
>>>
>>> return 0;
>>> @@ -1190,10 +1188,8 @@ static int ath11k_ahb_probe(struct platform_device *pdev)
>>> ath11k_ahb_init_qmi_ce_config(ab);
>>>
>>> ret = ath11k_core_get_rproc(ab);
>>> - if (ret) {
>>> - ath11k_err(ab, "failed to get rproc: %d\n", ret);
>>> + if (ret)
>>> goto err_ce_free;
>>> - }
>>
>> If the rproc handle is unavailable at this point, we undo quite a bit of work
>> in .probe.. would it make sense to move this check way above?
>>
>
> Given that devlink doesn't covers this, but presumably cover several of
> the above resources, I think that would make sense. It would be a
> separate patch regardless...
Yeah, I'm simply thinking out loud
For this one:
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Konrad
^ permalink raw reply
* Re: [PATCH ath-next 1/4] wifi: ath12k: validate survey index when frequency is not found
From: Jeff Johnson @ 2026-02-12 16:47 UTC (permalink / raw)
To: Михаил Лимаренко,
Baochen Qiang, jjohnson@kernel.org
Cc: linux-wireless@vger.kernel.org, ath12k@lists.infradead.org,
linux-kernel@vger.kernel.org
In-Reply-To: <1277331770898332@mail.yandex.ru>
On 2/12/2026 4:12 AM, Михаил Лимаренко wrote:
>
> Hi Baochen,
>
> Thanks for the review, good point.
>
> You are right that the current callers already check
> idx >= ARRAY_SIZE(ar->survey), so a direct OOB write is blocked there.
>
> My intent is to make the "frequency not found" case explicit in freq_to_idx(),
> instead of returning a synthetic index, and have callers reject negative values.
> I will respin v2 with corrected commit message/subject (no OOB claim).
>
> Thanks,
> Mikhail
https://subspace.kernel.org/etiquette.html
Please don't top post and don't send HTML e-mail.
Note that lore.kernel.org doesn't archive HTML e-mails...
https://lore.kernel.org/all/1277331770898332@mail.yandex.ru/
/jeff
^ permalink raw reply
* [PATCH wireless-next v2 00/02] wifi: ieee80211/mac80211: Add UHR (802.11bn) Capability and Operation parsing helpers
From: Karthikeyan Kathirvel @ 2026-02-12 17:23 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, ath12k, Karthikeyan Kathirvel
This series covers support for UHR capability and operation (11bn)
parsing helpers for DPS/DBE/P-EDCA, and adds mac80211 hwsim changes.
The code changes are based on the IEEE 802.11bn Draft P802.11bn/D1.3.
There may be changes in the code to adopt upcoming 11bn spec changes.
---
v2:
- Rebased the changes on top of Johannes's initial UHR commits
---
drivers/net/wireless/virtual/mac80211_hwsim.c | 288 ++++++++++++++++++
include/linux/ieee80211-uhr.h | 239 ++++++++++++++-
2 files changed, 520 insertions(+), 7 deletions(-)
base-commit: 333225e1e9ead7b06e5363389403bdac72ba3046
--
2.34.1
^ permalink raw reply
* [PATCH wireless-next v2 1/2] wifi: UHR: define DPS/DBE/P-EDCA elements and fix size parsing
From: Karthikeyan Kathirvel @ 2026-02-12 17:24 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, ath12k, Karthikeyan Kathirvel
In-Reply-To: <20260212172401.234059-1-karthikeyan.kathirvel@oss.qualcomm.com>
Add UHR Operation and Capability definitions and parsing helpers:
- Define ieee80211_uhr_dps_info, ieee80211_uhr_dbe_info,
ieee80211_uhr_p_edca_info with masks.
- Update ieee80211_uhr_oper_size_ok() to account for optional
DPS/DBE/P-EDCA blocks.
- Move NPCA pointer position after DPS Operation Parameter if it is
present in ieee80211_uhr_oper_size_ok().
- Move NPCA pointer position after DPS info if it is present in
ieee80211_uhr_npca_info().
Signed-off-by: Karthikeyan Kathirvel <karthikeyan.kathirvel@oss.qualcomm.com>
---
include/linux/ieee80211-uhr.h | 257 +++++++++++++++++++++++++++++++++-
1 file changed, 251 insertions(+), 6 deletions(-)
diff --git a/include/linux/ieee80211-uhr.h b/include/linux/ieee80211-uhr.h
index 132acced7d79..23fb3acf700a 100644
--- a/include/linux/ieee80211-uhr.h
+++ b/include/linux/ieee80211-uhr.h
@@ -29,11 +29,200 @@ struct ieee80211_uhr_operation {
#define IEEE80211_UHR_NPCA_PARAMS_MOPLEN 0x00400000
#define IEEE80211_UHR_NPCA_PARAMS_DIS_SUBCH_BMAP_PRES 0x00800000
+/**
+ * struct ieee80211_uhr_npca_info - npca operation information
+ *
+ * This structure is the "NPCA Operation Parameters field format" of "UHR
+ * Operation Element" fields as described in P802.11bn_D1.3
+ * subclause 9.4.2.353. Refer Figure 9-aa4.
+ *
+ * Please refer IEEE80211_UHR_NPCA*
+ * @params:
+ * NPCA Primary Channel - NPCA primary channel
+ * NPCA_Min Duration Threshold - Minimum duration of inter-BSS activity
+ * NPCA Switching Delay -
+ * Time needed by an NPCA AP to switch from the
+ * BSS primary channel to the NPCA primary channel
+ * in the unit of 4 µs.
+ * NPCA Switching Back Delay -
+ * Time to switch from the NPCA primary channel
+ * to the BSS primary channel in the unit of 4 µs.
+ * NPCA Initial QSRC -
+ * Initialize the EDCAF QSRC[AC] variables
+ * when an NPCA STA in the BSS
+ * switches to NPCA operation.
+ * NPCA MOPLEN -
+ * Indicates which conditions can be used to
+ * initiate an NPCA operation,
+ * 1 -> both PHYLEN NPCA operation and MOPLEN
+ * NPCA operation are
+ * permitted in the BSS
+ * 0 -> only PHYLEN NPCA operation is allowed in the BSS.
+ * NPCA Disabled Subchannel Bitmap Present -
+ * Indicates whether the NPCA Disabled Subchannel
+ * Bitmap field is present. A 1 in this field indicates that
+ * the NPCA Disabled Subchannel Bitmap field is present
+ * @dis_subch_bmap:
+ * A bit in the bitmap that lies within the BSS bandwidth is set
+ * to 1 to indicate that the corresponding 20 MHz subchannel is
+ * punctured and is set to 0 to indicate that the corresponding
+ * 20 MHz subchannel is not punctured. A bit in the bitmap that
+ * falls outside of the BSS bandwidth is reserved. This field is
+ * present when the value of the NPCA Disabled Subchannel Bitmap
+ * Field Present field is equal to 1, and not present, otherwise
+ */
struct ieee80211_uhr_npca_info {
__le32 params;
__le16 dis_subch_bmap[];
} __packed;
+#define IEEE80211_UHR_DPS_PADDING_DELAY 0x0000003F
+#define IEEE80211_UHR_DPS_RESERVED1 0x000000C0
+#define IEEE80211_UHR_DPS_TRANSITION_DELAY 0x00003F00
+#define IEEE80211_UHR_DPS_RESERVED2 0x0000C000
+#define IEEE80211_UHR_DPS_ICF_REQUIRED 0x00010000
+#define IEEE80211_UHR_DPS_PARAMETERIZED_FLAG 0x00020000
+#define IEEE80211_UHR_DPS_LC_MODE_BW 0x001C0000
+#define IEEE80211_UHR_DPS_LC_MODE_NSS 0x01E00000
+#define IEEE80211_UHR_DPS_LC_MODE_MCS 0x1E000000
+#define IEEE80211_UHR_DPS_MOBILE_AP_DPS_STATIC_HCM 0x20000000
+#define IEEE80211_UHR_DPS_RESERVED3 0xC0000000
+
+/**
+ * struct ieee80211_uhr_dps_info - DPS operation information
+ *
+ * This structure is the "DPS Operation Parameter field" of "UHR
+ * Operation Element" fields as described in P802.11bn_D1.3
+ * subclause 9.4.1.87. Refer Figure 9-207u.
+ *
+ * Please refer IEEE80211_UHR_DPS*
+ * @dps_params:
+ * DPS Padding Delay -
+ * Indicates the minimum MAC padding
+ * duration that is required by a DPS STA
+ * in an ICF to cause the STA to transition
+ * from the lower capability mode to the
+ * higher capability mode. The DPS Padding
+ * Delay field is in units of 4 µs.
+ * DPS Transition Delay -
+ * Indicates the amount of time required by a
+ * DPS STA to transition from the higher
+ * capability mode to the lower capability
+ * mode. The DPS Transition Delay field is in
+ * units of 4 µs.
+ * ICF Required -
+ * Indicates when the DPS assisting STA needs
+ * to transmit an ICF frame to the peer DPS STA
+ * before performing the frame exchanges with
+ * the peer DPS STA in a TXOP.
+ * 1 -> indicates that the transmission of the
+ * ICF frame to the peer DPS STA prior to
+ * any frame exchange is needed.
+ * 0 -> ICF transmission before the frame
+ * exchanges with the peer DPS STA is only
+ * needed if the frame exchange is performed
+ * in the HC mode.
+ * Parameterized Flag -
+ * 0 -> indicate that only 20 MHz, 1 SS,
+ * non-HT PPDU format with the data
+ * rate of 6, 12, and 24 Mb/s as the
+ * default mode are supported by the
+ * DPS STA in the LC mode
+ * 1 -> indicate that a bandwidth up to the
+ * bandwidth indicated in the LC Mode
+ * Bandwidth field, a number of spatial
+ * streams up to the NSS indicated in
+ * the LC Mode Nss field, and an MCS up
+ * to the MCS indicated in the LC Mode
+ * MCS fields are supported by the DPS
+ * STA in the LC mode as the
+ * parameterized mode.
+ * LC Mode Bandwidth -
+ * Indicates the maximum bandwidth supported
+ * by the STA in the LC mode.
+ * LC Mode NSS -
+ * Indicates the maximum number of the spatial
+ * streams supported by the STA in the LC mode.
+ * LC Mode MCS -
+ * Indicates the highest MCS supported by the STA
+ * in the LC mode.
+ * Mobile AP DPS Static HCM -
+ * 1 -> indicate that it will remain in the DPS high
+ * capability mode until the next TBTT on that
+ * link.
+ * 0 -> otherwise.
+ */
+struct ieee80211_uhr_dps_info {
+ __le32 dps_params;
+} __packed;
+
+#define IEEE80211_UHR_DBE_OPER_BANDWIDTH 0x07
+#define IEEE80211_UHR_DBE_OPER_DIS_SUBCHANNEL_BITMAP_PRES 0x08
+#define IEEE80211_UHR_DBE_OPER_RESERVED 0xF0
+#define IEEE80211_UHR_DBE_OPER_DIS_SUBCHANNEL_BITMAP 0xFFFF
+/**
+ * struct ieee80211_uhr_dbe_info - DBE operation information
+ *
+ * This structure is the "DBE Operation Parameters field" of
+ * "UHR Operation Element" fields as described in P802.11bn_D1.3
+ * subclause 9.4.2.353. Refer Figure 9-aa6.
+ *
+ * Please refer IEEE80211_UHR_DBE_OPER*
+ * @dbe_params:
+ * B0-B2 - DBE Bandwidth field is set to indicate
+ * expanded bandwidth for DBE mode
+ * Value 0 is reserved.
+ * Set to 1 to indicate 40 MHz DBE bandwidth.
+ * Set to 2 to indicate 80 MHz DBE bandwidth.
+ * Set to 3 to indicate 160 MHz DBE bandwidth.
+ * Set to 4 to indicate 320-1 MHz DBE bandwidth.
+ * Set to 5 to indicate 320-2 MHz DBE bandwidth.
+ * Values 6 to 7 are reserved.
+ * B3 - DBE Disabled Subchannel Bitmap Present.
+ * @dis_subch_bmap: DBE Disabled Subchannel Bitmap field is set to indicate
+ * disabled 20 MHz subchannels within the DBE Bandwidth.
+ */
+struct ieee80211_uhr_dbe_info {
+ u8 dbe_params;
+ __le16 dis_subch_bmap[];
+} __packed;
+
+#define IEEE80211_UHR_P_EDCA_ECWMIN 0x0F
+#define IEEE80211_UHR_P_EDCA_ECWMAX 0xF0
+#define IEEE80211_UHR_P_EDCA_AIFSN 0x000F
+#define IEEE80211_UHR_P_EDCA_CW_DS 0x0030
+#define IEEE80211_UHR_P_EDCA_PSRC_THRESHOLD 0x01C0
+#define IEEE80211_UHR_P_EDCA_QSRC_THRESHOLD 0x0600
+#define IEEE80211_UHR_P_EDCA_RESERVED 0x7800
+/**
+ * struct ieee80211_uhr_p_edca_info - P-EDCA operation information
+ *
+ * This structure is the "P-EDCA Operation Parameters field" of
+ * "UHR Operation Element" fields as described in P802.11bn_D1.3
+ * subclause 9.4.2.353. Refer Figure 9-aa5.
+ *
+ * Please refer IEEE80211_UHR_P_EDCA*
+ * @p_edca_ec: The P-EDCA ECWmin, P-EDCA and ECWmax
+ * fields indicate the CWmin and CWmax
+ * value that are used by a P-EDCA STA during P-EDCA contention.
+ * @p_edca_params: The AIFSN field indicate the AIFSN value that are
+ * used by a P-EDCA STA during P-EDCA contention.
+ * The CW DS field indicate the value used
+ * for the randomization of the transmission slot of the DS-CTS
+ * frame. The value 3 is reserved. The value 0 indicate that
+ * randomization not enabled.
+ * The P-EDCA PSRC threshold field indicates the maximum number
+ * of allowed consecutive DS-CTS transmissions. The value 0 and
+ * values greater than 4 are reserved
+ * The P-EDCA QSRC threshold field indicates the value of the
+ * QSRC[AC_VO] counter to be allowed to start P-EDCA contention.
+ * The value 0 is reserved.
+ */
+struct ieee80211_uhr_p_edca_info {
+ u8 p_edca_ec;
+ __le16 p_edca_params;
+} __packed;
+
static inline bool ieee80211_uhr_oper_size_ok(const u8 *data, u8 len,
bool beacon)
{
@@ -47,19 +236,52 @@ static inline bool ieee80211_uhr_oper_size_ok(const u8 *data, u8 len,
if (beacon)
return true;
- /* FIXME: DPS, DBE, P-EDCA (consider order, also relative to NPCA) */
+ /* DPS Operation Parameters (fixed 4 bytes) */
+ if (oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_DPS_ENA)) {
+ needed += sizeof(struct ieee80211_uhr_dps_info);
+ if (len < needed)
+ return false;
+ }
+ /* NPCA Operation Parameters (fixed 4 bytes + optional 2 bytes) */
if (oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_NPCA_ENA)) {
const struct ieee80211_uhr_npca_info *npca =
- (const void *)oper->variable;
+ (const void *)(data + needed);
needed += sizeof(*npca);
-
if (len < needed)
return false;
- if (npca->params & cpu_to_le32(IEEE80211_UHR_NPCA_PARAMS_DIS_SUBCH_BMAP_PRES))
+ if (npca->params &
+ cpu_to_le32(IEEE80211_UHR_NPCA_PARAMS_DIS_SUBCH_BMAP_PRES)) {
needed += sizeof(npca->dis_subch_bmap[0]);
+ if (len < needed)
+ return false;
+ }
+ }
+
+ /* P-EDCA Operation Parameters (fixed 3 bytes) */
+ if (oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_PEDCA_ENA)) {
+ needed += sizeof(struct ieee80211_uhr_p_edca_info);
+ if (len < needed)
+ return false;
+ }
+
+ /* DBE Operation Parameters (fixed 1 byte + optional 2 bytes) */
+ if (oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_DBE_ENA)) {
+ const struct ieee80211_uhr_dbe_info *dbe =
+ (const void *)(data + needed);
+
+ needed += sizeof(*dbe);
+ if (len < needed)
+ return false;
+
+ if (dbe->dbe_params &
+ IEEE80211_UHR_DBE_OPER_DIS_SUBCHANNEL_BITMAP_PRES) {
+ needed += sizeof(dbe->dis_subch_bmap[0]);
+ if (len < needed)
+ return false;
+ }
}
return len >= needed;
@@ -72,12 +294,16 @@ static inline bool ieee80211_uhr_oper_size_ok(const u8 *data, u8 len,
static inline const struct ieee80211_uhr_npca_info *
ieee80211_uhr_npca_info(const struct ieee80211_uhr_operation *oper)
{
+ const u8 *pos;
+
if (!(oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_NPCA_ENA)))
return NULL;
- /* FIXME: DPS */
+ pos = oper->variable;
+ if (oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_DPS_ENA))
+ pos += sizeof(struct ieee80211_uhr_dps_info);
- return (const void *)oper->variable;
+ return (const void *)pos;
}
static inline const __le16 *
@@ -131,6 +357,25 @@ ieee80211_uhr_npca_dis_subch_bitmap(const struct ieee80211_uhr_operation *oper)
#define IEEE80211_UHR_MAC_CAP_DBE_EHT_MCS_MAP_160_PRES 0x08
#define IEEE80211_UHR_MAC_CAP_DBE_EHT_MCS_MAP_320_PRES 0x10
+/**
+ * enum ieee80211_dbe_bandwidth - DBE Bandwidth
+ *
+ * As per spec P802.11bn_D1.3 "Table 9-bb5—Encoding of the DBE Maximum
+ * Supported Bandwidth field"
+ *
+ * @IEEE80211_DBE_BANDWIDTH_40MHZ: Indicate 40 MHz DBE bandwidth
+ * @IEEE80211_DBE_BANDWIDTH_80MHZ: Indicate 80 MHz DBE bandwidth
+ * @IEEE80211_DBE_BANDWIDTH_160MHZ: Indicate 160 MHz DBE bandwidth
+ * @IEEE80211_DBE_BANDWIDTH_320MHZ: Indicate 320 MHz DBE bandwidth
+ *
+ */
+enum ieee80211_dbe_bandwidth {
+ IEEE80211_DBE_BANDWIDTH_40MHZ = 1,
+ IEEE80211_DBE_BANDWIDTH_80MHZ = 2,
+ IEEE80211_DBE_BANDWIDTH_160MHZ = 3,
+ IEEE80211_DBE_BANDWIDTH_320MHZ = 4,
+};
+
struct ieee80211_uhr_cap_mac {
u8 mac_cap[5];
} __packed;
--
2.34.1
^ permalink raw reply related
* [PATCH wireless-next v2 2/2] wifi: mac80211_hwsim: Add UHR capabilities to the driver
From: Karthikeyan Kathirvel @ 2026-02-12 17:24 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, ath12k, Karthikeyan Kathirvel
In-Reply-To: <20260212172401.234059-1-karthikeyan.kathirvel@oss.qualcomm.com>
Add UHR capabilities for bringing up the interface in UHR mode.
This is required to validate UHR test cases.
Signed-off-by: Karthikeyan Kathirvel <karthikeyan.kathirvel@oss.qualcomm.com>
---
drivers/net/wireless/virtual/mac80211_hwsim.c | 285 ++++++++++++++++++
1 file changed, 285 insertions(+)
diff --git a/drivers/net/wireless/virtual/mac80211_hwsim.c b/drivers/net/wireless/virtual/mac80211_hwsim.c
index 4d9f5f87e814..5a576bbb7688 100644
--- a/drivers/net/wireless/virtual/mac80211_hwsim.c
+++ b/drivers/net/wireless/virtual/mac80211_hwsim.c
@@ -4478,6 +4478,49 @@ static const struct ieee80211_sband_iftype_data sband_capa_2ghz[] = {
},
/* PPE threshold information is not supported */
},
+ .uhr_cap = {
+ .has_uhr = true,
+ .mac = {
+ .mac_cap[0] =
+ IEEE80211_UHR_MAC_CAP0_DPS_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_ASSIST_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_AP_STATIC_HCM_SUPP |
+ IEEE80211_UHR_MAC_CAP0_NPCA_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ENH_BSR_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ADD_MAP_TID_SUPP |
+ IEEE80211_UHR_MAC_CAP0_EOTSP_SUPP,
+ .mac_cap[1] =
+ IEEE80211_UHR_MAC_CAP1_DSO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PEDCA_SUPP |
+ IEEE80211_UHR_MAC_CAP1_UL_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_P2P_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_AP_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DUO_SUPP,
+ .mac_cap[2] =
+ IEEE80211_UHR_MAC_CAP2_OMC_UL_MU_DIS_RX_SUPP |
+ IEEE80211_UHR_MAC_CAP2_AOM_SUPP |
+ IEEE80211_UHR_MAC_CAP2_IFCS_LOC_SUPP |
+ IEEE80211_UHR_MAC_CAP2_UHR_TRS_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXSPG_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXOP_RET_IN_TXSPG |
+ IEEE80211_UHR_MAC_CAP2_UHR_OM_PU_TO_LOW,
+ .mac_cap[3] =
+ IEEE80211_UHR_MAC_CAP3_UHR_OM_PU_TO_HIGH |
+ IEEE80211_UHR_MAC_CAP3_PARAM_UPD_ADV_NOTIF_INTV |
+ IEEE80211_UHR_MAC_CAP3_UPD_IND_TIM_INTV_LOW,
+ .mac_cap[4] =
+ IEEE80211_UHR_MAC_CAP4_UPD_IND_TIM_INTV_HIGH |
+ IEEE80211_UHR_MAC_CAP4_BOUNDED_ESS |
+ IEEE80211_UHR_MAC_CAP4_BTM_ASSURANCE |
+ IEEE80211_UHR_MAC_CAP4_CO_BF_SUPP,
+ },
+ .phy = {
+ .cap =
+ IEEE80211_UHR_PHY_CAP_ELR_RX |
+ IEEE80211_UHR_PHY_CAP_ELR_TX,
+ },
+ },
},
{
.types_mask = BIT(NL80211_IFTYPE_AP) |
@@ -4586,6 +4629,50 @@ static const struct ieee80211_sband_iftype_data sband_capa_2ghz[] = {
},
/* PPE threshold information is not supported */
},
+ .uhr_cap = {
+ .has_uhr = true,
+ .mac = {
+ .mac_cap[0] =
+ IEEE80211_UHR_MAC_CAP0_DPS_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_ASSIST_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_AP_STATIC_HCM_SUPP |
+ IEEE80211_UHR_MAC_CAP0_NPCA_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ENH_BSR_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ADD_MAP_TID_SUPP |
+ IEEE80211_UHR_MAC_CAP0_EOTSP_SUPP,
+ .mac_cap[1] =
+ IEEE80211_UHR_MAC_CAP1_DSO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PEDCA_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DBE_SUPP |
+ IEEE80211_UHR_MAC_CAP1_UL_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_P2P_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_AP_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DUO_SUPP,
+ .mac_cap[2] =
+ IEEE80211_UHR_MAC_CAP2_OMC_UL_MU_DIS_RX_SUPP |
+ IEEE80211_UHR_MAC_CAP2_AOM_SUPP |
+ IEEE80211_UHR_MAC_CAP2_IFCS_LOC_SUPP |
+ IEEE80211_UHR_MAC_CAP2_UHR_TRS_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXSPG_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXOP_RET_IN_TXSPG |
+ IEEE80211_UHR_MAC_CAP2_UHR_OM_PU_TO_LOW,
+ .mac_cap[3] =
+ IEEE80211_UHR_MAC_CAP3_UHR_OM_PU_TO_HIGH |
+ IEEE80211_UHR_MAC_CAP3_PARAM_UPD_ADV_NOTIF_INTV |
+ IEEE80211_UHR_MAC_CAP3_UPD_IND_TIM_INTV_LOW,
+ .mac_cap[4] =
+ IEEE80211_UHR_MAC_CAP4_UPD_IND_TIM_INTV_HIGH |
+ IEEE80211_UHR_MAC_CAP4_BOUNDED_ESS |
+ IEEE80211_UHR_MAC_CAP4_BTM_ASSURANCE |
+ IEEE80211_UHR_MAC_CAP4_CO_BF_SUPP,
+ },
+ .phy = {
+ .cap =
+ IEEE80211_UHR_PHY_CAP_ELR_RX |
+ IEEE80211_UHR_PHY_CAP_ELR_TX,
+ },
+ },
},
#ifdef CONFIG_MAC80211_MESH
{
@@ -4755,6 +4842,55 @@ static const struct ieee80211_sband_iftype_data sband_capa_5ghz[] = {
},
/* PPE threshold information is not supported */
},
+ .uhr_cap = {
+ .has_uhr = true,
+ .mac = {
+ .mac_cap[0] =
+ IEEE80211_UHR_MAC_CAP0_DPS_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_ASSIST_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_AP_STATIC_HCM_SUPP |
+ IEEE80211_UHR_MAC_CAP0_NPCA_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ENH_BSR_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ADD_MAP_TID_SUPP |
+ IEEE80211_UHR_MAC_CAP0_EOTSP_SUPP,
+ .mac_cap[1] =
+ IEEE80211_UHR_MAC_CAP1_DSO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PEDCA_SUPP |
+ IEEE80211_UHR_MAC_CAP1_UL_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_P2P_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_AP_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DUO_SUPP,
+ .mac_cap[2] =
+ IEEE80211_UHR_MAC_CAP2_OMC_UL_MU_DIS_RX_SUPP |
+ IEEE80211_UHR_MAC_CAP2_AOM_SUPP |
+ IEEE80211_UHR_MAC_CAP2_IFCS_LOC_SUPP |
+ IEEE80211_UHR_MAC_CAP2_UHR_TRS_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXSPG_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXOP_RET_IN_TXSPG |
+ IEEE80211_UHR_MAC_CAP2_UHR_OM_PU_TO_LOW,
+ .mac_cap[3] =
+ IEEE80211_UHR_MAC_CAP3_UHR_OM_PU_TO_HIGH |
+ IEEE80211_UHR_MAC_CAP3_PARAM_UPD_ADV_NOTIF_INTV |
+ IEEE80211_UHR_MAC_CAP3_UPD_IND_TIM_INTV_LOW,
+ .mac_cap[4] =
+ IEEE80211_UHR_MAC_CAP4_UPD_IND_TIM_INTV_HIGH |
+ IEEE80211_UHR_MAC_CAP4_BOUNDED_ESS |
+ IEEE80211_UHR_MAC_CAP4_BTM_ASSURANCE |
+ IEEE80211_UHR_MAC_CAP4_CO_BF_SUPP,
+ },
+ .phy = {
+ .cap =
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_320 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_320 |
+ IEEE80211_UHR_PHY_CAP_ELR_RX |
+ IEEE80211_UHR_PHY_CAP_ELR_TX,
+ },
+ },
},
{
.types_mask = BIT(NL80211_IFTYPE_AP) |
@@ -4880,6 +5016,56 @@ static const struct ieee80211_sband_iftype_data sband_capa_5ghz[] = {
},
/* PPE threshold information is not supported */
},
+ .uhr_cap = {
+ .has_uhr = true,
+ .mac = {
+ .mac_cap[0] =
+ IEEE80211_UHR_MAC_CAP0_DPS_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_ASSIST_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_AP_STATIC_HCM_SUPP |
+ IEEE80211_UHR_MAC_CAP0_NPCA_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ENH_BSR_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ADD_MAP_TID_SUPP |
+ IEEE80211_UHR_MAC_CAP0_EOTSP_SUPP,
+ .mac_cap[1] =
+ IEEE80211_UHR_MAC_CAP1_DSO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PEDCA_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DBE_SUPP |
+ IEEE80211_UHR_MAC_CAP1_UL_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_P2P_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_AP_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DUO_SUPP,
+ .mac_cap[2] =
+ IEEE80211_UHR_MAC_CAP2_OMC_UL_MU_DIS_RX_SUPP |
+ IEEE80211_UHR_MAC_CAP2_AOM_SUPP |
+ IEEE80211_UHR_MAC_CAP2_IFCS_LOC_SUPP |
+ IEEE80211_UHR_MAC_CAP2_UHR_TRS_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXSPG_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXOP_RET_IN_TXSPG |
+ IEEE80211_UHR_MAC_CAP2_UHR_OM_PU_TO_LOW,
+ .mac_cap[3] =
+ IEEE80211_UHR_MAC_CAP3_UHR_OM_PU_TO_HIGH |
+ IEEE80211_UHR_MAC_CAP3_PARAM_UPD_ADV_NOTIF_INTV |
+ IEEE80211_UHR_MAC_CAP3_UPD_IND_TIM_INTV_LOW,
+ .mac_cap[4] =
+ IEEE80211_UHR_MAC_CAP4_UPD_IND_TIM_INTV_HIGH |
+ IEEE80211_UHR_MAC_CAP4_BOUNDED_ESS |
+ IEEE80211_UHR_MAC_CAP4_BTM_ASSURANCE |
+ IEEE80211_UHR_MAC_CAP4_CO_BF_SUPP,
+ },
+ .phy = {
+ .cap =
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_320 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_320 |
+ IEEE80211_UHR_PHY_CAP_ELR_RX |
+ IEEE80211_UHR_PHY_CAP_ELR_TX,
+ },
+ },
},
#ifdef CONFIG_MAC80211_MESH
{
@@ -5073,6 +5259,55 @@ static const struct ieee80211_sband_iftype_data sband_capa_6ghz[] = {
},
/* PPE threshold information is not supported */
},
+ .uhr_cap = {
+ .has_uhr = true,
+ .mac = {
+ .mac_cap[0] =
+ IEEE80211_UHR_MAC_CAP0_DPS_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_ASSIST_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_AP_STATIC_HCM_SUPP |
+ IEEE80211_UHR_MAC_CAP0_NPCA_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ENH_BSR_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ADD_MAP_TID_SUPP |
+ IEEE80211_UHR_MAC_CAP0_EOTSP_SUPP,
+ .mac_cap[1] =
+ IEEE80211_UHR_MAC_CAP1_DSO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PEDCA_SUPP |
+ IEEE80211_UHR_MAC_CAP1_UL_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_P2P_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_AP_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DUO_SUPP,
+ .mac_cap[2] =
+ IEEE80211_UHR_MAC_CAP2_OMC_UL_MU_DIS_RX_SUPP |
+ IEEE80211_UHR_MAC_CAP2_AOM_SUPP |
+ IEEE80211_UHR_MAC_CAP2_IFCS_LOC_SUPP |
+ IEEE80211_UHR_MAC_CAP2_UHR_TRS_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXSPG_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXOP_RET_IN_TXSPG |
+ IEEE80211_UHR_MAC_CAP2_UHR_OM_PU_TO_LOW,
+ .mac_cap[3] =
+ IEEE80211_UHR_MAC_CAP3_UHR_OM_PU_TO_HIGH |
+ IEEE80211_UHR_MAC_CAP3_PARAM_UPD_ADV_NOTIF_INTV |
+ IEEE80211_UHR_MAC_CAP3_UPD_IND_TIM_INTV_LOW,
+ .mac_cap[4] =
+ IEEE80211_UHR_MAC_CAP4_UPD_IND_TIM_INTV_HIGH |
+ IEEE80211_UHR_MAC_CAP4_BOUNDED_ESS |
+ IEEE80211_UHR_MAC_CAP4_BTM_ASSURANCE |
+ IEEE80211_UHR_MAC_CAP4_CO_BF_SUPP,
+ },
+ .phy = {
+ .cap =
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_320 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_320 |
+ IEEE80211_UHR_PHY_CAP_ELR_RX |
+ IEEE80211_UHR_PHY_CAP_ELR_TX,
+ },
+ },
},
{
.types_mask = BIT(NL80211_IFTYPE_AP) |
@@ -5219,6 +5454,56 @@ static const struct ieee80211_sband_iftype_data sband_capa_6ghz[] = {
},
/* PPE threshold information is not supported */
},
+ .uhr_cap = {
+ .has_uhr = true,
+ .mac = {
+ .mac_cap[0] =
+ IEEE80211_UHR_MAC_CAP0_DPS_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_ASSIST_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_AP_STATIC_HCM_SUPP |
+ IEEE80211_UHR_MAC_CAP0_NPCA_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ENH_BSR_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ADD_MAP_TID_SUPP |
+ IEEE80211_UHR_MAC_CAP0_EOTSP_SUPP,
+ .mac_cap[1] =
+ IEEE80211_UHR_MAC_CAP1_DSO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PEDCA_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DBE_SUPP |
+ IEEE80211_UHR_MAC_CAP1_UL_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_P2P_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_AP_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DUO_SUPP,
+ .mac_cap[2] =
+ IEEE80211_UHR_MAC_CAP2_OMC_UL_MU_DIS_RX_SUPP |
+ IEEE80211_UHR_MAC_CAP2_AOM_SUPP |
+ IEEE80211_UHR_MAC_CAP2_IFCS_LOC_SUPP |
+ IEEE80211_UHR_MAC_CAP2_UHR_TRS_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXSPG_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXOP_RET_IN_TXSPG |
+ IEEE80211_UHR_MAC_CAP2_UHR_OM_PU_TO_LOW,
+ .mac_cap[3] =
+ IEEE80211_UHR_MAC_CAP3_UHR_OM_PU_TO_HIGH |
+ IEEE80211_UHR_MAC_CAP3_PARAM_UPD_ADV_NOTIF_INTV |
+ IEEE80211_UHR_MAC_CAP3_UPD_IND_TIM_INTV_LOW,
+ .mac_cap[4] =
+ IEEE80211_UHR_MAC_CAP4_UPD_IND_TIM_INTV_HIGH |
+ IEEE80211_UHR_MAC_CAP4_BOUNDED_ESS |
+ IEEE80211_UHR_MAC_CAP4_BTM_ASSURANCE |
+ IEEE80211_UHR_MAC_CAP4_CO_BF_SUPP,
+ },
+ .phy = {
+ .cap =
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_320 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_320 |
+ IEEE80211_UHR_PHY_CAP_ELR_RX |
+ IEEE80211_UHR_PHY_CAP_ELR_TX,
+ },
+ },
},
#ifdef CONFIG_MAC80211_MESH
{
--
2.34.1
^ permalink raw reply related
* Re: [PATCH v5 2/2] dt-bindings: net: wireless: mt76: clarify backoff limit usage
From: Ryder Lee @ 2026-02-12 17:31 UTC (permalink / raw)
To: krzk@kernel.org
Cc: robh@kernel.org, nbd@nbd.name, linux-mediatek@lists.infradead.org,
devicetree@vger.kernel.org, Allen Ye (葉芷勳),
linux-wireless@vger.kernel.org
In-Reply-To: <20260212-benevolent-peacock-of-rain-afbb6b@quoll>
On Thu, 2026-02-12 at 08:50 +0100, Krzysztof Kozlowski wrote:
> On Wed, Feb 11, 2026 at 04:36:06PM -0800, Ryder Lee wrote:
> > Clarify the usage of path backoff limit properties in mt76 binding.
> > Add explicit documentation for old generation (mt7915, mt7916,
> > mt7981,
> > mt7986) and new generation (mt7990, mt7992, mt7996) devices,
> > including
> > the difference in beamforming and non-beamforming entries.
> >
> > Rephrase the paths-ru/paths-ru-bf description to make them more
> > precise.
> >
> > Co-developed-by: Allen Ye <allen.ye@mediatek.com>
> > Signed-off-by: Allen Ye <allen.ye@mediatek.com>
> > Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> > ---
> > v4:
> > - revise commit message
> > - use PCI id as the compatible string to replace "connac2/3"
> >
> > v5: fix missing starting space in comment(comments)
> > ---
> > .../bindings/net/wireless/mediatek,mt76.yaml | 21
> > +++++++++++++++++++
> > 1 file changed, 21 insertions(+)
> >
> > diff --git
> > a/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
> > b/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
> > index ae6b97cdc..20b868f7d 100644
> > ---
> > a/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
> > +++
> > b/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
> > @@ -27,6 +27,11 @@ properties:
> > - mediatek,mt7622-wmac
> > - mediatek,mt7981-wmac
> > - mediatek,mt7986-wmac
> > + - pci14c3,7915 # mt7915
> > + - pci14c3,7906 # mt7916
> > + - pci14c3,7990 # mt7996
> > + - pci14c3,7992 # mt7992
> > + - pci14c3,7993 # mt7990
>
> These are two separate commits with their own separate rationale.
>
Ok.
> >
> > reg:
> > minItems: 1
> > @@ -252,6 +257,14 @@ properties:
> > followed by 10 power limit values. The order
> > of the
> > channel resource unit settings is RU26,
> > RU52, RU106,
> > RU242/SU20, RU484/SU40, RU996/SU80 and
> > RU2x996/SU160.
> > + - For mt7981/mt7986/mt7915/mt7916
> > + - Beamforming entries for BW20~BW160 and
> > OFDM do not
> > + include 1T1ss.
> > + - When 1T1ss is not used, it should be
> > filled with 0.
>
> Shouldn't be skipped in such case? Why filling with 0 matters?
>
This logic was already present in driver. The driver determines whether
to skip 1T1ss based on its value (0), so my update is focused on
improving the documentation to guide users on the correct DTS format.
For example, in the paths-ru-bf entries:
<1 20 22 38 36 24 30 23 21 28 29>,
<1 20 39 31 25 26 25 28 30 39 39>,
<1 37 34 26 26 25 21 34 23 34 24>,
<1 0 20 23 31 23 30 39 28 29 36>,
<1 0 27 34 33 34 29 38 33 33 22>,
<1 0 30 23 39 28 21 25 29 28 21>,
<1 0 34 20 38 32 35 33 37 26 36>;
(The order of all fields is required by the firmware.)
The value for 1T1ss is set to 0 when it is not used, and the driver
will skip it during parsing. So, users should always fill the DTS with
all 10 values, using 0 for unused entries.
This ensures that the parsing logic remains simple and uniform,
avoiding potential errors or misalignment.
For the new generation mt7996/mt7992/mt7990, skipping is not needed
because the 1T1ss value is always non-zero.
In summary, this patch is only to document the behavior from earlier
commits for mt7915/mt7986/mt7916/mt7981.
The previous committer requested that this behavior be explained in the
documentation, which is why this patch was added.
Ryder
^ permalink raw reply
* Re: [PATCH wireless-next v2 1/2] wifi: UHR: define DPS/DBE/P-EDCA elements and fix size parsing
From: Johannes Berg @ 2026-02-12 17:34 UTC (permalink / raw)
To: Karthikeyan Kathirvel; +Cc: linux-wireless, ath12k
In-Reply-To: <20260212172401.234059-2-karthikeyan.kathirvel@oss.qualcomm.com>
Hi,
Nice, thanks for sending this.
> + * subclause 9.4.1.87. Refer Figure 9-207u.
> + * Please refer IEEE80211_UHR_DPS*
"refer to"? Or "See Figure ..."?
> +#define IEEE80211_UHR_DPS_PADDING_DELAY 0x0000003F
> +#define IEEE80211_UHR_DPS_RESERVED1 0x000000C0
> +#define IEEE80211_UHR_DPS_TRANSITION_DELAY 0x00003F00
> +#define IEEE80211_UHR_DPS_RESERVED2 0x0000C000
> +#define IEEE80211_UHR_DPS_ICF_REQUIRED 0x00010000
> +#define IEEE80211_UHR_DPS_PARAMETERIZED_FLAG 0x00020000
> +#define IEEE80211_UHR_DPS_LC_MODE_BW 0x001C0000
> +#define IEEE80211_UHR_DPS_LC_MODE_NSS 0x01E00000
> +#define IEEE80211_UHR_DPS_LC_MODE_MCS 0x1E000000
> +#define IEEE80211_UHR_DPS_MOBILE_AP_DPS_STATIC_HCM 0x20000000
> +#define IEEE80211_UHR_DPS_RESERVED3 0xC0000000
Not sure I'd defined the ..._RESERVED* ones at all? There's no way we'd
ever use them really unless they get defined to something else.
> + * subclause 9.4.1.87. Refer Figure 9-207u.
> + *
> + * Please refer IEEE80211_UHR_DPS*
Also here as well.
> +#define IEEE80211_UHR_DBE_OPER_BANDWIDTH 0x07
> +#define IEEE80211_UHR_DBE_OPER_DIS_SUBCHANNEL_BITMAP_PRES 0x08
> +#define IEEE80211_UHR_DBE_OPER_RESERVED 0xF0
same comment about reserved
> +#define IEEE80211_UHR_DBE_OPER_DIS_SUBCHANNEL_BITMAP 0xFFFF
And this ... I think should just not be there? When would we ever mask a
16 bit value with an all 16 bits mask?
> +#define IEEE80211_UHR_P_EDCA_RESERVED 0x7800
> +/**
reserved again, don't think it makes sense - and probably should have a
blank line before the /**
> static inline const struct ieee80211_uhr_npca_info *
> ieee80211_uhr_npca_info(const struct ieee80211_uhr_operation *oper)
> {
> + const u8 *pos;
> +
> if (!(oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_NPCA_ENA)))
> return NULL;
>
> - /* FIXME: DPS */
> + pos = oper->variable;
I'd probably have directly put 'const u8 *pos = oper->variable;', but
doesn't really matter.
johannes
^ permalink raw reply
* Re: [PATCH wireless-next v2 00/02] wifi: ieee80211/mac80211: Add UHR (802.11bn) Capability and Operation parsing helpers
From: Johannes Berg @ 2026-02-12 17:36 UTC (permalink / raw)
To: Karthikeyan Kathirvel; +Cc: linux-wireless, ath12k
In-Reply-To: <20260212172401.234059-1-karthikeyan.kathirvel@oss.qualcomm.com>
On Thu, 2026-02-12 at 22:53 +0530, Karthikeyan Kathirvel wrote:
> This series covers support for UHR capability and operation (11bn)
> parsing helpers for DPS/DBE/P-EDCA, and adds mac80211 hwsim changes.
>
> The code changes are based on the IEEE 802.11bn Draft P802.11bn/D1.3.
> There may be changes in the code to adopt upcoming 11bn spec changes.
Indeed. I hear Qualcomm prefers 8 bits for the NPCA primary channel
rather than the 4 bits for the NPCA primary channel (offset) ;-)
Anyway, I'm sure we'll adjust this all eventually. I just wanted to also
say that I'll try to post the NPCA changes I made soon, where I was also
adding NPCA to UHR capabilities in hwsim, but that doesn't really
matter.
johannes
^ permalink raw reply
* Re: [RFC PATCH 1/2] wifi: ath10k: make in-order rx amsdu buffers persistent
From: Jeff Johnson @ 2026-02-12 17:38 UTC (permalink / raw)
To: Richard Acayan, Jeff Johnson, linux-wireless, ath10k
In-Reply-To: <20260210021249.12132-2-mailingradian@gmail.com>
On 2/9/2026 6:12 PM, Richard Acayan wrote:
some nits from my tooling...
> @@ -3299,16 +3302,32 @@ static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb)
> return -EINVAL;
> }
>
> + if (!skb_queue_empty(&htt->rx_in_ord_split)) {
> + /* It might still be possible to handle this case if there is
note that networking code no longer has a special block comment style, so all
new block comments should use the standard style which has the opening "/*" on
a line by itself.
> + * only one peer that splits at each given moment. We are
> + * bailing out because we should have a test case for this
> + * before trying to fix it.
> + */
> + if (tid != htt->rx_in_ord_split_tid
> + || peer_id != htt->rx_in_ord_split_peer_id
> + || offload) {
checkpatch complains:
LOGICAL_CONTINUATIONS: Logical continuations should be on the previous line
LOGICAL_CONTINUATIONS: Logical continuations should be on the previous line
> + ath10k_warn(ar, "split amsdu did not resume immediately\n");
> + htt->rx_confused = true;
> + return -EIO;
> + }
> + }
> +
Just wanted to get those out of the way before I look at the real content of
the patch.
/jeff
^ permalink raw reply
* Re: [PATCH wireless-next v2 00/02] wifi: ieee80211/mac80211: Add UHR (802.11bn) Capability and Operation parsing helpers
From: Karthikeyan Kathirvel @ 2026-02-12 17:43 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless, ath12k
In-Reply-To: <c9353b48d4efdcdfcd46553e83a8131869c08b49.camel@sipsolutions.net>
On 2/12/2026 11:06 PM, Johannes Berg wrote:
> On Thu, 2026-02-12 at 22:53 +0530, Karthikeyan Kathirvel wrote:
>> This series covers support for UHR capability and operation (11bn)
>> parsing helpers for DPS/DBE/P-EDCA, and adds mac80211 hwsim changes.
>>
>> The code changes are based on the IEEE 802.11bn Draft P802.11bn/D1.3.
>> There may be changes in the code to adopt upcoming 11bn spec changes.
>
> Indeed. I hear Qualcomm prefers 8 bits for the NPCA primary channel
> rather than the 4 bits for the NPCA primary channel (offset) ;-)
>
Okay, I might missed any other thread if this is discussed, let me check
> Anyway, I'm sure we'll adjust this all eventually. I just wanted to also
> say that I'll try to post the NPCA changes I made soon, where I was also
> adding NPCA to UHR capabilities in hwsim, but that doesn't really
> matter.
>
> johannes
Sure
/KK
^ permalink raw reply
* Re: [PATCH wireless-next v2 1/2] wifi: UHR: define DPS/DBE/P-EDCA elements and fix size parsing
From: Karthikeyan Kathirvel @ 2026-02-12 17:53 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless, ath12k
In-Reply-To: <7ac00be5cfa6a31b91d72db027030b89195f25a2.camel@sipsolutions.net>
On 2/12/2026 11:04 PM, Johannes Berg wrote:
> Hi,
>
> Nice, thanks for sending this.
>
>> + * subclause 9.4.1.87. Refer Figure 9-207u.
>
>> + * Please refer IEEE80211_UHR_DPS*
>
> "refer to"? Or "See Figure ..."?
>
I will use "See Figure" and "Refer to IEEE80211_UHR_DPS*"
>> +#define IEEE80211_UHR_DPS_PADDING_DELAY 0x0000003F
>> +#define IEEE80211_UHR_DPS_RESERVED1 0x000000C0
>> +#define IEEE80211_UHR_DPS_TRANSITION_DELAY 0x00003F00
>> +#define IEEE80211_UHR_DPS_RESERVED2 0x0000C000
>> +#define IEEE80211_UHR_DPS_ICF_REQUIRED 0x00010000
>> +#define IEEE80211_UHR_DPS_PARAMETERIZED_FLAG 0x00020000
>> +#define IEEE80211_UHR_DPS_LC_MODE_BW 0x001C0000
>> +#define IEEE80211_UHR_DPS_LC_MODE_NSS 0x01E00000
>> +#define IEEE80211_UHR_DPS_LC_MODE_MCS 0x1E000000
>> +#define IEEE80211_UHR_DPS_MOBILE_AP_DPS_STATIC_HCM 0x20000000
>> +#define IEEE80211_UHR_DPS_RESERVED3 0xC0000000
>
> Not sure I'd defined the ..._RESERVED* ones at all? There's no way we'd
> ever use them really unless they get defined to something else.
>
Sure will remove those
>> + * subclause 9.4.1.87. Refer Figure 9-207u.
>> + *
>> + * Please refer IEEE80211_UHR_DPS*
>
> Also here as well.
>
Will take care
>> +#define IEEE80211_UHR_DBE_OPER_BANDWIDTH 0x07
>> +#define IEEE80211_UHR_DBE_OPER_DIS_SUBCHANNEL_BITMAP_PRES 0x08
>> +#define IEEE80211_UHR_DBE_OPER_RESERVED 0xF0
>
> same comment about reserved
>
Will take care
>> +#define IEEE80211_UHR_DBE_OPER_DIS_SUBCHANNEL_BITMAP 0xFFFF
>
> And this ... I think should just not be there? When would we ever mask a
> 16 bit value with an all 16 bits mask?
>
Oops!!! Agree, will remove it
>> +#define IEEE80211_UHR_P_EDCA_RESERVED 0x7800
>> +/**
>
> reserved again, don't think it makes sense - and probably should have a
> blank line before the /**
>
Sure, will modify and remove it
>> static inline const struct ieee80211_uhr_npca_info *
>> ieee80211_uhr_npca_info(const struct ieee80211_uhr_operation *oper)
>> {
>> + const u8 *pos;
>> +
>> if (!(oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_NPCA_ENA)))
>> return NULL;
>>
>> - /* FIXME: DPS */
>> + pos = oper->variable;
>
> I'd probably have directly put 'const u8 *pos = oper->variable;', but
> doesn't really matter.
>
Will initialize during declaration in next version
> johannes
/KK
^ permalink raw reply
* Re: [RFC PATCH 2/2] wifi: ath10k: only wait for response to SET_KEY
From: Jeff Johnson @ 2026-02-12 17:56 UTC (permalink / raw)
To: James Prestwood, Richard Acayan, linux-wireless, ath10k,
Baochen Qiang
In-Reply-To: <dd019903-f8d9-4bd3-a90d-b4d505f489f3@gmail.com>
On 2/11/2026 6:11 PM, James Prestwood wrote:
> On 2/9/26 6:12 PM, Richard Acayan wrote:
>> When sending DELETE_KEY, the driver times out waiting for a response
>> that doesn't come. Only wait for a response when sending SET_KEY.
>
> We've run into the exact same thing on the QCA6174 and have been
> carrying an identical patch to this for at least a year.
>
> https://lore.kernel.org/linux-wireless/b2838a23-ea30-4dee-b513-f5471d486af2@gmail.com/
Baochen,
Were we ever able to reproduce this?
Do we normally always get a response to DELETE_KEY but in some instances it
comes very late (or not at all)?
If we remove the wait, is there any concern that a late arriving DELETE_KEY
response might be processed as a response to a subsequent SET_KEY command?
/jeff
^ permalink raw reply
* [PATCH wireless-next v3 00/02] wifi: ieee80211/mac80211: Add UHR (802.11bn) Capability and Operation parsing helpers
From: Karthikeyan Kathirvel @ 2026-02-12 18:01 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, ath12k, Karthikeyan Kathirvel
This series covers support for UHR capability and operation (11bn)
parsing helpers for DPS/DBE/P-EDCA, and adds mac80211 hwsim changes.
The code changes are based on the IEEE 802.11bn Draft P802.11bn/D1.3.
There may be changes in the code to adopt upcoming 11bn spec changes.
---
v3:
- Addressed Johannes's comments
- Removed reserved macros and unwanted
IEEE80211_UHR_DBE_OPER_DIS_SUBCHANNEL_BITMAP
v2:
- Rebased the changes on top of Johannes's initial UHR commits
---
drivers/net/wireless/virtual/mac80211_hwsim.c | 288 ++++++++++++++++++
include/linux/ieee80211-uhr.h | 239 ++++++++++++++-
2 files changed, 520 insertions(+), 7 deletions(-)
base-commit: 333225e1e9ead7b06e5363389403bdac72ba3046
--
2.34.1
^ permalink raw reply
* [PATCH wireless-next v3 1/2] wifi: UHR: define DPS/DBE/P-EDCA elements and fix size parsing
From: Karthikeyan Kathirvel @ 2026-02-12 18:01 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, ath12k, Karthikeyan Kathirvel
In-Reply-To: <20260212180128.257565-1-karthikeyan.kathirvel@oss.qualcomm.com>
Add UHR Operation and Capability definitions and parsing helpers:
- Define ieee80211_uhr_dps_info, ieee80211_uhr_dbe_info,
ieee80211_uhr_p_edca_info with masks.
- Update ieee80211_uhr_oper_size_ok() to account for optional
DPS/DBE/P-EDCA blocks.
- Move NPCA pointer position after DPS Operation Parameter if it is
present in ieee80211_uhr_oper_size_ok().
- Move NPCA pointer position after DPS info if it is present in
ieee80211_uhr_npca_info().
Signed-off-by: Karthikeyan Kathirvel <karthikeyan.kathirvel@oss.qualcomm.com>
---
include/linux/ieee80211-uhr.h | 252 +++++++++++++++++++++++++++++++++-
1 file changed, 246 insertions(+), 6 deletions(-)
diff --git a/include/linux/ieee80211-uhr.h b/include/linux/ieee80211-uhr.h
index 132acced7d79..e9f365ffcdac 100644
--- a/include/linux/ieee80211-uhr.h
+++ b/include/linux/ieee80211-uhr.h
@@ -29,11 +29,196 @@ struct ieee80211_uhr_operation {
#define IEEE80211_UHR_NPCA_PARAMS_MOPLEN 0x00400000
#define IEEE80211_UHR_NPCA_PARAMS_DIS_SUBCH_BMAP_PRES 0x00800000
+/**
+ * struct ieee80211_uhr_npca_info - npca operation information
+ *
+ * This structure is the "NPCA Operation Parameters field format" of "UHR
+ * Operation Element" fields as described in P802.11bn_D1.3
+ * subclause 9.4.2.353. See Figure 9-aa4.
+ *
+ * Refer to IEEE80211_UHR_NPCA*
+ * @params:
+ * NPCA Primary Channel - NPCA primary channel
+ * NPCA_Min Duration Threshold - Minimum duration of inter-BSS activity
+ * NPCA Switching Delay -
+ * Time needed by an NPCA AP to switch from the
+ * BSS primary channel to the NPCA primary channel
+ * in the unit of 4 µs.
+ * NPCA Switching Back Delay -
+ * Time to switch from the NPCA primary channel
+ * to the BSS primary channel in the unit of 4 µs.
+ * NPCA Initial QSRC -
+ * Initialize the EDCAF QSRC[AC] variables
+ * when an NPCA STA in the BSS
+ * switches to NPCA operation.
+ * NPCA MOPLEN -
+ * Indicates which conditions can be used to
+ * initiate an NPCA operation,
+ * 1 -> both PHYLEN NPCA operation and MOPLEN
+ * NPCA operation are
+ * permitted in the BSS
+ * 0 -> only PHYLEN NPCA operation is allowed in the BSS.
+ * NPCA Disabled Subchannel Bitmap Present -
+ * Indicates whether the NPCA Disabled Subchannel
+ * Bitmap field is present. A 1 in this field indicates that
+ * the NPCA Disabled Subchannel Bitmap field is present
+ * @dis_subch_bmap:
+ * A bit in the bitmap that lies within the BSS bandwidth is set
+ * to 1 to indicate that the corresponding 20 MHz subchannel is
+ * punctured and is set to 0 to indicate that the corresponding
+ * 20 MHz subchannel is not punctured. A bit in the bitmap that
+ * falls outside of the BSS bandwidth is reserved. This field is
+ * present when the value of the NPCA Disabled Subchannel Bitmap
+ * Field Present field is equal to 1, and not present, otherwise
+ */
struct ieee80211_uhr_npca_info {
__le32 params;
__le16 dis_subch_bmap[];
} __packed;
+#define IEEE80211_UHR_DPS_PADDING_DELAY 0x0000003F
+#define IEEE80211_UHR_DPS_TRANSITION_DELAY 0x00003F00
+#define IEEE80211_UHR_DPS_ICF_REQUIRED 0x00010000
+#define IEEE80211_UHR_DPS_PARAMETERIZED_FLAG 0x00020000
+#define IEEE80211_UHR_DPS_LC_MODE_BW 0x001C0000
+#define IEEE80211_UHR_DPS_LC_MODE_NSS 0x01E00000
+#define IEEE80211_UHR_DPS_LC_MODE_MCS 0x1E000000
+#define IEEE80211_UHR_DPS_MOBILE_AP_DPS_STATIC_HCM 0x20000000
+
+/**
+ * struct ieee80211_uhr_dps_info - DPS operation information
+ *
+ * This structure is the "DPS Operation Parameter field" of "UHR
+ * Operation Element" fields as described in P802.11bn_D1.3
+ * subclause 9.4.1.87. See Figure 9-207u.
+ *
+ * Refer to IEEE80211_UHR_DPS*
+ * @dps_params:
+ * DPS Padding Delay -
+ * Indicates the minimum MAC padding
+ * duration that is required by a DPS STA
+ * in an ICF to cause the STA to transition
+ * from the lower capability mode to the
+ * higher capability mode. The DPS Padding
+ * Delay field is in units of 4 µs.
+ * DPS Transition Delay -
+ * Indicates the amount of time required by a
+ * DPS STA to transition from the higher
+ * capability mode to the lower capability
+ * mode. The DPS Transition Delay field is in
+ * units of 4 µs.
+ * ICF Required -
+ * Indicates when the DPS assisting STA needs
+ * to transmit an ICF frame to the peer DPS STA
+ * before performing the frame exchanges with
+ * the peer DPS STA in a TXOP.
+ * 1 -> indicates that the transmission of the
+ * ICF frame to the peer DPS STA prior to
+ * any frame exchange is needed.
+ * 0 -> ICF transmission before the frame
+ * exchanges with the peer DPS STA is only
+ * needed if the frame exchange is performed
+ * in the HC mode.
+ * Parameterized Flag -
+ * 0 -> indicate that only 20 MHz, 1 SS,
+ * non-HT PPDU format with the data
+ * rate of 6, 12, and 24 Mb/s as the
+ * default mode are supported by the
+ * DPS STA in the LC mode
+ * 1 -> indicate that a bandwidth up to the
+ * bandwidth indicated in the LC Mode
+ * Bandwidth field, a number of spatial
+ * streams up to the NSS indicated in
+ * the LC Mode Nss field, and an MCS up
+ * to the MCS indicated in the LC Mode
+ * MCS fields are supported by the DPS
+ * STA in the LC mode as the
+ * parameterized mode.
+ * LC Mode Bandwidth -
+ * Indicates the maximum bandwidth supported
+ * by the STA in the LC mode.
+ * LC Mode NSS -
+ * Indicates the maximum number of the spatial
+ * streams supported by the STA in the LC mode.
+ * LC Mode MCS -
+ * Indicates the highest MCS supported by the STA
+ * in the LC mode.
+ * Mobile AP DPS Static HCM -
+ * 1 -> indicate that it will remain in the DPS high
+ * capability mode until the next TBTT on that
+ * link.
+ * 0 -> otherwise.
+ */
+struct ieee80211_uhr_dps_info {
+ __le32 dps_params;
+} __packed;
+
+#define IEEE80211_UHR_DBE_OPER_BANDWIDTH 0x07
+#define IEEE80211_UHR_DBE_OPER_DIS_SUBCHANNEL_BITMAP_PRES 0x08
+
+/**
+ * struct ieee80211_uhr_dbe_info - DBE operation information
+ *
+ * This structure is the "DBE Operation Parameters field" of
+ * "UHR Operation Element" fields as described in P802.11bn_D1.3
+ * subclause 9.4.2.353. See Figure 9-aa6.
+ *
+ * Refer to IEEE80211_UHR_DBE_OPER*
+ * @dbe_params:
+ * B0-B2 - DBE Bandwidth field is set to indicate
+ * expanded bandwidth for DBE mode
+ * Value 0 is reserved.
+ * Set to 1 to indicate 40 MHz DBE bandwidth.
+ * Set to 2 to indicate 80 MHz DBE bandwidth.
+ * Set to 3 to indicate 160 MHz DBE bandwidth.
+ * Set to 4 to indicate 320-1 MHz DBE bandwidth.
+ * Set to 5 to indicate 320-2 MHz DBE bandwidth.
+ * Values 6 to 7 are reserved.
+ * B3 - DBE Disabled Subchannel Bitmap Present.
+ * @dis_subch_bmap: DBE Disabled Subchannel Bitmap field is set to indicate
+ * disabled 20 MHz subchannels within the DBE Bandwidth.
+ */
+struct ieee80211_uhr_dbe_info {
+ u8 dbe_params;
+ __le16 dis_subch_bmap[];
+} __packed;
+
+#define IEEE80211_UHR_P_EDCA_ECWMIN 0x0F
+#define IEEE80211_UHR_P_EDCA_ECWMAX 0xF0
+#define IEEE80211_UHR_P_EDCA_AIFSN 0x000F
+#define IEEE80211_UHR_P_EDCA_CW_DS 0x0030
+#define IEEE80211_UHR_P_EDCA_PSRC_THRESHOLD 0x01C0
+#define IEEE80211_UHR_P_EDCA_QSRC_THRESHOLD 0x0600
+
+/**
+ * struct ieee80211_uhr_p_edca_info - P-EDCA operation information
+ *
+ * This structure is the "P-EDCA Operation Parameters field" of
+ * "UHR Operation Element" fields as described in P802.11bn_D1.3
+ * subclause 9.4.2.353. See Figure 9-aa5.
+ *
+ * Refer to IEEE80211_UHR_P_EDCA*
+ * @p_edca_ec: The P-EDCA ECWmin, P-EDCA and ECWmax
+ * fields indicate the CWmin and CWmax
+ * value that are used by a P-EDCA STA during P-EDCA contention.
+ * @p_edca_params: The AIFSN field indicate the AIFSN value that are
+ * used by a P-EDCA STA during P-EDCA contention.
+ * The CW DS field indicate the value used
+ * for the randomization of the transmission slot of the DS-CTS
+ * frame. The value 3 is reserved. The value 0 indicate that
+ * randomization not enabled.
+ * The P-EDCA PSRC threshold field indicates the maximum number
+ * of allowed consecutive DS-CTS transmissions. The value 0 and
+ * values greater than 4 are reserved
+ * The P-EDCA QSRC threshold field indicates the value of the
+ * QSRC[AC_VO] counter to be allowed to start P-EDCA contention.
+ * The value 0 is reserved.
+ */
+struct ieee80211_uhr_p_edca_info {
+ u8 p_edca_ec;
+ __le16 p_edca_params;
+} __packed;
+
static inline bool ieee80211_uhr_oper_size_ok(const u8 *data, u8 len,
bool beacon)
{
@@ -47,19 +232,52 @@ static inline bool ieee80211_uhr_oper_size_ok(const u8 *data, u8 len,
if (beacon)
return true;
- /* FIXME: DPS, DBE, P-EDCA (consider order, also relative to NPCA) */
+ /* DPS Operation Parameters (fixed 4 bytes) */
+ if (oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_DPS_ENA)) {
+ needed += sizeof(struct ieee80211_uhr_dps_info);
+ if (len < needed)
+ return false;
+ }
+ /* NPCA Operation Parameters (fixed 4 bytes + optional 2 bytes) */
if (oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_NPCA_ENA)) {
const struct ieee80211_uhr_npca_info *npca =
- (const void *)oper->variable;
+ (const void *)(data + needed);
needed += sizeof(*npca);
-
if (len < needed)
return false;
- if (npca->params & cpu_to_le32(IEEE80211_UHR_NPCA_PARAMS_DIS_SUBCH_BMAP_PRES))
+ if (npca->params &
+ cpu_to_le32(IEEE80211_UHR_NPCA_PARAMS_DIS_SUBCH_BMAP_PRES)) {
needed += sizeof(npca->dis_subch_bmap[0]);
+ if (len < needed)
+ return false;
+ }
+ }
+
+ /* P-EDCA Operation Parameters (fixed 3 bytes) */
+ if (oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_PEDCA_ENA)) {
+ needed += sizeof(struct ieee80211_uhr_p_edca_info);
+ if (len < needed)
+ return false;
+ }
+
+ /* DBE Operation Parameters (fixed 1 byte + optional 2 bytes) */
+ if (oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_DBE_ENA)) {
+ const struct ieee80211_uhr_dbe_info *dbe =
+ (const void *)(data + needed);
+
+ needed += sizeof(*dbe);
+ if (len < needed)
+ return false;
+
+ if (dbe->dbe_params &
+ IEEE80211_UHR_DBE_OPER_DIS_SUBCHANNEL_BITMAP_PRES) {
+ needed += sizeof(dbe->dis_subch_bmap[0]);
+ if (len < needed)
+ return false;
+ }
}
return len >= needed;
@@ -72,12 +290,15 @@ static inline bool ieee80211_uhr_oper_size_ok(const u8 *data, u8 len,
static inline const struct ieee80211_uhr_npca_info *
ieee80211_uhr_npca_info(const struct ieee80211_uhr_operation *oper)
{
+ const u8 *pos = oper->variable;
+
if (!(oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_NPCA_ENA)))
return NULL;
- /* FIXME: DPS */
+ if (oper->params & cpu_to_le16(IEEE80211_UHR_OPER_PARAMS_DPS_ENA))
+ pos += sizeof(struct ieee80211_uhr_dps_info);
- return (const void *)oper->variable;
+ return (const void *)pos;
}
static inline const __le16 *
@@ -131,6 +352,25 @@ ieee80211_uhr_npca_dis_subch_bitmap(const struct ieee80211_uhr_operation *oper)
#define IEEE80211_UHR_MAC_CAP_DBE_EHT_MCS_MAP_160_PRES 0x08
#define IEEE80211_UHR_MAC_CAP_DBE_EHT_MCS_MAP_320_PRES 0x10
+/**
+ * enum ieee80211_dbe_bandwidth - DBE Bandwidth
+ *
+ * As per spec P802.11bn_D1.3 "Table 9-bb5—Encoding of the DBE Maximum
+ * Supported Bandwidth field"
+ *
+ * @IEEE80211_DBE_BANDWIDTH_40MHZ: Indicate 40 MHz DBE bandwidth
+ * @IEEE80211_DBE_BANDWIDTH_80MHZ: Indicate 80 MHz DBE bandwidth
+ * @IEEE80211_DBE_BANDWIDTH_160MHZ: Indicate 160 MHz DBE bandwidth
+ * @IEEE80211_DBE_BANDWIDTH_320MHZ: Indicate 320 MHz DBE bandwidth
+ *
+ */
+enum ieee80211_dbe_bandwidth {
+ IEEE80211_DBE_BANDWIDTH_40MHZ = 1,
+ IEEE80211_DBE_BANDWIDTH_80MHZ = 2,
+ IEEE80211_DBE_BANDWIDTH_160MHZ = 3,
+ IEEE80211_DBE_BANDWIDTH_320MHZ = 4,
+};
+
struct ieee80211_uhr_cap_mac {
u8 mac_cap[5];
} __packed;
--
2.34.1
^ permalink raw reply related
* [PATCH wireless-next v3 2/2] wifi: mac80211_hwsim: Add UHR capabilities to the driver
From: Karthikeyan Kathirvel @ 2026-02-12 18:01 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, ath12k, Karthikeyan Kathirvel
In-Reply-To: <20260212180128.257565-1-karthikeyan.kathirvel@oss.qualcomm.com>
Add UHR capabilities for bringing up the interface in UHR mode.
This is required to validate UHR test cases.
Signed-off-by: Karthikeyan Kathirvel <karthikeyan.kathirvel@oss.qualcomm.com>
---
drivers/net/wireless/virtual/mac80211_hwsim.c | 285 ++++++++++++++++++
1 file changed, 285 insertions(+)
diff --git a/drivers/net/wireless/virtual/mac80211_hwsim.c b/drivers/net/wireless/virtual/mac80211_hwsim.c
index 4d9f5f87e814..5a576bbb7688 100644
--- a/drivers/net/wireless/virtual/mac80211_hwsim.c
+++ b/drivers/net/wireless/virtual/mac80211_hwsim.c
@@ -4478,6 +4478,49 @@ static const struct ieee80211_sband_iftype_data sband_capa_2ghz[] = {
},
/* PPE threshold information is not supported */
},
+ .uhr_cap = {
+ .has_uhr = true,
+ .mac = {
+ .mac_cap[0] =
+ IEEE80211_UHR_MAC_CAP0_DPS_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_ASSIST_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_AP_STATIC_HCM_SUPP |
+ IEEE80211_UHR_MAC_CAP0_NPCA_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ENH_BSR_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ADD_MAP_TID_SUPP |
+ IEEE80211_UHR_MAC_CAP0_EOTSP_SUPP,
+ .mac_cap[1] =
+ IEEE80211_UHR_MAC_CAP1_DSO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PEDCA_SUPP |
+ IEEE80211_UHR_MAC_CAP1_UL_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_P2P_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_AP_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DUO_SUPP,
+ .mac_cap[2] =
+ IEEE80211_UHR_MAC_CAP2_OMC_UL_MU_DIS_RX_SUPP |
+ IEEE80211_UHR_MAC_CAP2_AOM_SUPP |
+ IEEE80211_UHR_MAC_CAP2_IFCS_LOC_SUPP |
+ IEEE80211_UHR_MAC_CAP2_UHR_TRS_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXSPG_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXOP_RET_IN_TXSPG |
+ IEEE80211_UHR_MAC_CAP2_UHR_OM_PU_TO_LOW,
+ .mac_cap[3] =
+ IEEE80211_UHR_MAC_CAP3_UHR_OM_PU_TO_HIGH |
+ IEEE80211_UHR_MAC_CAP3_PARAM_UPD_ADV_NOTIF_INTV |
+ IEEE80211_UHR_MAC_CAP3_UPD_IND_TIM_INTV_LOW,
+ .mac_cap[4] =
+ IEEE80211_UHR_MAC_CAP4_UPD_IND_TIM_INTV_HIGH |
+ IEEE80211_UHR_MAC_CAP4_BOUNDED_ESS |
+ IEEE80211_UHR_MAC_CAP4_BTM_ASSURANCE |
+ IEEE80211_UHR_MAC_CAP4_CO_BF_SUPP,
+ },
+ .phy = {
+ .cap =
+ IEEE80211_UHR_PHY_CAP_ELR_RX |
+ IEEE80211_UHR_PHY_CAP_ELR_TX,
+ },
+ },
},
{
.types_mask = BIT(NL80211_IFTYPE_AP) |
@@ -4586,6 +4629,50 @@ static const struct ieee80211_sband_iftype_data sband_capa_2ghz[] = {
},
/* PPE threshold information is not supported */
},
+ .uhr_cap = {
+ .has_uhr = true,
+ .mac = {
+ .mac_cap[0] =
+ IEEE80211_UHR_MAC_CAP0_DPS_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_ASSIST_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_AP_STATIC_HCM_SUPP |
+ IEEE80211_UHR_MAC_CAP0_NPCA_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ENH_BSR_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ADD_MAP_TID_SUPP |
+ IEEE80211_UHR_MAC_CAP0_EOTSP_SUPP,
+ .mac_cap[1] =
+ IEEE80211_UHR_MAC_CAP1_DSO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PEDCA_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DBE_SUPP |
+ IEEE80211_UHR_MAC_CAP1_UL_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_P2P_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_AP_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DUO_SUPP,
+ .mac_cap[2] =
+ IEEE80211_UHR_MAC_CAP2_OMC_UL_MU_DIS_RX_SUPP |
+ IEEE80211_UHR_MAC_CAP2_AOM_SUPP |
+ IEEE80211_UHR_MAC_CAP2_IFCS_LOC_SUPP |
+ IEEE80211_UHR_MAC_CAP2_UHR_TRS_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXSPG_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXOP_RET_IN_TXSPG |
+ IEEE80211_UHR_MAC_CAP2_UHR_OM_PU_TO_LOW,
+ .mac_cap[3] =
+ IEEE80211_UHR_MAC_CAP3_UHR_OM_PU_TO_HIGH |
+ IEEE80211_UHR_MAC_CAP3_PARAM_UPD_ADV_NOTIF_INTV |
+ IEEE80211_UHR_MAC_CAP3_UPD_IND_TIM_INTV_LOW,
+ .mac_cap[4] =
+ IEEE80211_UHR_MAC_CAP4_UPD_IND_TIM_INTV_HIGH |
+ IEEE80211_UHR_MAC_CAP4_BOUNDED_ESS |
+ IEEE80211_UHR_MAC_CAP4_BTM_ASSURANCE |
+ IEEE80211_UHR_MAC_CAP4_CO_BF_SUPP,
+ },
+ .phy = {
+ .cap =
+ IEEE80211_UHR_PHY_CAP_ELR_RX |
+ IEEE80211_UHR_PHY_CAP_ELR_TX,
+ },
+ },
},
#ifdef CONFIG_MAC80211_MESH
{
@@ -4755,6 +4842,55 @@ static const struct ieee80211_sband_iftype_data sband_capa_5ghz[] = {
},
/* PPE threshold information is not supported */
},
+ .uhr_cap = {
+ .has_uhr = true,
+ .mac = {
+ .mac_cap[0] =
+ IEEE80211_UHR_MAC_CAP0_DPS_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_ASSIST_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_AP_STATIC_HCM_SUPP |
+ IEEE80211_UHR_MAC_CAP0_NPCA_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ENH_BSR_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ADD_MAP_TID_SUPP |
+ IEEE80211_UHR_MAC_CAP0_EOTSP_SUPP,
+ .mac_cap[1] =
+ IEEE80211_UHR_MAC_CAP1_DSO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PEDCA_SUPP |
+ IEEE80211_UHR_MAC_CAP1_UL_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_P2P_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_AP_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DUO_SUPP,
+ .mac_cap[2] =
+ IEEE80211_UHR_MAC_CAP2_OMC_UL_MU_DIS_RX_SUPP |
+ IEEE80211_UHR_MAC_CAP2_AOM_SUPP |
+ IEEE80211_UHR_MAC_CAP2_IFCS_LOC_SUPP |
+ IEEE80211_UHR_MAC_CAP2_UHR_TRS_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXSPG_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXOP_RET_IN_TXSPG |
+ IEEE80211_UHR_MAC_CAP2_UHR_OM_PU_TO_LOW,
+ .mac_cap[3] =
+ IEEE80211_UHR_MAC_CAP3_UHR_OM_PU_TO_HIGH |
+ IEEE80211_UHR_MAC_CAP3_PARAM_UPD_ADV_NOTIF_INTV |
+ IEEE80211_UHR_MAC_CAP3_UPD_IND_TIM_INTV_LOW,
+ .mac_cap[4] =
+ IEEE80211_UHR_MAC_CAP4_UPD_IND_TIM_INTV_HIGH |
+ IEEE80211_UHR_MAC_CAP4_BOUNDED_ESS |
+ IEEE80211_UHR_MAC_CAP4_BTM_ASSURANCE |
+ IEEE80211_UHR_MAC_CAP4_CO_BF_SUPP,
+ },
+ .phy = {
+ .cap =
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_320 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_320 |
+ IEEE80211_UHR_PHY_CAP_ELR_RX |
+ IEEE80211_UHR_PHY_CAP_ELR_TX,
+ },
+ },
},
{
.types_mask = BIT(NL80211_IFTYPE_AP) |
@@ -4880,6 +5016,56 @@ static const struct ieee80211_sband_iftype_data sband_capa_5ghz[] = {
},
/* PPE threshold information is not supported */
},
+ .uhr_cap = {
+ .has_uhr = true,
+ .mac = {
+ .mac_cap[0] =
+ IEEE80211_UHR_MAC_CAP0_DPS_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_ASSIST_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_AP_STATIC_HCM_SUPP |
+ IEEE80211_UHR_MAC_CAP0_NPCA_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ENH_BSR_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ADD_MAP_TID_SUPP |
+ IEEE80211_UHR_MAC_CAP0_EOTSP_SUPP,
+ .mac_cap[1] =
+ IEEE80211_UHR_MAC_CAP1_DSO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PEDCA_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DBE_SUPP |
+ IEEE80211_UHR_MAC_CAP1_UL_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_P2P_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_AP_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DUO_SUPP,
+ .mac_cap[2] =
+ IEEE80211_UHR_MAC_CAP2_OMC_UL_MU_DIS_RX_SUPP |
+ IEEE80211_UHR_MAC_CAP2_AOM_SUPP |
+ IEEE80211_UHR_MAC_CAP2_IFCS_LOC_SUPP |
+ IEEE80211_UHR_MAC_CAP2_UHR_TRS_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXSPG_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXOP_RET_IN_TXSPG |
+ IEEE80211_UHR_MAC_CAP2_UHR_OM_PU_TO_LOW,
+ .mac_cap[3] =
+ IEEE80211_UHR_MAC_CAP3_UHR_OM_PU_TO_HIGH |
+ IEEE80211_UHR_MAC_CAP3_PARAM_UPD_ADV_NOTIF_INTV |
+ IEEE80211_UHR_MAC_CAP3_UPD_IND_TIM_INTV_LOW,
+ .mac_cap[4] =
+ IEEE80211_UHR_MAC_CAP4_UPD_IND_TIM_INTV_HIGH |
+ IEEE80211_UHR_MAC_CAP4_BOUNDED_ESS |
+ IEEE80211_UHR_MAC_CAP4_BTM_ASSURANCE |
+ IEEE80211_UHR_MAC_CAP4_CO_BF_SUPP,
+ },
+ .phy = {
+ .cap =
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_320 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_320 |
+ IEEE80211_UHR_PHY_CAP_ELR_RX |
+ IEEE80211_UHR_PHY_CAP_ELR_TX,
+ },
+ },
},
#ifdef CONFIG_MAC80211_MESH
{
@@ -5073,6 +5259,55 @@ static const struct ieee80211_sband_iftype_data sband_capa_6ghz[] = {
},
/* PPE threshold information is not supported */
},
+ .uhr_cap = {
+ .has_uhr = true,
+ .mac = {
+ .mac_cap[0] =
+ IEEE80211_UHR_MAC_CAP0_DPS_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_ASSIST_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_AP_STATIC_HCM_SUPP |
+ IEEE80211_UHR_MAC_CAP0_NPCA_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ENH_BSR_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ADD_MAP_TID_SUPP |
+ IEEE80211_UHR_MAC_CAP0_EOTSP_SUPP,
+ .mac_cap[1] =
+ IEEE80211_UHR_MAC_CAP1_DSO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PEDCA_SUPP |
+ IEEE80211_UHR_MAC_CAP1_UL_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_P2P_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_AP_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DUO_SUPP,
+ .mac_cap[2] =
+ IEEE80211_UHR_MAC_CAP2_OMC_UL_MU_DIS_RX_SUPP |
+ IEEE80211_UHR_MAC_CAP2_AOM_SUPP |
+ IEEE80211_UHR_MAC_CAP2_IFCS_LOC_SUPP |
+ IEEE80211_UHR_MAC_CAP2_UHR_TRS_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXSPG_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXOP_RET_IN_TXSPG |
+ IEEE80211_UHR_MAC_CAP2_UHR_OM_PU_TO_LOW,
+ .mac_cap[3] =
+ IEEE80211_UHR_MAC_CAP3_UHR_OM_PU_TO_HIGH |
+ IEEE80211_UHR_MAC_CAP3_PARAM_UPD_ADV_NOTIF_INTV |
+ IEEE80211_UHR_MAC_CAP3_UPD_IND_TIM_INTV_LOW,
+ .mac_cap[4] =
+ IEEE80211_UHR_MAC_CAP4_UPD_IND_TIM_INTV_HIGH |
+ IEEE80211_UHR_MAC_CAP4_BOUNDED_ESS |
+ IEEE80211_UHR_MAC_CAP4_BTM_ASSURANCE |
+ IEEE80211_UHR_MAC_CAP4_CO_BF_SUPP,
+ },
+ .phy = {
+ .cap =
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_320 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_320 |
+ IEEE80211_UHR_PHY_CAP_ELR_RX |
+ IEEE80211_UHR_PHY_CAP_ELR_TX,
+ },
+ },
},
{
.types_mask = BIT(NL80211_IFTYPE_AP) |
@@ -5219,6 +5454,56 @@ static const struct ieee80211_sband_iftype_data sband_capa_6ghz[] = {
},
/* PPE threshold information is not supported */
},
+ .uhr_cap = {
+ .has_uhr = true,
+ .mac = {
+ .mac_cap[0] =
+ IEEE80211_UHR_MAC_CAP0_DPS_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_ASSIST_SUPP |
+ IEEE80211_UHR_MAC_CAP0_DPS_AP_STATIC_HCM_SUPP |
+ IEEE80211_UHR_MAC_CAP0_NPCA_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ENH_BSR_SUPP |
+ IEEE80211_UHR_MAC_CAP0_ADD_MAP_TID_SUPP |
+ IEEE80211_UHR_MAC_CAP0_EOTSP_SUPP,
+ .mac_cap[1] =
+ IEEE80211_UHR_MAC_CAP1_DSO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PEDCA_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DBE_SUPP |
+ IEEE80211_UHR_MAC_CAP1_UL_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_P2P_LLI_SUPP |
+ IEEE80211_UHR_MAC_CAP1_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_AP_PUO_SUPP |
+ IEEE80211_UHR_MAC_CAP1_DUO_SUPP,
+ .mac_cap[2] =
+ IEEE80211_UHR_MAC_CAP2_OMC_UL_MU_DIS_RX_SUPP |
+ IEEE80211_UHR_MAC_CAP2_AOM_SUPP |
+ IEEE80211_UHR_MAC_CAP2_IFCS_LOC_SUPP |
+ IEEE80211_UHR_MAC_CAP2_UHR_TRS_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXSPG_SUPP |
+ IEEE80211_UHR_MAC_CAP2_TXOP_RET_IN_TXSPG |
+ IEEE80211_UHR_MAC_CAP2_UHR_OM_PU_TO_LOW,
+ .mac_cap[3] =
+ IEEE80211_UHR_MAC_CAP3_UHR_OM_PU_TO_HIGH |
+ IEEE80211_UHR_MAC_CAP3_PARAM_UPD_ADV_NOTIF_INTV |
+ IEEE80211_UHR_MAC_CAP3_UPD_IND_TIM_INTV_LOW,
+ .mac_cap[4] =
+ IEEE80211_UHR_MAC_CAP4_UPD_IND_TIM_INTV_HIGH |
+ IEEE80211_UHR_MAC_CAP4_BOUNDED_ESS |
+ IEEE80211_UHR_MAC_CAP4_BTM_ASSURANCE |
+ IEEE80211_UHR_MAC_CAP4_CO_BF_SUPP,
+ },
+ .phy = {
+ .cap =
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_LE80 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_160 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_SND_NDP_320 |
+ IEEE80211_UHR_PHY_CAP_MAX_NSS_RX_DL_MU_320 |
+ IEEE80211_UHR_PHY_CAP_ELR_RX |
+ IEEE80211_UHR_PHY_CAP_ELR_TX,
+ },
+ },
},
#ifdef CONFIG_MAC80211_MESH
{
--
2.34.1
^ permalink raw reply related
* Re: [PATCH wireless-next v2 00/02] wifi: ieee80211/mac80211: Add UHR (802.11bn) Capability and Operation parsing helpers
From: Johannes Berg @ 2026-02-12 18:29 UTC (permalink / raw)
To: Karthikeyan Kathirvel; +Cc: linux-wireless, ath12k
In-Reply-To: <6e9ff54e-dc83-46ad-8415-5c950d6c4444@oss.qualcomm.com>
On Thu, 2026-02-12 at 23:13 +0530, Karthikeyan Kathirvel wrote:
>
> On 2/12/2026 11:06 PM, Johannes Berg wrote:
> > On Thu, 2026-02-12 at 22:53 +0530, Karthikeyan Kathirvel wrote:
> > > This series covers support for UHR capability and operation (11bn)
> > > parsing helpers for DPS/DBE/P-EDCA, and adds mac80211 hwsim changes.
> > >
> > > The code changes are based on the IEEE 802.11bn Draft P802.11bn/D1.3.
> > > There may be changes in the code to adopt upcoming 11bn spec changes.
> >
> > Indeed. I hear Qualcomm prefers 8 bits for the NPCA primary channel
> > rather than the 4 bits for the NPCA primary channel (offset) ;-)
> >
> Okay, I might missed any other thread if this is discussed, let me check
No no, that was a discussion with the spec folks!
johannes
^ permalink raw reply
* Re: [RFC PATCH 2/2] wifi: ath10k: only wait for response to SET_KEY
From: Felix Kaechele @ 2026-02-12 18:36 UTC (permalink / raw)
To: James Prestwood, Richard Acayan, Jeff Johnson, Michal Kazior,
Kalle Valo, linux-wireless, ath10k
In-Reply-To: <dd019903-f8d9-4bd3-a90d-b4d505f489f3@gmail.com>
I also had some hopes that this patch would fix the issue for me on
QCA9739 SDIO, but even with this patch I am still getting the warnings
in dmesg.
Regards,
Felix
^ permalink raw reply
* Re: [PATCH v2] net: intel: fix PCI device ID conflict between i40e and ipw2200
From: patchwork-bot+netdevbpf @ 2026-02-13 2:50 UTC (permalink / raw)
To: Ethan Nelson-Moore
Cc: netdev, linux-wireless, stable, johannes, anthony.l.nguyen,
przemyslaw.kitszel, andrew+netdev, davem, edumazet, kuba, pabeni,
stas.yakovlev, aleksandr.loktionov, alice.michael
In-Reply-To: <20260210021235.16315-1-enelsonmoore@gmail.com>
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Mon, 9 Feb 2026 18:12:34 -0800 you wrote:
> The ID 8086:104f is matched by both i40e and ipw2200. The same device
> ID should not be in more than one driver, because in that case, which
> driver is used is unpredictable. Fix this by taking advantage of the
> fact that i40e devices use PCI_CLASS_NETWORK_ETHERNET and ipw2200
> devices use PCI_CLASS_NETWORK_OTHER to differentiate the devices.
>
> Fixes: 2e45d3f4677a ("i40e: Add support for X710 B/P & SFP+ cards")
> Cc: stable@vger.kernel.org
> Acked-by: Johannes Berg <johannes@sipsolutions.net>
> Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
>
> [...]
Here is the summary with links:
- [v2] net: intel: fix PCI device ID conflict between i40e and ipw2200
https://git.kernel.org/netdev/net/c/d03e094473ec
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply
* [PATCH rtw-next] wifi: rtw88: coex: Solve LE-HID lag & update coex version to 26020420
From: Ping-Ke Shih @ 2026-02-13 5:34 UTC (permalink / raw)
To: linux-wireless; +Cc: ku920601
From: Ching-Te Ku <ku920601@realtek.com>
When Wi-Fi enters power save, the register value can not be read
correctly. If mechanism take the wrong information to make decision,
it will run with wrong parameters. It leads Bluetooth low-energy
HID lag. Add logic to isolate the wrong register state.
BTCOEX Version: 26020420-2020
Desired_BT_Coex_Ver: 0x20
Desired_WL_FW_Ver: 9.9.X
Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
drivers/net/wireless/realtek/rtw88/coex.c | 44 ++++++++++++-------
drivers/net/wireless/realtek/rtw88/main.h | 1 +
drivers/net/wireless/realtek/rtw88/rtw8703b.c | 5 +++
drivers/net/wireless/realtek/rtw88/rtw8723d.c | 5 +++
drivers/net/wireless/realtek/rtw88/rtw8821a.c | 7 ++-
drivers/net/wireless/realtek/rtw88/rtw8821c.c | 7 ++-
drivers/net/wireless/realtek/rtw88/rtw8822b.c | 5 +++
drivers/net/wireless/realtek/rtw88/rtw8822c.c | 5 ++-
8 files changed, 61 insertions(+), 18 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/coex.c b/drivers/net/wireless/realtek/rtw88/coex.c
index b4dc6ff2c175..ee4007fe6c18 100644
--- a/drivers/net/wireless/realtek/rtw88/coex.c
+++ b/drivers/net/wireless/realtek/rtw88/coex.c
@@ -485,6 +485,13 @@ static void rtw_coex_monitor_bt_ctr(struct rtw_dev *rtwdev)
"[BTCoex], Hi-Pri Rx/Tx: %d/%d, Lo-Pri Rx/Tx: %d/%d\n",
coex_stat->hi_pri_rx, coex_stat->hi_pri_tx,
coex_stat->lo_pri_rx, coex_stat->lo_pri_tx);
+
+ if (coex_stat->wl_under_lps || coex_stat->wl_under_ips ||
+ (coex_stat->hi_pri_rx > 60000 && coex_stat->hi_pri_tx == 60000 &&
+ coex_stat->lo_pri_rx > 60000 && coex_stat->lo_pri_tx == 60000))
+ coex_stat->bt_ctr_ok = false;
+ else
+ coex_stat->bt_ctr_ok = true;
}
static void rtw_coex_monitor_bt_enable(struct rtw_dev *rtwdev)
@@ -1959,14 +1966,18 @@ static void rtw_coex_action_bt_hid(struct rtw_dev *rtwdev)
struct rtw_coex *coex = &rtwdev->coex;
struct rtw_coex_stat *coex_stat = &coex->stat;
struct rtw_efuse *efuse = &rtwdev->efuse;
+ bool is_bt_ctr_hi = false, is_toggle_table = false;
u8 table_case, tdma_case;
u32 slot_type = 0;
- bool bt_multi_link_remain = false, is_toggle_table = false;
rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__);
rtw_coex_set_ant_path(rtwdev, false, COEX_SET_ANT_2G);
rtw_coex_set_rf_para(rtwdev, chip->wl_rf_para_rx[0]);
+ if (coex_stat->bt_ctr_ok &&
+ coex_stat->lo_pri_rx + coex_stat->lo_pri_tx > 360)
+ is_bt_ctr_hi = true;
+
if (efuse->share_ant) {
/* Shared-Ant */
if (coex_stat->bt_ble_exist) {
@@ -1980,28 +1991,31 @@ static void rtw_coex_action_bt_hid(struct rtw_dev *rtwdev)
}
} else {
/* Legacy HID */
- if (coex_stat->bt_profile_num == 1 &&
- (coex_stat->bt_multi_link ||
- (coex_stat->lo_pri_rx +
- coex_stat->lo_pri_tx > 360) ||
- coex_stat->bt_slave ||
- bt_multi_link_remain)) {
- slot_type = TDMA_4SLOT;
- table_case = 12;
- tdma_case = 20;
- } else if (coex_stat->bt_a2dp_active) {
+ if (coex_stat->bt_a2dp_active) {
table_case = 9;
tdma_case = 18;
+ } else if (coex_stat->bt_profile_num == 1 &&
+ (coex_stat->bt_multi_link &&
+ (is_bt_ctr_hi || coex_stat->bt_slave ||
+ coex_stat->bt_multi_link_remain))) {
+ if (coex_stat->wl_gl_busy &&
+ (coex_stat->wl_rx_rate <= 3 ||
+ coex_stat->wl_rts_rx_rate <= 3))
+ table_case = 13;
+ else
+ table_case = 12;
+
+ tdma_case = 26;
} else if (coex_stat->bt_418_hid_exist &&
coex_stat->wl_gl_busy) {
is_toggle_table = true;
slot_type = TDMA_4SLOT;
- table_case = 9;
- tdma_case = 24;
+ table_case = 32;
+ tdma_case = 27;
} else if (coex_stat->bt_ble_hid_exist &&
coex_stat->wl_gl_busy) {
- table_case = 32;
- tdma_case = 9;
+ table_case = 36;
+ tdma_case = 0;
} else {
table_case = 9;
tdma_case = 9;
diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 1ab70214ce36..1179231a672d 100644
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -1475,6 +1475,7 @@ struct rtw_coex_stat {
bool bt_game_hid_exist;
bool bt_hid_handle_cnt;
bool bt_mailbox_reply;
+ bool bt_ctr_ok;
bool wl_under_lps;
bool wl_under_ips;
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8703b.c b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
index 821c28d9cb5d..b5e7ae7ebd95 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8703b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
@@ -1794,6 +1794,11 @@ static const struct coex_table_para table_sant_8703b[] = {
{0x66556aaa, 0x6a5a6aaa}, /* case-30 */
{0xffffffff, 0x5aaa5aaa},
{0x56555555, 0x5a5a5aaa},
+ {0xdaffdaff, 0xdaffdaff},
+ {0xddffddff, 0xddffddff},
+ {0xe5555555, 0xe5555555}, /* case-35 */
+ {0xea5a5a5a, 0xea5a5a5a},
+ {0xea6a6a6a, 0xea6a6a6a},
};
/* Shared-Antenna TDMA */
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.c b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
index 8715e0435f17..a2b3e7a2ad99 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
@@ -1459,6 +1459,11 @@ static const struct coex_table_para table_sant_8723d[] = {
{0x66556aaa, 0x6a5a6aaa}, /* case-30 */
{0xffffffff, 0x5aaa5aaa},
{0x56555555, 0x5a5a5aaa},
+ {0xdaffdaff, 0xdaffdaff},
+ {0xddffddff, 0xddffddff},
+ {0xe5555555, 0xe5555555}, /* case-35 */
+ {0xea5a5a5a, 0xea5a5a5a},
+ {0xea6a6a6a, 0xea6a6a6a},
};
/* Non-Shared-Antenna Coex Table */
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821a.c b/drivers/net/wireless/realtek/rtw88/rtw8821a.c
index 414b77eef07c..cab85203b828 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8821a.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821a.c
@@ -998,7 +998,12 @@ static const struct coex_table_para table_sant_8821a[] = {
{0x66556655, 0x66556655},
{0x66556aaa, 0x6a5a6aaa}, /* case-30 */
{0xffffffff, 0x5aaa5aaa},
- {0x56555555, 0x5a5a5aaa}
+ {0x56555555, 0x5a5a5aaa},
+ {0xdaffdaff, 0xdaffdaff},
+ {0xddffddff, 0xddffddff},
+ {0xe5555555, 0xe5555555}, /* case-35 */
+ {0xea5a5a5a, 0xea5a5a5a},
+ {0xea6a6a6a, 0xea6a6a6a},
};
/* Non-Shared-Antenna Coex Table */
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
index 2078b067562e..246046da4f13 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
@@ -1727,7 +1727,12 @@ static const struct coex_table_para table_sant_8821c[] = {
{0x66556655, 0x66556655},
{0x66556aaa, 0x6a5a6aaa}, /* case-30 */
{0xffffffff, 0x5aaa5aaa},
- {0x56555555, 0x5a5a5aaa}
+ {0x56555555, 0x5a5a5aaa},
+ {0xdaffdaff, 0xdaffdaff},
+ {0xddffddff, 0xddffddff},
+ {0xe5555555, 0xe5555555}, /* case-35 */
+ {0xea5a5a5a, 0xea5a5a5a},
+ {0xea6a6a6a, 0xea6a6a6a},
};
/* Non-Shared-Antenna Coex Table */
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
index 4d88cc2f4148..e9e8a7f3f382 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
@@ -2217,6 +2217,11 @@ static const struct coex_table_para table_sant_8822b[] = {
{0x66556aaa, 0x6a5a6aaa}, /* case-30 */
{0xffffffff, 0x5aaa5aaa},
{0x56555555, 0x5a5a5aaa},
+ {0xdaffdaff, 0xdaffdaff},
+ {0xddffddff, 0xddffddff},
+ {0xe5555555, 0xe5555555}, /* case-35 */
+ {0xea5a5a5a, 0xea5a5a5a},
+ {0xea6a6a6a, 0xea6a6a6a},
};
/* Non-Shared-Antenna Coex Table */
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index 28c121cf1e68..244c8026479c 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -5035,6 +5035,9 @@ static const struct coex_table_para table_sant_8822c[] = {
{0x56555555, 0x5a5a5aaa},
{0xdaffdaff, 0xdaffdaff},
{0xddffddff, 0xddffddff},
+ {0xe5555555, 0xe5555555}, /* case-35 */
+ {0xea5a5a5a, 0xea5a5a5a},
+ {0xea6a6a6a, 0xea6a6a6a},
};
/* Non-Shared-Antenna Coex Table */
@@ -5401,7 +5404,7 @@ const struct rtw_chip_info rtw8822c_hw_spec = {
.max_sched_scan_ssids = 4,
#endif
.max_scan_ie_len = (RTW_PROBE_PG_CNT - 1) * TX_PAGE_SIZE,
- .coex_para_ver = 0x22020720,
+ .coex_para_ver = 0x26020420,
.bt_desired_ver = 0x20,
.scbd_support = true,
.new_scbd10_def = true,
base-commit: 333225e1e9ead7b06e5363389403bdac72ba3046
--
2.25.1
^ permalink raw reply related
* [PATCH rtw-next 00/12] wifi: rtw89: refine to read HW parameters from file, and update SER code
From: Ping-Ke Shih @ 2026-02-13 6:15 UTC (permalink / raw)
To: linux-wireless; +Cc: damon.chen, kevin_yang
First two patches are to support variants of RTL8922DE and RTL8922DE-VS,
which they have very similar features except to 4K and 1K QAM and they
use different firmware file. And, even RTL8922DE-VS has more than one
sub-variant that uses another type of firmware in the same file. Adjust
to support these variants.
Patches 3-7 are the first step to move hardware parameters to file. For
newer chips (after RTL8852CE), we have done that. But early chips, such as
RTL8852AE, RTL8851BE, RTL8852BE) still use driver built-in tables.
In order to remove these tables eventually after two TLS kernel (about
two years). We have submitted firmware into linux-firmware repository,
and driver support these new firmware by increasing firmware version
number.
Patches 8-9: update along internal developing RTL8922DE.
Patches 10-12 are related to SER simulation. In order to make recovery
more usable and stable in field, add more simulation cases and tests.
Kuan-Chung Chen (1):
wifi: rtw89: add H2C command to protect TX/RX for unused PHY
Ping-Ke Shih (4):
wifi: rtw89: fw: add fw_def struct to put firmware name and format
version
wifi: rtw89: fw: recognize firmware type B by AID
wifi: rtw89: 8852b: update supported firmware format to 2
wifi: rtw89: rfk: add hardware version to rtw89_fw_h2c_rf_pre_ntfy_mcc
for new WiFi 7 firmware
Zong-Zhe Yang (7):
wifi: rtw89: add general way to generate module firmware string
wifi: rtw89: 8852a: move DIG tables to rtw8852a.c
wifi: rtw89: 8852a: update supported firmware format to 1
wifi: rtw89: 8851b: update supported firmware format to 1
wifi: rtw89: debug: add SER SW counters to count simulation
wifi: rtw89: ser: Wi-Fi 7 reset HALT C2H after reading it
wifi: rtw89: ser: post-recover DMAC state to prevent LPS
drivers/net/wireless/realtek/rtw89/core.c | 3 +-
drivers/net/wireless/realtek/rtw89/core.h | 46 ++++++-
drivers/net/wireless/realtek/rtw89/debug.c | 6 +
drivers/net/wireless/realtek/rtw89/fw.c | 117 ++++++++++++++++--
drivers/net/wireless/realtek/rtw89/fw.h | 54 ++++++++
drivers/net/wireless/realtek/rtw89/mac.c | 17 ++-
drivers/net/wireless/realtek/rtw89/mac80211.c | 5 +
drivers/net/wireless/realtek/rtw89/phy.c | 8 +-
drivers/net/wireless/realtek/rtw89/phy.h | 4 +
drivers/net/wireless/realtek/rtw89/ps.c | 2 +
drivers/net/wireless/realtek/rtw89/rtw8851b.c | 11 +-
drivers/net/wireless/realtek/rtw89/rtw8852a.c | 62 +++++++++-
.../wireless/realtek/rtw89/rtw8852a_table.c | 51 --------
.../wireless/realtek/rtw89/rtw8852a_table.h | 1 -
drivers/net/wireless/realtek/rtw89/rtw8852b.c | 11 +-
.../net/wireless/realtek/rtw89/rtw8852bt.c | 9 +-
drivers/net/wireless/realtek/rtw89/rtw8852c.c | 9 +-
drivers/net/wireless/realtek/rtw89/rtw8922a.c | 10 +-
drivers/net/wireless/realtek/rtw89/ser.c | 2 +
19 files changed, 339 insertions(+), 89 deletions(-)
base-commit: 333225e1e9ead7b06e5363389403bdac72ba3046
--
2.25.1
^ permalink raw reply
* [PATCH rtw-next 01/12] wifi: rtw89: fw: add fw_def struct to put firmware name and format version
From: Ping-Ke Shih @ 2026-02-13 6:15 UTC (permalink / raw)
To: linux-wireless; +Cc: damon.chen, kevin_yang
In-Reply-To: <20260213061552.29997-1-pkshih@realtek.com>
The RTL8922DE has a RTL8922DE-VS variant which uses different firmware
name and format version, and the rule to select firmware type will be
needed to extend. Prepare for coming patches.
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
drivers/net/wireless/realtek/rtw89/core.c | 3 ++-
drivers/net/wireless/realtek/rtw89/core.h | 25 +++++++++++++++++--
drivers/net/wireless/realtek/rtw89/fw.c | 10 +++++---
drivers/net/wireless/realtek/rtw89/fw.h | 1 +
drivers/net/wireless/realtek/rtw89/rtw8851b.c | 6 +++--
drivers/net/wireless/realtek/rtw89/rtw8852a.c | 6 +++--
drivers/net/wireless/realtek/rtw89/rtw8852b.c | 6 +++--
.../net/wireless/realtek/rtw89/rtw8852bt.c | 6 +++--
drivers/net/wireless/realtek/rtw89/rtw8852c.c | 6 +++--
drivers/net/wireless/realtek/rtw89/rtw8922a.c | 7 ++++--
10 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 6e77522bcd8f..bba5e7669b1b 100644
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -6753,7 +6753,8 @@ struct rtw89_dev *rtw89_alloc_ieee80211_hw(struct device *device,
bool support_mlo;
bool no_chanctx;
- firmware = rtw89_early_fw_feature_recognize(device, chip, &early_fw, &fw_format);
+ firmware = rtw89_early_fw_feature_recognize(device, chip, variant,
+ &early_fw, &fw_format);
ops = kmemdup(&rtw89_ops, sizeof(rtw89_ops), GFP_KERNEL);
if (!ops)
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 4778957d6b2d..5cb8aacf7644 100644
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -4152,6 +4152,11 @@ struct rtw89_reg_imr {
u32 set;
};
+struct rtw89_fw_def {
+ const char *fw_basename;
+ u8 fw_format_max;
+};
+
struct rtw89_phy_table {
const struct rtw89_reg2_def *regs;
u32 n_regs;
@@ -4494,8 +4499,7 @@ struct rtw89_chip_info {
const struct rtw89_chip_ops *ops;
const struct rtw89_mac_gen_def *mac_def;
const struct rtw89_phy_gen_def *phy_def;
- const char *fw_basename;
- u8 fw_format_max;
+ struct rtw89_fw_def fw_def;
bool try_ce_fw;
u8 bbmcu_nr;
u32 needed_fw_elms;
@@ -4633,6 +4637,7 @@ struct rtw89_chip_info {
struct rtw89_chip_variant {
bool no_mcs_12_13: 1;
u32 fw_min_ver_code;
+ const struct rtw89_fw_def *fw_def_override;
};
union rtw89_bus_info {
@@ -7379,6 +7384,22 @@ void rtw89_chip_calc_rx_gain_normal(struct rtw89_dev *rtwdev,
chip->ops->calc_rx_gain_normal(rtwdev, chan, path, phy_idx, calc);
}
+static inline const struct rtw89_fw_def *
+__rtw89_chip_get_fw_def(const struct rtw89_chip_info *chip,
+ const struct rtw89_chip_variant *variant)
+{
+ if (variant && variant->fw_def_override)
+ return variant->fw_def_override;
+
+ return &chip->fw_def;
+}
+
+static inline
+const struct rtw89_fw_def *rtw89_chip_get_fw_def(struct rtw89_dev *rtwdev)
+{
+ return __rtw89_chip_get_fw_def(rtwdev->chip, rtwdev->variant);
+}
+
static inline void rtw89_load_txpwr_table(struct rtw89_dev *rtwdev,
const struct rtw89_txpwr_table *tbl)
{
diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index f84726f04669..638af4ebf628 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -965,18 +965,20 @@ static void rtw89_fw_recognize_features(struct rtw89_dev *rtwdev)
const struct firmware *
rtw89_early_fw_feature_recognize(struct device *device,
const struct rtw89_chip_info *chip,
+ const struct rtw89_chip_variant *variant,
struct rtw89_fw_info *early_fw,
int *used_fw_format)
{
+ const struct rtw89_fw_def *fw_def = __rtw89_chip_get_fw_def(chip, variant);
const struct firmware *firmware;
char fw_name[64];
int fw_format;
u32 ver_code;
int ret;
- for (fw_format = chip->fw_format_max; fw_format >= 0; fw_format--) {
+ for (fw_format = fw_def->fw_format_max; fw_format >= 0; fw_format--) {
rtw89_fw_get_filename(fw_name, sizeof(fw_name),
- chip->fw_basename, fw_format);
+ fw_def->fw_basename, fw_format);
ret = request_firmware(&firmware, fw_name, device);
if (!ret) {
@@ -2024,11 +2026,11 @@ void rtw89_load_firmware_work(struct work_struct *work)
{
struct rtw89_dev *rtwdev =
container_of(work, struct rtw89_dev, load_firmware_work);
- const struct rtw89_chip_info *chip = rtwdev->chip;
+ const struct rtw89_fw_def *fw_def = rtw89_chip_get_fw_def(rtwdev);
char fw_name[64];
rtw89_fw_get_filename(fw_name, sizeof(fw_name),
- chip->fw_basename, rtwdev->fw.fw_format);
+ fw_def->fw_basename, rtwdev->fw.fw_format);
rtw89_load_firmware_req(rtwdev, &rtwdev->fw.req, fw_name, false);
}
diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index d45b6ea6ea1b..c60d419616d6 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -5171,6 +5171,7 @@ int rtw89_fw_recognize_elements(struct rtw89_dev *rtwdev);
const struct firmware *
rtw89_early_fw_feature_recognize(struct device *device,
const struct rtw89_chip_info *chip,
+ const struct rtw89_chip_variant *variant,
struct rtw89_fw_info *early_fw,
int *used_fw_format);
int rtw89_fw_download(struct rtw89_dev *rtwdev, enum rtw89_fw_type type,
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
index d6deb44a685b..171749f5002d 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
@@ -2580,8 +2580,10 @@ const struct rtw89_chip_info rtw8851b_chip_info = {
.ops = &rtw8851b_chip_ops,
.mac_def = &rtw89_mac_gen_ax,
.phy_def = &rtw89_phy_gen_ax,
- .fw_basename = RTW8851B_FW_BASENAME,
- .fw_format_max = RTW8851B_FW_FORMAT_MAX,
+ .fw_def = {
+ .fw_basename = RTW8851B_FW_BASENAME,
+ .fw_format_max = RTW8851B_FW_FORMAT_MAX,
+ },
.try_ce_fw = true,
.bbmcu_nr = 0,
.needed_fw_elms = 0,
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index 5ea7a36ab5ab..36d66f4e2dd0 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -2265,8 +2265,10 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
.ops = &rtw8852a_chip_ops,
.mac_def = &rtw89_mac_gen_ax,
.phy_def = &rtw89_phy_gen_ax,
- .fw_basename = RTW8852A_FW_BASENAME,
- .fw_format_max = RTW8852A_FW_FORMAT_MAX,
+ .fw_def = {
+ .fw_basename = RTW8852A_FW_BASENAME,
+ .fw_format_max = RTW8852A_FW_FORMAT_MAX,
+ },
.try_ce_fw = false,
.bbmcu_nr = 0,
.needed_fw_elms = 0,
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index 197e3f5fb21b..602432c47ea3 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -911,8 +911,10 @@ const struct rtw89_chip_info rtw8852b_chip_info = {
.ops = &rtw8852b_chip_ops,
.mac_def = &rtw89_mac_gen_ax,
.phy_def = &rtw89_phy_gen_ax,
- .fw_basename = RTW8852B_FW_BASENAME,
- .fw_format_max = RTW8852B_FW_FORMAT_MAX,
+ .fw_def = {
+ .fw_basename = RTW8852B_FW_BASENAME,
+ .fw_format_max = RTW8852B_FW_FORMAT_MAX,
+ },
.try_ce_fw = true,
.bbmcu_nr = 0,
.needed_fw_elms = 0,
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
index 92bbd6e5d699..514861e48c25 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
@@ -757,8 +757,10 @@ const struct rtw89_chip_info rtw8852bt_chip_info = {
.ops = &rtw8852bt_chip_ops,
.mac_def = &rtw89_mac_gen_ax,
.phy_def = &rtw89_phy_gen_ax,
- .fw_basename = RTW8852BT_FW_BASENAME,
- .fw_format_max = RTW8852BT_FW_FORMAT_MAX,
+ .fw_def = {
+ .fw_basename = RTW8852BT_FW_BASENAME,
+ .fw_format_max = RTW8852BT_FW_FORMAT_MAX,
+ },
.try_ce_fw = true,
.bbmcu_nr = 0,
.needed_fw_elms = RTW89_AX_GEN_DEF_NEEDED_FW_ELEMENTS_NO_6GHZ,
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index de5d343f80a5..70ca8c3950d9 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -3106,8 +3106,10 @@ const struct rtw89_chip_info rtw8852c_chip_info = {
.ops = &rtw8852c_chip_ops,
.mac_def = &rtw89_mac_gen_ax,
.phy_def = &rtw89_phy_gen_ax,
- .fw_basename = RTW8852C_FW_BASENAME,
- .fw_format_max = RTW8852C_FW_FORMAT_MAX,
+ .fw_def = {
+ .fw_basename = RTW8852C_FW_BASENAME,
+ .fw_format_max = RTW8852C_FW_FORMAT_MAX,
+ },
.try_ce_fw = false,
.bbmcu_nr = 0,
.needed_fw_elms = 0,
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922a.c b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
index f41b66b362c4..fd1b171b106c 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8922a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
@@ -2916,8 +2916,10 @@ const struct rtw89_chip_info rtw8922a_chip_info = {
.ops = &rtw8922a_chip_ops,
.mac_def = &rtw89_mac_gen_be,
.phy_def = &rtw89_phy_gen_be,
- .fw_basename = RTW8922A_FW_BASENAME,
- .fw_format_max = RTW8922A_FW_FORMAT_MAX,
+ .fw_def = {
+ .fw_basename = RTW8922A_FW_BASENAME,
+ .fw_format_max = RTW8922A_FW_FORMAT_MAX,
+ },
.try_ce_fw = false,
.bbmcu_nr = 1,
.needed_fw_elms = RTW89_BE_GEN_DEF_NEEDED_FW_ELEMENTS,
@@ -3057,6 +3059,7 @@ EXPORT_SYMBOL(rtw8922a_chip_info);
const struct rtw89_chip_variant rtw8922ae_vs_variant = {
.no_mcs_12_13 = true,
.fw_min_ver_code = RTW89_FW_VER_CODE(0, 35, 54, 0),
+ .fw_def_override = NULL,
};
EXPORT_SYMBOL(rtw8922ae_vs_variant);
--
2.25.1
^ permalink raw reply related
* [PATCH rtw-next 02/12] wifi: rtw89: fw: recognize firmware type B by AID
From: Ping-Ke Shih @ 2026-02-13 6:15 UTC (permalink / raw)
To: linux-wireless; +Cc: damon.chen, kevin_yang
In-Reply-To: <20260213061552.29997-1-pkshih@realtek.com>
Select a firmware suit including normal and WoWLAN firmware by chip AID
from multiple firmware, because coming RTL8922D has variant hardware with
different chip AID.
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
drivers/net/wireless/realtek/rtw89/core.h | 4 ++++
drivers/net/wireless/realtek/rtw89/fw.c | 13 +++++++++++--
drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 +
drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 +
drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 +
drivers/net/wireless/realtek/rtw89/rtw8852bt.c | 1 +
drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 +
drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 +
8 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 5cb8aacf7644..d1f58bf953a9 100644
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -4155,6 +4155,7 @@ struct rtw89_reg_imr {
struct rtw89_fw_def {
const char *fw_basename;
u8 fw_format_max;
+ u16 fw_b_aid;
};
struct rtw89_phy_table {
@@ -4729,6 +4730,8 @@ enum rtw89_fw_type {
RTW89_FW_NORMAL = 1,
RTW89_FW_WOWLAN = 3,
RTW89_FW_NORMAL_CE = 5,
+ RTW89_FW_NORMAL_B = 14,
+ RTW89_FW_WOWLAN_B = 15,
RTW89_FW_BBMCU0 = 64,
RTW89_FW_BBMCU1 = 65,
RTW89_FW_LOGFMT = 255,
@@ -7562,6 +7565,7 @@ static inline struct rtw89_fw_suit *rtw89_fw_suit_get(struct rtw89_dev *rtwdev,
switch (type) {
case RTW89_FW_WOWLAN:
+ case RTW89_FW_WOWLAN_B:
return &fw_info->wowlan;
case RTW89_FW_LOGFMT:
return &fw_info->log.suit;
diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 638af4ebf628..ff27f00ec6d2 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -1027,16 +1027,25 @@ static int rtw89_fw_validate_ver_required(struct rtw89_dev *rtwdev)
int rtw89_fw_recognize(struct rtw89_dev *rtwdev)
{
+ const struct rtw89_fw_def *fw_def = rtw89_chip_get_fw_def(rtwdev);
const struct rtw89_chip_info *chip = rtwdev->chip;
+ const struct rtw89_hal *hal = &rtwdev->hal;
+ enum rtw89_fw_type normal_fw_type = RTW89_FW_NORMAL;
+ enum rtw89_fw_type wowlan_fw_type = RTW89_FW_WOWLAN;
int ret;
+ if (fw_def->fw_b_aid && fw_def->fw_b_aid == hal->aid) {
+ normal_fw_type = RTW89_FW_NORMAL_B;
+ wowlan_fw_type = RTW89_FW_WOWLAN_B;
+ }
+
if (chip->try_ce_fw) {
ret = __rtw89_fw_recognize(rtwdev, RTW89_FW_NORMAL_CE, true);
if (!ret)
goto normal_done;
}
- ret = __rtw89_fw_recognize(rtwdev, RTW89_FW_NORMAL, false);
+ ret = __rtw89_fw_recognize(rtwdev, normal_fw_type, false);
if (ret)
return ret;
@@ -1046,7 +1055,7 @@ int rtw89_fw_recognize(struct rtw89_dev *rtwdev)
return ret;
/* It still works if wowlan firmware isn't existing. */
- __rtw89_fw_recognize(rtwdev, RTW89_FW_WOWLAN, false);
+ __rtw89_fw_recognize(rtwdev, wowlan_fw_type, false);
/* It still works if log format file isn't existing. */
__rtw89_fw_recognize(rtwdev, RTW89_FW_LOGFMT, true);
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
index 171749f5002d..89c759a2b5f4 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
@@ -2583,6 +2583,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = {
.fw_def = {
.fw_basename = RTW8851B_FW_BASENAME,
.fw_format_max = RTW8851B_FW_FORMAT_MAX,
+ .fw_b_aid = 0,
},
.try_ce_fw = true,
.bbmcu_nr = 0,
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index 36d66f4e2dd0..32644c40ae28 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -2268,6 +2268,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
.fw_def = {
.fw_basename = RTW8852A_FW_BASENAME,
.fw_format_max = RTW8852A_FW_FORMAT_MAX,
+ .fw_b_aid = 0,
},
.try_ce_fw = false,
.bbmcu_nr = 0,
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index 602432c47ea3..c2e14a9dfc73 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -914,6 +914,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = {
.fw_def = {
.fw_basename = RTW8852B_FW_BASENAME,
.fw_format_max = RTW8852B_FW_FORMAT_MAX,
+ .fw_b_aid = 0,
},
.try_ce_fw = true,
.bbmcu_nr = 0,
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
index 514861e48c25..0acdf64395f0 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
@@ -760,6 +760,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = {
.fw_def = {
.fw_basename = RTW8852BT_FW_BASENAME,
.fw_format_max = RTW8852BT_FW_FORMAT_MAX,
+ .fw_b_aid = 0,
},
.try_ce_fw = true,
.bbmcu_nr = 0,
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index 70ca8c3950d9..9f0dd6a3956f 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -3109,6 +3109,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = {
.fw_def = {
.fw_basename = RTW8852C_FW_BASENAME,
.fw_format_max = RTW8852C_FW_FORMAT_MAX,
+ .fw_b_aid = 0,
},
.try_ce_fw = false,
.bbmcu_nr = 0,
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922a.c b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
index fd1b171b106c..1c9db283cff9 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8922a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
@@ -2919,6 +2919,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = {
.fw_def = {
.fw_basename = RTW8922A_FW_BASENAME,
.fw_format_max = RTW8922A_FW_FORMAT_MAX,
+ .fw_b_aid = 0,
},
.try_ce_fw = false,
.bbmcu_nr = 1,
--
2.25.1
^ permalink raw reply related
* [PATCH rtw-next 03/12] wifi: rtw89: add general way to generate module firmware string
From: Ping-Ke Shih @ 2026-02-13 6:15 UTC (permalink / raw)
To: linux-wireless; +Cc: damon.chen, kevin_yang
In-Reply-To: <20260213061552.29997-1-pkshih@realtek.com>
From: Zong-Zhe Yang <kevin_yang@realtek.com>
Module firmware string depends on max format of the firmware. When max
format is 0, the module firmware string will be like XYZ.bin. However,
when max format N > 0, the module firmware string will become XYZ-N.bin.
Originally, when one chip updated its max firmware format from 0 to 1,
the module firmware string also needed to be changed. However, did not
need to do for other cases, e.g. from 1 to 2. It's a bit inconvenient
to always remember that from 0 to 1 is a special case.
So, add a general macro to generate the corresponding module firmware
string based on max firmware format.
Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
drivers/net/wireless/realtek/rtw89/core.h | 9 +++++++++
drivers/net/wireless/realtek/rtw89/rtw8851b.c | 2 +-
drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 +-
drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2 +-
drivers/net/wireless/realtek/rtw89/rtw8852bt.c | 2 +-
drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 +-
drivers/net/wireless/realtek/rtw89/rtw8922a.c | 2 +-
7 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index d1f58bf953a9..1ad1fd2a1f6f 100644
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -4152,6 +4152,15 @@ struct rtw89_reg_imr {
u32 set;
};
+#define RTW89_MODULE_FWNAME_PLACEHOLDER_0 0,
+#define __RTW89_GEN_MODULE_FWNAME_FMT(placeholder_or_ignored, strfmt) \
+ __take_second_arg(placeholder_or_ignored, strfmt)
+#define RTW89_GEN_MODULE_FWNAME_FMT(maxfmt) \
+ __RTW89_GEN_MODULE_FWNAME_FMT(RTW89_MODULE_FWNAME_PLACEHOLDER_ ## maxfmt, \
+ "-" __stringify(maxfmt))
+#define RTW89_GEN_MODULE_FWNAME(basename, maxformat) \
+ basename RTW89_GEN_MODULE_FWNAME_FMT(maxformat) ".bin"
+
struct rtw89_fw_def {
const char *fw_basename;
u8 fw_format_max;
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
index 89c759a2b5f4..0ea125ef21fa 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
@@ -18,7 +18,7 @@
#define RTW8851B_FW_FORMAT_MAX 0
#define RTW8851B_FW_BASENAME "rtw89/rtw8851b_fw"
#define RTW8851B_MODULE_FIRMWARE \
- RTW8851B_FW_BASENAME ".bin"
+ RTW89_GEN_MODULE_FWNAME(RTW8851B_FW_BASENAME, RTW8851B_FW_FORMAT_MAX)
static const struct rtw89_hfc_ch_cfg rtw8851b_hfc_chcfg_pcie[] = {
{5, 343, grp_0}, /* ACH 0 */
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index 32644c40ae28..0d5ec9755783 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -15,7 +15,7 @@
#define RTW8852A_FW_FORMAT_MAX 0
#define RTW8852A_FW_BASENAME "rtw89/rtw8852a_fw"
#define RTW8852A_MODULE_FIRMWARE \
- RTW8852A_FW_BASENAME ".bin"
+ RTW89_GEN_MODULE_FWNAME(RTW8852A_FW_BASENAME, RTW8852A_FW_FORMAT_MAX)
static const struct rtw89_hfc_ch_cfg rtw8852a_hfc_chcfg_pcie[] = {
{128, 1896, grp_0}, /* ACH 0 */
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index c2e14a9dfc73..b687ddaa839e 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -16,7 +16,7 @@
#define RTW8852B_FW_FORMAT_MAX 1
#define RTW8852B_FW_BASENAME "rtw89/rtw8852b_fw"
#define RTW8852B_MODULE_FIRMWARE \
- RTW8852B_FW_BASENAME "-" __stringify(RTW8852B_FW_FORMAT_MAX) ".bin"
+ RTW89_GEN_MODULE_FWNAME(RTW8852B_FW_BASENAME, RTW8852B_FW_FORMAT_MAX)
static const struct rtw89_hfc_ch_cfg rtw8852b_hfc_chcfg_pcie[] = {
{5, 341, grp_0}, /* ACH 0 */
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
index 0acdf64395f0..c86b995a7cb1 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
@@ -14,7 +14,7 @@
#define RTW8852BT_FW_FORMAT_MAX 0
#define RTW8852BT_FW_BASENAME "rtw89/rtw8852bt_fw"
#define RTW8852BT_MODULE_FIRMWARE \
- RTW8852BT_FW_BASENAME ".bin"
+ RTW89_GEN_MODULE_FWNAME(RTW8852BT_FW_BASENAME, RTW8852BT_FW_FORMAT_MAX)
static const struct rtw89_hfc_ch_cfg rtw8852bt_hfc_chcfg_pcie[] = {
{16, 742, grp_0}, /* ACH 0 */
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index 9f0dd6a3956f..e62a7288c8aa 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -18,7 +18,7 @@
#define RTW8852C_FW_FORMAT_MAX 2
#define RTW8852C_FW_BASENAME "rtw89/rtw8852c_fw"
#define RTW8852C_MODULE_FIRMWARE \
- RTW8852C_FW_BASENAME "-" __stringify(RTW8852C_FW_FORMAT_MAX) ".bin"
+ RTW89_GEN_MODULE_FWNAME(RTW8852C_FW_BASENAME, RTW8852C_FW_FORMAT_MAX)
static const struct rtw89_hfc_ch_cfg rtw8852c_hfc_chcfg_pcie[] = {
{13, 1614, grp_0}, /* ACH 0 */
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922a.c b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
index 1c9db283cff9..36ef36110602 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8922a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
@@ -18,7 +18,7 @@
#define RTW8922A_FW_FORMAT_MAX 4
#define RTW8922A_FW_BASENAME "rtw89/rtw8922a_fw"
#define RTW8922A_MODULE_FIRMWARE \
- RTW8922A_FW_BASENAME "-" __stringify(RTW8922A_FW_FORMAT_MAX) ".bin"
+ RTW89_GEN_MODULE_FWNAME(RTW8922A_FW_BASENAME, RTW8922A_FW_FORMAT_MAX)
#define HE_N_USER_MAX_8922A 4
--
2.25.1
^ permalink raw reply related
* [PATCH rtw-next 04/12] wifi: rtw89: 8852b: update supported firmware format to 2
From: Ping-Ke Shih @ 2026-02-13 6:15 UTC (permalink / raw)
To: linux-wireless; +Cc: damon.chen, kevin_yang
In-Reply-To: <20260213061552.29997-1-pkshih@realtek.com>
After firmware version 0.29.29.15, more data are included in firmware
file. Increase format to 2 to prevent old driver failed to load the new
firmware.
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index b687ddaa839e..f4fb5f76298c 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -13,7 +13,7 @@
#include "rtw8852b_table.h"
#include "txrx.h"
-#define RTW8852B_FW_FORMAT_MAX 1
+#define RTW8852B_FW_FORMAT_MAX 2
#define RTW8852B_FW_BASENAME "rtw89/rtw8852b_fw"
#define RTW8852B_MODULE_FIRMWARE \
RTW89_GEN_MODULE_FWNAME(RTW8852B_FW_BASENAME, RTW8852B_FW_FORMAT_MAX)
--
2.25.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox