A 6GHz AP can decide to transmit Beacon, Broadcast probe response
and FILS discovery frames in a non-HT duplicate PPDU when
operating in non 20MHz Bandwidth to enhance its discoverability.
(IEEE Std 802.11ax‐2021-26.17.2.2)
Send WMI_VDEV_PARAM_6GHZ_PARAMS with enable/disable option to FW
based on he_6g_nonht_dup_beacon_set.
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1
Signed-off-by: Rameshkumar Sundaram <[email protected]>
---
drivers/net/wireless/ath/ath11k/mac.c | 38 +++++++++++++++++++++++++++++++++++
drivers/net/wireless/ath/ath11k/wmi.h | 8 ++++++++
2 files changed, 46 insertions(+)
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 80f8640..307377a 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -2915,6 +2915,33 @@ static int ath11k_mac_fils_discovery(struct ath11k_vif *arvif,
return ret;
}
+static int ath11k_mac_set_6g_nonht_dup_conf(struct ath11k_vif *arvif,
+ const struct cfg80211_chan_def *chandef)
+{
+ struct ath11k *ar = arvif->ar;
+ int ret = 0;
+ bool is_nontx_ap = arvif->vif->bss_conf.nontransmitted;
+ enum wmi_phy_mode mode = ath11k_phymodes[chandef->chan->band][chandef->width];
+ bool dup_bcn_enable = arvif->vif->bss_conf.he_6g_nonht_dup_beacon_set;
+
+ if ((arvif->vdev_type == WMI_VDEV_TYPE_AP) && !is_nontx_ap &&
+ (chandef->chan->band == NL80211_BAND_6GHZ)) {
+ u32 param_id = WMI_VDEV_PARAM_6GHZ_PARAMS;
+ u32 value = 0;
+
+ if (mode > MODE_11AX_HE20 && dup_bcn_enable) {
+ value |= WMI_VDEV_6GHZ_BITMAP_NON_HT_DUPLICATE_BEACON;
+ value |= WMI_VDEV_6GHZ_BITMAP_NON_HT_DUPLICATE_BCAST_PROBE_RSP;
+ value |= WMI_VDEV_6GHZ_BITMAP_NON_HT_DUPLICATE_FD_FRAME;
+ }
+ ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "Set 6GHz non-ht dup params for "
+ "vdev %pM vdev_id %d param %d value %d\n", arvif->vif->addr,
+ arvif->vdev_id, param_id, value);
+ ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, param_id, value);
+ }
+ return ret;
+}
+
static int ath11k_mac_config_obss_pd(struct ath11k *ar,
struct ieee80211_he_obss_pd *he_obss_pd)
{
@@ -3129,6 +3156,17 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
arvif->do_not_send_tmpl = true;
else
arvif->do_not_send_tmpl = false;
+
+ if (vif->type == NL80211_IFTYPE_AP && vif->bss_conf.he_support) {
+ if (!ath11k_mac_vif_chan(arvif->vif, &def)) {
+ ret = ath11k_mac_set_6g_nonht_dup_conf(arvif, &def);
+ if (ret) {
+ ath11k_warn(ar->ab, "failed to set 6G non-ht dup"
+ " conf for vdev %d: %d\n",
+ arvif->vdev_id, ret);
+ }
+ }
+ }
}
if (changed & (BSS_CHANGED_BEACON_INFO | BSS_CHANGED_BEACON)) {
diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index 2f26ec1a..96ed891 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -2125,6 +2125,14 @@ enum {
/* preablbe short */
#define WMI_VDEV_PREAMBLE_SHORT 0x2
+/** 6GHZ params **/
+/* Control to enable/disable beacon tx in non-HT duplicate */
+#define WMI_VDEV_6GHZ_BITMAP_NON_HT_DUPLICATE_BEACON BIT(0)
+/* Control to enable/disable broadcast probe response tx in non-HT duplicate */
+#define WMI_VDEV_6GHZ_BITMAP_NON_HT_DUPLICATE_BCAST_PROBE_RSP BIT(1)
+/* Control to enable/disable FILS discovery frame tx in non-HT duplicate */
+#define WMI_VDEV_6GHZ_BITMAP_NON_HT_DUPLICATE_FD_FRAME BIT(2)
+
enum wmi_peer_smps_state {
WMI_PEER_SMPS_PS_NONE = 0x0,
WMI_PEER_SMPS_STATIC = 0x1,
--
2.7.4