nl80211: add support for setting fixed HE rate/gi/ltf
PATCH v6 1/2 nl80211: add support for setting fixed HE rate/gi/ltf
From: Miles Hu <[email protected]>
This patch adds the nl80211 structs, definitions, policies and parsing code required to pass fixed HE rate, GI and LTF settings.
---
Changes in V6
* use dev and not skb->dev
* remove _WARN from policy
* fix description
Changes in V5
* use ieee80211_get_he_iftype_cap
Changes in V4
* fix sparse warnings
Changes in V3
* minor cleanup based on Johannes's feedback
* properly make use the iftype_data array
Changes in V2
* add more policies
* reoder enums
* remove incorrect he_cap from ieee80211_supported_band
* remove _WARN from policy
include/net/cfg80211.h | 3 + include/uapi/linux/nl80211.h | 28 ++++++++ net/wireless/nl80211.c | 135 +++++++++++++++++++++++++++++++++-- 3 files changed, 159 insertions(+), 7 deletions(-)
include/net/cfg80211.h +3 -0
@@ -678,7 +678,10 @@ struct cfg80211_bitrate_mask {u32 legacy;u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN ];u16 vht_mcs[NL80211_VHT_NSS_MAX ]; +u16 he_mcs[NL80211_HE_NSS_MAX ];enum nl80211_txrate_gi gi; +enum nl80211_he_gi he_gi; +enum nl80211_he_ltf he_ltf; } control[NUM_NL80211_BANDS ]; };
include/uapi/linux/nl80211.h +28 -0
@@ -3186,6 +3186,18 @@ enum nl80211_he_gi { NL80211_RATE_INFO_HE_GI_3_2, }; +/** +* enum nl80211_he_ltf - HE long training field +* @NL80211_RATE_INFO_HE_1xLTF: 3.2 usec +* @NL80211_RATE_INFO_HE_2xLTF: 6.4 usec +* @NL80211_RATE_INFO_HE_4xLTF: 12.8 usec +*/ +enum nl80211_he_ltf { +NL80211_RATE_INFO_HE_1XLTF , +NL80211_RATE_INFO_HE_2XLTF , +NL80211_RATE_INFO_HE_4XLTF , +}; +/** * enum nl80211_he_ru_alloc - HE RU allocation values * @NL80211_RATE_INFO_HE_RU_ALLOC_26: 26-tone RU allocation
@@ -4741,6 +4753,10 @@ enum nl80211_key_attributes {* @NL80211_TXRATE_VHT: VHT rates allowed for TX rate selection, * see &struct nl80211_txrate_vht * @NL80211_TXRATE_GI: configure GI, see &enum nl80211_txrate_gi +* @NL80211_TXRATE_HE: HE rates allowed for TX rate selection, +* see &struct nl80211_txrate_he +* @NL80211_TXRATE_HE_GI: configure HE GI, 0.8us, 1.6us and 3.2us. +* @NL80211_TXRATE_HE_LTF: configure HE LTF, 1XLTF, 2XLTF and 4XLTF. * @__NL80211_TXRATE_AFTER_LAST: internal * @NL80211_TXRATE_MAX: highest TX rate attribute */
@@ -4750,6 +4766,9 @@ enum nl80211_tx_rate_attributes {NL80211_TXRATE_HT ,NL80211_TXRATE_VHT ,NL80211_TXRATE_GI , +NL80211_TXRATE_HE , +NL80211_TXRATE_HE_GI , +NL80211_TXRATE_HE_LTF ,/* keep last */ __NL80211_TXRATE_AFTER_LAST,
@@ -4767,6 +4786,15 @@ struct nl80211_txrate_vht {__u16 mcs[NL80211_VHT_NSS_MAX ]; }; +#define NL80211_HE_NSS_MAX 8 +/** +* struct nl80211_txrate_he - HE MCS/NSS txrate bitmap +* @mcs: MCS bitmap table for each NSS (array index 0 for 1 stream, etc.) +*/ +struct nl80211_txrate_he { +__u16 mcs[NL80211_HE_NSS_MAX ]; +}; +enum nl80211_txrate_gi {NL80211_TXRATE_DEFAULT_GI ,NL80211_TXRATE_FORCE_SGI ,
net/wireless/nl80211.c +128 -7
208 lines not on this page · raw message
Signature · 7 lines
2.25.1 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v6 2/2 ath11k: add support for setting fixed HE rate/gi/ltf
From: Miles Hu <[email protected]>
This patch adds ath11k support for setting fixed HE rate/gi/ltf values that we are now able to send to the kernel using nl80211. The added code is reusing parts of the existing code path already used for HT/VHT. The new helpers are symmetric to how we do it for HT/VHT.
---
Changes in V4
* fix sparse warnings
* fix indentation
drivers/net/wireless/ath/ath11k/mac.c | 538 ++++++++++++++++++++++++-- drivers/net/wireless/ath/ath11k/wmi.h | 18 + 2 files changed, 520 insertions(+), 36 deletions(-)
drivers/net/wireless/ath/ath11k/mac.c +502 -36
@@ -356,6 +356,18 @@ ath11k_mac_max_vht_nss(const u16 vht_mcs_mask[NL80211_VHT_NSS_MAX])return 1 ; } +static u32 +ath11k_mac_max_he_nss (const u16 he_mcs_mask[NL80211_HE_NSS_MAX ]) +{ +int nss; + +for (nss =NL80211_HE_NSS_MAX -1 ; nss >=0 ; nss--) +if (he_mcs_mask[nss]) +return nss +1 ; + +return 1 ; +} +static u8 ath11k_parse_mpdudensity (u8 mpdudensity) {/* 802.11n D2.0 defined values for "Minimum MPDU Start Spacing":
@@ -1054,6 +1066,13 @@ static void ath11k_peer_assoc_h_ht(struct ath11k *ar, arg->bw_40 = true; arg->peer_rate_caps |=WMI_HOST_RC_CW40_FLAG ; } +/* As firmware handles this two flags (IEEE80211_HT_CAP_SGI_20 +* and IEEE80211_HT_CAP_SGI_40) for enabling SGI, we reset +* both flags if guard interval is Default GI +*/ +if (arvif->bitrate_mask.control[band].gi ==NL80211_TXRATE_DEFAULT_GI ) + arg->peer_ht_caps &= ~(IEEE80211_HT_CAP_SGI_20 | +IEEE80211_HT_CAP_SGI_40 );if (arvif->bitrate_mask.control[band].gi !=NL80211_TXRATE_FORCE_LGI ) { if (ht_cap->cap & (IEEE80211_HT_CAP_SGI_20 |
@@ -1262,17 +1281,98 @@ static void ath11k_peer_assoc_h_vht(struct ath11k *ar,/* TODO: rxnss_override */ } +static int ath11k_mac_get_max_he_mcs_map (u16 mcs_map,int nss) +{ +switch ((mcs_map >> (2 * nss)) &0x3 ) { +case IEEE80211_HE_MCS_SUPPORT_0_7 :return BIT (8 ) -1 ; +case IEEE80211_HE_MCS_SUPPORT_0_9 :return BIT (10 ) -1 ; +case IEEE80211_HE_MCS_SUPPORT_0_11 :return BIT (12 ) -1 ; + } +return 0 ; +} + +static u16 ath11k_peer_assoc_h_he_limit (u16 tx_mcs_set, +const u16 he_mcs_limit[NL80211_HE_NSS_MAX ]) +{ +int idx_limit; +int nss; +u16 mcs_map; +u16 mcs; + +for (nss =0 ; nss <NL80211_HE_NSS_MAX ; nss++) { + mcs_map =ath11k_mac_get_max_he_mcs_map (tx_mcs_set, nss) & + he_mcs_limit[nss]; + +if (mcs_map) + idx_limit =fls (mcs_map) -1 ; +else + idx_limit =-1 ; + +switch (idx_limit) { + case 0 ... 7: + mcs =IEEE80211_HE_MCS_SUPPORT_0_7 ; +break ; +case 8 : +case 9 : + mcs =IEEE80211_HE_MCS_SUPPORT_0_9 ; +break ; +case 10 : +case 11 : + mcs =IEEE80211_HE_MCS_SUPPORT_0_11 ; +break ; +default : +WARN_ON (1 ); +/* fall through */ +case -1 : + mcs =IEEE80211_HE_MCS_NOT_SUPPORTED ; +break ; + } + + tx_mcs_set &= ~(0x3 << (nss *2 )); + tx_mcs_set |= mcs << (nss *2 ); + } + +return tx_mcs_set; +} + +static bool +ath11k_peer_assoc_h_he_masked (const u16 he_mcs_mask[NL80211_HE_NSS_MAX ]) +{ +int nss; + +for (nss =0 ; nss <NL80211_HE_NSS_MAX ; nss++) +if (he_mcs_mask[nss]) +return false; + +return true; +} +static void ath11k_peer_assoc_h_he (struct ath11k *ar,struct ieee80211_vif *vif,struct ieee80211_sta *sta,struct peer_assoc_params *arg) { +struct ath11k_vif *arvif = (void *)vif->drv_priv; +struct cfg80211_chan_def def;const struct ieee80211_sta_he_cap *he_cap = &sta->he_cap; -u16 v; +enum nl80211_band band; +const u16 *he_mcs_mask; +u8 max_nss, he_mcs; +u16 he_tx_mcs =0 , v =0 ; +int i; + +if (WARN_ON (ath11k_mac_vif_chan (vif, &def))) +return ;if (!he_cap->has_he)return ; + band = def.chan->band; + he_mcs_mask = arvif->bitrate_mask.control[band].he_mcs; + +if (ath11k_peer_assoc_h_he_masked (he_mcs_mask)) +return ; + arg->he_flag = true; memcpy(&arg->peer_he_cap_macinfo, he_cap->he_cap_elem.mac_cap_info,
@@ -1328,17 +1428,22 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar, arg->peer_he_rx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80_80 ] = v; v =le16_to_cpu (he_cap->he_mcs_nss_supp.tx_mcs_80p80); + v =ath11k_peer_assoc_h_he_limit (v, he_mcs_mask); arg->peer_he_tx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80_80 ] = v; arg->peer_he_mcs_count++; + he_tx_mcs = v; } v =le16_to_cpu (he_cap->he_mcs_nss_supp.rx_mcs_160); arg->peer_he_rx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_160 ] = v; v =le16_to_cpu (he_cap->he_mcs_nss_supp.tx_mcs_160); + v =ath11k_peer_assoc_h_he_limit (v, he_mcs_mask); arg->peer_he_tx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_160 ] = v; arg->peer_he_mcs_count++; +if (!he_tx_mcs) + he_tx_mcs = v;/* fall through */ default :
@@ -1346,11 +1451,33 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar, arg->peer_he_rx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80 ] = v; v =le16_to_cpu (he_cap->he_mcs_nss_supp.tx_mcs_80); + v =ath11k_peer_assoc_h_he_limit (v, he_mcs_mask); arg->peer_he_tx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80 ] = v; arg->peer_he_mcs_count++; +if (!he_tx_mcs) + he_tx_mcs = v;break ; } +/* Calculate peer NSS capability from HE capabilities if STA +* supports HE. +*/ +for (i =0 , max_nss =0 , he_mcs =0 ; i <NL80211_HE_NSS_MAX ; i++) { + he_mcs = he_tx_mcs >> (2 * i) &3 ; + +/* In case of fixed rates, MCS Range in he_tx_mcs might have +* unsupported range, with he_mcs_mask set, so check either of them +* to find nss. +*/ +if (he_mcs !=IEEE80211_HE_MCS_NOT_SUPPORTED || + he_mcs_mask[i]) + max_nss = i +1 ; + } + arg->peer_nss =min (sta->rx_nss, max_nss); + +ath11k_dbg (ar->ab,ATH11K_DBG_MAC , +"mac he peer %pM nss %d mcs cnt %d\n" , + sta->addr, arg->peer_nss, arg->peer_he_mcs_count); } static void ath11k_peer_assoc_h_smps(struct ieee80211_sta *sta,
@@ -1553,6 +1680,7 @@ static void ath11k_peer_assoc_h_phymode(struct ath11k *ar,enum nl80211_band band;const u8 *ht_mcs_mask;const u16 *vht_mcs_mask; +const u16 *he_mcs_mask;enum wmi_phy_mode phymode =MODE_UNKNOWN ;if (WARN_ON (ath11k_mac_vif_chan (vif, &def)))
@@ -1561,10 +1689,12 @@ static void ath11k_peer_assoc_h_phymode(struct ath11k *ar, band = def.chan->band; ht_mcs_mask = arvif->bitrate_mask.control[band].ht_mcs; vht_mcs_mask = arvif->bitrate_mask.control[band].vht_mcs; + he_mcs_mask = arvif->bitrate_mask.control[band].he_mcs;switch (band) {case NL80211_BAND_2GHZ : -if (sta->he_cap.has_he) { +if (sta->he_cap.has_he && + !ath11k_peer_assoc_h_he_masked (he_mcs_mask)) {if (sta->bandwidth ==IEEE80211_STA_RX_BW_80 ) phymode =MODE_11AX_HE80_2G ;else if (sta->bandwidth ==IEEE80211_STA_RX_BW_40 )
@@ -1592,7 +1722,8 @@ static void ath11k_peer_assoc_h_phymode(struct ath11k *ar,case NL80211_BAND_5GHZ :case NL80211_BAND_6GHZ :/* Check HE first */ -if (sta->he_cap.has_he) { +if (sta->he_cap.has_he && + !ath11k_peer_assoc_h_he_masked (he_mcs_mask)) { phymode =ath11k_mac_get_phymode_he (ar, sta); }else if (sta->vht_cap.vht_supported && !ath11k_peer_assoc_h_vht_masked (vht_mcs_mask)) {
@@ -2590,6 +2721,20 @@ ath11k_mac_bitrate_mask_num_vht_rates(struct ath11k *ar,return num_rates; } +static int +ath11k_mac_bitrate_mask_num_he_rates (struct ath11k *ar, +enum nl80211_band band, +const struct cfg80211_bitrate_mask *mask) +{ +int num_rates =0 ; +int i; + +for (i =0 ; i <ARRAY_SIZE (mask->control[band].he_mcs); i++) + num_rates +=hweight16 (mask->control[band].he_mcs[i]); + +return num_rates; +} + static int ath11k_mac_set_peer_vht_fixed_rate(struct ath11k_vif *arvif, struct ieee80211_sta *sta,
@@ -2618,6 +2763,10 @@ ath11k_mac_set_peer_vht_fixed_rate(struct ath11k_vif *arvif,return -EINVAL ; } +/* Avoid updating invalid nss as fixed rate*/ +if (nss > sta->rx_nss) +return -EINVAL ; +ath11k_dbg (ar->ab,ATH11K_DBG_MAC ,"Setting Fixed VHT Rate for peer %pM. Device will not switch to any other selected rates" , sta->addr);
@@ -2636,6 +2785,56 @@ ath11k_mac_set_peer_vht_fixed_rate(struct ath11k_vif *arvif,return ret; } +static int +ath11k_mac_set_peer_he_fixed_rate (struct ath11k_vif *arvif, +struct ieee80211_sta *sta, +const struct cfg80211_bitrate_mask *mask, +enum nl80211_band band) +{ +struct ath11k *ar = arvif->ar; +u8 he_rate, nss; +u32 rate_code; +int ret, i; + +lockdep_assert_held (&ar->conf_mutex); + + nss =0 ; + +for (i =0 ; i <ARRAY_SIZE (mask->control[band].he_mcs); i++) { +if (hweight16 (mask->control[band].he_mcs[i]) ==1 ) { + nss = i +1 ; + he_rate =ffs (mask->control[band].he_mcs[i]) -1 ; + } + } + +if (!nss) { +ath11k_warn (ar->ab,"No single HE Fixed rate found to set for %pM" , + sta->addr); +return -EINVAL ; + } + +/* Avoid updating invalid nss as fixed rate*/ +if (nss > sta->rx_nss) +return -EINVAL ; + +ath11k_dbg (ar->ab,ATH11K_DBG_MAC , +"Setting Fixed HE Rate for peer %pM. Device will not switch to any other selected rates" , + sta->addr); + + rate_code =ATH11K_HW_RATE_CODE (he_rate, nss -1 , +WMI_RATE_PREAMBLE_HE ); + ret =ath11k_wmi_set_peer_param (ar, sta->addr, + arvif->vdev_id, +WMI_PEER_PARAM_FIXED_RATE , + rate_code); +if (ret) +ath11k_warn (ar->ab, +"failed to update STA %pM Fixed Rate %d: %d\n" , + sta->addr, rate_code, ret); + +return ret; +} + static int ath11k_station_assoc(struct ath11k *ar, struct ieee80211_vif *vif, struct ieee80211_sta *sta,
@@ -2647,7 +2846,7 @@ static int ath11k_station_assoc(struct ath11k *ar,struct cfg80211_chan_def def;enum nl80211_band band;struct cfg80211_bitrate_mask *mask; -u8 num_vht_rates; +u8 num_vht_rates, num_he_rates;lockdep_assert_held (&ar->conf_mutex);
@@ -2673,9 +2872,10 @@ static int ath11k_station_assoc(struct ath11k *ar, } num_vht_rates =ath11k_mac_bitrate_mask_num_vht_rates (ar, band, mask); + num_he_rates =ath11k_mac_bitrate_mask_num_he_rates (ar, band, mask); -/* If single VHT rate is configured (by set_bitrate_mask()), -* peer_assoc will disable VHT. This is now enabled by a peer specific +/* If single VHT/HE rate is configured (by set_bitrate_mask()), +* peer_assoc will disable VHT/HE. This is now enabled by a peer specific * fixed param. * Note that all other rates and NSS will be disabled for this peer. */
@@ -2684,6 +2884,11 @@ static int ath11k_station_assoc(struct ath11k *ar, band);if (ret)return ret; + }else if (sta->he_cap.has_he && num_he_rates ==1 ) { + ret =ath11k_mac_set_peer_he_fixed_rate (arvif, sta, mask, + band); +if (ret) +return ret; }/* Re-assoc is run only to update supported rates for given station. It
@@ -2754,8 +2959,9 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk)enum nl80211_band band;const u8 *ht_mcs_mask;const u16 *vht_mcs_mask; +const u16 *he_mcs_mask;u32 changed, bw, nss, smps; -int err, num_vht_rates; +int err, num_vht_rates, num_he_rates;const struct cfg80211_bitrate_mask *mask;struct peer_assoc_params peer_arg;
@@ -2770,6 +2976,7 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk) band = def.chan->band; ht_mcs_mask = arvif->bitrate_mask.control[band].ht_mcs; vht_mcs_mask = arvif->bitrate_mask.control[band].vht_mcs; + he_mcs_mask = arvif->bitrate_mask.control[band].he_mcs;spin_lock_bh (&ar->data_lock);
@@ -2785,8 +2992,9 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk)mutex_lock (&ar->conf_mutex); nss =max_t (u32,1 , nss); - nss =min (nss,max (ath11k_mac_max_ht_nss (ht_mcs_mask), -ath11k_mac_max_vht_nss (vht_mcs_mask))); + nss =min (nss,max (max (ath11k_mac_max_ht_nss (ht_mcs_mask), +ath11k_mac_max_vht_nss (vht_mcs_mask)), +ath11k_mac_max_he_nss (he_mcs_mask)));if (changed &IEEE80211_RC_BW_CHANGED ) { err = ath11k_wmi_set_peer_param(ar, sta->addr, arvif->vdev_id,
@@ -2822,6 +3030,8 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk) mask = &arvif->bitrate_mask; num_vht_rates =ath11k_mac_bitrate_mask_num_vht_rates (ar, band, mask); + num_he_rates =ath11k_mac_bitrate_mask_num_he_rates (ar, band, + mask);/* Peer_assoc_prepare will reject vht rates in * bitrate_mask if its not available in range format and
@@ -2837,11 +3047,25 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk)if (sta->vht_cap.vht_supported && num_vht_rates ==1 ) {ath11k_mac_set_peer_vht_fixed_rate (arvif, sta, mask, band); + }else if (sta->he_cap.has_he && num_he_rates ==1 ) { +ath11k_mac_set_peer_he_fixed_rate (arvif, sta, mask, + band); }else { -/* If the peer is non-VHT or no fixed VHT rate +/* If the peer is non-VHT/HE or no fixed VHT/HE rate * is provided in the new bitrate mask we set the -* other rates using peer_assoc command. +* other rates using peer_assoc command. Also clear +* the peer fixed rate settings as it has higher proprity +* than peer assoc */ + err =ath11k_wmi_set_peer_param (ar, sta->addr, + arvif->vdev_id, +WMI_PEER_PARAM_FIXED_RATE , +WMI_FIXED_RATE_NONE ); +if (err) +ath11k_warn (ar->ab, +"failed to disable peer fixed rate for STA %pM ret %d\n" , + sta->addr, err); +ath11k_peer_assoc_prepare (ar, arvif->vif, sta, &peer_arg, true);
@@ -4350,10 +4574,13 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,for (i =0 ; i <ARRAY_SIZE (arvif->bitrate_mask.control); i++) { arvif->bitrate_mask.control[i].legacy =0xffffffff ; + arvif->bitrate_mask.control[i].gi =NL80211_TXRATE_FORCE_SGI ;memset (arvif->bitrate_mask.control[i].ht_mcs,0xff ,sizeof (arvif->bitrate_mask.control[i].ht_mcs));memset (arvif->bitrate_mask.control[i].vht_mcs,0xff ,sizeof (arvif->bitrate_mask.control[i].vht_mcs)); +memset (arvif->bitrate_mask.control[i].he_mcs,0xff , +sizeof (arvif->bitrate_mask.control[i].he_mcs)); } bit =__ffs64 (ab->free_vdev_map);
@@ -5302,9 +5529,26 @@ ath11k_mac_has_single_legacy_rate(struct ath11k *ar,if (ath11k_mac_bitrate_mask_num_vht_rates (ar, band, mask))return false; +if (ath11k_mac_bitrate_mask_num_he_rates (ar, band, mask)) +return false; +return num_rates ==1 ; } +static __le16 +ath11k_mac_get_tx_mcs_map (const struct ieee80211_sta_he_cap *he_cap) +{ +if (he_cap->he_cap_elem.phy_cap_info[0 ] & +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G ) +return he_cap->he_mcs_nss_supp.tx_mcs_80p80; + +if (he_cap->he_cap_elem.phy_cap_info[0 ] & +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G ) +return he_cap->he_mcs_nss_supp.tx_mcs_160; + +return he_cap->he_mcs_nss_supp.tx_mcs_80; +} + static bool ath11k_mac_bitrate_mask_get_single_nss(struct ath11k *ar, enum nl80211_band band,
@@ -5313,8 +5557,10 @@ ath11k_mac_bitrate_mask_get_single_nss(struct ath11k *ar, {struct ieee80211_supported_band *sband = &ar->mac.sbands[band];u16 vht_mcs_map =le16_to_cpu (sband->vht_cap.vht_mcs.tx_mcs_map); +u16 he_mcs_map =0 ;u8 ht_nss_mask =0 ;u8 vht_nss_mask =0 ; +u8 he_nss_mask =0 ;int i;/* No need to consider legacy here. Basic rates are always present
@@ -5341,7 +5587,19 @@ ath11k_mac_bitrate_mask_get_single_nss(struct ath11k *ar,return false; } -if (ht_nss_mask != vht_nss_mask) + he_mcs_map =le16_to_cpu (ath11k_mac_get_tx_mcs_map (&sband->iftype_data->he_cap)); + +for (i =0 ; i <ARRAY_SIZE (mask->control[band].he_mcs); i++) { +if (mask->control[band].he_mcs[i] ==0 ) +continue ; +else if (mask->control[band].he_mcs[i] == +ath11k_mac_get_max_he_mcs_map (he_mcs_map, i)) + he_nss_mask |=BIT (i); +else +return false; + } + +if (ht_nss_mask != vht_nss_mask || ht_nss_mask != he_nss_mask)return false;if (ht_nss_mask ==0 )
@@ -5388,42 +5646,125 @@ ath11k_mac_get_single_legacy_rate(struct ath11k *ar,return 0 ; } -static int ath11k_mac_set_fixed_rate_params (struct ath11k_vif *arvif, -u32 rate,u8 nss,u8 sgi,u8 ldpc) +static int +ath11k_mac_set_fixed_rate_GI_LTF (struct ath11k_vif *arvif,u8 he_gi,u8 he_ltf) {struct ath11k *ar = arvif->ar; -u32 vdev_param;int ret; -lockdep_assert_held (&ar->conf_mutex); +/* 0.8 = 0, 1.6 = 2 and 3.2 = 3. */ +if (he_gi && he_gi !=0xFF ) + he_gi +=1 ; -ath11k_dbg (ar->ab,ATH11K_DBG_MAC ,"mac set fixed rate params vdev %i rate 0x%02hhx nss %hhu sgi %hhu\n" , - arvif->vdev_id, rate, nss, sgi); + ret =ath11k_wmi_vdev_set_param_cmd (ar, arvif->vdev_id, +WMI_VDEV_PARAM_SGI , he_gi); +if (ret) { +ath11k_warn (ar->ab,"failed to set HE GI:%d, error:%d\n" , + he_gi, ret); +return ret; + } +/* start from 1 */ +if (he_ltf !=0xFF ) + he_ltf +=1 ; - vdev_param =WMI_VDEV_PARAM_FIXED_RATE ; ret =ath11k_wmi_vdev_set_param_cmd (ar, arvif->vdev_id, - vdev_param, rate); +WMI_VDEV_PARAM_HE_LTF , he_ltf);if (ret) { -ath11k_warn (ar->ab,"failed to set fixed rate param 0x%02x: %d\n" , - rate, ret); +ath11k_warn (ar->ab,"failed to set HE LTF:%d, error:%d\n" , + he_ltf, ret);return ret; } +return 0 ; +} + +static int +ath11k_mac_set_auto_rate_GI_LTF (struct ath11k_vif *arvif,u16 he_gi,u8 he_ltf) +{ +struct ath11k *ar = arvif->ar; +int ret; +u32 he_ar_gi_ltf =0 ; + +if (he_gi !=0xFF ) { +switch (he_gi) { +case NL80211_RATE_INFO_HE_GI_0_8 : + he_gi =WMI_AUTORATE_800NS_GI ; +break ; +case NL80211_RATE_INFO_HE_GI_1_6 : + he_gi =WMI_AUTORATE_1600NS_GI ; +break ; +case NL80211_RATE_INFO_HE_GI_3_2 : + he_gi =WMI_AUTORATE_3200NS_GI ; +break ; +default : +ath11k_warn (ar->ab,"Invalid GI\n" ); +return 1 ; + } + } - vdev_param =WMI_VDEV_PARAM_NSS ; +if (he_ltf !=0xFF ) { +switch (he_ltf) { +case NL80211_RATE_INFO_HE_1XLTF : + he_ltf =WMI_HE_AUTORATE_LTF_1X ; +break ; +case NL80211_RATE_INFO_HE_2XLTF : + he_ltf =WMI_HE_AUTORATE_LTF_2X ; +break ; +case NL80211_RATE_INFO_HE_4XLTF : + he_ltf =WMI_HE_AUTORATE_LTF_4X ; +break ; +default : +ath11k_warn (ar->ab,"Invalid LTF\n" ); +return 1 ; + } + } + + he_ar_gi_ltf = he_gi | he_ltf; ret =ath11k_wmi_vdev_set_param_cmd (ar, arvif->vdev_id, - vdev_param, nss); +WMI_VDEV_PARAM_AUTORATE_MISC_CFG , + he_ar_gi_ltf);if (ret) { -ath11k_warn (ar->ab,"failed to set nss param %d: %d\n" , - nss, ret); +ath11k_warn (ar->ab, +"failed to set HE autorate GI:%u, LTF:%u params, error:%d\n" , + he_gi, he_ltf, ret);return ret; } +return 0 ; +} + +static int ath11k_mac_set_rate_params (struct ath11k_vif *arvif, +u32 rate,u8 nss,u8 sgi,u8 ldpc, +u8 he_gi,u8 he_ltf,bool he_fixed_rate) +{ +struct ath11k *ar = arvif->ar; +u32 vdev_param; +int ret; + +lockdep_assert_held (&ar->conf_mutex); - vdev_param =WMI_VDEV_PARAM_SGI ; +ath11k_dbg (ar->ab,ATH11K_DBG_MAC , +"mac set rate params vdev %i, rate:0x%02x, nss:0x%02x, sgi:0x%02x, ldpc:0x%02x\n" , + arvif->vdev_id, rate, nss, sgi, ldpc); + +ath11k_dbg (ar->ab,ATH11K_DBG_MAC , +"he_gi:0x%02x, he_ltf:0x%02x, he_fixed_rate:%d\n" , he_gi, + he_ltf, he_fixed_rate); + +if (!arvif->vif->bss_conf.he_support) { + vdev_param =WMI_VDEV_PARAM_FIXED_RATE ; + ret =ath11k_wmi_vdev_set_param_cmd (ar, arvif->vdev_id, + vdev_param, rate); +if (ret) { +ath11k_warn (ar->ab,"failed to set fixed rate param 0x%02x: %d\n" , + rate, ret); +return ret; + } + } + vdev_param =WMI_VDEV_PARAM_NSS ; ret =ath11k_wmi_vdev_set_param_cmd (ar, arvif->vdev_id, - vdev_param, sgi); + vdev_param, nss);if (ret) { -ath11k_warn (ar->ab,"failed to set sgi param %d: %d\n" , - sgi, ret); +ath11k_warn (ar->ab,"failed to set nss param %d: %d\n" , + nss, ret);return ret; }
@@ -5436,6 +5777,27 @@ static int ath11k_mac_set_fixed_rate_params(struct ath11k_vif *arvif,return ret; } +if (arvif->vif->bss_conf.he_support) { +if (he_fixed_rate) { + ret =ath11k_mac_set_fixed_rate_GI_LTF (arvif, he_gi, + he_ltf); + }else { + ret =ath11k_mac_set_auto_rate_GI_LTF (arvif, he_gi, + he_ltf); + } +if (ret) +return ret; + }else { + vdev_param =WMI_VDEV_PARAM_SGI ; + ret =ath11k_wmi_vdev_set_param_cmd (ar, arvif->vdev_id, + vdev_param, sgi); +if (ret) { +ath11k_warn (ar->ab,"failed to set sgi param %d: %d\n" , + sgi, ret); +return ret; + } + } +return 0 ; }
@@ -5464,6 +5826,31 @@ ath11k_mac_vht_mcs_range_present(struct ath11k *ar,return true; } +static bool +ath11k_mac_he_mcs_range_present (struct ath11k *ar, +enum nl80211_band band, +const struct cfg80211_bitrate_mask *mask) +{ +int i; +u16 he_mcs; + +for (i =0 ; i <NL80211_HE_NSS_MAX ; i++) { + he_mcs = mask->control[band].he_mcs[i]; + +switch (he_mcs) { +case 0 : +case BIT (8 ) -1 : +case BIT (10 ) -1 : +case BIT (12 ) -1 : +break ; +default : +return false; + } + } + +return true; +} +static void ath11k_mac_set_bitrate_mask_iter (void *data,struct ieee80211_sta *sta) {
@@ -5495,6 +5882,53 @@ static void ath11k_mac_disable_peer_fixed_rate(void *data, sta->addr, ret); } +static bool +ath11k_mac_validate_vht_he_fixed_rate_settings (struct ath11k *ar,enum nl80211_band band, +const struct cfg80211_bitrate_mask *mask) +{ +bool he_fixed_rate = false, vht_fixed_rate = false; +struct ath11k_peer *peer, *tmp; +const u16 *vht_mcs_mask, *he_mcs_mask; +u8 vht_nss, he_nss; +bool ret = true; + + vht_mcs_mask = mask->control[band].vht_mcs; + he_mcs_mask = mask->control[band].he_mcs; + +if (ath11k_mac_bitrate_mask_num_vht_rates (ar, band, mask) ==1 ) + vht_fixed_rate = true; + +if (ath11k_mac_bitrate_mask_num_he_rates (ar, band, mask) ==1 ) + he_fixed_rate = true; + +if (!vht_fixed_rate && !he_fixed_rate) +return true; + + vht_nss =ath11k_mac_max_vht_nss (vht_mcs_mask); + he_nss =ath11k_mac_max_he_nss (he_mcs_mask); + +rcu_read_lock (); +spin_lock_bh (&ar->ab->base_lock); +list_for_each_entry_safe (peer, tmp, &ar->ab->peers, list) { +if (peer->sta) { +if (vht_fixed_rate && (!peer->sta->vht_cap.vht_supported || + peer->sta->rx_nss < vht_nss)) { + ret = false; + goto exit; + } +if (he_fixed_rate && (!peer->sta->he_cap.has_he || + peer->sta->rx_nss < he_nss)) { + ret = false; + goto exit; + } + } + } +exit: +spin_unlock_bh (&ar->ab->base_lock); +rcu_read_unlock (); +return ret; +} + static int ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -5506,6 +5940,9 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,enum nl80211_band band;const u8 *ht_mcs_mask;const u16 *vht_mcs_mask; +const u16 *he_mcs_mask; +u8 he_ltf =0 ; +u8 he_gi =0 ;u32 rate;u8 nss;u8 sgi;
@@ -5513,6 +5950,7 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,int single_nss;int ret;int num_rates; +bool he_fixed_rate = false;if (ath11k_mac_vif_chan (vif, &def))return -EPERM ;
@@ -5520,12 +5958,16 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw, band = def.chan->band; ht_mcs_mask = mask->control[band].ht_mcs; vht_mcs_mask = mask->control[band].vht_mcs; + he_mcs_mask = mask->control[band].he_mcs; ldpc = !!(ar->ht_cap_info &WMI_HT_CAP_LDPC ); sgi = mask->control[band].gi;if (sgi ==NL80211_TXRATE_FORCE_LGI )return -EINVAL ; + he_gi = mask->control[band].he_gi; + he_ltf = mask->control[band].he_ltf; +/* mac80211 doesn't support sending a fixed HT/VHT MCS alone, rather it * requires passing atleast one of used basic rates along with them. * Fixed rate setting across different preambles(legacy, HT, VHT) is
@@ -5549,11 +5991,23 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw, &single_nss)) { rate =WMI_FIXED_RATE_NONE ; nss = single_nss; +mutex_lock (&ar->conf_mutex); + arvif->bitrate_mask = *mask; +ieee80211_iterate_stations_atomic (ar->hw, + ath11k_mac_set_bitrate_mask_iter, + arvif); +mutex_unlock (&ar->conf_mutex); } else { rate =WMI_FIXED_RATE_NONE ; + +if (!ath11k_mac_validate_vht_he_fixed_rate_settings (ar, band, mask)) +ath11k_warn (ar->ab, +"could not update fixed rate settings to all peers due to mcs/nss incompaitiblity\n" ); + nss =min_t (u32, ar->num_tx_chains, -max (ath11k_mac_max_ht_nss (ht_mcs_mask), -ath11k_mac_max_vht_nss (vht_mcs_mask))); +max (max (ath11k_mac_max_ht_nss (ht_mcs_mask), +ath11k_mac_max_vht_nss (vht_mcs_mask)), +ath11k_mac_max_he_nss (he_mcs_mask)));/* If multiple rates across different preambles are given * we can reconfigure this info with all peers using PEER_ASSOC
@@ -5588,12 +6042,23 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,return -EINVAL ; } + num_rates =ath11k_mac_bitrate_mask_num_he_rates (ar, band, + mask); +if (num_rates ==1 ) + he_fixed_rate = true; + +if (!ath11k_mac_he_mcs_range_present (ar, band, mask) && + num_rates >1 ) { +ath11k_warn (ar->ab, +"Setting more than one HE MCS Value in bitrate mask not supported\n" ); +return -EINVAL ; + } + +mutex_lock (&ar->conf_mutex);ieee80211_iterate_stations_atomic (ar->hw, ath11k_mac_disable_peer_fixed_rate, arvif); -mutex_lock (&ar->conf_mutex); - arvif->bitrate_mask = *mask; ieee80211_iterate_stations_atomic(ar->hw, ath11k_mac_set_bitrate_mask_iter,
@@ -5604,9 +6069,10 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,mutex_lock (&ar->conf_mutex); - ret =ath11k_mac_set_fixed_rate_params (arvif, rate, nss, sgi, ldpc); + ret =ath11k_mac_set_rate_params (arvif, rate, nss, sgi, ldpc, he_gi, + he_ltf, he_fixed_rate);if (ret) { -ath11k_warn (ar->ab,"failed to set fixed rate params on vdev %i: %d\n" , +ath11k_warn (ar->ab,"failed to set rate params on vdev %i: %d\n" , arvif->vdev_id, ret); }
drivers/net/wireless/ath/ath11k/wmi.h +18 -0
@@ -119,6 +119,22 @@ enum { WMI_HOST_WLAN_2G_5G_CAP = 0x3, }; +/* Parameters used for WMI_VDEV_PARAM_AUTORATE_MISC_CFG command. +* Used only for HE auto rate mode. +*/ +enum { +/* HE LTF related configuration */ +WMI_HE_AUTORATE_LTF_1X = (1 <<0 ), +WMI_HE_AUTORATE_LTF_2X = (1 <<1 ), +WMI_HE_AUTORATE_LTF_4X = (1 <<2 ), + +/* HE GI related configuration */ +WMI_AUTORATE_400NS_GI = (1 <<8 ), +WMI_AUTORATE_800NS_GI = (1 <<9 ), +WMI_AUTORATE_1600NS_GI = (1 <<10 ), +WMI_AUTORATE_3200NS_GI = (1 <<11 ), +}; +/* * wmi command groups. */
@@ -1026,7 +1042,9 @@ enum wmi_tlv_vdev_param {WMI_VDEV_PARAM_HE_RANGE_EXT ,WMI_VDEV_PARAM_ENABLE_BCAST_PROBE_RESPONSE ,WMI_VDEV_PARAM_FILS_MAX_CHANNEL_GUARD_TIME , +WMI_VDEV_PARAM_HE_LTF =0x74 ,WMI_VDEV_PARAM_BA_MODE =0x7e , +WMI_VDEV_PARAM_AUTORATE_MISC_CFG =0x80 ,WMI_VDEV_PARAM_SET_HE_SOUNDING_MODE =0x87 ,WMI_VDEV_PARAM_6GHZ_PARAMS =0x99 , WMI_VDEV_PARAM_PROTOTYPE = 0x8000,
Signature · 1 line
2.25.1
Re: [PATCH V6 2/2] ath11k: add support for setting fixed HE rate/gi/ltf
Quoted 9 lines · John Crispin
From: Miles Hu <[email protected]>
This patch adds ath11k support for setting fixed HE rate/gi/ltf values that we are now able to send to the kernel using nl80211. The added code is reusing parts of the existing code path already used for HT/VHT. The new helpers are symmetric to how we do it for HT/VHT.
Signed-off-by Miles Hu <[email protected]>Signed-off-by John Crispin <[email protected]>
Depends on:
eb89a6a6b7a1 nl80211: add support for setting fixed HE rate/gi/ltf
Currently in net-next.
Signature · 3 lines
https://patchwork.kernel.org/patch/11699949/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH V6 2/2] ath11k: add support for setting fixed HE rate/gi/ltf
Quoted 9 lines · Kalle Valo
Quoted 7 lines · John Crispin
From: Miles Hu <[email protected]>
This patch adds ath11k support for setting fixed HE rate/gi/ltf values that we are now able to send to the kernel using nl80211. The added code is reusing parts of the existing code path already used for HT/VHT. The new helpers are symmetric to how we do it for HT/VHT.
Quoted 8 lines
Quoted 2 lines
Signed-off-by Miles Hu <[email protected]>Signed-off-by John Crispin <[email protected]>Depends on:
eb89a6a6b7a1nl80211: add support for setting fixed HE rate/gi/ltfCurrently in net-next.
Hi Kalle and John,
This patch includes auto-rate support as well which is part of the CAF changes John mentioned in v55 change-log. Auto-rate part was added by me into CAF.
Please add my sign-off on this patch.
Or let me know if you decide to remove that particular portion, then I will send a separate patch. Thanks.
Re: [PATCH V6 2/2] ath11k: add support for setting fixed HE rate/gi/ltf
In reply to Kalle ValoQuoted 9 lines · Kalle Valo
Quoted 7 lines · John Crispin
From: Miles Hu <[email protected]>
This patch adds ath11k support for setting fixed HE rate/gi/ltf values that we are now able to send to the kernel using nl80211. The added code is reusing parts of the existing code path already used for HT/VHT. The new helpers are symmetric to how we do it for HT/VHT.
Quoted 8 lines
Quoted 2 lines
Signed-off-by Miles Hu <[email protected]>Signed-off-by John Crispin <[email protected]>Depends on:
eb89a6a6b7a1nl80211: add support for setting fixed HE rate/gi/ltfCurrently in net-next.
Hi Kalle and John,
This patch includes auto-rate support as well which is part of the CAF changes John mentioned in v55 change-log. Auto-rate part was added by me into CAF.
Please add my sign-off on this patch.
Or let me know if you decide to remove that particular portion, then I will send a separate patch. Thanks.
Signature · 3 lines
ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
A message that is not in the archive (sent off-list or not yet received): 010101747ecf2d5c-5543939f-2417-438a-8d0a-c31832121a00-000000@us-west-2.amazonses.com
Re: [PATCH V6 2/2] ath11k: add support for setting fixed HE rate/gi/ltf
Quoted 17 lines · Aloka Dixit
Quoted 16 lines · Kalle Valo
Quoted 9 lines · John Crispin
From: Miles Hu <[email protected]>
This patch adds ath11k support for setting fixed HE rate/gi/ltf values that we are now able to send to the kernel using nl80211. The added code is reusing parts of the existing code path already used for HT/VHT. The new helpers are symmetric to how we do it for HT/VHT.
Signed-off-by Miles Hu <[email protected]>Signed-off-by John Crispin <[email protected]>Depends on:
eb89a6a6b7a1nl80211: add support for setting fixed HE rate/gi/ltf
Quoted 8 lines
Quoted 1 line
Currently in net-next.
Hi Kalle and John,
This patch includes auto-rate support as well which is part of the CAF changes John mentioned in v55 change-log. Auto-rate part was added by me into CAF.
Please add my sign-off on this patch.
Or let me know if you decide to remove that particular portion, then I will send a separate patch. Thanks.
Hi Kalle,
please ignore this patch for now
John
Signature · 3 lines
ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH V6 2/2] ath11k: add support for setting fixed HE rate/gi/ltf
In reply to John CrispinQuoted 9 lines · John Crispin
From: Miles Hu <[email protected]>
This patch adds ath11k support for setting fixed HE rate/gi/ltf values that we are now able to send to the kernel using nl80211. The added code is reusing parts of the existing code path already used for HT/VHT. The new helpers are symmetric to how we do it for HT/VHT.
Signed-off-by Miles Hu <[email protected]>Signed-off-by John Crispin <[email protected]>
Depends on:
eb89a6a6b7a1 nl80211: add support for setting fixed HE rate/gi/ltf
Currently in net-next.
Signature · 9 lines
https://patchwork.kernel.org/patch/11699949/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH V6 2/2] ath11k: add support for setting fixed HE rate/gi/ltf
In reply to John CrispinQuoted 9 lines · John Crispin
From: Miles Hu <[email protected]>
This patch adds ath11k support for setting fixed HE rate/gi/ltf values that we are now able to send to the kernel using nl80211. The added code is reusing parts of the existing code path already used for HT/VHT. The new helpers are symmetric to how we do it for HT/VHT.
Signed-off-by Miles Hu <[email protected]>Signed-off-by John Crispin <[email protected]>
[...]
Quoted 11 lines
drivers/net/wireless/ath/ath11k/wmi.h +5
-0@@ -119,6 +119,22 @@ enum { WMI_HOST_WLAN_2G_5G_CAP = 0x3, }; +/* Parameters used for WMI_VDEV_PARAM_AUTORATE_MISC_CFG command. +* Used only for HE auto rate mode. +*/ +enum { +/* HE LTF related configuration */
drivers/net/wireless/ath/ath11k/wmi.h enum { · line 136
Quoted 10 lines
drivers/net/wireless/ath/ath11k/wmi.h +10
-0+WMI_HE_AUTORATE_LTF_1X = (1 <<0 ), +WMI_HE_AUTORATE_LTF_2X = (1 <<1 ), +WMI_HE_AUTORATE_LTF_4X = (1 <<2 ), + +/* HE GI related configuration */ +WMI_AUTORATE_400NS_GI = (1 <<8 ), +WMI_AUTORATE_800NS_GI = (1 <<9 ), +WMI_AUTORATE_1600NS_GI = (1 <<10 ), + WMI_AUTORATE_3200NS_GI = (1 << 11), +};
BIT()?
Signature · 6 lines
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k