diff --git a/mlme/core/src/wlan_mlme_main.c b/mlme/core/src/wlan_mlme_main.c
index 164d12fd3e..fd554acccb 100644
--- a/mlme/core/src/wlan_mlme_main.c
+++ b/mlme/core/src/wlan_mlme_main.c
@@ -205,6 +205,123 @@ static void mlme_init_sap_protection_cfg(struct wlan_objmgr_psoc *psoc,
cfg_get(psoc, CFG_IGNORE_PEER_HT_MODE);
}
+static void mlme_init_he_cap_in_cfg(struct wlan_objmgr_psoc *psoc,
+ struct wlan_mlme_he_caps *he_caps)
+{
+ he_caps->he_control = cfg_default(CFG_HE_CONTROL);
+ he_caps->he_twt_requestor = cfg_default(CFG_HE_TWT_REQUESTOR);
+ he_caps->he_twt_responder = cfg_default(CFG_HE_TWT_RESPONDER);
+ he_caps->he_twt_fragmentation = cfg_default(CFG_HE_TWT_FRAGMENTATION);
+ he_caps->he_max_frag_msdu = cfg_default(CFG_HE_MAX_FRAG_MSDU);
+ he_caps->he_min_frag_size = cfg_default(CFG_HE_MIN_FRAG_SIZE);
+ he_caps->he_trig_pad = cfg_default(CFG_HE_TRIG_PAD);
+ he_caps->he_mtid_aggr_rx = cfg_default(CFG_HE_MTID_AGGR_RX);
+ he_caps->he_link_adaptation = cfg_default(CFG_HE_LINK_ADAPTATION);
+ he_caps->he_all_ack = cfg_default(CFG_HE_ALL_ACK);
+ he_caps->he_trigd_rsp_scheduling =
+ cfg_default(CFG_HE_TRIGD_RSP_SCHEDULING);
+ he_caps->he_buffer_status_rpt = cfg_default(CFG_HE_BUFFER_STATUS_RPT);
+ he_caps->he_bcast_twt = cfg_default(CFG_HE_BCAST_TWT);
+ he_caps->he_ba_32bit = cfg_default(CFG_HE_BA_32BIT);
+ he_caps->he_mu_cascading = cfg_default(CFG_HE_MU_CASCADING);
+ he_caps->he_multi_tid = cfg_default(CFG_HE_MULTI_TID);
+ he_caps->he_dl_mu_ba = cfg_default(CFG_HE_DL_MU_BA);
+ he_caps->he_omi = cfg_default(CFG_HE_OMI);
+ he_caps->he_ofdma_ra = cfg_default(CFG_HE_OFDMA_RA);
+ he_caps->he_max_ampdu_len = cfg_default(CFG_HE_MAX_AMPDU_LEN);
+ he_caps->he_amsdu_frag = cfg_default(CFG_HE_AMSDU_FRAG);
+ he_caps->he_flex_twt_sched = cfg_default(CFG_HE_FLEX_TWT_SCHED);
+ he_caps->he_rx_ctrl = cfg_default(CFG_HE_RX_CTRL);
+ he_caps->he_bsrp_ampdu_aggr = cfg_default(CFG_HE_BSRP_AMPDU_AGGR);
+ he_caps->he_qtp = cfg_default(CFG_HE_QTP);
+ he_caps->he_a_bqr = cfg_default(CFG_HE_A_BQR);
+ he_caps->he_sr_responder = cfg_default(CFG_HE_SR_RESPONDER);
+ he_caps->he_ndp_feedback_supp = cfg_default(CFG_HE_NDP_FEEDBACK_SUPP);
+ he_caps->he_ops_supp = cfg_default(CFG_HE_OPS_SUPP);
+ he_caps->he_amsdu_in_ampdu = cfg_default(CFG_HE_AMSDU_IN_AMPDU);
+ he_caps->he_chan_width = cfg_default(CFG_HE_CHAN_WIDTH);
+ he_caps->he_mtid_aggr_tx = cfg_default(CFG_HE_MTID_AGGR_TX);
+ he_caps->he_sub_ch_sel_tx = cfg_default(CFG_HE_SUB_CH_SEL_TX);
+ he_caps->he_ul_2x996_ru = cfg_default(CFG_HE_UL_2X996_RU);
+ he_caps->he_om_ctrl_ul_mu_dis_rx =
+ cfg_default(CFG_HE_OM_CTRL_UL_MU_DIS_RX);
+ he_caps->he_rx_pream_punc = cfg_default(CFG_HE_RX_PREAM_PUNC);
+ he_caps->he_class_of_device = cfg_default(CFG_HE_CLASS_OF_DEVICE);
+ he_caps->he_ldpc = cfg_default(CFG_HE_LDPC);
+ he_caps->he_ltf_ppdu = cfg_default(CFG_HE_LTF_PPDU);
+ he_caps->he_midamble_rx_nsts = cfg_default(CFG_HE_MIDAMBLE_RX_MAX_NSTS);
+ he_caps->he_ltf_ndp = cfg_default(CFG_HE_LTF_NDP);
+ he_caps->he_tx_stbc_lt80 = cfg_default(CFG_HE_TX_STBC_LT80);
+ he_caps->he_rx_stbc_lt80 = cfg_default(CFG_HE_RX_STBC_LT80);
+ he_caps->he_doppler = cfg_default(CFG_HE_DOPPLER);
+ he_caps->he_ul_mumimo = cfg_default(CFG_HE_UL_MUMIMO);
+ he_caps->he_dcm_tx = cfg_default(CFG_HE_DCM_TX);
+ he_caps->he_dcm_rx = cfg_default(CFG_HE_DCM_RX);
+ he_caps->he_mu_ppdu = cfg_default(CFG_HE_MU_PPDU);
+ he_caps->he_su_beamformer = cfg_default(CFG_HE_SU_BEAMFORMER);
+ he_caps->he_su_beamformee = cfg_default(CFG_HE_SU_BEAMFORMEE);
+ he_caps->he_mu_beamformer = cfg_default(CFG_HE_MU_BEAMFORMER);
+ he_caps->he_bfee_sts_lt80 = cfg_default(CFG_HE_BFEE_STS_LT80);
+ he_caps->he_bfee_sts_gt80 = cfg_default(CFG_HE_BFEE_STS_GT80);
+ he_caps->he_num_sound_lt80 = cfg_default(CFG_HE_NUM_SOUND_LT80);
+ he_caps->he_num_sound_gt80 = cfg_default(CFG_HE_NUM_SOUND_GT80);
+ he_caps->he_su_feed_tone16 = cfg_default(CFG_HE_SU_FEED_TONE16);
+ he_caps->he_mu_feed_tone16 = cfg_default(CFG_HE_MU_FEED_TONE16);
+ he_caps->he_codebook_su = cfg_default(CFG_HE_CODEBOOK_SU);
+ he_caps->he_codebook_mu = cfg_default(CFG_HE_CODEBOOK_MU);
+ he_caps->he_bfrm_feed = cfg_default(CFG_HE_BFRM_FEED);
+ he_caps->he_er_su_ppdu = cfg_default(CFG_HE_ER_SU_PPDU);
+ he_caps->he_dl_part_bw = cfg_default(CFG_HE_DL_PART_BW);
+ he_caps->he_ppet_present = cfg_default(CFG_HE_PPET_PRESENT);
+ he_caps->he_srp = cfg_default(CFG_HE_SRP);
+ he_caps->he_power_boost = cfg_default(CFG_HE_POWER_BOOST);
+ he_caps->he_4x_ltf_gi = cfg_default(CFG_HE_4x_LTF_GI);
+ he_caps->he_max_nc = cfg_default(CFG_HE_MAX_NC);
+ he_caps->he_tx_stbc_gt80 = cfg_default(CFG_HE_TX_STBC_GT80);
+ he_caps->he_rx_stbc_gt80 = cfg_default(CFG_HE_RX_STBC_GT80);
+ he_caps->he_er_4x_ltf_gi = cfg_default(CFG_HE_ER_4x_LTF_GI);
+ he_caps->he_ppdu_20_in_40mhz_2g =
+ cfg_default(CFG_HE_PPDU_20_IN_40MHZ_2G);
+ he_caps->he_ppdu_20_in_160_80p80mhz =
+ cfg_default(CFG_HE_PPDU_20_IN_160_80P80MHZ);
+ he_caps->he_ppdu_80_in_160_80p80mhz =
+ cfg_default(CFG_HE_PPDU_80_IN_160_80P80MHZ);
+ he_caps->he_er_1x_he_ltf_gi =
+ cfg_default(CFG_HE_ER_1X_HE_LTF_GI);
+ he_caps->he_midamble_rx_1x_he_ltf =
+ cfg_default(CFG_HE_MIDAMBLE_RX_1X_HE_LTF);
+ he_caps->he_dcm_max_bw = cfg_default(CFG_HE_DCM_MAX_BW);
+ he_caps->he_longer_16_sigb_ofdm_sym =
+ cfg_default(CFG_HE_LONGER_16_SIGB_OFDM_SYM);
+ he_caps->he_non_trig_cqi_feedback =
+ cfg_default(CFG_HE_NON_TRIG_CQI_FEEDBACK);
+ he_caps->he_tx_1024_qam_lt_242_ru =
+ cfg_default(CFG_HE_TX_1024_QAM_LT_242_RU);
+ he_caps->he_rx_1024_qam_lt_242_ru =
+ cfg_default(CFG_HE_RX_1024_QAM_LT_242_RU);
+ he_caps->he_rx_full_bw_mu_cmpr_sigb =
+ cfg_default(CFG_HE_RX_FULL_BW_MU_CMPR_SIGB);
+ he_caps->he_rx_full_bw_mu_non_cmpr_sigb =
+ cfg_default(CFG_HE_RX_FULL_BW_MU_NON_CMPR_SIGB);
+ he_caps->he_rx_mcs_map_lt_80 = cfg_default(CFG_HE_RX_MCS_MAP_LT_80);
+ he_caps->he_tx_mcs_map_lt_80 = cfg_default(CFG_HE_TX_MCS_MAP_LT_80);
+ he_caps->he_rx_mcs_map_160 = cfg_default(CFG_HE_RX_MCS_MAP_160);
+ he_caps->he_tx_mcs_map_160 = cfg_default(CFG_HE_TX_MCS_MAP_160);
+ he_caps->he_rx_mcs_map_80_80 = cfg_default(CFG_HE_RX_MCS_MAP_80_80);
+ he_caps->he_tx_mcs_map_80_80 = cfg_default(CFG_HE_TX_MCS_MAP_80_80);
+ he_caps->he_ops_basic_mcs_nss = cfg_default(CFG_HE_OPS_BASIC_MCS_NSS);
+ he_caps->he_twt_dynamic_fragmentation =
+ cfg_get(psoc, CFG_HE_DYNAMIC_FRAGMENTATION);
+ he_caps->enable_ul_mimo =
+ cfg_get(psoc, CFG_ENABLE_UL_MIMO);
+ he_caps->enable_ul_ofdm =
+ cfg_get(psoc, CFG_ENABLE_UL_OFDMA);
+ he_caps->he_sta_obsspd =
+ cfg_get(psoc, CFG_HE_STA_OBSSPD);
+ qdf_mem_zero(he_caps->he_ppet_2g, MLME_HE_PPET_LEN);
+ qdf_mem_zero(he_caps->he_ppet_5g, MLME_HE_PPET_LEN);
+}
+
static void mlme_init_sap_cfg(struct wlan_objmgr_psoc *psoc,
struct wlan_mlme_cfg_sap *sap_cfg)
{
@@ -543,6 +660,7 @@ QDF_STATUS mlme_cfg_on_psoc_enable(struct wlan_objmgr_psoc *psoc)
mlme_init_sap_protection_cfg(psoc, &mlme_cfg->sap_protection_cfg);
mlme_init_chainmask_cfg(psoc, &mlme_cfg->chainmask_cfg);
mlme_init_sap_cfg(psoc, &mlme_cfg->sap_cfg);
+ mlme_init_he_cap_in_cfg(psoc, &mlme_cfg->he_caps);
mlme_init_obss_ht40_cfg(psoc, &mlme_cfg->obss_ht40);
mlme_init_sta_cfg(psoc, &mlme_cfg->sta);
mlme_init_lfr_cfg(psoc, &mlme_cfg->lfr);
diff --git a/mlme/dispatcher/inc/cfg_mlme.h b/mlme/dispatcher/inc/cfg_mlme.h
index 9712cf9287..a27fa71583 100644
--- a/mlme/dispatcher/inc/cfg_mlme.h
+++ b/mlme/dispatcher/inc/cfg_mlme.h
@@ -25,6 +25,7 @@
#include "cfg_mlme_chainmask.h"
#include "cfg_mlme_ht_caps.h"
+#include "cfg_mlme_he_caps.h"
#include "cfg_mlme_lfr.h"
#include "cfg_mlme_obss_ht40.h"
#include "cfg_mlme_mbo.h"
@@ -40,6 +41,7 @@
#define CFG_MLME_ALL \
CFG_CHAINMASK_ALL \
CFG_HT_CAPS_ALL \
+ CFG_HE_CAPS_ALL \
CFG_LFR_ALL \
CFG_MBO_ALL \
CFG_OBSS_HT40_ALL \
diff --git a/mlme/dispatcher/inc/cfg_mlme_he_caps.h b/mlme/dispatcher/inc/cfg_mlme_he_caps.h
new file mode 100644
index 0000000000..5ff03754f4
--- /dev/null
+++ b/mlme/dispatcher/inc/cfg_mlme_he_caps.h
@@ -0,0 +1,761 @@
+/*
+ * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: This file contains centralized definitions of converged configuration.
+ */
+
+#ifndef __CFG_MLME_HE_CAPS_H
+#define __CFG_MLME_HE_CAPS_H
+
+#define CFG_HE_CONTROL CFG_BOOL( \
+ "he_control", \
+ 0, \
+ "HE Control")
+
+#define CFG_HE_TWT_REQUESTOR CFG_BOOL( \
+ "he_twt_requestor", \
+ 0, \
+ "HE Twt Requestor")
+
+#define CFG_HE_TWT_RESPONDER CFG_BOOL( \
+ "he_twt_responder", \
+ 0, \
+ "HE Twt Responder")
+
+#define CFG_HE_TWT_FRAGMENTATION CFG_UINT( \
+ "he_twt_fragmentation", \
+ 0, \
+ 3, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "HE Twt Fragmentation")
+
+#define CFG_HE_MAX_FRAG_MSDU CFG_UINT( \
+ "he_max_frag_msdu", \
+ 0, \
+ 7, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "HE Max Frag Msdu")
+
+#define CFG_HE_MIN_FRAG_SIZE CFG_UINT( \
+ "he_min_frag_size", \
+ 0, \
+ 3, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "HE Min Frag Size")
+
+#define CFG_HE_TRIG_PAD CFG_UINT( \
+ "he_trig_pad", \
+ 0, \
+ 2, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "HE Trig Pad")
+
+#define CFG_HE_MTID_AGGR_RX CFG_UINT( \
+ "he_mtid_aggr_rx", \
+ 0, \
+ 7, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "HE Mtid Aggr")
+
+#define CFG_HE_LINK_ADAPTATION CFG_UINT( \
+ "he_link_adaptation", \
+ 0, \
+ 3, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "HE Link Adaptation")
+
+#define CFG_HE_ALL_ACK CFG_BOOL( \
+ "he_all_ack", \
+ 0, \
+ "HE All Ack")
+
+#define CFG_HE_TRIGD_RSP_SCHEDULING CFG_BOOL( \
+ "he_trigd_rsp_scheduling", \
+ 0, \
+ "HE Trigd Rsp Scheduling")
+
+#define CFG_HE_BUFFER_STATUS_RPT CFG_BOOL( \
+ "he_buffer_status_rpt", \
+ 0, \
+ "HE Buffer Status Rpt")
+
+#define CFG_HE_BCAST_TWT CFG_BOOL( \
+ "he_bcast_twt", \
+ 0, \
+ "HE Bcast twt")
+
+#define CFG_HE_BA_32BIT CFG_BOOL( \
+ "he_ba_32bit", \
+ 0, \
+ "HE BA 32Bit")
+
+#define CFG_HE_MU_CASCADING CFG_BOOL( \
+ "he_mu_cascading", \
+ 0, \
+ "HE Mu Cascading")
+
+#define CFG_HE_MULTI_TID CFG_BOOL( \
+ "he_multi_tid", \
+ 0, \
+ "HE Multi Tid")
+
+#define CFG_HE_DL_MU_BA CFG_BOOL( \
+ "he_dl_mu_ba", \
+ 0, \
+ "HE Dl_Mu_Ba")
+
+#define CFG_HE_OMI CFG_BOOL( \
+ "he_omi", \
+ 0, \
+ "HE Omi")
+
+#define CFG_HE_OFDMA_RA CFG_BOOL( \
+ "he_ofdma_ra", \
+ 0, \
+ "HE Ofdma Ra")
+
+#define CFG_HE_MAX_AMPDU_LEN CFG_UINT( \
+ "he_max_ampdu_len", \
+ 0, \
+ 3, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "HE Max Ampdu Len")
+
+#define CFG_HE_AMSDU_FRAG CFG_BOOL( \
+ "he_amspdu_frag", \
+ 0, \
+ "HE Amsdu Frag")
+
+#define CFG_HE_FLEX_TWT_SCHED CFG_BOOL( \
+ "he_flex_twt_sched", \
+ 0, \
+ "HE Flex Twt Sched")
+
+#define CFG_HE_RX_CTRL CFG_BOOL( \
+ "he_rx_ctrl", \
+ 0, \
+ "HE Rx Ctrl")
+
+#define CFG_HE_BSRP_AMPDU_AGGR CFG_BOOL( \
+ "he_bsrp_ampdu_aggr", \
+ 0, \
+ "He Bspr Ampdu Aggr")
+
+#define CFG_HE_QTP CFG_BOOL( \
+ "he_qtp", \
+ 0, \
+ "He Qtp")
+
+#define CFG_HE_A_BQR CFG_BOOL( \
+ "he_a_bqr", \
+ 0, \
+ "He A Bqr")
+
+#define CFG_HE_SR_RESPONDER CFG_BOOL( \
+ "he_sr_responder", \
+ 0, \
+ "He Sr Responder")
+
+#define CFG_HE_NDP_FEEDBACK_SUPP CFG_BOOL( \
+ "he_ndp_feedback_supp", \
+ 0, \
+ "He Ndp Feedback Supp")
+
+#define CFG_HE_OPS_SUPP CFG_BOOL( \
+ "he_ops_supp", \
+ 0, \
+ "He Ops Supp")
+
+#define CFG_HE_AMSDU_IN_AMPDU CFG_BOOL( \
+ "he_amsdu_in_ampdu", \
+ 0, \
+ "He Amsdu In Ampdu")
+
+#define CFG_HE_MTID_AGGR_TX CFG_UINT( \
+ "he_mtid_aggr_tx", \
+ 0, \
+ 0x7, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He MTid Aggr Tx")
+
+#define CFG_HE_SUB_CH_SEL_TX CFG_BOOL( \
+ "he_sub_ch_sel_tx", \
+ 0, \
+ "He Sub cg sel tx")
+
+#define CFG_HE_UL_2X996_RU CFG_BOOL( \
+ "he_ul_2x996_ru", \
+ 0, \
+ "He Ul 2x996 Ru")
+
+#define CFG_HE_OM_CTRL_UL_MU_DIS_RX CFG_BOOL( \
+ "he_om_ctrl_ul_mu_dis_rx", \
+ 0, \
+ "He Om Ctrl Ul My Dis Rx")
+
+#define CFG_HE_CHAN_WIDTH CFG_UINT( \
+ "he_chan_width", \
+ 0, \
+ 0x3F, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Chan Width")
+
+#define CFG_HE_RX_PREAM_PUNC CFG_UINT( \
+ "he_rx_pream_punc", \
+ 0, \
+ 0xF, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Rx Pream Punc")
+
+#define CFG_HE_CLASS_OF_DEVICE CFG_BOOL( \
+ "he_class_of_device", \
+ 0, \
+ "He Class Of Device")
+
+#define CFG_HE_LDPC CFG_BOOL( \
+ "he_ldpc", \
+ 0, \
+ "He Ldpc")
+
+#define CFG_HE_LTF_PPDU CFG_UINT( \
+ "he_ltf_ppdu", \
+ 0, \
+ 3, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Ltf Ppdu")
+
+#define CFG_HE_MIDAMBLE_RX_MAX_NSTS CFG_UINT( \
+ "he_midamble_rx_max_nsts", \
+ 0, \
+ 3, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Midamble Rx Max Nsts")
+
+#define CFG_HE_LTF_NDP CFG_UINT( \
+ "he_ltf_ndp", \
+ 0, \
+ 3, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Ltf Ndp")
+
+#define CFG_HE_TX_STBC_LT80 CFG_BOOL( \
+ "he_tx_stbc_lt80_sta", \
+ 0, \
+ "He Tx Stbc Lt80")
+
+#define CFG_HE_RX_STBC_LT80 CFG_BOOL( \
+ "he_rx_stbc_lt80", \
+ 0, \
+ "He Rx Stbc Lt80")
+
+#define CFG_HE_DOPPLER CFG_UINT( \
+ "he_doppler", \
+ 0, \
+ 3, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Doppler")
+
+#define CFG_HE_UL_MUMIMO CFG_UINT( \
+ "he_ul_mumimo", \
+ 0, \
+ 3, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Ul Mumimo")
+
+#define CFG_HE_DCM_TX CFG_UINT( \
+ "he_dcm_tx", \
+ 0, \
+ 7, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Dcm Tx")
+
+#define CFG_HE_DCM_RX CFG_UINT( \
+ "he_dcm_rx", \
+ 0, \
+ 7, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Dcm Rx")
+
+#define CFG_HE_MU_PPDU CFG_BOOL( \
+ "he_mu_ppdu", \
+ 0, \
+ "He Mu Ppdu")
+
+#define CFG_HE_SU_BEAMFORMER CFG_BOOL( \
+ "he_su_beamformer", \
+ 0, \
+ "He Su Beamformer")
+
+#define CFG_HE_SU_BEAMFORMEE CFG_BOOL( \
+ "he_su_beamformee", \
+ 0, \
+ "He Su Beamformee")
+
+#define CFG_HE_MU_BEAMFORMER CFG_BOOL( \
+ "he_mu_beamformer", \
+ 0, \
+ "He Mu Beamformer")
+
+#define CFG_HE_BFEE_STS_LT80 CFG_UINT( \
+ "he_bfee_sts_lt80", \
+ 0, \
+ 7, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Mu Bfee Sts Lt80")
+
+#define CFG_HE_BFEE_STS_GT80 CFG_UINT( \
+ "he_bfee_sts_lt80", \
+ 0, \
+ 7, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Mu Bfee Sts Gt80")
+
+#define CFG_HE_NUM_SOUND_LT80 CFG_UINT( \
+ "he_num_sound_lt80", \
+ 0, \
+ 7, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Num Sound Lt80")
+
+#define CFG_HE_NUM_SOUND_GT80 CFG_UINT( \
+ "he_num_sound_gt80", \
+ 0, \
+ 7, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Num Sound Gt80")
+
+#define CFG_HE_SU_FEED_TONE16 CFG_BOOL( \
+ "he_su_feed_tone16", \
+ 0, \
+ "He Su Feed Tone16")
+
+#define CFG_HE_MU_FEED_TONE16 CFG_BOOL( \
+ "he_mu_feed_tone16", \
+ 0, \
+ "He Mu Feed Tone16")
+
+#define CFG_HE_CODEBOOK_SU CFG_BOOL( \
+ "he_codebook_su", \
+ 0, \
+ "He Codebook Su")
+
+#define CFG_HE_CODEBOOK_MU CFG_BOOL( \
+ "he_codebook_mu", \
+ 0, \
+ "He Codebook Mu")
+
+#define CFG_HE_BFRM_FEED CFG_UINT( \
+ "he_bfrm_feed", \
+ 0, \
+ 7, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Bfrm Feed")
+
+#define CFG_HE_ER_SU_PPDU CFG_BOOL( \
+ "he_bfrm_feed", \
+ 0, \
+ "He Er Su Ppdu")
+
+#define CFG_HE_DL_PART_BW CFG_BOOL( \
+ "he_dl_part_bw", \
+ 0, \
+ "He Dl Part Bw")
+
+#define CFG_HE_PPET_PRESENT CFG_BOOL( \
+ "he_ppet_present", \
+ 0, \
+ "He Pper Present")
+
+#define CFG_HE_SRP CFG_BOOL( \
+ "he_srp", \
+ 0, \
+ "He Srp")
+
+#define CFG_HE_POWER_BOOST CFG_BOOL( \
+ "he_power_boost", \
+ 0, \
+ "He Power Boost")
+
+#define CFG_HE_4x_LTF_GI CFG_BOOL( \
+ "he_4x_ltf_gi", \
+ 0, \
+ "He 4x Ltf Gi")
+
+#define CFG_HE_MAX_NC CFG_UINT( \
+ "he_max_nc", \
+ 0, \
+ 7, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Max Nc")
+
+#define CFG_HE_RX_STBC_GT80 CFG_BOOL( \
+ "he_rx_stbc_gt80", \
+ 0, \
+ "He Rx Stbc Gt80")
+
+#define CFG_HE_TX_STBC_GT80 CFG_BOOL( \
+ "he_Tx_stbc_gt80", \
+ 0, \
+ "He Tx Stbc Gt80")
+
+#define CFG_HE_ER_4x_LTF_GI CFG_BOOL( \
+ "he_er_4x_ltf_gi", \
+ 0, \
+ "He Er 4x Ltf Gi")
+
+#define CFG_HE_PPDU_20_IN_40MHZ_2G CFG_BOOL( \
+ "he_ppdu_20_in_40mhz_2g", \
+ 0, \
+ "He Ppdu 20 In 40Mhz 2g")
+
+#define CFG_HE_PPDU_20_IN_160_80P80MHZ CFG_BOOL( \
+ "he_ppdu_20_in_160_80p80mhz", \
+ 0, \
+ "He Ppdu 20 In 160 80p80mhz")
+
+#define CFG_HE_PPDU_80_IN_160_80P80MHZ CFG_BOOL( \
+ "he_ppdu_80_in_160_80p80mhz", \
+ 0, \
+ "He Ppdu 80 In 160 80p80mhz")
+
+#define CFG_HE_ER_1X_HE_LTF_GI CFG_BOOL( \
+ "he_er_1x_he_ltf_gi", \
+ 0, \
+ "He Er 1x He Ltf Gi")
+
+#define CFG_HE_MIDAMBLE_RX_1X_HE_LTF CFG_BOOL( \
+ "he_midamble_rx_1x_he_ltf", \
+ 0, \
+ "He Midamble Rx 1x He Ltf")
+
+#define CFG_HE_DCM_MAX_BW CFG_UINT( \
+ "he_dcm_max_bw", \
+ 0, \
+ 3, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Dcm Max Bw")
+
+#define CFG_HE_LONGER_16_SIGB_OFDM_SYM CFG_BOOL( \
+ "he_longer_16_sigb_ofdm_sys", \
+ 0, \
+ "He Longer 16 Sigb Ofdm Sys")
+
+#define CFG_HE_NON_TRIG_CQI_FEEDBACK CFG_BOOL( \
+ "he_rx_mcs_map_lt_80", \
+ 0, \
+ "He Non Trig Cqi Feedback")
+
+#define CFG_HE_TX_1024_QAM_LT_242_RU CFG_BOOL( \
+ "he_tx_1024_qam_lt_242_ru", \
+ 0, \
+ "He Tx 1024 Qam Lt 242 Ru")
+
+#define CFG_HE_RX_1024_QAM_LT_242_RU CFG_BOOL( \
+ "he_rx_1024_qam_lt_242_ru", \
+ 0, \
+ "He Rx 1024 Qam Lt 242 Ru")
+
+#define CFG_HE_RX_FULL_BW_MU_CMPR_SIGB CFG_BOOL( \
+ "he_rx_full_bw_cmpr_sigb", \
+ 0, \
+ "He Rx Full Bw Mu Cmpr Sigb")
+
+#define CFG_HE_RX_FULL_BW_MU_NON_CMPR_SIGB CFG_BOOL( \
+ "he_rx_full_bw_mu_non_cmpr_sigb", \
+ 0, \
+ "He Rx Full Bw Mu Non Cmpr Sigb")
+
+#define CFG_HE_RX_MCS_MAP_LT_80 CFG_UINT( \
+ "he_rx_mcs_map_lt_80", \
+ 0, \
+ 0xFFFF, \
+ 0xFFF0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Rx Mcs Map Lt 80")
+
+#define CFG_HE_TX_MCS_MAP_LT_80 CFG_UINT( \
+ "he_tx_mcs_map_lt_80", \
+ 0, \
+ 0xFFFF, \
+ 0xFFF0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Tx Mcs Map Lt 80")
+
+#define CFG_HE_RX_MCS_MAP_160 CFG_UINT( \
+ "he_rx_mcs_map_160", \
+ 0, \
+ 0xFFFF, \
+ 0xFFF0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Rx Mcs Map 160")
+
+#define CFG_HE_TX_MCS_MAP_160 CFG_UINT( \
+ "he_tx_mcs_map_160", \
+ 0, \
+ 0xFFFF, \
+ 0xFFF0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Tx Mcs Map 160")
+
+#define CFG_HE_RX_MCS_MAP_80_80 CFG_UINT( \
+ "he_rx_mcs_map_80_80", \
+ 0, \
+ 0xFFFF, \
+ 0xFFF0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Rx Mcs Map 80 80")
+
+#define CFG_HE_TX_MCS_MAP_80_80 CFG_UINT( \
+ "he_tx_mcs_map_80_80", \
+ 0, \
+ 0xFFFF, \
+ 0xFFF0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He tx Mcs Map 80 80")
+
+#define CFG_HE_OPS_BASIC_MCS_NSS CFG_UINT( \
+ "cfg_he_ops_basic_mcs_nss", \
+ 0x0000, \
+ 0xFFFF, \
+ 0xFFFC, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Ops Basic Mcs NSS")
+
+/*
+ *
+ * he_dynamic_frag_support - configure dynamic fragmentation
+ * @Min: 0
+ * @Max: 3
+ * @Default: 0
+ *
+ * This ini is used to configure dynamic fragmentation.
+ *
+ * Related: NA
+ *
+ * Supported Feature: 11AX
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
+#define CFG_HE_DYNAMIC_FRAGMENTATION CFG_INI_UINT( \
+ "he_dynamic_frag_support", \
+ 0, \
+ 3, \
+ 0, \
+ CFG_VALUE_OR_DEFAULT, \
+ "HE Dynamic Twt Fragmentation")
+
+/*
+ *
+ * enable_ul_mimo- Enable UL MIMO.
+ * @Min: 0
+ * @Max: 1
+ * @Default: 0
+ *
+ * This ini is used to enable or disable UL MIMO.
+ *
+ * Related: NA
+ *
+ * Supported Feature: 11AX
+ *
+ * Usage: External
+ *
+ *
+ */
+#define CFG_ENABLE_UL_MIMO CFG_INI_BOOL( \
+ "enable_ul_mimo", \
+ 0, \
+ "He Enble Ul Mimo Name")
+
+/*
+ *
+ * enable_ul_ofdma- Enable UL OFDMA.
+ * @Min: 0
+ * @Max: 1
+ * @Default: 0
+ *
+ * This ini is used to enable or disable UL OFDMA.
+ *
+ * Related: NA
+ *
+ * Supported Feature: 11AX
+ *
+ * Usage: External
+ *
+ *
+ */
+
+#define CFG_ENABLE_UL_OFDMA CFG_INI_BOOL( \
+ "enable_ul_ofdma", \
+ 0, \
+ "He Enable Ul Ofdma Name")
+
+/*
+ *
+ * he_sta_obsspd- 11AX HE OBSS PD bit field
+ * @Min: 0
+ * @Max: uin32_t max
+ * @Default: 0x15b8c2ae
+ *
+ * 4 Byte value with each byte representing a signed value for following params:
+ * Param Bit position Default
+ * OBSS_PD min (primary) 7:0 -82 (0xae)
+ * OBSS_PD max (primary) 15:8 -62 (0xc2)
+ * Secondary channel Ed 23:16 -72 (0xb8)
+ * TX_PWR(ref) 31:24 21 (0x15)
+ * This bit field value is directly applied to FW
+ *
+ * Related: NA
+ *
+ * Supported Feature: 11AX
+ *
+ * Usage: External
+ *
+ *
+ */
+#define CFG_HE_STA_OBSSPD CFG_INI_UINT( \
+ "he_sta_obsspd", \
+ 0, \
+ 0xFFFFFFFF, \
+ 0x15b8c2ae, \
+ CFG_VALUE_OR_DEFAULT, \
+ "He Mu Bfee Sts Gt80")
+
+ #define CFG_HE_CAPS_ALL \
+ CFG(CFG_HE_CONTROL) \
+ CFG(CFG_HE_TWT_REQUESTOR) \
+ CFG(CFG_HE_TWT_RESPONDER) \
+ CFG(CFG_HE_TWT_FRAGMENTATION) \
+ CFG(CFG_HE_MAX_FRAG_MSDU) \
+ CFG(CFG_HE_MIN_FRAG_SIZE) \
+ CFG(CFG_HE_TRIG_PAD) \
+ CFG(CFG_HE_MTID_AGGR_RX) \
+ CFG(CFG_HE_LINK_ADAPTATION) \
+ CFG(CFG_HE_ALL_ACK) \
+ CFG(CFG_HE_TRIGD_RSP_SCHEDULING) \
+ CFG(CFG_HE_BUFFER_STATUS_RPT) \
+ CFG(CFG_HE_BCAST_TWT) \
+ CFG(CFG_HE_BA_32BIT) \
+ CFG(CFG_HE_MU_CASCADING) \
+ CFG(CFG_HE_MULTI_TID) \
+ CFG(CFG_HE_DL_MU_BA) \
+ CFG(CFG_HE_OMI) \
+ CFG(CFG_HE_OFDMA_RA) \
+ CFG(CFG_HE_MAX_AMPDU_LEN) \
+ CFG(CFG_HE_AMSDU_FRAG) \
+ CFG(CFG_HE_FLEX_TWT_SCHED) \
+ CFG(CFG_HE_RX_CTRL) \
+ CFG(CFG_HE_BSRP_AMPDU_AGGR) \
+ CFG(CFG_HE_QTP) \
+ CFG(CFG_HE_A_BQR) \
+ CFG(CFG_HE_SR_RESPONDER) \
+ CFG(CFG_HE_NDP_FEEDBACK_SUPP) \
+ CFG(CFG_HE_OPS_SUPP) \
+ CFG(CFG_HE_AMSDU_IN_AMPDU) \
+ CFG(CFG_HE_CHAN_WIDTH) \
+ CFG(CFG_HE_MTID_AGGR_TX) \
+ CFG(CFG_HE_SUB_CH_SEL_TX) \
+ CFG(CFG_HE_UL_2X996_RU) \
+ CFG(CFG_HE_OM_CTRL_UL_MU_DIS_RX) \
+ CFG(CFG_HE_RX_PREAM_PUNC) \
+ CFG(CFG_HE_CLASS_OF_DEVICE) \
+ CFG(CFG_HE_LDPC) \
+ CFG(CFG_HE_LTF_PPDU) \
+ CFG(CFG_HE_MIDAMBLE_RX_MAX_NSTS) \
+ CFG(CFG_HE_LTF_NDP) \
+ CFG(CFG_HE_TX_STBC_LT80) \
+ CFG(CFG_HE_RX_STBC_LT80) \
+ CFG(CFG_HE_DOPPLER) \
+ CFG(CFG_HE_UL_MUMIMO) \
+ CFG(CFG_HE_DCM_TX) \
+ CFG(CFG_HE_DCM_RX) \
+ CFG(CFG_HE_MU_PPDU) \
+ CFG(CFG_HE_SU_BEAMFORMER) \
+ CFG(CFG_HE_SU_BEAMFORMEE) \
+ CFG(CFG_HE_MU_BEAMFORMER) \
+ CFG(CFG_HE_BFEE_STS_LT80) \
+ CFG(CFG_HE_BFEE_STS_GT80) \
+ CFG(CFG_HE_NUM_SOUND_LT80) \
+ CFG(CFG_HE_NUM_SOUND_GT80) \
+ CFG(CFG_HE_SU_FEED_TONE16) \
+ CFG(CFG_HE_MU_FEED_TONE16) \
+ CFG(CFG_HE_CODEBOOK_SU) \
+ CFG(CFG_HE_CODEBOOK_MU) \
+ CFG(CFG_HE_BFRM_FEED) \
+ CFG(CFG_HE_ER_SU_PPDU) \
+ CFG(CFG_HE_DL_PART_BW) \
+ CFG(CFG_HE_PPET_PRESENT) \
+ CFG(CFG_HE_SRP) \
+ CFG(CFG_HE_POWER_BOOST) \
+ CFG(CFG_HE_4x_LTF_GI) \
+ CFG(CFG_HE_MAX_NC) \
+ CFG(CFG_HE_RX_STBC_GT80) \
+ CFG(CFG_HE_TX_STBC_GT80) \
+ CFG(CFG_HE_ER_4x_LTF_GI) \
+ CFG(CFG_HE_PPDU_20_IN_40MHZ_2G) \
+ CFG(CFG_HE_PPDU_20_IN_160_80P80MHZ) \
+ CFG(CFG_HE_PPDU_80_IN_160_80P80MHZ) \
+ CFG(CFG_HE_ER_1X_HE_LTF_GI) \
+ CFG(CFG_HE_MIDAMBLE_RX_1X_HE_LTF) \
+ CFG(CFG_HE_DCM_MAX_BW) \
+ CFG(CFG_HE_LONGER_16_SIGB_OFDM_SYM) \
+ CFG(CFG_HE_NON_TRIG_CQI_FEEDBACK) \
+ CFG(CFG_HE_TX_1024_QAM_LT_242_RU) \
+ CFG(CFG_HE_RX_1024_QAM_LT_242_RU) \
+ CFG(CFG_HE_RX_FULL_BW_MU_CMPR_SIGB) \
+ CFG(CFG_HE_RX_FULL_BW_MU_NON_CMPR_SIGB) \
+ CFG(CFG_HE_RX_MCS_MAP_LT_80) \
+ CFG(CFG_HE_TX_MCS_MAP_LT_80) \
+ CFG(CFG_HE_RX_MCS_MAP_160) \
+ CFG(CFG_HE_TX_MCS_MAP_160) \
+ CFG(CFG_HE_RX_MCS_MAP_80_80) \
+ CFG(CFG_HE_TX_MCS_MAP_80_80) \
+ CFG(CFG_HE_OPS_BASIC_MCS_NSS) \
+ CFG(CFG_HE_DYNAMIC_FRAGMENTATION) \
+ CFG(CFG_ENABLE_UL_MIMO) \
+ CFG(CFG_ENABLE_UL_OFDMA) \
+ CFG(CFG_HE_STA_OBSSPD)
+
+#endif /* __CFG_MLME_HE_CAPS_H */
+
diff --git a/mlme/dispatcher/inc/wlan_mlme_public_struct.h b/mlme/dispatcher/inc/wlan_mlme_public_struct.h
index 37372ed82b..78b29fd38d 100644
--- a/mlme/dispatcher/inc/wlan_mlme_public_struct.h
+++ b/mlme/dispatcher/inc/wlan_mlme_public_struct.h
@@ -166,6 +166,108 @@ struct wlan_mlme_qos {
bool sap_max_inactivity_override;
};
+#define MLME_HE_PPET_LEN 25
+/**
+ * struct wlan_mlme_he_caps - HE Capabilities related config items
+ */
+struct wlan_mlme_he_caps {
+ uint8_t he_control;
+ uint8_t he_twt_requestor;
+ uint8_t he_twt_responder;
+ uint8_t he_twt_fragmentation;
+ uint8_t he_max_frag_msdu;
+ uint8_t he_min_frag_size;
+ uint8_t he_trig_pad;
+ uint8_t he_mtid_aggr_rx;
+ uint8_t he_link_adaptation;
+ uint8_t he_all_ack;
+ uint8_t he_trigd_rsp_scheduling;
+ uint8_t he_buffer_status_rpt;
+ uint8_t he_bcast_twt;
+ uint8_t he_ba_32bit;
+ uint8_t he_mu_cascading;
+ uint8_t he_multi_tid;
+ uint8_t he_dl_mu_ba;
+ uint8_t he_omi;
+ uint8_t he_ofdma_ra;
+ uint8_t he_max_ampdu_len;
+ uint8_t he_amsdu_frag;
+ uint8_t he_flex_twt_sched;
+ uint8_t he_rx_ctrl;
+ uint8_t he_bsrp_ampdu_aggr;
+ uint8_t he_qtp;
+ uint8_t he_a_bqr;
+ uint8_t he_sr_responder;
+ uint8_t he_ndp_feedback_supp;
+ uint8_t he_ops_supp;
+ uint8_t he_amsdu_in_ampdu;
+ uint8_t he_chan_width;
+ uint8_t he_mtid_aggr_tx;
+ uint8_t he_sub_ch_sel_tx;
+ uint8_t he_ul_2x996_ru;
+ uint8_t he_om_ctrl_ul_mu_dis_rx;
+ uint8_t he_rx_pream_punc;
+ uint8_t he_class_of_device;
+ uint8_t he_ldpc;
+ uint8_t he_ltf_ppdu;
+ uint8_t he_midamble_rx_nsts;
+ uint8_t he_ltf_ndp;
+ uint8_t he_tx_stbc_lt80;
+ uint8_t he_rx_stbc_lt80;
+ uint8_t he_doppler;
+ uint8_t he_ul_mumimo;
+ uint8_t he_dcm_tx;
+ uint8_t he_dcm_rx;
+ uint8_t he_mu_ppdu;
+ uint8_t he_su_beamformer;
+ uint8_t he_su_beamformee;
+ uint8_t he_mu_beamformer;
+ uint8_t he_bfee_sts_lt80;
+ uint8_t he_bfee_sts_gt80;
+ uint8_t he_num_sound_lt80;
+ uint8_t he_num_sound_gt80;
+ uint8_t he_su_feed_tone16;
+ uint8_t he_mu_feed_tone16;
+ uint8_t he_codebook_su;
+ uint8_t he_codebook_mu;
+ uint8_t he_bfrm_feed;
+ uint8_t he_er_su_ppdu;
+ uint8_t he_dl_part_bw;
+ uint8_t he_ppet_present;
+ uint8_t he_srp;
+ uint8_t he_power_boost;
+ uint8_t he_4x_ltf_gi;
+ uint8_t he_max_nc;
+ uint8_t he_rx_stbc_gt80;
+ uint8_t he_tx_stbc_gt80;
+ uint8_t he_er_4x_ltf_gi;
+ uint8_t he_ppdu_20_in_40mhz_2g;
+ uint8_t he_ppdu_20_in_160_80p80mhz;
+ uint8_t he_ppdu_80_in_160_80p80mhz;
+ uint8_t he_er_1x_he_ltf_gi;
+ uint8_t he_midamble_rx_1x_he_ltf;
+ uint8_t he_dcm_max_bw;
+ uint8_t he_longer_16_sigb_ofdm_sym;
+ uint8_t he_non_trig_cqi_feedback;
+ uint8_t he_tx_1024_qam_lt_242_ru;
+ uint8_t he_rx_1024_qam_lt_242_ru;
+ uint8_t he_rx_full_bw_mu_cmpr_sigb;
+ uint8_t he_rx_full_bw_mu_non_cmpr_sigb;
+ uint32_t he_rx_mcs_map_lt_80;
+ uint32_t he_tx_mcs_map_lt_80;
+ uint32_t he_rx_mcs_map_160;
+ uint32_t he_tx_mcs_map_160;
+ uint32_t he_rx_mcs_map_80_80;
+ uint32_t he_tx_mcs_map_80_80;
+ uint8_t he_ppet_2g[MLME_HE_PPET_LEN];
+ uint8_t he_ppet_5g[MLME_HE_PPET_LEN];
+ uint32_t he_ops_basic_mcs_nss;
+ uint8_t he_twt_dynamic_fragmentation;
+ uint8_t enable_ul_mimo;
+ uint8_t enable_ul_ofdm;
+ uint32_t he_sta_obsspd;
+};
+
/**
* struct wlan_mlme_rates - RATES related config items
* @cfpPeriod: cfp period info
@@ -518,6 +620,7 @@ struct wlan_mlme_scoring_cfg {
/**
* struct wlan_mlme_cfg - MLME config items
* @ht_cfg: HT related CFG Items
+ * @he_caps: HE related cfg items
* @lfr: LFR related CFG Items
* @obss_ht40:obss ht40 CFG Items
* @vht_cfg: VHT related CFG Items
@@ -528,6 +631,7 @@ struct wlan_mlme_scoring_cfg {
*/
struct wlan_mlme_cfg {
struct wlan_mlme_ht_caps ht_caps;
+ struct wlan_mlme_he_caps he_caps;
struct wlan_mlme_lfr_cfg lfr;
struct wlan_mlme_obss_ht40 obss_ht40;
struct wlan_mlme_mbo mbo_cfg;