mac80211: HE: add TWT and SPR/OBSSPD support
v2 cover mac80211: HE: add TWT and SPR/OBSSPD support
This series adds support for propagating the TWT and OBSS PD information from userland/assocs to a wireless driver. The patches for making use of these features inside ath11k are also included.
I already have the hostapd patches ready and will send them once these changes are inside nl80211.h.
Changes in V2
* always use bss_conf as per request from Johannes
John Crispin (6):
mac80211: dynamically enable the TWT requester support on STA
interfaces
mac80211: allow turning TWT responder support on and off via netlink
ath11k: add TWT support
mac80211: HE: add Spatial Reuse IE parsing support
mac80211: allow setting spatial reuse parameters from bss_conf
ath11k: add spatial reuse support
drivers/net/wireless/ath/ath11k/mac.c | 22 +++++ drivers/net/wireless/ath/ath11k/wmi.c | 126 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/wmi.h | 87 ++++++++++++++++++ include/linux/ieee80211.h | 49 ++++++++++ include/net/cfg80211.h | 17 ++++ include/net/mac80211.h | 9 ++ include/uapi/linux/nl80211.h | 31 +++++++ net/mac80211/cfg.c | 7 +- net/mac80211/he.c | 24 +++++ net/mac80211/ieee80211_i.h | 4 + net/mac80211/mlme.c | 19 +++- net/mac80211/util.c | 4 + net/wireless/nl80211.c | 47 ++++++++++ 13 files changed, 443 insertions(+), 3 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 2/6 mac80211: allow turning TWT responder support on and off via netlink
Allow the userland daemon to en/disable TWT support for an AP.
--- include/net/cfg80211.h | 2 ++ include/net/mac80211.h | 3 +++ include/uapi/linux/nl80211.h | 4 ++++ net/mac80211/cfg.c | 4 +++- net/wireless/nl80211.c | 5 +++++ 5 files changed, 17 insertions(+), 1 deletion(-)
include/net/cfg80211.h +2 -0
@@ -876,6 +876,7 @@ enum cfg80211_ap_settings_flags {* @he_cap: HE capabilities (or %NULL if HE isn't enabled) * @ht_required: stations must support HT * @vht_required: stations must support VHT +* @twt_responder: Enable Target Wait Time * @flags: flags, as defined in enum cfg80211_ap_settings_flags */ struct cfg80211_ap_settings {
@@ -902,6 +903,7 @@ struct cfg80211_ap_settings {const struct ieee80211_vht_cap *vht_cap;const struct ieee80211_he_cap_elem *he_cap;bool ht_required, vht_required; +bool twt_responder;u32 flags; };
include/net/mac80211.h +3 -0
@@ -506,6 +506,8 @@ struct ieee80211_ftm_responder_params {* @he_support: does this BSS support HE * @twt_requester: does this BSS support TWT requester (relevant for managed * mode only, set if the AP advertises TWT responder role) +* @twt_responder: does this BSS support TWT requester (relevant for managed +* mode only, set if the AP advertises TWT responder role) * @assoc: association status * @ibss_joined: indicates whether this station is part of an IBSS * or not
@@ -614,6 +616,7 @@ struct ieee80211_bss_conf {u16 frame_time_rts_th;bool he_support;bool twt_requester; +bool twt_responder;/* association related data */ bool assoc, ibss_joined;bool ibss_creator;
include/uapi/linux/nl80211.h +4 -0
@@ -2308,6 +2308,8 @@ enum nl80211_commands {* @NL80211_ATTR_AIRTIME_WEIGHT: Station's weight when scheduled by the airtime * scheduler. * +* @NL80211_ATTR_TWT_RESPONDER: Enable target wait time responder support. +* * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2759,6 +2761,8 @@ enum nl80211_attrs {NL80211_ATTR_AIRTIME_WEIGHT , +NL80211_ATTR_TWT_RESPONDER , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
net/mac80211/cfg.c +3 -1
@@ -939,7 +939,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,BSS_CHANGED_BEACON |BSS_CHANGED_SSID |BSS_CHANGED_P2P_PS | -BSS_CHANGED_TXPOWER ; +BSS_CHANGED_TXPOWER | +BSS_CHANGED_TWT ;int err;int prev_beacon_int;
@@ -1009,6 +1010,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, sdata->vif.bss_conf.dtim_period = params->dtim_period; sdata->vif.bss_conf.enable_beacon = true; sdata->vif.bss_conf.allow_p2p_go_ps = sdata->vif.p2p; + sdata->vif.bss_conf.twt_responder = params->twt_responder; sdata->vif.bss_conf.ssid_len = params->ssid_len;if (params->ssid_len)
net/wireless/nl80211.c +5 -0
@@ -541,6 +541,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { [NL80211_ATTR_PEER_MEASUREMENTS ] = NLA_POLICY_NESTED(nl80211_pmsr_attr_policy), [NL80211_ATTR_AIRTIME_WEIGHT] = NLA_POLICY_MIN(NLA_U16, 1), + [NL80211_ATTR_TWT_RESPONDER] = { .type = NLA_FLAG }, };/* policy for the key attributes */
@@ -4531,6 +4532,10 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)return PTR_ERR (params.acl); } +if (info->attrs[NL80211_ATTR_TWT_RESPONDER ]) + params.twt_responder = +nla_get_flag (info->attrs[NL80211_ATTR_TWT_RESPONDER ]); +nl80211_calculate_ap_params (¶ms);if (info->attrs[NL80211_ATTR_EXTERNAL_AUTH_SUPPORT ])
Signature · 1 line
2.20.1
PATCH v2 1/6 mac80211: dynamically enable the TWT requester support on STA interfaces
In reply to John CrispinTurn TWT for STA interfaces when they associate and/or receive a beacon where the twt_responder bit has changed.
--- include/net/mac80211.h | 2 ++ net/mac80211/mlme.c | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-)
include/net/mac80211.h +2 -0
@@ -317,6 +317,7 @@ struct ieee80211_vif_chanctx_switch {* @BSS_CHANGED_MCAST_RATE: Multicast Rate setting changed for this interface * @BSS_CHANGED_FTM_RESPONDER: fime timing reasurement request responder * functionality changed for this BSS (AP mode). +* @BSS_CHANGED_TWT: TWT status changed * */ enum ieee80211_bss_change {
@@ -347,6 +348,7 @@ enum ieee80211_bss_change {BSS_CHANGED_KEEP_ALIVE =1 <<24 ,BSS_CHANGED_MCAST_RATE =1 <<25 ,BSS_CHANGED_FTM_RESPONDER =1 <<26 , + BSS_CHANGED_TWT = 1<<27, /* when adding here, make sure to change ieee80211_reconfig */ };
net/mac80211/mlme.c +16 -2
@@ -3151,6 +3151,19 @@ static bool ieee80211_twt_req_supported(const struct sta_info *sta,IEEE80211_HE_MAC_CAP0_TWT_RES ; } +static int ieee80211_recalc_twt_req (struct ieee80211_sub_if_data *sdata, +struct sta_info *sta, +struct ieee802_11_elems *elems) +{ +bool twt =ieee80211_twt_req_supported (sta, elems); + +if (sdata->vif.bss_conf.twt_requester != twt) { + sdata->vif.bss_conf.twt_requester = twt; +return BSS_CHANGED_TWT ; + } +return 0 ; +} +static bool ieee80211_assoc_success (struct ieee80211_sub_if_data *sdata,struct cfg80211_bss *cbss,struct ieee80211_mgmt *mgmt,size_t len)
@@ -3333,8 +3346,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, sta); bss_conf->he_support = sta->sta.he_cap.has_he; - bss_conf->twt_requester = -ieee80211_twt_req_supported (sta, &elems); + changed |=ieee80211_recalc_twt_req (sdata, sta, &elems); }else { bss_conf->he_support = false; bss_conf->twt_requester = false;
@@ -3995,6 +4007,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,mutex_lock (&local->sta_mtx); sta =sta_info_get (sdata, bssid); + changed |=ieee80211_recalc_twt_req (sdata, sta, &elems); + if (ieee80211_config_bw(sdata, sta, elems.ht_cap_elem, elems.ht_operation, elems.vht_operation, elems.he_operation,
Signature · 1 line
2.20.1
PATCH v2 3/6 ath11k: add TWT support
In reply to John CrispinAdd target wait time wmi calls to the driver. En/disable the support from when the bss_config changes. We ignore the cmd completion events.
--- drivers/net/wireless/ath/ath11k/mac.c | 12 ++++ drivers/net/wireless/ath/ath11k/wmi.c | 91 +++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/wmi.h | 71 +++++++++++++++++++++ 3 files changed, 174 insertions(+)
drivers/net/wireless/ath/ath11k/mac.c +12 -0
@@ -1326,6 +1326,11 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar, } } +if (he_cap->he_cap_elem.mac_cap_info[0 ] &IEEE80211_HE_MAC_CAP0_TWT_RES ) + arg->twt_responder = true; +if (he_cap->he_cap_elem.mac_cap_info[0 ] &IEEE80211_HE_MAC_CAP0_TWT_REQ ) + arg->twt_requester = true; +switch (sta->bandwidth) {case IEEE80211_STA_RX_BW_160 : if (he_cap->he_cap_elem.phy_cap_info[0] &
@@ -1894,6 +1899,13 @@ static void ath11k_bss_info_changed(struct ieee80211_hw *hw,ath11k_mac_txpower_recalc (ar); } +if (changed &BSS_CHANGED_TWT ) { +if (info->twt_requester || info->twt_responder) +ath11k_wmi_send_twt_enable_cmd (ar, ar->pdev_idx); +else +ath11k_wmi_send_twt_disable_cmd (ar, ar->pdev_idx); + } +mutex_unlock (&ar->conf_mutex); }
drivers/net/wireless/ath/ath11k/wmi.c +91 -0
121 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/wmi.h +71 -0
123 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v2 4/6 mac80211: HE: add Spatial Reuse IE parsing support
In reply to John CrispinAdd support to mac80211 for parsing SPR.
--- include/linux/ieee80211.h | 49 ++++++++++++++++++++++++++++++++++++++ net/mac80211/ieee80211_i.h | 1 + net/mac80211/util.c | 4 ++++ 3 files changed, 54 insertions(+)
include/linux/ieee80211.h +49 -0
@@ -1628,6 +1628,18 @@ struct ieee80211_he_operation {u8 optional[0 ]; } __packed; +/** +* struct ieee80211_he_spr - HE spatial reuse element +* +* This structure is the "HE spatial reuse element" element as +* described in P802.11ax_D3.0 section 9.4.2.241 +*/ +struct ieee80211_he_spr { +u8 he_sr_control; +/* Optional 0 to 19 bytes: depends on @he_sr_control */ +u8 optional[0 ]; +} __packed; +/** * struct ieee80211_he_mu_edca_param_ac_rec - MU AC Parameter Record field *
@@ -2063,6 +2075,42 @@ ieee80211_he_oper_size(const u8 *he_oper_ie)return oper_len; } +/* HE Spatial Reuse defines */ +#define IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT 0x4 +#define IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT 0x8 + +/* +* ieee80211_he_spr_size - calculate 802.11ax HE Spatial Reuse IE size +* @he_spr_ie: byte data of the He Spatial Reuse IE, stating from the the byte +* after the ext ID byte. It is assumed that he_spr_ie has at least +* sizeof(struct ieee80211_he_spr) bytes, checked already in +* ieee802_11_parse_elems_crc() +* @return the actual size of the IE data (not including header), or 0 on error +*/ +static inline u8 +ieee80211_he_spr_size (const u8 *he_spr_ie) +{ +struct ieee80211_he_spr *he_spr = (void *)he_spr_ie; +u8 spr_len =sizeof (struct ieee80211_he_spr ); +u32 he_spr_params; + +/* Make sure the input is not NULL */ +if (!he_spr_ie) +return 0 ; + +/* Calc required length */ + he_spr_params =le32_to_cpu (he_spr->he_sr_control); +if (he_spr_params &IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT ) + spr_len++; +if (he_spr_params &IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT ) + spr_len +=18 ; + +/* Add the first byte (extension ID) to the total length */ + spr_len++; + +return spr_len; +} +/* Authentication algorithms */ #define WLAN_AUTH_OPEN 0#define WLAN_AUTH_SHARED_KEY 1
@@ -2485,6 +2533,7 @@ enum ieee80211_eid_ext {WLAN_EID_EXT_HE_OPERATION =36 ,WLAN_EID_EXT_UORA =37 ,WLAN_EID_EXT_HE_MU_EDCA =38 , +WLAN_EID_EXT_HE_SPR =39 ,WLAN_EID_EXT_MAX_CHANNEL_SWITCH_TIME =52 , WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION = 55, };
net/mac80211/ieee80211_i.h +1 -0
@@ -1482,6 +1482,7 @@ struct ieee802_11_elems {const struct ieee80211_meshconf_ie *mesh_config;const u8 *he_cap;const struct ieee80211_he_operation *he_operation; +const struct ieee80211_he_spr *he_spr;const struct ieee80211_mu_edca_param_set *mu_edca_param_set;const u8 *uora_element;const u8 *mesh_id;
net/mac80211/util.c +4 -0
@@ -1282,6 +1282,10 @@ _ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION && elen == 3) { elems->mbssid_config_ie = (void *)&pos[1 ]; + } else if (pos[0] == WLAN_EID_EXT_HE_SPR && + elen >= sizeof(*elems->he_spr) && + elen >= ieee80211_he_spr_size(&pos[1])) { + elems->he_spr = (void *)&pos[1 ]; }break ;default :
Signature · 1 line
2.20.1
PATCH v2 5/6 mac80211: allow setting spatial reuse parameters from bss_conf
In reply to John CrispinStore the OBSS PD parameters inside bss_conf when bringing up an AP and/or when a station connects to an AP. This allows the driver to configure the HW accordingly.
--- include/net/cfg80211.h | 15 +++++++++++++ include/net/mac80211.h | 4 ++++ include/uapi/linux/nl80211.h | 27 +++++++++++++++++++++++ net/mac80211/cfg.c | 5 ++++- net/mac80211/he.c | 24 +++++++++++++++++++++ net/mac80211/ieee80211_i.h | 3 +++ net/mac80211/mlme.c | 1 + net/wireless/nl80211.c | 42 ++++++++++++++++++++++++++++++++++++ 8 files changed, 120 insertions(+), 1 deletion(-)
include/net/cfg80211.h +15 -0
@@ -249,6 +249,19 @@ struct ieee80211_rate {u16 hw_value, hw_value_short; }; +/** +* struct ieee80211_he_obss_pd - AP settings for spatial reuse +* +* @enable: is the feature enabled. +* @min_offset: minimal tx power offset an associated station shall use +* @max_offset: maximum tx power offset an associated station shall use +*/ +struct ieee80211_he_obss_pd { +bool enable; +u32 min_offset; +u32 max_offset; +}; +/** * struct ieee80211_sta_ht_cap - STA's HT capabilities *
@@ -878,6 +891,7 @@ enum cfg80211_ap_settings_flags {* @vht_required: stations must support VHT * @twt_responder: Enable Target Wait Time * @flags: flags, as defined in enum cfg80211_ap_settings_flags +* @he_obss_pd: OBSS Packet Detection settings */ struct cfg80211_ap_settings {struct cfg80211_chan_def chandef;
@@ -905,6 +919,7 @@ struct cfg80211_ap_settings {bool ht_required, vht_required;bool twt_responder;u32 flags; +struct ieee80211_he_obss_pd he_obss_pd; };/**
include/net/mac80211.h +4 -0
@@ -318,6 +318,7 @@ struct ieee80211_vif_chanctx_switch {* @BSS_CHANGED_FTM_RESPONDER: fime timing reasurement request responder * functionality changed for this BSS (AP mode). * @BSS_CHANGED_TWT: TWT status changed +* @BSS_CHANGED_HE_OBSS_PD: OBSS Packet Detection status changed. * */ enum ieee80211_bss_change {
@@ -349,6 +350,7 @@ enum ieee80211_bss_change {BSS_CHANGED_MCAST_RATE =1 <<25 ,BSS_CHANGED_FTM_RESPONDER =1 <<26 ,BSS_CHANGED_TWT =1 <<27 , + BSS_CHANGED_HE_OBSS_PD = 1<<28, /* when adding here, make sure to change ieee80211_reconfig */ };
@@ -604,6 +606,7 @@ struct ieee80211_ftm_responder_params {* @profile_periodicity: the least number of beacon frames need to be received * in order to discover all the nontransmitted BSSIDs in the set. * @he_operation: HE operation information of the AP we are connected to +* @he_obss_pd: OBSS Packet Detection parameters. */ struct ieee80211_bss_conf {const u8 *bssid;
@@ -666,6 +669,7 @@ struct ieee80211_bss_conf {bool ema_ap;u8 profile_periodicity;struct ieee80211_he_operation he_operation; +struct ieee80211_he_obss_pd he_obss_pd; };/**
include/uapi/linux/nl80211.h +27 -0
@@ -2310,6 +2310,9 @@ enum nl80211_commands {* * @NL80211_ATTR_TWT_RESPONDER: Enable target wait time responder support. * +* @NL80211_ATTR_HE_OBSS_PD: nested attribute for OBSS Packet Detection +* functionality. +* * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2763,6 +2766,8 @@ enum nl80211_attrs {NL80211_ATTR_TWT_RESPONDER , +NL80211_ATTR_HE_OBSS_PD , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
@@ -6390,4 +6395,26 @@ enum nl80211_peer_measurement_ftm_resp {NL80211_PMSR_FTM_RESP_ATTR_MAX =NUM_NL80211_PMSR_FTM_RESP_ATTR -1 }; +/** +* enum nl80211_he_spr - spatial reuse attributes +* @__NL80211_HE_OBSS_PD_ATTR_INVALID: Invalid +* +* @NL80211_ATTR_HE_OBSS_PD_MIN_OFFSET: the OBSS PD minimum tx power offset. +* @NL80211_ATTR_HE_OBSS_PD_MAX_OFFSET: the OBSS PD maximum tx power offset. +* +* @__NL80211_HE_OBSS_PD_ATTR_LAST: Internal +* @NL80211_HE_OBSS_PD_ATTR_MAX: highest spiatl reuse attribute. +*/ +enum nl80211_he_spr_attributes { + __NL80211_HE_OBSS_PD_ATTR_INVALID, + +NL80211_ATTR_HE_OBSS_PD_MIN_OFFSET , +NL80211_ATTR_HE_OBSS_PD_MAX_OFFSET , + +/* keep last */ + __NL80211_ATTR_HE_OBSS_PD_LAST, +NL80211_HE_OBSS_PD_ATTR_MAX = __NL80211_ATTR_HE_OBSS_PD_LAST -1 , +}; + +#endif /* __LINUX_NL80211_H */
net/mac80211/cfg.c +4 -1
@@ -940,7 +940,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,BSS_CHANGED_SSID |BSS_CHANGED_P2P_PS |BSS_CHANGED_TXPOWER | -BSS_CHANGED_TWT ; +BSS_CHANGED_TWT | +BSS_CHANGED_HE_OBSS_PD ;int err;int prev_beacon_int;
@@ -1011,6 +1012,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, sdata->vif.bss_conf.enable_beacon = true; sdata->vif.bss_conf.allow_p2p_go_ps = sdata->vif.p2p; sdata->vif.bss_conf.twt_responder = params->twt_responder; +memcpy (&sdata->vif.bss_conf.he_obss_pd, ¶ms->he_obss_pd, +sizeof (struct ieee80211_he_obss_pd )); sdata->vif.bss_conf.ssid_len = params->ssid_len;if (params->ssid_len)
net/mac80211/he.c +24 -0
@@ -67,3 +67,27 @@ ieee80211_he_op_ie_to_bss_conf(struct ieee80211_vif *vif, }memcpy (he_operation, he_op_ie_elem,sizeof (*he_operation)); } + +void +ieee80211_he_spr_ie_to_bss_conf (struct ieee80211_vif *vif, +const struct ieee80211_he_spr *he_spr_ie_elem) +{ +struct ieee80211_he_obss_pd *he_obss_pd = + &vif->bss_conf.he_obss_pd; +const u8 *data = he_spr_ie_elem->optional; + +memset (he_obss_pd,0 ,sizeof (*he_obss_pd)); + +if (!he_spr_ie_elem) +return ; + +if (he_spr_ie_elem->he_sr_control & +IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT ) + data++; +if (he_spr_ie_elem->he_sr_control & +IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT ) { + he_obss_pd->max_offset = *data++; + he_obss_pd->min_offset = *data++; + he_obss_pd->enable = true; + } +}
net/mac80211/ieee80211_i.h +3 -0
@@ -1870,6 +1870,9 @@ 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, struct sta_info *sta); +void +ieee80211_he_spr_ie_to_bss_conf (struct ieee80211_vif *vif, +const struct ieee80211_he_spr *he_spr_ie_elem); void ieee80211_he_op_ie_to_bss_conf(struct ieee80211_vif *vif,
net/mac80211/mlme.c +1 -0
@@ -3377,6 +3377,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, bss_conf->uora_ocw_range = elems.uora_element[0 ];ieee80211_he_op_ie_to_bss_conf (&sdata->vif, elems.he_operation); +ieee80211_he_spr_ie_to_bss_conf (&sdata->vif, elems.he_spr);/* TODO: OPEN: what happens if BSS color disable is set? */ }
net/wireless/nl80211.c +42 -0
60 lines not on this page · raw message
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 6/6 ath11k: add spatial reuse support
In reply to John CrispinTrigger the WMI call en/disabling OBSS PD when the bss config changes or we assoc to an AP that broadcasts the IE.
--- drivers/net/wireless/ath/ath11k/mac.c | 10 ++++++++ drivers/net/wireless/ath/ath11k/wmi.c | 35 +++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/wmi.h | 16 ++++++++++++ 3 files changed, 61 insertions(+)
drivers/net/wireless/ath/ath11k/mac.c +10 -0
@@ -1715,6 +1715,12 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw, 1);if (ret)ath11k_warn (ar->ab,"Unable to authorize BSS peer: %d\n" , ret); + + ret =ath11k_wmi_send_obss_spr_cmd (ar, arvif->vdev_id, + &bss_conf->he_obss_pd); +if (ret) +ath11k_warn (ar->ab,"failed to set vdev %i OBSS PD parameters: %d\n" , + arvif->vdev_id, ret); } static void ath11k_bss_disassoc(struct ieee80211_hw *hw,
@@ -1906,6 +1912,10 @@ static void ath11k_bss_info_changed(struct ieee80211_hw *hw,ath11k_wmi_send_twt_disable_cmd (ar, ar->pdev_idx); } +if (changed &BSS_CHANGED_HE_OBSS_PD ) +ath11k_wmi_send_obss_spr_cmd (ar, arvif->vdev_id, + &info->he_obss_pd); +mutex_unlock (&ar->conf_mutex); }
drivers/net/wireless/ath/ath11k/wmi.c +35 -0
@@ -2586,6 +2586,41 @@ ath11k_wmi_send_twt_disable_cmd(struct ath11k *ar, u32 pdev_id)return ret; } +int +ath11k_wmi_send_obss_spr_cmd (struct ath11k *ar,u32 vdev_id, +struct ieee80211_he_obss_pd *he_obss_pd) +{ +struct ath11k_pdev_wmi *wmi = ar->wmi; +struct ath11k_base *ab = wmi->wmi_sc->sc; +struct wmi_obss_spatial_reuse_params_cmd *cmd; +struct sk_buff *skb; +int ret, len; + + len =sizeof (*cmd); + + skb =ath11k_wmi_alloc_skb (wmi->wmi_sc, len); +if (!skb) +return -ENOMEM ; + + cmd = (void *)skb->data; + cmd->tlv_header =FIELD_PREP (WMI_TLV_TAG , +WMI_TAG_OBSS_SPATIAL_REUSE_SET_CMD ) | +FIELD_PREP (WMI_TLV_LEN , len -TLV_HDR_SIZE ); + cmd->vdev_id = vdev_id; + cmd->enable = he_obss_pd->enable; + cmd->obss_min = he_obss_pd->min_offset; + cmd->obss_max = he_obss_pd->max_offset; + + ret =ath11k_wmi_cmd_send (wmi, skb, +WMI_PDEV_OBSS_PD_SPATIAL_REUSE_CMDID ); +if (ret) { +ath11k_warn (ab, +"Failed to send WMI_PDEV_OBSS_PD_SPATIAL_REUSE_CMDID" ); +dev_kfree_skb (skb); + } +return ret; +} +static inline void ath11k_fill_band_to_mac_param (struct ath11k_base *soc,struct wmi_host_pdev_band_to_mac *band_to_mac) {
drivers/net/wireless/ath/ath11k/wmi.h +16 -0
@@ -172,6 +172,8 @@ enum wmi_cmd_group {WMI_GRP_WLM ,/* 0x3c */ WMI_GRP_11K_OFFLOAD ,/* 0x3d */ WMI_GRP_TWT ,/* 0x3e */ +WMI_GRP_MOTION_DET ,/* 0x3f */ + WMI_GRP_SPATIAL_REUSE, /* 0x40 */ };
@@ -541,6 +543,9 @@ enum wmi_tlv_cmd_id {WMI_TWT_DEL_DIALOG_CMDID ,WMI_TWT_PAUSE_DIALOG_CMDID ,WMI_TWT_RESUME_DIALOG_CMDID , +WMI_PDEV_OBSS_PD_SPATIAL_REUSE_CMDID = +WMI_TLV_CMD (WMI_GRP_SPATIAL_REUSE ), + WMI_PDEV_OBSS_PD_SPATIAL_REUSE_SET_DEF_OBSS_THRESH_CMDID, }; enum wmi_tlv_event_id {
@@ -5114,6 +5119,15 @@ struct wmi_twt_disable_params_cmd {u32 pdev_id; }; +struct wmi_obss_spatial_reuse_params_cmd { +u32 tlv_header; +u32 pdev_id; +u32 enable; +s32 obss_min; +s32 obss_max; +u32 vdev_id; +}; +struct target_resource_config {u32 num_vdevs;u32 num_peers;
@@ -5305,4 +5319,6 @@ void ath11k_wmi_fw_stats_fill(struct ath11k *ar,int ath11k_wmi_simulate_radar (struct ath11k *ar);int ath11k_wmi_send_twt_enable_cmd (struct ath11k *ar,u32 pdev_id);int ath11k_wmi_send_twt_disable_cmd (struct ath11k *ar,u32 pdev_id); +int ath11k_wmi_send_obss_spr_cmd (struct ath11k *ar,u32 vdev_id, +struct ieee80211_he_obss_pd *he_obss_pd);#endif
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Johannes Berg
maintainerRe: [PATCH V2 4/6] mac80211: HE: add Spatial Reuse IE parsing support
In reply to John CrispinQuoted 6 lines
+/*
+ *ieee80211_he_spr_size- calculate 802.11ax HE Spatial Reuse IE size
+ * @he_spr_ie: byte data of the He Spatial Reuse IE, stating from the the byte
+ * after the ext ID byte. It is assumed thathe_spr_iehas at least
+ *sizeof(struct ieee80211_he_spr)bytes, checked already in
+ *ieee802_11_parse_elems_crc()
That reference to mac80211 isn't really quite appropriate here - should say something like "the caller must have validated this". This is a lower layer usable by non-mac80211 as well.
johannes