* [PATCH v3 0/3] Add support to configure beacon tx mode
@ 2021-06-08 15:04 Maharaja Kennadyrajan
2021-06-08 15:04 ` [PATCH v3 1/3] nl80211: Add support for " Maharaja Kennadyrajan
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Maharaja Kennadyrajan @ 2021-06-08 15:04 UTC (permalink / raw)
To: 000ath11k, linux-wireless; +Cc: Maharaja Kennadyrajan
Add support to configure the beacon tx mode as STAGGERED
or BURST mode via hostapd configuration during the AP
bring-up or via wpa_suppplicant configuration during MESH
bring-up.
Beacons can be sent out in burst(continuously in a single shot
one after another) or staggered (equally spread out over beacon
interval) mode.
V3: Addressed Johnson's comment on v2 patch.
V2: Addressed Johannes's comment on v1 patch.
Maharaja Kennadyrajan (3):
nl80211: Add support for beacon tx mode
mac80211: Add support for beacon tx mode
ath11k: Add support for beacon tx mode
drivers/net/wireless/ath/ath11k/mac.c | 10 +++++++---
include/net/cfg80211.h | 4 ++++
include/net/mac80211.h | 2 ++
include/uapi/linux/nl80211.h | 16 ++++++++++++++++
net/mac80211/cfg.c | 2 ++
net/wireless/nl80211.c | 9 +++++++++
6 files changed, 40 insertions(+), 3 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3 1/3] nl80211: Add support for beacon tx mode
2021-06-08 15:04 [PATCH v3 0/3] Add support to configure beacon tx mode Maharaja Kennadyrajan
@ 2021-06-08 15:04 ` Maharaja Kennadyrajan
2021-06-08 15:04 ` [PATCH v3 2/3] mac80211: " Maharaja Kennadyrajan
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Maharaja Kennadyrajan @ 2021-06-08 15:04 UTC (permalink / raw)
To: 000ath11k, linux-wireless; +Cc: Maharaja Kennadyrajan
User can configure the below beacon tx mode
1. Staggered mode and 2. Burst mode while bring-up the AP
or MESH.
Beacons can be sent out in burst(continuously in a single shot
one after another) or staggered (equally spread out over beacon
interval) mode.
Set the beacon_tx_mode as 1 for Staggered mode and 2 for
burst mode.
Hence, added the support in the nl80211/cfg80211
layer to honour the beacon tx mode configuration and pass
this value to the driver.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-00630-QCAHKSWPL_SILICONZ-2
Signed-off-by: Maharaja Kennadyrajan <mkenna@codeaurora.org>
---
V3: Addressed Johnson's comment on v2 patch.
V2: Addressed Johannes's comment on v1 patch.
include/net/cfg80211.h | 4 ++++
include/uapi/linux/nl80211.h | 16 ++++++++++++++++
net/wireless/nl80211.c | 9 +++++++++
3 files changed, 29 insertions(+)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 58c2cd4..65161fd 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1182,6 +1182,7 @@ enum cfg80211_ap_settings_flags {
* @he_oper: HE operation IE (or %NULL if HE isn't enabled)
* @fils_discovery: FILS discovery transmission parameters
* @unsol_bcast_probe_resp: Unsolicited broadcast probe response parameters
+ * @beacon_tx_mode: Beacon Tx Mode setting
*/
struct cfg80211_ap_settings {
struct cfg80211_chan_def chandef;
@@ -1214,6 +1215,7 @@ struct cfg80211_ap_settings {
struct cfg80211_he_bss_color he_bss_color;
struct cfg80211_fils_discovery fils_discovery;
struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp;
+ enum nl80211_beacon_tx_mode beacon_tx_mode;
};
/**
@@ -2061,6 +2063,7 @@ struct mesh_config {
* to operate on DFS channels.
* @control_port_over_nl80211: TRUE if userspace expects to exchange control
* port frames over NL80211 instead of the network interface.
+ * @beacon_tx_mode: Beacon Tx Mode setting.
*
* These parameters are fixed when the mesh is created.
*/
@@ -2084,6 +2087,7 @@ struct mesh_setup {
struct cfg80211_bitrate_mask beacon_rate;
bool userspace_handles_dfs;
bool control_port_over_nl80211;
+ enum nl80211_beacon_tx_mode beacon_tx_mode;
};
/**
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index f962c06..a86b32e 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2560,6 +2560,10 @@ enum nl80211_commands {
* disassoc events to indicate that an immediate reconnect to the AP
* is desired.
*
+ * @NL80211_ATTR_BEACON_TX_MODE: used to configure the beacon tx mode as
+ * staggered mode = 1 or burst mode = 2 in %NL80211_CMD_START_AP or
+ * %NL80211_CMD_JOIN_MESH from user-space.
+ *
* @NUM_NL80211_ATTR: total number of nl80211_attrs available
* @NL80211_ATTR_MAX: highest attribute number currently defined
* @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3057,6 +3061,8 @@ enum nl80211_attrs {
NL80211_ATTR_DISABLE_HE,
+ NL80211_ATTR_BEACON_TX_MODE,
+
/* add attributes here, update the policy in nl80211.c */
__NL80211_ATTR_AFTER_LAST,
@@ -7299,4 +7305,14 @@ enum nl80211_sar_specs_attrs {
NL80211_SAR_ATTR_SPECS_MAX = __NL80211_SAR_ATTR_SPECS_LAST - 1,
};
+/**
+ * enum nl80211_beacon_tx_mode - Beacon Tx Mode enum.
+ * Used to configure beacon staggered mode or beacon burst mode.
+ */
+enum nl80211_beacon_tx_mode {
+ NL80211_BEACON_DEFAULT_MODE = 0,
+ NL80211_BEACON_STAGGERED_MODE = 1,
+ NL80211_BEACON_BURST_MODE = 2,
+};
+
#endif /* __LINUX_NL80211_H */
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index fc9286a..6076d00 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -759,6 +759,7 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
[NL80211_ATTR_RECONNECT_REQUESTED] = { .type = NLA_REJECT },
[NL80211_ATTR_SAR_SPEC] = NLA_POLICY_NESTED(sar_policy),
[NL80211_ATTR_DISABLE_HE] = { .type = NLA_FLAG },
+ [NL80211_ATTR_BEACON_TX_MODE] = NLA_POLICY_RANGE(NLA_U32, 1, 2),
};
/* policy for the key attributes */
@@ -5342,6 +5343,10 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
params.dtim_period =
nla_get_u32(info->attrs[NL80211_ATTR_DTIM_PERIOD]);
+ if (info->attrs[NL80211_ATTR_BEACON_TX_MODE])
+ params.beacon_tx_mode =
+ nla_get_u32(info->attrs[NL80211_ATTR_BEACON_TX_MODE]);
+
err = cfg80211_validate_beacon_int(rdev, dev->ieee80211_ptr->iftype,
params.beacon_interval);
if (err)
@@ -11896,6 +11901,10 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
return -EINVAL;
}
+ if (info->attrs[NL80211_ATTR_BEACON_TX_MODE])
+ setup.beacon_tx_mode =
+ nla_get_u32(info->attrs[NL80211_ATTR_BEACON_TX_MODE]);
+
if (info->attrs[NL80211_ATTR_MESH_SETUP]) {
/* parse additional setup parameters if given */
err = nl80211_parse_mesh_setup(info, &setup);
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 2/3] mac80211: Add support for beacon tx mode
2021-06-08 15:04 [PATCH v3 0/3] Add support to configure beacon tx mode Maharaja Kennadyrajan
2021-06-08 15:04 ` [PATCH v3 1/3] nl80211: Add support for " Maharaja Kennadyrajan
@ 2021-06-08 15:04 ` Maharaja Kennadyrajan
2021-06-08 15:04 ` [PATCH v3 3/3] ath11k: " Maharaja Kennadyrajan
2021-06-08 15:06 ` [PATCH v3 0/3] Add support to configure " Maharaja Kennadyrajan
3 siblings, 0 replies; 5+ messages in thread
From: Maharaja Kennadyrajan @ 2021-06-08 15:04 UTC (permalink / raw)
To: 000ath11k, linux-wireless; +Cc: Maharaja Kennadyrajan
Pass the beacon tx mode value from the nl80211/cfg80211
layer to the driver via ieee80211_ops and driver ops.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-00480-QCAHKSWPL_SILICONZ-1
Signed-off-by: Maharaja Kennadyrajan <mkenna@codeaurora.org>
---
include/net/mac80211.h | 2 ++
net/mac80211/cfg.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 445b66c..ff0e51e 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -631,6 +631,7 @@ struct ieee80211_fils_discovery {
* @s1g: BSS is S1G BSS (affects Association Request format).
* @beacon_tx_rate: The configured beacon transmit rate that needs to be passed
* to driver when rate control is offloaded to firmware.
+ * @beacon_tx_mode: Beacon Tx Mode setting.
*/
struct ieee80211_bss_conf {
const u8 *bssid;
@@ -700,6 +701,7 @@ struct ieee80211_bss_conf {
u32 unsol_bcast_probe_resp_interval;
bool s1g;
struct cfg80211_bitrate_mask beacon_tx_rate;
+ enum nl80211_beacon_tx_mode beacon_tx_mode;
};
/**
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 7a99892..18e0d98 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1063,6 +1063,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
prev_beacon_int = sdata->vif.bss_conf.beacon_int;
sdata->vif.bss_conf.beacon_int = params->beacon_interval;
+ sdata->vif.bss_conf.beacon_tx_mode = params->beacon_tx_mode;
if (params->he_cap && params->he_oper) {
sdata->vif.bss_conf.he_support = true;
@@ -2094,6 +2095,7 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,
sdata->vif.bss_conf.beacon_int = setup->beacon_interval;
sdata->vif.bss_conf.dtim_period = setup->dtim_period;
+ sdata->vif.bss_conf.beacon_tx_mode = setup->beacon_tx_mode;
sdata->beacon_rate_set = false;
if (wiphy_ext_feature_isset(sdata->local->hw.wiphy,
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 3/3] ath11k: Add support for beacon tx mode
2021-06-08 15:04 [PATCH v3 0/3] Add support to configure beacon tx mode Maharaja Kennadyrajan
2021-06-08 15:04 ` [PATCH v3 1/3] nl80211: Add support for " Maharaja Kennadyrajan
2021-06-08 15:04 ` [PATCH v3 2/3] mac80211: " Maharaja Kennadyrajan
@ 2021-06-08 15:04 ` Maharaja Kennadyrajan
2021-06-08 15:06 ` [PATCH v3 0/3] Add support to configure " Maharaja Kennadyrajan
3 siblings, 0 replies; 5+ messages in thread
From: Maharaja Kennadyrajan @ 2021-06-08 15:04 UTC (permalink / raw)
To: 000ath11k, linux-wireless; +Cc: Maharaja Kennadyrajan
Add support to configure the beacon tx mode in
the driver.
Beacons can be sent out in burst(continuously in a single shot
one after another) or staggered (equally spread out over beacon
interval) mode.
Use the below configuration in the hostapd/wpa_supplicant
for AP/MESH mode to configure the beacon tx mode.
"beacon_tx_mode=N", where N = 1 for STAGGERED beacon mode
and N = 2 for BURST beacon mode.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-00480-QCAHKSWPL_SILICONZ-1
Signed-off-by: Maharaja Kennadyrajan <mkenna@codeaurora.org>
---
drivers/net/wireless/ath/ath11k/mac.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 9d0ff15..dfc8644 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -2130,7 +2130,10 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
if (changed & BSS_CHANGED_BEACON) {
param_id = WMI_PDEV_PARAM_BEACON_TX_MODE;
- param_value = WMI_BEACON_STAGGERED_MODE;
+ if (info->beacon_tx_mode == NL80211_BEACON_BURST_MODE)
+ param_value = WMI_BEACON_BURST_MODE;
+ else
+ param_value = WMI_BEACON_STAGGERED_MODE;
ret = ath11k_wmi_pdev_set_param(ar, param_id,
param_value, ar->pdev->pdev_id);
if (ret)
@@ -2138,8 +2141,9 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
arvif->vdev_id);
else
ath11k_dbg(ar->ab, ATH11K_DBG_MAC,
- "Set staggered beacon mode for VDEV: %d\n",
- arvif->vdev_id);
+ "Set %s beacon mode for VDEV: %d mode: %d\n",
+ param_value ? "burst" : "staggered",
+ arvif->vdev_id, param_value);
ret = ath11k_mac_setup_bcn_tmpl(arvif);
if (ret)
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3 0/3] Add support to configure beacon tx mode
2021-06-08 15:04 [PATCH v3 0/3] Add support to configure beacon tx mode Maharaja Kennadyrajan
` (2 preceding siblings ...)
2021-06-08 15:04 ` [PATCH v3 3/3] ath11k: " Maharaja Kennadyrajan
@ 2021-06-08 15:06 ` Maharaja Kennadyrajan
3 siblings, 0 replies; 5+ messages in thread
From: Maharaja Kennadyrajan @ 2021-06-08 15:06 UTC (permalink / raw)
To: 000ath11k, linux-wireless
On 2021-06-08 20:34, Maharaja Kennadyrajan wrote:
> Add support to configure the beacon tx mode as STAGGERED
> or BURST mode via hostapd configuration during the AP
> bring-up or via wpa_suppplicant configuration during MESH
> bring-up.
>
> Beacons can be sent out in burst(continuously in a single shot
> one after another) or staggered (equally spread out over beacon
> interval) mode.
>
> V3: Addressed Johnson's comment on v2 patch.
>
> V2: Addressed Johannes's comment on v1 patch.
>
> Maharaja Kennadyrajan (3):
> nl80211: Add support for beacon tx mode
> mac80211: Add support for beacon tx mode
> ath11k: Add support for beacon tx mode
>
> drivers/net/wireless/ath/ath11k/mac.c | 10 +++++++---
> include/net/cfg80211.h | 4 ++++
> include/net/mac80211.h | 2 ++
> include/uapi/linux/nl80211.h | 16 ++++++++++++++++
> net/mac80211/cfg.c | 2 ++
> net/wireless/nl80211.c | 9 +++++++++
> 6 files changed, 40 insertions(+), 3 deletions(-)
[Maha]: Please drop this revision patchset.
I will send the next revision. Sorry for the inconvenience.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-06-08 15:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-08 15:04 [PATCH v3 0/3] Add support to configure beacon tx mode Maharaja Kennadyrajan
2021-06-08 15:04 ` [PATCH v3 1/3] nl80211: Add support for " Maharaja Kennadyrajan
2021-06-08 15:04 ` [PATCH v3 2/3] mac80211: " Maharaja Kennadyrajan
2021-06-08 15:04 ` [PATCH v3 3/3] ath11k: " Maharaja Kennadyrajan
2021-06-08 15:06 ` [PATCH v3 0/3] Add support to configure " Maharaja Kennadyrajan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).