| Message ID | 20240325212304.28241-5-quic_pradeepc@quicinc.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | bug fixes and enhancements to 6 GHz band support | expand |
On 3/25/2024 2:23 PM, Pradeep Kumar Chitrapu wrote: > 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: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 > > Co-developed-by: Avula Sri Charan <quic_asrichar@quicinc.com> > Signed-off-by: Avula Sri Charan <quic_asrichar@quicinc.com> > Signed-off-by: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> > --- > drivers/net/wireless/ath/ath12k/mac.c | 56 ++++++++++++++++++++++++++- > 1 file changed, 55 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c > index 6d7df18ec424..7e296140439a 100644 > --- a/drivers/net/wireless/ath/ath12k/mac.c > +++ b/drivers/net/wireless/ath/ath12k/mac.c > @@ -1910,6 +1910,59 @@ static void ath12k_peer_assoc_h_he(struct ath12k *ar, > } > } > > +static void ath12k_peer_assoc_h_he_6ghz(struct ath12k *ar, > + struct ieee80211_vif *vif, > + struct ieee80211_sta *sta, > + struct ath12k_wmi_peer_assoc_arg *arg) > +{ > + const struct ieee80211_sta_he_cap *he_cap = &sta->deflink.he_cap; > + struct cfg80211_chan_def def; > + enum nl80211_band band; > + u8 ampdu_factor; > + > + if (WARN_ON(ath12k_mac_vif_chan(vif, &def))) > + return; > + > + band = def.chan->band; > + > + if (!arg->he_flag || band != NL80211_BAND_6GHZ || !sta->deflink.he_6ghz_capa.capa) > + return; > + > + if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_40) > + arg->bw_40 = true; > + > + if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_80) > + arg->bw_80 = true; > + > + if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_160) > + arg->bw_160 = true; > + > + if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_320) > + arg->bw_320 = true; > + > + arg->peer_he_caps_6ghz = le16_to_cpu(sta->deflink.he_6ghz_capa.capa); > + arg->peer_mpdu_density = > + ath12k_parse_mpdudensity(u32_get_bits(arg->peer_he_caps_6ghz, > + IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START)); ath12k-check complains: drivers/net/wireless/ath/ath12k/mac.c:1946: line length of 93 exceeds 90 columns git blame flags: b2b50e659028d (Pradeep Kumar Chitrapu 2024-03-25 14:23:02 -0700 1946) IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START)); perhaps use a local variable to hold the u32_get_bits() value?
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c index 6d7df18ec424..7e296140439a 100644 --- a/drivers/net/wireless/ath/ath12k/mac.c +++ b/drivers/net/wireless/ath/ath12k/mac.c @@ -1910,6 +1910,59 @@ static void ath12k_peer_assoc_h_he(struct ath12k *ar, } } +static void ath12k_peer_assoc_h_he_6ghz(struct ath12k *ar, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta, + struct ath12k_wmi_peer_assoc_arg *arg) +{ + const struct ieee80211_sta_he_cap *he_cap = &sta->deflink.he_cap; + struct cfg80211_chan_def def; + enum nl80211_band band; + u8 ampdu_factor; + + if (WARN_ON(ath12k_mac_vif_chan(vif, &def))) + return; + + band = def.chan->band; + + if (!arg->he_flag || band != NL80211_BAND_6GHZ || !sta->deflink.he_6ghz_capa.capa) + return; + + if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_40) + arg->bw_40 = true; + + if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_80) + arg->bw_80 = true; + + if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_160) + arg->bw_160 = true; + + if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_320) + arg->bw_320 = true; + + arg->peer_he_caps_6ghz = le16_to_cpu(sta->deflink.he_6ghz_capa.capa); + arg->peer_mpdu_density = + ath12k_parse_mpdudensity(u32_get_bits(arg->peer_he_caps_6ghz, + IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START)); + + /* 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 = u8_get_bits(he_cap->he_cap_elem.mac_cap_info[3], + IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK) + + u32_get_bits(arg->peer_he_caps_6ghz, + IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP); + + arg->peer_max_mpdu = (1u << (IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR + + ampdu_factor)) - 1; +} + static void ath12k_peer_assoc_h_smps(struct ieee80211_sta *sta, struct ath12k_wmi_peer_assoc_arg *arg) { @@ -2382,6 +2435,7 @@ static void ath12k_peer_assoc_prepare(struct ath12k *ar, ath12k_peer_assoc_h_ht(ar, vif, sta, arg); ath12k_peer_assoc_h_vht(ar, vif, sta, arg); ath12k_peer_assoc_h_he(ar, vif, sta, arg); + ath12k_peer_assoc_h_he_6ghz(ar, vif, sta, arg); ath12k_peer_assoc_h_eht(ar, vif, sta, arg); ath12k_peer_assoc_h_qos(ar, vif, sta, arg); ath12k_peer_assoc_h_phymode(ar, vif, sta, arg); @@ -8029,7 +8083,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah) ieee80211_hw_set(hw, SUPPORTS_TX_FRAG); ieee80211_hw_set(hw, REPORTS_LOW_ACK); - if (ht_cap & WMI_HT_CAP_ENABLED) { + if ((ht_cap & WMI_HT_CAP_ENABLED) || ar->supports_6ghz) { ieee80211_hw_set(hw, AMPDU_AGGREGATION); ieee80211_hw_set(hw, TX_AMPDU_SETUP_IN_HW); ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER);