wifi: ath11k: fix VHT MCS assignment

While associating, firmware needs to know peer's receive capability to
calculate its own VHT transmit MCS, currently host sends this information
to firmware via mcs->rx_mcs_set field, this is wrong as firmware actually
takes it from mcs->tx_mcs_set field. Till now there is no failure seen
due to this, most likely because almost all peers are advertising the
same capability for both transmit and receive. Swap the assignment to
fix it.

Besides, rate control mask is meant to limit our own transmit MCS, hence
need to go via mcs->tx_mcs_set field. With the aforementioned swapping
done, change is needed as well to apply it to the peer's receive
capability rather than transmit capability.

Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.41
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1

Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
Signed-off-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20251017-ath11k-mcs-assignment-v1-1-da40825c1783@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 106e2530b64e97a70ae8d4897b39e36edf597cc8..367ca0c90167b8e3ba03f60e65965936391085d2 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -2235,9 +2235,9 @@ static void ath11k_peer_assoc_h_vht(struct ath11k *ar,
        arg->peer_nss = min(sta->deflink.rx_nss, max_nss);
        arg->rx_max_rate = __le16_to_cpu(vht_cap->vht_mcs.rx_highest);
        arg->rx_mcs_set = __le16_to_cpu(vht_cap->vht_mcs.rx_mcs_map);
+       arg->rx_mcs_set = ath11k_peer_assoc_h_vht_limit(arg->rx_mcs_set, vht_mcs_mask);
        arg->tx_max_rate = __le16_to_cpu(vht_cap->vht_mcs.tx_highest);
-       arg->tx_mcs_set = ath11k_peer_assoc_h_vht_limit(
-               __le16_to_cpu(vht_cap->vht_mcs.tx_mcs_map), vht_mcs_mask);
+       arg->tx_mcs_set = __le16_to_cpu(vht_cap->vht_mcs.tx_mcs_map);
 
        /* In IPQ8074 platform, VHT mcs rate 10 and 11 is enabled by default.
         * VHT mcs rate 10 and 11 is not supported in 11ac standard.

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 0491e3fd6b5e16d464bd3e3c3933b9102641204b..942dfeb8b1af8553d1c872ac1444bfacf11f44cd 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 /*
  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
  */
 #include <linux/skbuff.h>
 #include <linux/ctype.h>
@@ -2061,10 +2061,13 @@ int ath11k_wmi_send_peer_assoc_cmd(struct ath11k *ar,
        cmd->peer_bw_rxnss_override |= param->peer_bw_rxnss_override;
 
        if (param->vht_capable) {
-               mcs->rx_max_rate = param->rx_max_rate;
-               mcs->rx_mcs_set = param->rx_mcs_set;
-               mcs->tx_max_rate = param->tx_max_rate;
-               mcs->tx_mcs_set = param->tx_mcs_set;
+               /* firmware interprets mcs->tx_mcs_set field as peer's
+                * RX capability
+                */
+               mcs->tx_max_rate = param->rx_max_rate;
+               mcs->tx_mcs_set = param->rx_mcs_set;
+               mcs->rx_max_rate = param->tx_max_rate;
+               mcs->rx_mcs_set = param->tx_mcs_set;
        }
 
        /* HE Rates */

diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index 3c4885a12855ba87dd815b44c71d619612596d5e..0f0de24a384089c1d36722a115aa007c042916c2 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -4119,8 +4119,10 @@ struct wmi_rate_set {
 struct wmi_vht_rate_set {
        u32 tlv_header;
        u32 rx_max_rate;
+       /* MCS at which the peer can transmit */
        u32 rx_mcs_set;
        u32 tx_max_rate;
+       /* MCS at which the peer can receive */
        u32 tx_mcs_set;
        u32 tx_max_mcs_nss;
 } __packed;