| Message ID | 1589399105-25472-6-git-send-email-rmanohar@codeaurora.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | [v3,01/11] cfg80211: use only HE capability to set prohibited flags in 6 GHz | expand |
On Wed, 2020-05-13 at 12:45 -0700, Rajkumar Manoharan wrote: > During association or mesh peering of HE STA in 6 GHz band, required > HT/VHT information has to be processed from 6 GHz band capabilities > as HT/VHT IEs are not allowed in 6 GHz. > > * @has_he: true iff HE data is valid. > + * @has_he_6ghz: true iff HE 6 GHz data is valid. I guess here things start compiling ;-) But like I said before, I'm not sure why this is needed? Surely if the STA connected on 6 GHz it has capability ... johannes
> +++ b/include/net/cfg80211.h > @@ -332,15 +332,25 @@ struct ieee80211_sta_vht_cap { > * to describe 802.11ax HE capabilities for a STA. > * > * @has_he: true iff HE data is valid. > + * @has_he_6ghz: true iff HE 6 GHz data is valid. > * @he_cap_elem: Fixed portion of the HE capabilities element. > * @he_mcs_nss_supp: The supported NSS/MCS combinations. > * @ppe_thres: Holds the PPE Thresholds data. > + * @ampdu_factor: Maximum A-MPDU length factor used in 6 GHz. > + * @ampdu_density: Minimum A-MPDU spacing used in 6 GHz. > + * @cap: HE 6 GHz Band capability. > */ > struct ieee80211_sta_he_cap { > bool has_he; > + bool has_he_6ghz; > struct ieee80211_he_cap_elem he_cap_elem; > struct ieee80211_he_mcs_nss_supp he_mcs_nss_supp; > u8 ppe_thres[IEEE80211_HE_PPE_THRES_MAX_LEN]; > + struct { > + u8 ampdu_factor; > + u8 ampdu_density; > + u16 cap; > + } he_6ghz; > }; So ... I'm a bit unsure about this now. What I had done was this (well, I adjusted it slightly now): https://p.sipsolutions.net/2d0eb7c7e23a1b92.txt But it's only half related? Maybe you're also using that for the associated stations, not just for "self"? But then again, you *already* added @@ -1270,6 +1271,7 @@ struct station_parameters { u8 he_capa_len; u16 airtime_weight; struct sta_txpwr txpwr; + const struct ieee80211_he_6ghz_capa *he_6ghz_capa; }; right? But no ... that's different. We still have a need to store the station's capabilities. But even then, > + struct { > + u8 ampdu_factor; > + u8 ampdu_density; > + u16 cap; > + } he_6ghz; doesn't really make sense, does it? "cap' already includes the ampdu_factor and ampdu_density flags, so that's doubled... I think I would prefer to have this separate. We need it as I put into my patch that I linked to above, and we also need it in the station in mac80211 for AP, but we don't really need it for cfg80211 as you put it here. I'll continue with my other patches, and then maybe see how this fits in later. johannes
So I'm dropping this one for now. I'm going to send a series right now with what I have, and you can start looking at how to put this on top. I'd prefer for *mac80211* to add the 6ghz capa sub-struct to the station and use that while parsing, I think that should still be reasonable from the driver's POV. You'll see I didn't change ieee80211_sta_he_cap, and I am thinking now that it shouldn't change. I'm still working on * the HE oper -> channel parsing (MLME, and you also had mesh) * 6 GHz scan bits that we had. But I think you should be able to work on this patch without those two things. johannes
On Thu, 2020-05-28 at 11:43 +0200, Johannes Berg wrote: > I'd prefer for *mac80211* to add the 6ghz capa sub-struct to the station > and use that while parsing, I think that should still be reasonable from > the driver's POV. You'll see I didn't change ieee80211_sta_he_cap, and I > am thinking now that it shouldn't change. Actually. I had this patch too, sending it out soon. johannes
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 0797a296c083..2c7bfc170604 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -332,15 +332,25 @@ struct ieee80211_sta_vht_cap { * to describe 802.11ax HE capabilities for a STA. * * @has_he: true iff HE data is valid. + * @has_he_6ghz: true iff HE 6 GHz data is valid. * @he_cap_elem: Fixed portion of the HE capabilities element. * @he_mcs_nss_supp: The supported NSS/MCS combinations. * @ppe_thres: Holds the PPE Thresholds data. + * @ampdu_factor: Maximum A-MPDU length factor used in 6 GHz. + * @ampdu_density: Minimum A-MPDU spacing used in 6 GHz. + * @cap: HE 6 GHz Band capability. */ struct ieee80211_sta_he_cap { bool has_he; + bool has_he_6ghz; struct ieee80211_he_cap_elem he_cap_elem; struct ieee80211_he_mcs_nss_supp he_mcs_nss_supp; u8 ppe_thres[IEEE80211_HE_PPE_THRES_MAX_LEN]; + struct { + u8 ampdu_factor; + u8 ampdu_density; + u16 cap; + } he_6ghz; }; /** diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 0f72813fed53..591c3c7324e3 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1508,7 +1508,8 @@ static int sta_apply_parameters(struct ieee80211_local *local, if (params->he_capa) ieee80211_he_cap_ie_to_sta_he_cap(sdata, sband, (void *)params->he_capa, - params->he_capa_len, sta); + params->he_capa_len, + params->he_6ghz_capa, sta); if (params->opmode_notif_used) { /* returned value is only needed for rc update, but the diff --git a/net/mac80211/he.c b/net/mac80211/he.c index f520552b22be..4376fa5e6336 100644 --- a/net/mac80211/he.c +++ b/net/mac80211/he.c @@ -12,10 +12,14 @@ void ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata, struct ieee80211_supported_band *sband, const u8 *he_cap_ie, u8 he_cap_len, + const struct ieee80211_he_6ghz_band_cap + *he_6ghz_cap_ie, struct sta_info *sta) { struct ieee80211_sta_he_cap *he_cap = &sta->sta.he_cap; struct ieee80211_he_cap_elem *he_cap_ie_elem = (void *)he_cap_ie; + enum ieee80211_smps_mode smps_mode; + u16 cap; u8 he_ppe_size; u8 mcs_nss_size; u8 he_total_size; @@ -53,6 +57,53 @@ ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata, sta->cur_max_bandwidth = ieee80211_sta_cap_rx_bw(sta); sta->sta.bandwidth = ieee80211_sta_cur_vht_bw(sta); + + if (!he_6ghz_cap_ie) + return; + + cap = __le16_to_cpu(he_6ghz_cap_ie->capab); + + he_cap->he_6ghz.ampdu_density = + FIELD_GET(IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START_SPACE_MASK, + cap); + he_cap->he_6ghz.ampdu_factor = + FIELD_GET(IEEE80211_HE_6GHZ_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK, + cap); + + switch (FIELD_GET(IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LENGTH_MASK, cap)) { + case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454: + sta->sta.max_amsdu_len = IEEE80211_MAX_MPDU_LEN_VHT_11454; + break; + case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991: + sta->sta.max_amsdu_len = IEEE80211_MAX_MPDU_LEN_VHT_7991; + break; + case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895: + default: + sta->sta.max_amsdu_len = IEEE80211_MAX_MPDU_LEN_VHT_3895; + break; + } + + switch (FIELD_GET(IEEE80211_HE_6GHZ_CAP_SMPS_MASK, cap)) { + case WLAN_HT_CAP_SM_PS_INVALID: + case WLAN_HT_CAP_SM_PS_STATIC: + smps_mode = IEEE80211_SMPS_STATIC; + break; + case WLAN_HT_CAP_SM_PS_DYNAMIC: + smps_mode = IEEE80211_SMPS_DYNAMIC; + break; + case WLAN_HT_CAP_SM_PS_DISABLED: + smps_mode = IEEE80211_SMPS_OFF; + break; + } + + if (sta->sdata->vif.type == NL80211_IFTYPE_AP || + sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN) + sta->sta.smps_mode = smps_mode; + else + sta->sta.smps_mode = IEEE80211_SMPS_OFF; + + he_cap->he_6ghz.cap = cap; + he_cap->has_he_6ghz = true; } void diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 5e33746d7210..78a95a11458c 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1892,6 +1892,8 @@ void ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata, struct ieee80211_supported_band *sband, const u8 *he_cap_ie, u8 he_cap_len, + const struct ieee80211_he_6ghz_band_cap + *he_6ghz_cap_ie, struct sta_info *sta); void ieee80211_he_spr_ie_to_bss_conf(struct ieee80211_vif *vif, diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 737c5f4dbf52..e3e29b8d641d 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -441,7 +441,9 @@ static void mesh_sta_info_init(struct ieee80211_sub_if_data *sdata, elems->vht_cap_elem, sta); ieee80211_he_cap_ie_to_sta_he_cap(sdata, sband, elems->he_cap, - elems->he_cap_len, sta); + elems->he_cap_len, + elems->he_6ghz_cap_elem, + sta); if (bw != sta->sta.bandwidth) changed |= IEEE80211_RC_BW_CHANGED; diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 16d75da0996a..58a082efc3b3 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3381,6 +3381,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, ieee80211_he_cap_ie_to_sta_he_cap(sdata, sband, elems->he_cap, elems->he_cap_len, + elems->he_6ghz_cap_elem, sta); bss_conf->he_support = sta->sta.he_cap.has_he;
During association or mesh peering of HE STA in 6 GHz band, required HT/VHT information has to be processed from 6 GHz band capabilities as HT/VHT IEs are not allowed in 6 GHz. Signed-off-by: Rajkumar Manoharan <rmanohar@codeaurora.org> --- include/net/cfg80211.h | 10 +++++++++ net/mac80211/cfg.c | 3 ++- net/mac80211/he.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ net/mac80211/ieee80211_i.h | 2 ++ net/mac80211/mesh_plink.c | 4 +++- net/mac80211/mlme.c | 1 + 6 files changed, 69 insertions(+), 2 deletions(-)