From b4834eb736780f4baca3effade63035e1d065917 Mon Sep 17 00:00:00 2001 From: Mohammed Ahmed Date: Tue, 27 Jun 2023 14:28:38 -0700 Subject: [PATCH] qcacld-3.0: Additional bazel build fixes Currently code is running into compilation issues when building with bazel. Change-Id: I458de9b971955bb64c06dd2541dd5d20c2c3d16c CRs-Fixed: 3546637 --- Kconfig | 44 +++++++++++++++ configs/config_to_feature.h | 54 ++++++++++++++++++- .../pineapple_consolidate_kiwi-v2_defconfig | 8 +-- configs/pineapple_gki_kiwi-v2_defconfig | 17 ++++++ .../src/pe/lim/lim_process_sme_req_messages.c | 4 +- core/mac/src/pe/lim/lim_utils.c | 1 + core/mac/src/pe/lim/lim_utils.h | 12 +++++ wlan_qcacld3_modules.bzl | 4 +- 8 files changed, 133 insertions(+), 11 deletions(-) diff --git a/Kconfig b/Kconfig index d502d8d064..fcb60ccb7c 100644 --- a/Kconfig +++ b/Kconfig @@ -74,6 +74,10 @@ config BUILD_TIMESTAMP bool "Embed timestamp in wlan version" default n +config BUS_AUTO_SUSPEND + bool "enable CONFIG_BUS_AUTO_SUSPEND" + default n + config CE_DISABLE_SRNG_TIMER_IRQ bool "Enable CE_DISABLE_SRNG_TIMER_IRQ" default n @@ -494,6 +498,10 @@ config FEATURE_WLAN_SCAN_PNO bool "Enable FEATURE_WLAN_SCAN_PNO" default n +config WALT_GET_CPU_TAKEN_SUPPORT + bool "enable WALT_GET_CPU_TAKEN_SUPPORT" + default n + config FEATURE_WLAN_WAPI bool "Enable FEATURE_WLAN_WAPI" default n @@ -848,6 +856,10 @@ config ROME_IF string "Enable ROME_IF" default pci +config RPS + bool "enable CONFIG_QCA_CONFIG_RPS" + default n + config RX_DEFRAG_DO_NOT_REINJECT bool "Enable RX_DEFRAG_DO_NOT_REINJECT" default n @@ -915,6 +927,10 @@ config SMMU_S1_UNMAP bool "Enable SMMU_S1_UNMAP" default n +config SMP + bool "enable CONFIG_SMP" + default n + config SOFTAP_CHANNEL_RANGE bool "Enable SOFTAP_CHANNEL_RANGE" default n @@ -1132,6 +1148,10 @@ config WLAN_FEATURE_11BE_MLO bool "Enable WLAN_FEATURE_11BE_MLO" default n +config WLAN_HDD_MULTI_VDEV_SINGLE_NDEV + bool "Enable WLAN_HDD_MULTI_VDEV_SINGLE_NDEV" + default n + config WLAN_FEATURE_11W bool "Enable the WLAN 802.11w Protected Management Frames feature" default n @@ -1809,8 +1829,32 @@ config NL80211_EXT_FEATURE_PUNCT_SUPPORT bool "enable CONFIG_NL80211_EXT_FEATURE_PUNCT_SUPPORT" default n +config NL80211_TESTMODE + bool "enable CONFIG_NL80211_TESTMODE" + default n + config DYNAMIC_DEBUG bool "enable CONFIG_DYNAMIC_DEBUG" default n +config DP_MLO_LINK_STATS_SUPPORT + bool "enable CONFIG_DP_MLO_LINK_STATS_SUPPORT" + default n + +config MULTI_IF_NAME + string "set MULTI_IF_NAME" + default \"wlan\" + +config CFG80211_EXT_FEATURE_AUTH_AND_DEAUTH_RANDOM_TA + bool "enable CFG80211_EXT_FEATURE_AUTH_AND_DEAUTH_RANDOM_TA" + default n + +config WLAN_DP_FEATURE_DEFERRED_REO_QDESC_DESTROY + bool "enable WLAN_DP_FEATURE_DEFERRED_REO_QDESC_DESTROY" + default n + +config FEATURE_WLAN_CH_AVOID_EXT + bool "enable FEATURE_WLAN_CH_AVOID_EXT" + default n + endif # QCA_CLD_WLAN diff --git a/configs/config_to_feature.h b/configs/config_to_feature.h index 2edd598589..cb9fd90150 100644 --- a/configs/config_to_feature.h +++ b/configs/config_to_feature.h @@ -2821,8 +2821,6 @@ #define WLAN_OPEN_SOURCE (1) #endif -#define MULTI_IF_NAME "kiwi_v2" - #ifdef CONFIG_DP_MULTIPASS_SUPPORT #define QCA_MULTIPASS_SUPPORT (1) #define WLAN_REPEATER_NOT_SUPPORTED (1) @@ -2845,4 +2843,56 @@ #define NL80211_EXT_FEATURE_PUNCT_SUPPORT (1) #endif +#ifdef CONFIG_DP_MLO_LINK_STATS_SUPPORT +#define DP_MLO_LINK_STATS_SUPPORT (1) +#endif + +#ifdef CONFIG_MULTI_IF_NAME +#define MULTI_IF_NAME CONFIG_MULTI_IF_NAME +#endif + +#ifdef CONFIG_FEATURE_HIF_DELAYED_REG_WRITE +#define FEATURE_HIF_DELAYED_REG_WRITE (1) +#endif + +#ifdef CONFIG_WLAN_FEATURE_11BE_MLO +#ifndef CONFIG_WLAN_MAX_ML_DEFAULT_LINK +#define CONFIG_WLAN_MAX_ML_DEFAULT_LINK (2) +#endif +#else +#ifndef CONFIG_WLAN_MAX_ML_DEFAULT_LINK +#define CONFIG_WLAN_MAX_ML_DEFAULT_LINK (1) +#endif +#endif + +#ifdef CONFIG_WLAN_MAX_ML_DEFAULT_LINK +#define WLAN_MAX_ML_DEFAULT_LINK CONFIG_WLAN_MAX_ML_DEFAULT_LINK +#endif + +#ifdef CONFIG_WLAN_FEATURE_11BE_MLO +#ifndef CONFIG_WLAN_MAX_ML_BSS_LINKS +#define CONFIG_WLAN_MAX_ML_BSS_LINKS (3) +#endif +#else +#ifndef CONFIG_WLAN_MAX_ML_BSS_LINKS +#define CONFIG_WLAN_MAX_ML_BSS_LINKS (1) +#endif +#endif + +#ifdef CONFIG_WLAN_MAX_ML_BSS_LINKS +#define WLAN_MAX_ML_BSS_LINKS CONFIG_WLAN_MAX_ML_BSS_LINKS +#endif + +#ifdef CONFIG_WALT_GET_CPU_TAKEN_SUPPORT +#define WALT_GET_CPU_TAKEN_SUPPORT (1) +#endif + +#ifdef CONFIG_WLAN_HDD_MULTI_VDEV_SINGLE_NDEV +#define WLAN_HDD_MULTI_VDEV_SINGLE_NDEV (1) +#endif + +#ifdef CONFIG_WLAN_FEATURE_CE_RX_BUFFER_REUSE +#define WLAN_FEATURE_CE_RX_BUFFER_REUSE (1) +#endif + #endif /* CONFIG_TO_FEATURE_H */ diff --git a/configs/pineapple_consolidate_kiwi-v2_defconfig b/configs/pineapple_consolidate_kiwi-v2_defconfig index 24fcc9b145..f0fd708265 100644 --- a/configs/pineapple_consolidate_kiwi-v2_defconfig +++ b/configs/pineapple_consolidate_kiwi-v2_defconfig @@ -12,26 +12,22 @@ CONFIG_FEATURE_UNIT_TEST_SUSPEND=y CONFIG_HAL_DEBUG=y CONFIG_HIF_CE_DEBUG_DATA_BUF=y CONFIG_HIF_CPU_PERF_AFFINE_MASK=y -CONFIG_HIF_DEBUG=y CONFIG_LEAK_DETECTION=y CONFIG_MAX_LOGS_PER_SEC=500 +CONFIG_ENABLE_MAX_LOGS_PER_SEC=y CONFIG_QDF_NBUF_HISTORY_SIZE=16384 CONFIG_REGISTER_OP_DEBUG=y CONFIG_REO_QDESC_HISTORY=y CONFIG_RX_DESC_DEBUG_CHECK=y CONFIG_SCHED_HISTORY_SIZE=256 +CONFIG_ENABLE_SCHED_HISTORY_SIZE=y CONFIG_TALLOC_DEBUG=y CONFIG_UNIT_TEST=y CONFIG_WLAN_FEATURE_DP_CFG_EVENT_HISTORY=y CONFIG_WLAN_FEATURE_DP_MON_STATUS_RING_HISTORY=y CONFIG_WLAN_FEATURE_DP_RX_RING_HISTORY=y CONFIG_WLAN_FEATURE_DP_TX_DESC_HISTORY=y -CONFIG_WLAN_OBJMGR_DEBUG=y -CONFIG_WLAN_OBJMGR_REF_ID_TRACE=y CONFIG_WLAN_RECORD_RX_PADDR=y -CONFIG_PANIC_ON_BUG=y -CONFIG_WLAN_WARN_ON_ASSERT=y -CONFIG_CNSS_OUT_OF_TREE=y CONFIG_QDF_TEST=y CONFIG_DYNAMIC_DEBUG=y CONFIG_FEATURE_WLM_STATS=y diff --git a/configs/pineapple_gki_kiwi-v2_defconfig b/configs/pineapple_gki_kiwi-v2_defconfig index 5e34ba0aa3..bd5f271240 100644 --- a/configs/pineapple_gki_kiwi-v2_defconfig +++ b/configs/pineapple_gki_kiwi-v2_defconfig @@ -235,6 +235,7 @@ CONFIG_WLAN_ENH_CFR_ENABLE=y CONFIG_WLAN_FEATURE_11AX=y CONFIG_WLAN_FEATURE_11BE=y CONFIG_WLAN_FEATURE_11BE_MLO=y +CONFIG_WLAN_HDD_MULTI_VDEV_SINGLE_NDEV=y CONFIG_WLAN_FEATURE_ACTION_OUI=y CONFIG_WLAN_FEATURE_BIG_DATA_STATS=y CONFIG_WLAN_FEATURE_CAL_FAILURE_TRIGGER=y @@ -359,6 +360,7 @@ CONFIG_CFG80211_EXTERNAL_AUTH_MLO_SUPPORT=y CONFIG_CFG80211_EXT_FEATURE_SECURE_NAN=y CONFIG_CFG80211_LINK_STA_PARAMS_PRESENT=y CONFIG_WLAN_CTRL_NAME="wlan" +CONFIG_MULTI_IF_NAME="kiwi_v2" CONFIG_NL80211_TESTMODE=y CONFIG_QCA_WIFI_FTM_IOCTL=y CONFIG_ENABLE_CE4_COMP_DISABLE_HTT_HTC_MISC_LIST=y @@ -375,4 +377,19 @@ CONFIG_CFG80211_MLD_AP_STA_CONNECT_UPSTREAM_SUPPORT=y CONFIG_DP_MULTIPASS_SUPPORT=y CONFIG_WLAN_DP_VDEV_NO_SELF_PEER=y CONFIG_WLAN_FEATURE_AFFINITY_MGR=y +CONFIG_WALT_GET_CPU_TAKEN_SUPPORT=y CONFIG_NL80211_EXT_FEATURE_PUNCT_SUPPORT=y +CONFIG_DP_MLO_LINK_STATS_SUPPORT=y +CONFIG_CFG80211_EXT_FEATURE_AUTH_AND_DEAUTH_RANDOM_TA=y +CONFIG_HIF_DEBUG=y +CONFIG_WLAN_OBJMGR_DEBUG=y +CONFIG_WLAN_OBJMGR_REF_ID_TRACE=y +CONFIG_WLAN_WARN_ON_ASSERT=y +CONFIG_WLAN_DP_FEATURE_DEFERRED_REO_QDESC_DESTROY=y +CONFIG_PANIC_ON_BUG=y +CONFIG_FEATURE_WLAN_CH_AVOID_EXT=y +CONFIG_CNSS2_SSR_DRIVER_DUMP=y +CONFIG_BUS_AUTO_SUSPEND=y +CONFIG_CNSS_OUT_OF_TREE=y +CONFIG_SMP=y +CONFIG_RPS=y diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 4a40d20347..f2d1b726a3 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -1724,7 +1724,7 @@ lim_update_he_caps_htc(struct pe_session *session, bool val) #endif #ifdef WLAN_FEATURE_11BE -static void +void lim_update_eht_caps_mcs(struct mac_context *mac, struct pe_session *session) { uint8_t tx_nss = 0; @@ -1803,7 +1803,7 @@ lim_update_eht_caps_mcs(struct mac_context *mac, struct pe_session *session) } } #else -static void +void lim_update_eht_caps_mcs(struct mac_context *mac, struct pe_session *session) { } diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 6bb2127e03..d724174bc3 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -82,6 +82,7 @@ #include #include "parser_api.h" #include "wlan_mlo_mgr_link_switch.h" +#include "wlan_epcs_api.h" /** ------------------------------------------------------------- \fn lim_delete_dialogue_token_list diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index 95ed567a0b..305f1a2b3a 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -3297,4 +3297,16 @@ lim_is_chan_connected_for_mode(struct wlan_objmgr_psoc *psoc, */ enum phy_ch_width lim_convert_vht_chwidth_to_phy_chwidth(uint8_t ch_width, bool is_40); + +/** + * lim_update_eht_caps_mcs() - update eht caps + * + * @mac: Pointer to Global mac structure + * @session: Session pointer of the interface + * + * Return: None + */ +void lim_update_eht_caps_mcs(struct mac_context *mac, + struct pe_session *session); + #endif /* __LIM_UTILS_H */ diff --git a/wlan_qcacld3_modules.bzl b/wlan_qcacld3_modules.bzl index 681bb1ffdd..083f0785eb 100644 --- a/wlan_qcacld3_modules.bzl +++ b/wlan_qcacld3_modules.bzl @@ -538,7 +538,6 @@ _fixed_srcs = [ "core/hdd/src/wlan_hdd_wowl.c", "core/mac/src/dph/dph_hash_table.c", "core/mac/src/pe/lim/lim_admit_control.c", - #"core/mac/src/pe/lim/lim_aid_mgmt.c", "core/mac/src/pe/lim/lim_api.c", "core/mac/src/pe/lim/lim_assoc_utils.c", "core/mac/src/pe/lim/lim_ft.c", @@ -1534,12 +1533,14 @@ _conditional_srcs = { "cmn/umac/mlo_mgr/src/wlan_mlo_mgr_sta.c", "cmn/umac/mlo_mgr/src/wlan_mlo_t2lm.c", "components/umac/mlme/mlo_mgr/src/wlan_epcs_api.c", + "cmn/umac/mlo_mgr/src/wlan_mlo_mgr_link_switch.c", "cmn/umac/mlo_mgr/src/wlan_mlo_epcs.c", "components/umac/mlme/mlo_mgr/dispatcher/src/wlan_mlo_epcs_ucfg_api.c", "cmn/wmi/src/wmi_unified_11be_api.c", "cmn/wmi/src/wmi_unified_11be_tlv.c", "components/umac/mlme/mlo_mgr/src/wlan_mlo_mgr_roam.c", "components/umac/mlme/mlo_mgr/src/wlan_t2lm_api.c", + "components/umac/mlme/mlo_mgr/src/wlan_mlo_link_force.c", ], }, "CONFIG_WLAN_FEATURE_ACTION_OUI": { @@ -2049,6 +2050,7 @@ _conditional_srcs = { "CONFIG_WLAN_FEATURE_LL_LT_SAP": { True: [ "components/umac/mlme/sap/ll_sap/dispatcher/src/wlan_ll_sap_ucfg_api.c", + "components/umac/mlme/sap/ll_sap/core/src/wlan_ll_lt_sap_main.c", "components/umac/mlme/sap/ll_sap/core/src/wlan_ll_sap_main.c", ], },