diff --git a/Kbuild b/Kbuild index 49472b178f..4d5f217c3b 100644 --- a/Kbuild +++ b/Kbuild @@ -1713,6 +1713,7 @@ $(call add-wlan-objs,ftm_time_sync,$(FTM_TIME_SYNC_OBJS)) WLAN_PRE_CAC_DIR := components/pre_cac PRE_CAC_OSIF_DIR := os_if/pre_cac WLAN_PRE_CAC_INC := -I$(WLAN_ROOT)/$(WLAN_PRE_CAC_DIR)/dispatcher/inc \ + -I$(WLAN_ROOT)/$(WLAN_PRE_CAC_DIR)/core/src \ -I$(WLAN_ROOT)/$(PRE_CAC_OSIF_DIR)/inc ifeq ($(CONFIG_FEATURE_WLAN_PRE_CAC), y) @@ -1831,6 +1832,7 @@ TDLS_OS_IF_SRC := os_if/tdls/src TDLS_TARGET_IF_INC := components/target_if/tdls/inc TDLS_TARGET_IF_SRC := components/target_if/tdls/src TDLS_INC := -I$(WLAN_ROOT)/$(TDLS_DIR)/dispatcher/inc \ + -I$(WLAN_ROOT)/$(TDLS_DIR)/core/src \ -I$(WLAN_ROOT)/$(TDLS_OS_IF_INC) \ -I$(WLAN_ROOT)/$(TDLS_TARGET_IF_INC) diff --git a/Kconfig b/Kconfig index 9ffce6bb45..d502d8d064 100644 --- a/Kconfig +++ b/Kconfig @@ -107,6 +107,10 @@ config CNSS_UTILS_MODULE bool "Enable CNSS_UTILS_MODULE" default n +config CNSS_UTILS + bool "Enable CNSS_UTILS" + default n + config CONNECTIVITY_PKTLOG bool "Enable CONNECTIVITY_PKTLOG" default n @@ -630,6 +634,10 @@ config MAX_ALLOC_PAGE_SIZE bool "Enable MAX_ALLOC_PAGE_SIZE" default n +config ENABLE_MAX_LOGS_PER_SEC + bool "Enable ENABLE_MAX_LOGS_PER_SEC" + default n + config MAX_LOGS_PER_SEC int "Enable MAX_LOGS_PER_SEC" @@ -888,6 +896,10 @@ config SCALE_INCLUDES bool "Enable SCALE_INCLUDES" default n +config ENABLE_SCHED_HISTORY_SIZE + bool "Enable ENABLE_SCHED_HISTORY_SIZE" + default n + config SCHED_HISTORY_SIZE int "Enable SCHED_HISTORY_SIZE" @@ -975,6 +987,10 @@ config WCNSS_MEM_PRE_ALLOC_MODULE bool "Enable WCNSS_MEM_PRE_ALLOC_MODULE" default n +config WCNSS_MEM_PRE_ALLOC + bool "Enable WCNSS_MEM_PRE_ALLOC" + default n + config WDI_EVENT_ENABLE bool "Enable WDI_EVENT_ENABLE" default n @@ -1674,4 +1690,127 @@ config PADDR_CHECK_ON_3RD_PARTY_PLATFORM bool "Enable data path memory addr check on third-party platforms" default n +config CFG80211_SINGLE_NETDEV_MULTI_LINK_SUPPORT + bool "Enable CONFIG_CFG80211_SINGLE_NETDEV_MULTI_LINK_SUPPORT" + default n + +config CFG80211_RU_PUNCT_NOTIFY + bool "Enable CFG80211_RU_PUNCT_NOTIFY" + default n + +config CFG80211_EXTERNAL_AUTH_MLO_SUPPORT + bool "Enable CFG80211_EXTERNAL_AUTH_MLO_SUPPORT" + default n + +config CFG80211_MLO_KEY_OPERATION_SUPPORT + bool "Enable CFG80211_MLO_KEY_OPERATION_SUPPORT" + default n + +config FEATURE_PKTLOG + bool "Enable CONFIG_FEATURE_PKTLOG" + default n + +config FEATURE_PKTLOG_EN_NON_LEGACY + bool "Enable FEATURE_PKTLOG_EN_NON_LEGACY" + default n + +config WLAN_CTRL_NAME + string "Enable CONFIG_WLAN_CTRL_NAME" + default \"wlan\" + +config QCA_WIFI_FTM_IOCTL + bool "Enable CONFIG_QCA_WIFI_FTM_IOCTL" + default n + +config LL_DP_SUPPORT_NON_LITH + bool "ENABLE CONFIG_LL_DP_SUPPORT_NON_LITH" + default n + +config QCA_SUPPORT_TX_THROTTLE_NON_LITH + bool "Enable CONFIG_QCA_SUPPORT_TX_THROTTLE_NON_LITH" + default n + +config PANIC_ON_BUG + bool "Enable PANIC_ON_BUG" + default n + +config CFG80211_LINK_STA_PARAMS_PRESENT + bool "Enable CONFIG_CFG80211_LINK_STA_PARAMS_PRESENT" + default n + +config ARCH_MSM + bool "Enable CONFIG_ARCH_MSM" + default n + +config WLAN_HOST_ARCH_ARM + bool "Enable if host arch is arm" + default n + +config WLAN_WARN_ON_ASSERT + bool "Enable WLAN_WARN_ON_ASSERT" + default n + +config WIFI_MONITOR_SUPPORT_2_0 + bool "Enable WIFI MONITOR SUPPORT 2_0" + default n + +config WLAN_TX_MON_2_0_Y_WLAN_DP_LOCAL_PKT_CAPTURE + bool "Enable WLAN_TX_MON_2_0_Y_DP_LOCAL_PKT_CAPTURE" + default n + +config WIFI_MONITOR_SUPPORT_Y_WLAN_TX_MON_2_0 + bool "Enable WIFI_MONITOR_SUPPORT_Y_WLAN_TX_MON_2_0" + default n + +config WLAN_DP_LOCAL_PKT_CAPTURE + bool "Enable CONFIG_WLAN_DP_LOCAL_PKT_CAPTURE" + default n + +config DP_TX_PACKET_INSPECT_FOR_ILP + bool "enable DP_TX_PACKET_INSPECT_FOR_ILP" + default n + +config NUM_SOC_PERF_CLUSTER + int "enable NUM_SOC_PERF_CLUSTER" + +config WLAN_OPEN_SOURCE + bool "enable WLAN_OPEN_SOURCE" + default n + +config CFG80211_EXT_FEATURE_SECURE_NAN + bool "enable CFG80211_EXT_FEATURE_SECURE_NAN" + default n + +config CNSS_OUT_OF_TREE + bool "enable CNSS_OUT_OF_TREE" + default n + +config CFG80211_MLD_AP_STA_CONNECT_UPSTREAM_SUPPORT + bool "enable CFG80211_MLD_AP_STA_CONNECT_UPSTREAM_SUPPORT" + default n + +config DP_MULTIPASS_SUPPORT + bool "enable CONFIG_DP_MULTIPASS_SUPPORT" + default n + +config WLAN_FEATURE_LL_LT_SAP + bool "enable CONFIG_WLAN_FEATURE_LL_LT_SAP" + default n + +config WLAN_DP_VDEV_NO_SELF_PEER + bool "enable CONFIG_WLAN_DP_VDEV_NO_SELF_PEER" + default n + +config WLAN_FEATURE_AFFINITY_MGR + bool "enable CONFIG_WLAN_FEATURE_AFFINITY_MGR" + default n + +config NL80211_EXT_FEATURE_PUNCT_SUPPORT + bool "enable CONFIG_NL80211_EXT_FEATURE_PUNCT_SUPPORT" + default n + +config DYNAMIC_DEBUG + bool "enable CONFIG_DYNAMIC_DEBUG" + default n + endif # QCA_CLD_WLAN diff --git a/components/pre_cac/dispatcher/src/wlan_pre_cac_api.c b/components/pre_cac/dispatcher/src/wlan_pre_cac_api.c index 13fe20f024..de1c0bb3e9 100644 --- a/components/pre_cac/dispatcher/src/wlan_pre_cac_api.c +++ b/components/pre_cac/dispatcher/src/wlan_pre_cac_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. 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 @@ -18,7 +18,7 @@ * DOC: Public API implementation of pre cac called from SAP module */ -#include "../../core/src/wlan_pre_cac_main.h" +#include "wlan_pre_cac_main.h" #include "wlan_pre_cac_api.h" bool wlan_pre_cac_get_status(struct wlan_objmgr_psoc *psoc) diff --git a/components/tdls/dispatcher/inc/wlan_tdls_tgt_api.h b/components/tdls/dispatcher/inc/wlan_tdls_tgt_api.h index ea4e288c6e..f0930f9cdb 100644 --- a/components/tdls/dispatcher/inc/wlan_tdls_tgt_api.h +++ b/components/tdls/dispatcher/inc/wlan_tdls_tgt_api.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. 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 @@ -26,7 +26,7 @@ #ifndef _WLAN_TDLS_TGT_API_H_ #define _WLAN_TDLS_TGT_API_H_ #include -#include "../../core/src/wlan_tdls_main.h" +#include "wlan_tdls_main.h" /** * tgt_tdls_set_fw_state() - invoke lmac tdls update fw diff --git a/configs/pineapple_consolidate_kiwi-v2_defconfig b/configs/pineapple_consolidate_kiwi-v2_defconfig index 434684f3bc..24fcc9b145 100644 --- a/configs/pineapple_consolidate_kiwi-v2_defconfig +++ b/configs/pineapple_consolidate_kiwi-v2_defconfig @@ -1,394 +1,37 @@ -CONFIG_QCA_CLD_WLAN=y -CONFIG_160MHZ_SUPPORT=y -CONFIG_6G_SCAN_CHAN_SORT_ALGO=y -CONFIG_ADAPTIVE_11R=y -CONFIG_AGEIE_ON_SCAN_RESULTS=y CONFIG_ALLOW_PKT_DROPPING=y -CONFIG_ANI_LEVEL_REQUEST=y -CONFIG_AR900B=y -CONFIG_ATH_11AC_TXCOMPACT=y -CONFIG_ATH_BUS_PM=y CONFIG_ATH_DIAG_EXT_DIRECT=y -CONFIG_ATH_PERF_PWR_OFFLOAD=y -CONFIG_BAND_6GHZ=y -CONFIG_BERYLLIUM=y -CONFIG_CE_DISABLE_SRNG_TIMER_IRQ=y -CONFIG_CFG_BMISS_OFFLOAD_MAX_VDEV=4 -CONFIG_CFG_MAX_STA_VDEVS=4 -CONFIG_CHECKSUM_OFFLOAD=y -CONFIG_CHIP_VERSION=2 -CONFIG_CNSS_GENL_MODULE=y -CONFIG_CNSS_KIWI=y -CONFIG_CNSS_KIWI_V2=y -CONFIG_CNSS_UTILS_MODULE=y -CONFIG_CONNECTIVITY_PKTLOG=y -CONFIG_CONVERGED_P2P_ENABLE=y -CONFIG_CP_STATS=y -CONFIG_DCS=y -CONFIG_DDP_MON_RSSI_IN_DBM=y -CONFIG_DEBUG_RX_RING_BUFFER=y -CONFIG_DELIVERY_TO_STACK_STATUS_CHECK=y -CONFIG_DESC_DUP_DETECT_DEBUG=y CONFIG_DESC_TIMESTAMP_DEBUG_INFO=y -CONFIG_DEVICE_FORCE_WAKE_ENABLE=y -CONFIG_DIRECT_BUF_RX_ENABLE=y -CONFIG_DISABLE_CHANNEL_LIST=y -CONFIG_DISABLE_EAPOL_INTRABSS_FWD=y -CONFIG_DISABLE_STATUS_RING_TIMER_WAR=y -CONFIG_DP_BE_WAR=y -CONFIG_DP_CON_MON_MSI_ENABLED=y -CONFIG_DP_CON_MON_MSI_SKIP_SET=y -CONFIG_DP_FEATURE_HW_COOKIE_CONVERSION=y -CONFIG_DP_HW_COOKIE_CONVERT_EXCEPTION=y -CONFIG_DP_HW_TX_DELAY_STATS_ENABLE=y -CONFIG_DP_INTR_POLL_BASED=y -CONFIG_DP_LFR=y -CONFIG_DP_MEM_PRE_ALLOC=y -CONFIG_DP_PKT_ADD_TIMESTAMP=y -CONFIG_DP_PKT_STATS_PER_LMAC=y -CONFIG_DP_RX_BUFFER_POOL_ALLOC_THRES=5 -CONFIG_DP_RX_BUFFER_POOL_SIZE=128 -CONFIG_DP_RX_DROP_RAW_FRM=y -CONFIG_DP_RX_PKT_NO_PEER_DELIVER=y CONFIG_DP_RX_REFILL_CPU_PERF_AFFINE_MASK=y -CONFIG_DP_RX_SPECIAL_FRAME_NEED=y -CONFIG_DP_TRACE=y -CONFIG_DP_TRAFFIC_END_INDICATION=y CONFIG_DP_TX_COMP_RING_DESC_SANITY_CHECK=y CONFIG_DP_TX_HW_DESC_HISTORY=y -CONFIG_DP_TXRX_SOC_ATTACH=y -CONFIG_DP_USE_REDUCED_PEER_ID_FIELD_WIDTH=y -CONFIG_DP_WAR_INVALID_FIRST_MSDU_FLAG=y CONFIG_DSC_DEBUG=y CONFIG_DSC_TEST=y -CONFIG_DUP_RX_DESC_WAR=y -CONFIG_DYNAMIC_RX_AGGREGATION=y -CONFIG_EMULATION_2_0=y -CONFIG_ENABLE_HAL_REG_WR_HISTORY=y -CONFIG_ENABLE_HAL_SOC_STATS=y -CONFIG_ENABLE_MTRACE_LOG=y CONFIG_ENABLE_QDF_PTR_HASH_DEBUG=y -CONFIG_ENABLE_SMMU_S1_TRANSLATION=y -CONFIG_FEATURE_ACTIVE_TOS=y -CONFIG_FEATURE_ALIGN_STATS_FROM_DP=y -CONFIG_FEATURE_BECN_STATS=y -CONFIG_FEATURE_BSS_TRANSITION=y -CONFIG_FEATURE_BUS_BANDWIDTH_MGR=y -CONFIG_FEATURE_CLUB_LL_STATS_AND_GET_STATION=y -CONFIG_FEATURE_COEX=y -CONFIG_FEATURE_CONCURRENCY_MATRIX=y -CONFIG_FEATURE_DELAYED_PEER_OBJ_DESTROY=y -CONFIG_FEATURE_DENYLIST_MGR=y -CONFIG_FEATURE_EPPING=y -CONFIG_FEATURE_FORCE_WAKE=y -CONFIG_FEATURE_FW_LOG_PARSING=y -CONFIG_FEATURE_GPIO_CFG=y -CONFIG_FEATURE_HAL_DELAYED_REG_WRITE=y -CONFIG_FEATURE_HAL_RECORD_SUSPEND_WRITE=y CONFIG_FEATURE_HIF_LATENCY_PROFILE_ENABLE=y -CONFIG_FEATURE_HTC_CREDIT_HISTORY=y -CONFIG_FEATURE_INTEROP_ISSUES_AP=y -CONFIG_FEATURE_MEMDUMP_ENABLE=y -CONFIG_FEATURE_MONITOR_MODE_SUPPORT=y -CONFIG_FEATURE_MSCS=y -CONFIG_FEATURE_NO_DBS_INTRABAND_MCC_SUPPORT=y -CONFIG_FEATURE_OEM_DATA=y -CONFIG_FEATURE_OTA_TEST=y -CONFIG_FEATURE_P2P_LISTEN_OFFLOAD=y -CONFIG_FEATURE_RADAR_HISTORY=y -CONFIG_FEATURE_ROAM_DEBUG=y -CONFIG_FEATURE_RSSI_MONITOR=y -CONFIG_FEATURE_RX_LINKSPEED_ROAM_TRIGGER=y -CONFIG_FEATURE_SAP_COND_CHAN_SWITCH=y -CONFIG_FEATURE_SAR_LIMITS=y -CONFIG_FEATURE_SET=y -CONFIG_FEATURE_STATION_INFO=y -CONFIG_FEATURE_STATS_EXT=y -CONFIG_FEATURE_STATS_EXT_V2=y -CONFIG_FEATURE_TSO=y -CONFIG_FEATURE_TSO_STATS=y -CONFIG_FEATURE_TX_POWER=y CONFIG_FEATURE_UNIT_TEST_SUSPEND=y -CONFIG_FEATURE_VDEV_OPS_WAKELOCK=y -CONFIG_FEATURE_WLAN_D0WOW=y -CONFIG_FEATURE_WLAN_LPHB=y -CONFIG_FEATURE_WLAN_PRE_CAC=y -CONFIG_FEATURE_WLAN_RA_FILTERING=y -CONFIG_FEATURE_WLAN_SCAN_PNO=y -CONFIG_FEATURE_WLAN_WAPI=y -CONFIG_FEATURE_WLM_STATS=y -CONFIG_FIX_TXDMA_LIMITATION=y -CONFIG_FOURTH_CONNECTION=y -CONFIG_FW_THERMAL_THROTTLE=y -CONFIG_GET_DRIVER_MODE=y -CONFIG_GTK_OFFLOAD=y CONFIG_HAL_DEBUG=y -CONFIG_HAL_DISABLE_NON_BA_2K_JUMP_ERROR=y -CONFIG_HANDLE_BC_EAP_TX_FRM=y -CONFIG_HANDLE_RX_REROUTE_ERR=y -CONFIG_HASTINGS_BT_WAR=y -CONFIG_HDD_INIT_WITH_RTNL_LOCK=y CONFIG_HIF_CE_DEBUG_DATA_BUF=y CONFIG_HIF_CPU_PERF_AFFINE_MASK=y CONFIG_HIF_DEBUG=y -CONFIG_HIF_PCI=y -CONFIG_HIF_REG_WINDOW_SUPPORT=y -CONFIG_HOST_OPCLASS=y -CONFIG_HTT_PADDR64=y -CONFIG_IPA_OFFLOAD=y -CONFIG_IPA_OPT_WIFI_DP=y -CONFIG_IPA_SET_RESET_TX_DB_PA=y -CONFIG_KIWI_HEADERS_DEF=y CONFIG_LEAK_DETECTION=y -CONFIG_LFR_SUBNET_DETECTION=y -CONFIG_LINUX_QCMBR=y -CONFIG_LITTLE_ENDIAN=y -CONFIG_LL_DP_SUPPORT=y -CONFIG_LOCK_STATS_ON=y -CONFIG_LTE_COEX=y -CONFIG_MARK_ICMP_REQ_TO_FW=y -CONFIG_MAX_ALLOC_PAGE_SIZE=y CONFIG_MAX_LOGS_PER_SEC=500 -CONFIG_MCC_TO_SCC_SWITCH=y -CONFIG_MON_ENABLE_DROP_FOR_MAC=y -CONFIG_MON_ENABLE_DROP_FOR_NON_MON_PMAC=y -CONFIG_MORE_TX_DESC=y -CONFIG_MULTI_CLIENT_LL_SUPPORT=y -CONFIG_NO_RX_PKT_HDR_TLV=y -CONFIG_OBSS_PD=y -CONFIG_OFDM_SCRAMBLER_SEED=y -CONFIG_PCI_LINK_STATUS_SANITY=y -CONFIG_PCIE_GEN_SWITCH=y -CONFIG_PEER_PROTECTED_ACCESS=y -CONFIG_PKTLOG_HAS_SPECIFIC_DATA=y -CONFIG_PLD_PCIE_CNSS_FLAG=y -CONFIG_PLD_PCIE_INIT_FLAG=y -CONFIG_POWER_MANAGEMENT_OFFLOAD=y -CONFIG_PTT_SOCK_SVC_ENABLE=y -CONFIG_QCA_CLD_WLAN=m -CONFIG_QCA_DFS_BW_PUNCTURE=y -CONFIG_QCA_GET_TSF_VIA_REG=y -CONFIG_QCA_MONITOR_PKT_SUPPORT=y -CONFIG_QCA_SUPPORT_TX_MIN_RATES_FOR_SPECIAL_FRAMES=y -CONFIG_QCA_SUPPORT_TX_THROTTLE=y -CONFIG_QCA_WIFI_FTM=y -CONFIG_QCA_WIFI_KIWI=y -CONFIG_QCA_WIFI_MONITOR_MODE_NO_MSDU_START_TLV_SUPPORT=y -CONFIG_QCA_WIFI_QCA8074=y -CONFIG_QCA_WIFI_QCA8074_VP=y -CONFIG_QCACLD_FEATURE_APF=y -CONFIG_QCACLD_FEATURE_FW_STATE=y -CONFIG_QCACLD_FEATURE_GAP_LL_PS_MODE=y -CONFIG_QCACLD_FEATURE_GREEN_AP=y -CONFIG_QCACLD_FEATURE_NAN=y -CONFIG_QCACLD_RX_DESC_MULTI_PAGE_ALLOC=y -CONFIG_QCACLD_WLAN_CONNECTIVITY_DIAG_EVENT=y -CONFIG_QCACLD_WLAN_LFR3=y -CONFIG_QCOM_ESE=y -CONFIG_QCOM_LTE_COEX=y -CONFIG_QCOM_TDLS=y -CONFIG_QCOM_VOWIFI_11R=y CONFIG_QDF_NBUF_HISTORY_SIZE=16384 -CONFIG_QDF_TEST=y -CONFIG_QMI_SUPPORT=y -CONFIG_REG_CLIENT=y CONFIG_REGISTER_OP_DEBUG=y -CONFIG_REMOVE_PKT_LOG=y -CONFIG_REO_DESC_DEFER_FREE=y CONFIG_REO_QDESC_HISTORY=y -CONFIG_ROME_IF=pci -CONFIG_RX_DEFRAG_DO_NOT_REINJECT=y CONFIG_RX_DESC_DEBUG_CHECK=y -CONFIG_RX_DESC_SANITY_WAR=y -CONFIG_RX_FISA=y -CONFIG_RX_HASH_DEBUG=y -CONFIG_RX_OL=y -CONFIG_RXDMA_ERR_PKT_DROP=y -CONFIG_SAE_SINGLE_PMK=y -CONFIG_SAP_AVOID_ACS_FREQ_LIST=y -CONFIG_SAP_DHCP_FW_IND=y -CONFIG_SAR_SAFETY_FEATURE=y -CONFIG_SCALE_INCLUDES=y CONFIG_SCHED_HISTORY_SIZE=256 -CONFIG_SERIALIZE_QUEUE_SETUP=y -CONFIG_SHADOW_V3=y -CONFIG_SMMU_S1_UNMAP=y -CONFIG_SOFTAP_CHANNEL_RANGE=y -CONFIG_SUPPORT_11AX=y -CONFIG_SYSTEM_PM_CHECK=y CONFIG_TALLOC_DEBUG=y -CONFIG_TARGET_11D_SCAN=y -CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC=y -CONFIG_THERMAL_STATS_SUPPORT=y -CONFIG_TRACE_RECORD_FEATURE=y -CONFIG_TSO_DEBUG_LOG_ENABLE=y -CONFIG_TX_ADDR_INDEX_SEARCH=y -CONFIG_TX_MULTI_TCL=y -CONFIG_TX_MULTIQ_PER_AC=y -CONFIG_TX_PER_PDEV_DESC_POOL=y -CONFIG_TX_TID_OVERRIDE=y CONFIG_UNIT_TEST=y -CONFIG_VERBOSE_DEBUG=y -CONFIG_WAPI_BIG_ENDIAN=y -CONFIG_WCNSS_MEM_PRE_ALLOC_MODULE=y -CONFIG_WDI_EVENT_ENABLE=y -CONFIG_WDI3_IPA_OVER_GSI=y -CONFIG_WIFI_MONITOR_SUPPORT=y -CONFIG_WIFI_POS_CONVERGED=y -CONFIG_WIFI_POS_PASN=y -CONFIG_WINDOW_REG_PLD_LOCK_ENABLE=y -CONFIG_WLAN_BCN_RECV_FEATURE=y -CONFIG_WLAN_BMISS=y -CONFIG_WLAN_CE_INTERRUPT_THRESHOLD_CONFIG=y -CONFIG_WLAN_CFR_ENABLE=y -CONFIG_WLAN_CLD_DEV_PM_QOS=y -CONFIG_WLAN_CLD_PM_QOS=y -CONFIG_WLAN_CONV_SPECTRAL_ENABLE=y -CONFIG_WLAN_CUSTOM_DSCP_UP_MAP=y -CONFIG_WLAN_DEBUG_CRASH_INJECT=y -CONFIG_WLAN_DEBUG_LINK_VOTE=y -CONFIG_WLAN_DEBUG_VERSION=y -CONFIG_WLAN_DEBUGFS=y -CONFIG_WLAN_DFS_MASTER_ENABLE=y -CONFIG_WLAN_DFS_STATIC_MEM_ALLOC=y -CONFIG_WLAN_DIAG_VERSION=y -CONFIG_WLAN_DISABLE_EXPORT_SYMBOL=y -CONFIG_WLAN_DL_MODES=y -CONFIG_WLAN_DP_DISABLE_TCL_CMD_CRED_SRNG=y -CONFIG_WLAN_DP_DISABLE_TCL_STATUS_SRNG=y -CONFIG_WLAN_DP_PENDING_MEM_FLUSH=y -CONFIG_WLAN_DP_PER_RING_TYPE_CONFIG=y -CONFIG_WLAN_DP_SRNG_USAGE_WM_TRACKING=y -CONFIG_WLAN_DYNAMIC_CVM=y -CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY=y -CONFIG_WLAN_ENH_CFR_ENABLE=y -CONFIG_WLAN_FEATURE_11AX=y -CONFIG_WLAN_FEATURE_11BE=y -CONFIG_WLAN_FEATURE_11BE_MLO=y -CONFIG_WLAN_FEATURE_11W=y -CONFIG_WLAN_FEATURE_ACTION_OUI=y -CONFIG_WLAN_FEATURE_BIG_DATA_STATS=y -CONFIG_WLAN_FEATURE_CAL_FAILURE_TRIGGER=y -CONFIG_WLAN_FEATURE_COAP=y -CONFIG_WLAN_FEATURE_COEX_DBAM=y -CONFIG_WLAN_FEATURE_DFS_OFFLOAD=y -CONFIG_WLAN_FEATURE_DISA=y -CONFIG_WLAN_FEATURE_DP_BUS_BANDWIDTH=y CONFIG_WLAN_FEATURE_DP_CFG_EVENT_HISTORY=y -CONFIG_WLAN_FEATURE_DP_EVENT_HISTORY=y CONFIG_WLAN_FEATURE_DP_MON_STATUS_RING_HISTORY=y CONFIG_WLAN_FEATURE_DP_RX_RING_HISTORY=y -CONFIG_WLAN_FEATURE_DP_RX_THREADS=y CONFIG_WLAN_FEATURE_DP_TX_DESC_HISTORY=y -CONFIG_WLAN_FEATURE_DYNAMIC_MAC_ADDR_UPDATE=y -CONFIG_WLAN_FEATURE_ELNA=y -CONFIG_WLAN_FEATURE_FILS=y -CONFIG_WLAN_FEATURE_FIPS=y -CONFIG_WLAN_FEATURE_GET_USABLE_CHAN_LIST=y -CONFIG_WLAN_FEATURE_ICMP_OFFLOAD=y -CONFIG_WLAN_FEATURE_IGMP_OFFLOAD=y -CONFIG_WLAN_FEATURE_LINK_LAYER_STATS=y -CONFIG_WLAN_FEATURE_LPSS=y -CONFIG_WLAN_FEATURE_LRO_CTX_IN_CB=y -CONFIG_WLAN_FEATURE_MBSSID=y -CONFIG_WLAN_FEATURE_MCC_QUOTA=y -CONFIG_WLAN_FEATURE_MDNS_OFFLOAD=y -CONFIG_WLAN_FEATURE_MEDIUM_ASSESS=y -CONFIG_WLAN_FEATURE_MIB_STATS=y -CONFIG_WLAN_FEATURE_NEAR_FULL_IRQ=y -CONFIG_WLAN_FEATURE_P2P_DEBUG=y -CONFIG_WLAN_FEATURE_P2P_P2P_STA=y -CONFIG_WLAN_FEATURE_PACKET_FILTERING=y -CONFIG_WLAN_FEATURE_PEER_TXQ_FLUSH_CONF=y -CONFIG_WLAN_FEATURE_ROAM_INFO_STATS=y -CONFIG_WLAN_FEATURE_RX_BUFFER_POOL=y -CONFIG_WLAN_FEATURE_RX_SOFTIRQ_TIME_LIMIT=y -CONFIG_WLAN_FEATURE_SAE=y -CONFIG_WLAN_FEATURE_SAP_ACS_OPTIMIZE=y -CONFIG_WLAN_FEATURE_SARV1_TO_SARV2=y -CONFIG_WLAN_FEATURE_SR=y -CONFIG_WLAN_FEATURE_TWT=y -CONFIG_WLAN_FEATURE_WMI_DIAG_OVER_CE7=y -CONFIG_WLAN_FREQ_LIST=y -CONFIG_WLAN_FW_OFFLOAD=y -CONFIG_WLAN_GTX_BW_MASK=y -CONFIG_WLAN_HANG_EVENT=y -CONFIG_WLAN_LOG_DEBUG=y -CONFIG_WLAN_LOG_ENTER=y -CONFIG_WLAN_LOG_ERROR=y -CONFIG_WLAN_LOG_EXIT=y -CONFIG_WLAN_LOG_FATAL=y -CONFIG_WLAN_LOG_INFO=y -CONFIG_WLAN_LOG_WARN=y -CONFIG_WLAN_LOGGING_SOCK_SVC=y -CONFIG_WLAN_MWS_INFO_DEBUGFS=y -CONFIG_WLAN_NAPI=y -CONFIG_WLAN_NS_OFFLOAD=y -CONFIG_WLAN_NUD_TRACKING=y CONFIG_WLAN_OBJMGR_DEBUG=y CONFIG_WLAN_OBJMGR_REF_ID_TRACE=y -CONFIG_WLAN_OFFLOAD_PACKETS=y -CONFIG_WLAN_OPEN_P2P_INTERFACE=y -CONFIG_WLAN_PDEV_VDEV_SEND_MULTI_PARAM=y -CONFIG_WLAN_PMO_ENABLE=y -CONFIG_WLAN_POLICY_MGR_ENABLE=y -CONFIG_WLAN_POWER_DEBUG=y -CONFIG_WLAN_REASSOC=y CONFIG_WLAN_RECORD_RX_PADDR=y -CONFIG_WLAN_RX_MON_PARSE_CMN_USER_INFO=y -CONFIG_WLAN_SCAN_DISABLE=y -CONFIG_WLAN_SKIP_BAR_UPDATE=y -CONFIG_WLAN_SPECTRAL_ENABLE=y -CONFIG_WLAN_SUPPORT_DATA_STALL=y -CONFIG_WLAN_SYNC_TSF=y -CONFIG_WLAN_SYNC_TSF_PLUS=y -CONFIG_WLAN_SYNC_TSF_TIMER=y -CONFIG_WLAN_SYSFS=y -CONFIG_WLAN_SYSFS_CHANNEL=y -CONFIG_WLAN_SYSFS_CONNECT_INFO=y -CONFIG_WLAN_SYSFS_DCM=y -CONFIG_WLAN_SYSFS_DFSNOL=y -CONFIG_WLAN_SYSFS_DP_STATS=y -CONFIG_WLAN_SYSFS_DP_TRACE=y -CONFIG_WLAN_SYSFS_EHT_RATE=y -CONFIG_WLAN_SYSFS_FW_MODE_CFG=y -CONFIG_WLAN_SYSFS_HE_BSS_COLOR=y -CONFIG_WLAN_SYSFS_LOG_BUFFER=y -CONFIG_WLAN_SYSFS_MEM_STATS=y -CONFIG_WLAN_SYSFS_MONITOR_MODE_CHANNEL=y -CONFIG_WLAN_SYSFS_RADAR=y -CONFIG_WLAN_SYSFS_RANGE_EXT=y -CONFIG_WLAN_SYSFS_RTS_CTS=y -CONFIG_WLAN_SYSFS_SCAN_CFG=y -CONFIG_WLAN_SYSFS_STA_INFO=y -CONFIG_WLAN_SYSFS_STATS=y -CONFIG_WLAN_SYSFS_TDLS_PEERS=y -CONFIG_WLAN_SYSFS_TEMPERATURE=y -CONFIG_WLAN_SYSFS_TX_STBC=y -CONFIG_WLAN_SYSFS_WLAN_DBG=y -CONFIG_WLAN_THERMAL_CFG=y -CONFIG_WLAN_THERMAL_MULTI_CLIENT_SUPPORT=y -CONFIG_WLAN_TRACEPOINTS=y -CONFIG_WLAN_TSF_UPLINK_DELAY=y -CONFIG_WLAN_TWT_CONVERGED=y -CONFIG_WLAN_TWT_SAP_PDEV_COUNT=y -CONFIG_WLAN_TWT_SAP_STA_COUNT=y -CONFIG_WLAN_TX_FLOW_CONTROL_V2=y -CONFIG_WLAN_TXRX_FW_ST_RST=y -CONFIG_WLAN_TXRX_FW_STATS=y -CONFIG_WLAN_TXRX_STATS=y -CONFIG_WLAN_UMAC_MLO_MAX_DEV=3 -CONFIG_WLAN_VENDOR_HANDOFF_CONTROL=y -CONFIG_WLAN_WBUFF=y -CONFIG_WLAN_WEXT_SUPPORT_ENABLE=y -CONFIG_WLAN_WOW_ITO=y -CONFIG_WLAN_WOWL_ADD_PTRN=y -CONFIG_WLAN_WOWL_DEL_PTRN=y -CONFIG_WMI_BCN_OFFLOAD=y -CONFIG_WMI_CMD_STRINGS=y -CONFIG_WMI_CONCURRENCY_SUPPORT=y -CONFIG_WMI_DBR_SUPPORT=y -CONFIG_WMI_INTERFACE_EVENT_LOGGING=y -CONFIG_WMI_ROAM_SUPPORT=y -CONFIG_WMI_SEND_RECV_QMI=y -CONFIG_WMI_STA_SUPPORT=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/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 93cf9f92a3..548644507e 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -46,7 +46,7 @@ #include "wlan_lmac_if_def.h" #include #include "wlan_mlo_mgr_sta.h" -#include "../../../../qca-wifi-host-cmn/umac/mlo_mgr/inc/utils_mlo.h" +#include "utils_mlo.h" #include "wlan_mlo_mgr_roam.h" #define MAX_SUPPORTED_PEERS_WEP 16 diff --git a/wlan_qcacld3_modules.bzl b/wlan_qcacld3_modules.bzl index 958a492efe..9a2c925ecf 100644 --- a/wlan_qcacld3_modules.bzl +++ b/wlan_qcacld3_modules.bzl @@ -37,8 +37,10 @@ _fixed_ipaths = [ "cmn/dp/cmn_dp_api", "cmn/dp/inc", "cmn/dp/wifi3.0", + "cmn/dp/wifi3.0/be", "cmn/dp/wifi3.0/monitor", "cmn/dp/wifi3.0/monitor/1.0", + "cmn/dp/wifi3.0/monitor/2.0", "cmn/ftm/core/src", "cmn/ftm/dispatcher/inc", "cmn/global_lmac_if/inc", @@ -56,9 +58,11 @@ _fixed_ipaths = [ "cmn/ipa/core/inc", "cmn/ipa/dispatcher/inc", "cmn/os_if/linux", + "cmn/os_if/linux/afc/inc", "cmn/os_if/linux/cp_stats/inc", "cmn/os_if/linux/crypto/inc", "cmn/os_if/linux/ftm/inc", + "cmn/os_if/linux/ftm/src", "cmn/os_if/linux/gpio/inc", "cmn/os_if/linux/mlme/inc", "cmn/os_if/linux/scan/inc", @@ -81,6 +85,7 @@ _fixed_ipaths = [ "cmn/target_if/dcs/inc", "cmn/target_if/dfs/inc", "cmn/target_if/direct_buf_rx/inc", + "cmn/target_if/direct_buf_rx/src", "cmn/target_if/dispatcher/inc", "cmn/target_if/dp/inc", "cmn/target_if/ftm/inc", @@ -99,6 +104,8 @@ _fixed_ipaths = [ "cmn/target_if/twt/inc", "cmn/target_if/wifi_pos/inc", "cmn/umac", + "cmn/umac/afc/core/inc", + "cmn/umac/afc/dispatcher/inc", "cmn/umac/cfr/core/inc", "cmn/umac/cfr/dispatcher/inc", "cmn/umac/cmn_services/cmn_defs/inc", @@ -129,10 +136,14 @@ _fixed_ipaths = [ "cmn/umac/mlme/vdev_mgr/dispatcher/inc", "cmn/umac/mlo_mgr/inc", "cmn/umac/regulatory/dispatcher/inc", + "cmn/umac/regulatory/core/inc", + "cmn/umac/regulatory/core/src", "cmn/umac/scan/dispatcher/inc", "cmn/umac/thermal/dispatcher/inc", "cmn/umac/twt/dispatcher/inc", "cmn/umac/wifi_pos/inc", + "cmn/umac/wifi_radar/core/inc", + "cmn/umac/wifi_radar/dispatcher/inc", "cmn/utils/epping/inc", "cmn/utils/fwlog", "cmn/utils/host_diag_log/inc", @@ -143,8 +154,10 @@ _fixed_ipaths = [ "cmn/utils/ptt/inc", "cmn/utils/sys", "cmn/wbuff/inc", + "cmn/wbuff/src", "cmn/wlan_cfg", "cmn/wmi/inc", + "cmn/wmi/src", "components/action_oui/core/inc", "components/action_oui/dispatcher/inc", "components/cfg", @@ -174,12 +187,15 @@ _fixed_ipaths = [ "components/interop_issues_ap/core/inc", "components/interop_issues_ap/dispatcher/inc", "components/mlme/core/inc", + "components/mlme/core/src", "components/mlme/dispatcher/inc", "components/nan/core/inc", + "components/nan/core/src", "components/nan/dispatcher/inc", "components/ocb/core/inc", "components/ocb/dispatcher/inc", "components/p2p/dispatcher/inc", + "components/p2p/core/src", "components/pkt_capture/core/inc", "components/pkt_capture/dispatcher/inc", "components/pmo/core/inc", @@ -187,6 +203,7 @@ _fixed_ipaths = [ "components/pmo/dispatcher/inc", "components/pmo/dispatcher/src", "components/pre_cac/dispatcher/inc", + "components/pre_cac/core/src", "components/qmi/core/inc", "components/qmi/core/src", "components/qmi/dispatcher/inc", @@ -209,11 +226,15 @@ _fixed_ipaths = [ "components/target_if/tdls/inc", "components/target_if/wfa_config/inc", "components/tdls/dispatcher/inc", + "components/tdls/core/inc", + "components/tdls/core/src", "components/umac", "components/umac/mlme/connection_mgr/dispatcher/inc", "components/umac/mlme/connection_mgr/utf/inc", "components/umac/mlme/mlo_mgr/inc", + "components/umac/mlme/mlo_mgr/dispatcher/inc", "components/umac/mlme/wfa_config/dispatcher/inc", + "components/umac/mlme/sap/ll_sap/dispatcher/inc", "components/umac/twt/dispatcher/inc", "components/wifi_pos/core/inc", "components/wifi_pos/dispatcher/inc", @@ -427,13 +448,12 @@ _fixed_srcs = [ "cmn/umac/scan/dispatcher/src/wlan_scan_tgt_api.c", "cmn/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c", "cmn/umac/scan/dispatcher/src/wlan_scan_utils_api.c", - "cmn/umac/wifi_radar/core/src/wifi_radar_common.c", - "cmn/umac/wifi_radar/dispatcher/src/wlan_wifi_radar_utils_api.c", "cmn/utils/logging/src/wlan_logging_sock_svc.c", "cmn/utils/logging/src/wlan_roam_debug.c", "cmn/utils/nlink/src/wlan_nlink_srv.c", "cmn/utils/ptt/src/wlan_ptt_sock_svc.c", "cmn/wmi/src/wmi_tlv_helper.c", + "cmn/wmi/src/wmi_tlv_platform.c", "cmn/wmi/src/wmi_unified_api.c", "cmn/wmi/src/wmi_unified.c", "cmn/wmi/src/wmi_unified_crypto_api.c", @@ -464,6 +484,7 @@ _fixed_srcs = [ "components/dsc/src/wlan_dsc_vdev.c", "components/mlme/core/src/wlan_mlme_main.c", "components/mlme/core/src/wlan_mlme_vdev_mgr_interface.c", + "components/mlme/core/src/wlan_mlme_twt_api.c", "components/mlme/dispatcher/src/wlan_mlme_api.c", "components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c", "components/p2p/core/src/wlan_p2p_main.c", @@ -517,7 +538,7 @@ _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_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", @@ -548,6 +569,7 @@ _fixed_srcs = [ "core/mac/src/pe/lim/lim_timer_utils.c", "core/mac/src/pe/lim/lim_trace.c", "core/mac/src/pe/lim/lim_utils.c", + "core/mac/src/pe/lim/lim_aid_mgmt.c", "core/mac/src/pe/rrm/rrm_api.c", "core/mac/src/pe/sch/sch_api.c", "core/mac/src/pe/sch/sch_beacon_gen.c", @@ -640,12 +662,6 @@ _conditional_srcs = { "cmn/qdf/linux/src/qdf_ssr_driver_dump.c", ], }, - "CONFIG_CNSS_KIWI": { - True: [ - "cmn/hal/wifi3.0/kiwi/hal_kiwi.c", - "cmn/hif/src/kiwidef.c", - ], - }, "CONFIG_CNSS_KIWI_V2": { True: [ "cmn/hal/wifi3.0/kiwi/hal_kiwi.c", @@ -950,7 +966,7 @@ _conditional_srcs = { "core/pld/src/pld_usb.c", ], }, - "CONFIG_HL_DP_SUPPORT": { + "LEGACY_CONFIG_HL_DP_SUPPORT": { True: [ "core/dp/txrx/ol_tx_classify.c", "core/dp/txrx/ol_tx_hl.c", @@ -1023,7 +1039,7 @@ _conditional_srcs = { "components/dp/core/src/wlan_dp_prealloc.c", ], }, - "CONFIG_LL_DP_SUPPORT": { + "LEGACY_CONFIG_LL_DP_SUPPORT": { True: [ "core/dp/txrx/ol_tx_ll.c", ], @@ -1042,8 +1058,9 @@ _conditional_srcs = { True: [ "cmn/utils/pktlog/pktlog_wifi2.c", ], - False: [ - #TODO: This won't work, need a separate flag + }, + "CONFIG_FEATURE_PKTLOG_EN_NON_LEGACY": { + True: [ "cmn/utils/pktlog/pktlog_wifi3.c", ], }, @@ -1202,7 +1219,7 @@ _conditional_srcs = { "components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload_event.c", ], }, - "CONFIG_QCA_SUPPORT_TX_THROTTLE": { + "LEGACY_CONFIG_QCA_SUPPORT_TX_THROTTLE": { True: [ "core/dp/txrx/ol_tx_throttle.c", ], @@ -1331,6 +1348,19 @@ _conditional_srcs = { "cmn/dp/wifi3.0/monitor/dp_rx_mon.c", ], }, + "CONFIG_WIFI_MONITOR_SUPPORT_Y_WLAN_TX_MON_2_0": { + True: [ + "cmn/dp/wifi3.0/monitor/2.0/dp_mon_2.0.c", + "cmn/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c", + "cmn/dp/wifi3.0/monitor/2.0/dp_tx_mon_2.0.c", + "cmn/dp/wifi3.0/monitor/2.0/dp_tx_mon_status_2.0.c", + ], + }, + "CONFIG_WLAN_TX_MON_2_0_Y_WLAN_DP_LOCAL_PKT_CAPTURE": { + True: [ + "os_if/dp/src/os_if_dp_local_pkt_capture.c", + ], + }, "CONFIG_WIFI_POS_CONVERGED": { True: [ "cmn/os_if/linux/wifi_pos/src/os_if_wifi_pos.c", @@ -1465,14 +1495,15 @@ _conditional_srcs = { "cmn/target_if/cfr/src/target_if_cfr_enh.c", ], }, - "CONFIG_WLAN_FASTPATH": { - True: [ - "core/dp/txrx/ol_tx_ll_fastpath.c", - ], - False: [ - "core/dp/txrx/ol_tx_ll_legacy.c", - ], - }, + #"LEGACY_CONFIG_WLAN_FASTPATH": { + #True: [ + # "core/dp/txrx/ol_tx_ll_fastpath.c", + #], + #TODO: Will need to create a separate flag to handle false case + #False: [ + # "core/dp/txrx/ol_tx_ll_legacy.c", + #], + #}, "CONFIG_WLAN_FEATURE_11AX": { True: [ "core/hdd/src/wlan_hdd_he.c", @@ -1502,6 +1533,9 @@ _conditional_srcs = { "cmn/umac/mlo_mgr/src/wlan_mlo_mgr_primary_umac.c", "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_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", @@ -1711,8 +1745,9 @@ _conditional_srcs = { "os_if/twt/src/osif_twt_ext_util.c", # TODO: rest being removed by David's TWT change # "components/mlme/core/src/wlan_mlme_twt_api.c", - # "components/mlme/dispatcher/src/wlan_mlme_twt_ucfg_api.c", - # "core/wma/src/wma_twt.c", + # TODO: to be removed by David's TWT change + "components/mlme/dispatcher/src/wlan_mlme_twt_ucfg_api.c", + "core/wma/src/wma_twt.c", ], }, "CONFIG_WLAN_FREQ_LIST": { @@ -1946,7 +1981,7 @@ _conditional_srcs = { "core/hdd/src/wlan_hdd_sysfs_txrx_stats.c", ], }, - "CONFIG_WLAN_TX_FLOW_CONTROL_LEGACY": { + "LEGACY_CONFIG_WLAN_TX_FLOW_CONTROL_LEGACY": { True: [ "core/dp/txrx/ol_txrx_legacy_flow_control.c", ], @@ -2006,6 +2041,18 @@ _conditional_srcs = { "cmn/wmi/src/wmi_unified_sta_tlv.c", ], }, + "CONFIG_AFC_SUPPORT": { + True: [ + "core/hdd/src/wlan_hdd_afc.c", + ], + }, + "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_sap_main.c", + ], + }, + } def _define_module_for_target_variant_chipset(target, variant, chipset): @@ -2032,11 +2079,29 @@ def _define_module_for_target_variant_chipset(target, variant, chipset): copts.append("-include") copts.append(i) + native.genrule( + name = "configs/{}_defconfig_generate_consolidate".format(tvc), + outs = ["configs/{}_defconfig.generated_consolidate".format(tvc)], + srcs = [ + "configs/{}_gki_{}_defconfig".format(target,chipset), + "configs/{}_consolidate_{}_defconfig".format(target,chipset), + ], + cmd = "cat $(SRCS) > $@", + ) + native.genrule( + name = "configs/{}_defconfig_generate_gki".format(tvc), + outs = ["configs/{}_defconfig.generated_gki".format(tvc)], + srcs = [ + "configs/{}_gki_{}_defconfig".format(target,chipset), + ], + cmd = "cat $(SRCS) > $@", + ) + srcs = native.glob(iglobs) + _fixed_srcs - out = "qca_cld_{}.ko".format(chipset.replace("-", "_")) + out = "qca_cld3_{}.ko".format(chipset.replace("-", "_")) kconfig = "Kconfig" - defconfig = "configs/{}_defconfig".format(tvc) + defconfig = ":configs/{}_defconfig_generate_{}".format(tvc,variant) print("name=", name) print("hw=", hw) @@ -2051,7 +2116,7 @@ def _define_module_for_target_variant_chipset(target, variant, chipset): ddk_module( name = name, srcs = srcs, - includes = ipaths, + includes = ipaths + ["."], kconfig = kconfig, defconfig = defconfig, conditional_srcs = _conditional_srcs, @@ -2060,8 +2125,13 @@ def _define_module_for_target_variant_chipset(target, variant, chipset): kernel_build = "//msm-kernel:{}".format(tv), deps = [ "//vendor/qcom/opensource/wlan/platform:{}_cnss2".format(tv), + "//vendor/qcom/opensource/wlan/platform:{}_cnss_prealloc".format(tv), + "//vendor/qcom/opensource/wlan/platform:{}_cnss_utils".format(tv), + "//vendor/qcom/opensource/wlan/platform:{}_cnss_nl".format(tv), "//msm-kernel:all_headers", "//vendor/qcom/opensource/wlan/platform:wlan-platform-headers", + "//vendor/qcom/opensource/dataipa:include_headers", + "//vendor/qcom/opensource/dataipa:{}_{}_ipam".format(target, variant), ], )