wifi: ath12k: Add EHT fixed GI/LTF

Add EHT functionality to set fixed GI/LTF parameters.
Add new wmi vdev parameter id for EHT LTF

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1

Signed-off-by: Muna Sinada <muna.sinada@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20251024001928.257356-5-muna.sinada@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index f1b5755bb85e15e550cf46522a955b19c5f8ef82..ca06807c4e0fc609e2f08f7fca8f6f126f84e8b2 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -12305,10 +12305,11 @@ ath12k_mac_get_single_legacy_rate(struct ath12k *ar,
 }
 
 static int
-ath12k_mac_set_fixed_rate_gi_ltf(struct ath12k_link_vif *arvif, u8 gi, u8 ltf)
+ath12k_mac_set_fixed_rate_gi_ltf(struct ath12k_link_vif *arvif, u8 gi, u8 ltf,
+                                u32 param)
 {
        struct ath12k *ar = arvif->ar;
-       int param, ret;
+       int ret;
 
        lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
 
@@ -12323,11 +12324,16 @@ ath12k_mac_set_fixed_rate_gi_ltf(struct ath12k_link_vif *arvif, u8 gi, u8 ltf)
                            gi, ret);
                return ret;
        }
-       /* start from 1 */
-       if (ltf != 0xFF)
-               ltf += 1;
 
-       param = WMI_VDEV_PARAM_HE_LTF;
+       if (param == WMI_VDEV_PARAM_HE_LTF) {
+               /* HE values start from 1 */
+               if (ltf != 0xFF)
+                       ltf += 1;
+       } else {
+               /* EHT values start from 5 */
+               if (ltf != 0xFF)
+                       ltf += 4;
+       }
 
        ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id,
                                            param, ltf);
@@ -12410,6 +12416,7 @@ static u32 ath12k_mac_nlgi_to_wmigi(enum nl80211_txrate_gi gi)
 static int ath12k_mac_set_rate_params(struct ath12k_link_vif *arvif,
                                      u32 rate, u8 nss, u8 sgi, u8 ldpc,
                                      u8 he_gi, u8 he_ltf, bool he_fixed_rate,
+                                     u8 eht_gi, u8 eht_ltf,
                                      bool eht_fixed_rate)
 {
        struct ieee80211_bss_conf *link_conf;
@@ -12436,8 +12443,9 @@ static int ath12k_mac_set_rate_params(struct ath12k_link_vif *arvif,
                   "he_gi 0x%02x he_ltf 0x%02x he_fixed_rate %d\n", he_gi,
                   he_ltf, he_fixed_rate);
 
-       ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "eht_fixed_rate %d\n",
-                  eht_fixed_rate);
+       ath12k_dbg(ar->ab, ATH12K_DBG_MAC,
+                  "eht_gi 0x%02x eht_ltf 0x%02x eht_fixed_rate %d\n",
+                  eht_gi, eht_ltf, eht_fixed_rate);
 
        if (!he_support && !eht_support) {
                vdev_param = WMI_VDEV_PARAM_FIXED_RATE;
@@ -12468,9 +12476,26 @@ static int ath12k_mac_set_rate_params(struct ath12k_link_vif *arvif,
                return ret;
        }
 
+       if (eht_support) {
+               if (eht_fixed_rate)
+                       ret = ath12k_mac_set_fixed_rate_gi_ltf(arvif, eht_gi, eht_ltf,
+                                                              WMI_VDEV_PARAM_EHT_LTF);
+               else
+                       ret = ath12k_mac_set_auto_rate_gi_ltf(arvif, eht_gi, eht_ltf);
+
+               if (ret) {
+                       ath12k_warn(ar->ab,
+                                   "failed to set EHT LTF/GI params %d/%d: %d\n",
+                                   eht_gi, eht_ltf, ret);
+                       return ret;
+               }
+               gi_ltf_set = true;
+       }
+
        if (he_support) {
                if (he_fixed_rate)
-                       ret = ath12k_mac_set_fixed_rate_gi_ltf(arvif, he_gi, he_ltf);
+                       ret = ath12k_mac_set_fixed_rate_gi_ltf(arvif, he_gi, he_ltf,
+                                                              WMI_VDEV_PARAM_HE_LTF);
                else
                        ret = ath12k_mac_set_auto_rate_gi_ltf(arvif, he_gi, he_ltf);
                if (ret)
@@ -12672,6 +12697,7 @@ ath12k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,
        const u16 *he_mcs_mask;
        u8 he_ltf = 0;
        u8 he_gi = 0;
+       u8 eht_ltf = 0, eht_gi = 0;
        u32 rate;
        u8 nss, mac_nss;
        u8 sgi;
@@ -12707,6 +12733,9 @@ ath12k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,
        he_gi = mask->control[band].he_gi;
        he_ltf = mask->control[band].he_ltf;
 
+       eht_gi = mask->control[band].eht_gi;
+       eht_ltf = mask->control[band].eht_ltf;
+
        /* mac80211 doesn't support sending a fixed HT/VHT MCS alone, rather it
         * requires passing at least one of used basic rates along with them.
         * Fixed rate setting across different preambles(legacy, HT, VHT) is
@@ -12805,7 +12834,8 @@ ath12k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,
        }
 
        ret = ath12k_mac_set_rate_params(arvif, rate, nss, sgi, ldpc, he_gi,
-                                        he_ltf, he_fixed_rate, eht_fixed_rate);
+                                        he_ltf, he_fixed_rate, eht_gi, eht_ltf,
+                                        eht_fixed_rate);
        if (ret) {
                ath12k_warn(ar->ab, "failed to set rate params on vdev %i: %d\n",
                            arvif->vdev_id, ret);

diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h
index 467fc32feee2365eb0cc3b21d1b9e8025c7e5581..f99fced1610e63e9ec668527c0ea9950eebb175a 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.h
+++ b/drivers/net/wireless/ath/ath12k/wmi.h
@@ -1197,6 +1197,7 @@ enum wmi_tlv_vdev_param {
        WMI_VDEV_PARAM_SET_HEMU_MODE,
        WMI_VDEV_PARAM_HEOPS_0_31 = 0x8003,
        WMI_VDEV_PARAM_SET_EHT_MU_MODE = 0x8005,
+       WMI_VDEV_PARAM_EHT_LTF,
 };
 
 enum wmi_tlv_peer_flags {