From 4933c905f5e40bdb6f90735fd64446675bee0433 Mon Sep 17 00:00:00 2001 From: Wu Gao Date: Thu, 5 Mar 2020 10:04:59 +0800 Subject: [PATCH] qcacld-3.0: Enable CFR in Kbuild This is part of adding channel frequency response. Enable CFR and streamfs in Kbuild for QCA6490 only. Change-Id: I7ef0eff10cfbe09e7fb3e14cefede0a352af5d9a CRs-Fixed: 2637187 --- Kbuild | 40 ++++++++++++++++++++++++++++++++++++++- configs/default_defconfig | 10 ++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/Kbuild b/Kbuild index fd8d5a18e171..6953bc7eba0f 100644 --- a/Kbuild +++ b/Kbuild @@ -301,6 +301,10 @@ ifeq ($(CONFIG_WLAN_HANG_EVENT), y) HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_hang_event.o endif +ifeq ($(CONFIG_WLAN_CFR_ENABLE), y) +HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_cfr.o +endif + ###### OSIF_SYNC ######## SYNC_DIR := os_if/sync SYNC_INC_DIR := $(SYNC_DIR)/inc @@ -651,6 +655,10 @@ ifeq ($(CONFIG_WLAN_DEBUGFS), y) QDF_OBJS += $(QDF_LINUX_OBJ_DIR)/qdf_debugfs.o endif +ifeq ($(CONFIG_WLAN_STREAMFS), y) +QDF_OBJS += $(QDF_LINUX_OBJ_DIR)/qdf_streamfs.o +endif + ifeq ($(CONFIG_IPA_OFFLOAD), y) QDF_OBJS += $(QDF_LINUX_OBJ_DIR)/qdf_ipa.o endif @@ -794,6 +802,26 @@ UMAC_SPECTRAL_OBJS := $(UMAC_SPECTRAL_CORE_DIR)/spectral_offload.o \ $(WLAN_COMMON_ROOT)/target_if/spectral/target_if_spectral.o \ $(WLAN_COMMON_ROOT)/target_if/spectral/target_if_spectral_sim.o endif +############# WLAN_CFR ############ +WLAN_CFR_DIR := umac/cfr +WLAN_CFR_DISP_INC_DIR := $(WLAN_CFR_DIR)/dispatcher/inc +WLAN_CFR_CORE_INC_DIR := $(WLAN_CFR_DIR)/core/inc +WLAN_CFR_CORE_DIR := $(WLAN_COMMON_ROOT)/$(WLAN_CFR_DIR)/core/src +WLAN_CFR_DISP_DIR := $(WLAN_COMMON_ROOT)/$(WLAN_CFR_DIR)/dispatcher/src +WLAN_CFR_TARGET_INC_DIR := target_if/cfr/inc + +WLAN_CFR_INC := -I$(WLAN_COMMON_INC)/$(WLAN_CFR_DISP_INC_DIR) \ + -I$(WLAN_COMMON_INC)/$(WLAN_CFR_CORE_INC_DIR) \ + -I$(WLAN_COMMON_INC)/$(WLAN_CFR_TARGET_INC_DIR) +ifeq ($(CONFIG_WLAN_CFR_ENABLE),y) +WLAN_CFR_OBJS := $(WLAN_CFR_CORE_DIR)/cfr_common.o \ + $(WLAN_CFR_DISP_DIR)/wlan_cfr_tgt_api.o \ + $(WLAN_CFR_DISP_DIR)/wlan_cfr_ucfg_api.o \ + $(WLAN_CFR_DISP_DIR)/wlan_cfr_utils_api.o \ + $(WLAN_COMMON_ROOT)/target_if/cfr/src/target_if_cfr.o \ + $(WLAN_COMMON_ROOT)/target_if/cfr/src/target_if_cfr_6018.o \ + $(WLAN_COMMON_ROOT)/target_if/cfr/src/target_if_cfr_6490.o +endif ############# UMAC_GREEN_AP ############ UMAC_GREEN_AP_DIR := umac/green_ap UMAC_GREEN_AP_DISP_INC_DIR := $(UMAC_GREEN_AP_DIR)/dispatcher/inc @@ -1374,6 +1402,11 @@ ifeq ($(CONFIG_WLAN_HANG_EVENT), y) WMI_OBJS += $(WMI_OBJ_DIR)/wmi_hang_event.o endif +ifeq ($(CONFIG_WLAN_CFR_ENABLE), y) +WMI_OBJS += $(WMI_OBJ_DIR)/wmi_unified_cfr_tlv.o +WMI_OBJS += $(WMI_OBJ_DIR)/wmi_unified_cfr_api.o +endif + ########### FWLOG ########### FWLOG_DIR := $(WLAN_COMMON_ROOT)/utils/fwlog @@ -2158,6 +2191,7 @@ INCS += $(UMAC_GREEN_AP_INC) INCS += $(UMAC_TARGET_GREEN_AP_INC) INCS += $(UMAC_COMMON_INC) INCS += $(UMAC_SPECTRAL_INC) +INCS += $(WLAN_CFR_INC) INCS += $(UMAC_TARGET_SPECTRAL_INC) INCS += $(UMAC_DBR_INC) INCS += $(UMAC_CRYPTO_INC) @@ -2280,6 +2314,7 @@ OBJS += $(WCFG_OBJS) OBJS += $(UMAC_SPECTRAL_OBJS) OBJS += $(UMAC_DBR_OBJS) +OBJS += $(WLAN_CFR_OBJS) ifeq ($(CONFIG_QCACLD_FEATURE_GREEN_AP), y) OBJS += $(UMAC_GREEN_AP_OBJS) @@ -2330,12 +2365,14 @@ cppflags-$(CONFIG_FEATURE_BLACKLIST_MGR) += -DFEATURE_BLACKLIST_MGR cppflags-$(CONFIG_SUPPORT_11AX) += -DSUPPORT_11AX cppflags-$(CONFIG_HDD_INIT_WITH_RTNL_LOCK) += -DCONFIG_HDD_INIT_WITH_RTNL_LOCK cppflags-$(CONFIG_WLAN_CONV_SPECTRAL_ENABLE) += -DWLAN_CONV_SPECTRAL_ENABLE +cppflags-$(CONFIG_WLAN_CFR_ENABLE) += -DWLAN_CFR_ENABLE +cppflags-$(CONFIG_WLAN_ENH_CFR_ENABLE) += -DWLAN_ENH_CFR_ENABLE +cppflags-$(CONFIG_WLAN_CFR_ENABLE) += -DCFR_USE_FIXED_FOLDER cppflags-$(CONFIG_DIRECT_BUF_RX_ENABLE) += -DDIRECT_BUF_RX_ENABLE cppflags-$(CONFIG_WMI_DBR_SUPPORT) += -DWMI_DBR_SUPPORT cppflags-$(CONFIG_DIRECT_BUF_RX_ENABLE) += -DDBR_MULTI_SRNG_ENABLE cppflags-$(CONFIG_WMI_CMD_STRINGS) += -DWMI_CMD_STRINGS cppflags-$(CONFIG_WLAN_FEATURE_TWT) += -DWLAN_SUPPORT_TWT - cppflags-$(CONFIG_WLAN_DISABLE_EXPORT_SYMBOL) += -DWLAN_DISABLE_EXPORT_SYMBOL cppflags-$(CONFIG_WIFI_POS_CONVERGED) += -DWIFI_POS_CONVERGED cppflags-$(CONFIG_WIFI_POS_LEGACY) += -DFEATURE_OEM_DATA_SUPPORT @@ -3023,6 +3060,7 @@ cppflags-$(CONFIG_WLAN_DFS_MASTER_ENABLE) += -DQCA_DFS_USE_POLICY_MANAGER cppflags-$(CONFIG_WLAN_DFS_MASTER_ENABLE) += -DQCA_DFS_NOL_PLATFORM_DRV_SUPPORT cppflags-$(CONFIG_WLAN_DEBUGFS) += -DWLAN_DEBUGFS +cppflags-$(CONFIG_WLAN_STREAMFS) += -DWLAN_STREAMFS cppflags-$(CONFIG_DYNAMIC_DEBUG) += -DFEATURE_MULTICAST_HOST_FW_MSGS diff --git a/configs/default_defconfig b/configs/default_defconfig index 7750223e357b..6b9c9f694c13 100644 --- a/configs/default_defconfig +++ b/configs/default_defconfig @@ -27,6 +27,10 @@ ifeq ($(CONFIG_CNSS_QCA6390), y) endif ifeq ($(CONFIG_CNSS_QCA6490), y) + CONFIG_DIRECT_BUF_RX_ENABLE := y + CONFIG_WMI_DBR_SUPPORT := y + CONFIG_WLAN_CFR_ENABLE := y + CONFIG_WLAN_ENH_CFR_ENABLE := y ifeq ($(CONFIG_CNSS_EMULATION), y) CONFIG_QCA_WIFI_NAPIER_EMULATION := y endif @@ -495,6 +499,12 @@ ifeq ($(CONFIG_DEBUG_FS), y) CONFIG_WLAN_DEBUGFS := y CONFIG_WLAN_POWER_DEBUGFS := y + + # Flag to enable streamfs. Depends on CONFIG_DEBUG_FS and + # CONFIG_RELAY in kernel configuration. +ifeq ($(CONFIG_RELAY), y) + CONFIG_WLAN_STREAMFS := y +endif endif ifeq ($(CONFIG_WLAN_DEBUGFS), y)