ath11k: add 6 GHz params in peer assoc command

Currently A-MPDU aggregation parameters are not being configured
during peer association for 6 GHz band. Hence, extract these
parameters from station's capabilities received in association
request and send to firmware. Without this, A-MPDU aggregation
is not happening in 6 GHz band.

Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.4.0.1-01386-QCAHKSWPL_SILICONZ-1

Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210913175510.193005-2-jouni@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 3bb7135..a59c418 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -2016,6 +2016,53 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar,
                   arg->peer_bw_rxnss_override);
 }
 
+static void ath11k_peer_assoc_h_he_6ghz(struct ath11k *ar,
+                                       struct ieee80211_vif *vif,
+                                       struct ieee80211_sta *sta,
+                                       struct peer_assoc_params *arg)
+{
+       const struct ieee80211_sta_he_cap *he_cap = &sta->he_cap;
+       struct cfg80211_chan_def def;
+       enum nl80211_band band;
+       u8  ampdu_factor;
+
+       if (WARN_ON(ath11k_mac_vif_chan(vif, &def)))
+               return;
+
+       band = def.chan->band;
+
+       if (!arg->he_flag || band != NL80211_BAND_6GHZ || !sta->he_6ghz_capa.capa)
+               return;
+
+       if (sta->bandwidth == IEEE80211_STA_RX_BW_80)
+               arg->bw_80 = true;
+
+       if (sta->bandwidth == IEEE80211_STA_RX_BW_160)
+               arg->bw_160 = true;
+
+       arg->peer_he_caps_6ghz = le16_to_cpu(sta->he_6ghz_capa.capa);
+       arg->peer_mpdu_density =
+               ath11k_parse_mpdudensity(FIELD_GET(IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START,
+                                                  arg->peer_he_caps_6ghz));
+
+       /* From IEEE Std 802.11ax-2021 - Section 10.12.2: An HE STA shall be capable of
+        * receiving A-MPDU where the A-MPDU pre-EOF padding length is up to the value
+        * indicated by the Maximum A-MPDU Length Exponent Extension field in the HE
+        * Capabilities element and the Maximum A-MPDU Length Exponent field in HE 6 GHz
+        * Band Capabilities element in the 6 GHz band.
+        *
+        * Here, we are extracting the Max A-MPDU Exponent Extension from HE caps and
+        * factor is the Maximum A-MPDU Length Exponent from HE 6 GHZ Band capability.
+        */
+       ampdu_factor = FIELD_GET(IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK,
+                                he_cap->he_cap_elem.mac_cap_info[3]) +
+                       FIELD_GET(IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP,
+                                 arg->peer_he_caps_6ghz);
+
+       arg->peer_max_mpdu = (1u << (IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR +
+                                    ampdu_factor)) - 1;
+}
+
 static void ath11k_peer_assoc_h_smps(struct ieee80211_sta *sta,
                                     struct peer_assoc_params *arg)
 {
@@ -2305,6 +2352,7 @@ static void ath11k_peer_assoc_prepare(struct ath11k *ar,
        ath11k_peer_assoc_h_ht(ar, vif, sta, arg);
        ath11k_peer_assoc_h_vht(ar, vif, sta, arg);
        ath11k_peer_assoc_h_he(ar, vif, sta, arg);
+       ath11k_peer_assoc_h_he_6ghz(ar, vif, sta, arg);
        ath11k_peer_assoc_h_qos(ar, vif, sta, arg);
        ath11k_peer_assoc_h_smps(sta, arg);
 
@@ -7598,7 +7646,7 @@ static int __ath11k_mac_register(struct ath11k *ar)
        if (cap->nss_ratio_enabled)
                ieee80211_hw_set(ar->hw, SUPPORTS_VHT_EXT_NSS_BW);
 
-       if (ht_cap & WMI_HT_CAP_ENABLED) {
+       if ((ht_cap & WMI_HT_CAP_ENABLED) || ar->supports_6ghz) {
                ieee80211_hw_set(ar->hw, AMPDU_AGGREGATION);
                ieee80211_hw_set(ar->hw, TX_AMPDU_SETUP_IN_HW);
                ieee80211_hw_set(ar->hw, SUPPORTS_REORDERING_BUFFER);