diff --git a/Kconfig b/Kconfig index 6f7f534ab5..5657ec342d 100644 --- a/Kconfig +++ b/Kconfig @@ -1,7 +1,6 @@ comment "Qualcomm Atheros CLD WLAN module" config QCA_CLD_WLAN - tristate "Qualcomm Atheros CLD WLAN module" default n help @@ -98,12 +97,6 @@ config CE_DISABLE_SRNG_TIMER_IRQ bool "Enable CE_DISABLE_SRNG_TIMER_IRQ" default n -config CFG_BMISS_OFFLOAD_MAX_VDEV - int "Enable CFG_BMISS_OFFLOAD_MAX_VDEV" - -config CFG_MAX_STA_VDEVS - int "Enable CFG_MAX_STA_VDEVS" - config CHECKSUM_OFFLOAD bool "Enable CHECKSUM_OFFLOAD" default n @@ -132,8 +125,8 @@ config CNSS_UTILS_MODULE default n config CNSS_UTILS - bool "Enable CNSS_UTILS" - default n + tristate "Enable CNSS_UTILS" + default n config CONNECTIVITY_PKTLOG bool "Enable CONNECTIVITY_PKTLOG" @@ -882,10 +875,6 @@ config REO_QDESC_HISTORY bool "Enable REO_QDESC_HISTORY" default n -config ROME_IF - string "Enable ROME_IF" - default pci - config RPS bool "enable CONFIG_QCA_CONFIG_RPS" default n @@ -1034,7 +1023,7 @@ config WCNSS_MEM_PRE_ALLOC_MODULE default n config WCNSS_MEM_PRE_ALLOC - bool "Enable WCNSS_MEM_PRE_ALLOC" + tristate "Enable WCNSS_MEM_PRE_ALLOC" default n config WDI_EVENT_ENABLE @@ -1709,7 +1698,6 @@ config WLAN_WBUFF config WLAN_WEXT_SUPPORT_ENABLE bool "Enable WLAN_WEXT_SUPPORT_ENABLE" - depends on CFG80211_WEXT default n config WLAN_WOW_ITO @@ -1941,4 +1929,117 @@ config WLAN_SYSFS_RF_TEST_MODE config WLAN_FEATURE_MARK_FIRST_WAKEUP_PACKET bool "enable WLAN_FEATURE_MARK_FIRST_WAKEUP_PACKET" default n + +config CNSS2_MODULE + bool "Enable CONFIG_CNSS2_MODULE" + default n + +config DP_RX_DESC_COOKIE_INVALIDATE + bool "Enable CONFIG_DP_RX_DESC_COOKIE_INVALIDATE" + default n + +config DP_SWLM + bool "Enable DP_SWLM" + default n + +config DP_TX_TRACKING + bool "Enable DP_TX_TRACKING" + default n + +config DP_WAR_VALIDATE_RX_ERR_MSDU_COOKIE + bool "Enable DP_WAR_VALIDATE_RX_ERR_MSDU_COOKIE" + default n + +config FEATURE_AST + bool "Enable FEATURE_AST" + default n + +config HIF_IPCI + bool "Enable HIF_IPCI" + default n + +config HOST_WAKEUP_OVER_QMI + bool "Enable HOST_WAKEUP_OVER_QMI" + default n + +config LITHIUM + bool "Enable LITHIUM" + default n + +config QCA6750_HEADERS_DEF + bool "Enable QCA6750_HEADERS_DEF" + default n + +config QCA_TARGET_IF_MLME + bool "Enable QCA_TARGET_IF_MLME" + default n + +config QCA_WIFI_QCA6750 + bool "Enable QCA_WIFI_QCA6750" + default n + +config PLD_IPCI_ICNSS_FLAG + bool "Enable PLD_IPCI_ICNSS_FLAG" + default n + +config SHADOW_V2 + bool "Enable SHADOW_V2" + default n + +config WLAN_DP_PROFILE_SUPPORT + bool "Enable WLAN_DP_PROFILE_SUPPORT" + default n + +config WLAN_FEATURE_CE_RX_BUFFER_REUSE + bool "Enable WLAN_FEATURE_CE_RX_BUFFER_REUSE" + default n + +config WLAN_STREAMFS + bool "Enable WLAN_STREAMFS" + default n + +config WLAN_SYSFS_ROAM_TRIGGER_BITMAP + bool "Enable WLAN_SYSFS_ROAM_TRIGGER_BITMAP" + default n + +config WLAN_SYSFS_WDS_MODE + bool "Enable WLAN_SYSFS_WDS_MODE" + default n + +config WLAN_TRACE_HIDE_MAC_ADDRESS + bool "Enable WLAN_TRACE_HIDE_MAC_ADDRESS" + default n + +config CNSS_QCA6750 + bool "Enable CNSS_QCA6750" + default n + +menu "Optional Configs" + +if CNSS_KIWI_V2 + +config CFG_BMISS_OFFLOAD_MAX_VDEV + int "Enable CFG_BMISS_OFFLOAD_MAX_VDEV" + +config CFG_MAX_STA_VDEVS + int "Enable CFG_MAX_STA_VDEVS" + +config ROME_IF + string "Enable ROME_IF" + default pci + +endif + +if CNSS_QCA6750 + +config ROME_IF + string "Enable ROME_IF" + default ipci + +config DP_LEGACY_MODE_CSM_DEFAULT_DISABLE + int "Enable CONFIG_DP_LEGACY_MODE_CSM_DEFAULT_DISABLE" + +endif + +endmenu endif # QCA_CLD_WLAN diff --git a/wlan_qcacld3_modules.bzl b/wlan_qcacld3_modules.bzl index 05edcd2dcb..0c542aa3cd 100644 --- a/wlan_qcacld3_modules.bzl +++ b/wlan_qcacld3_modules.bzl @@ -9,6 +9,7 @@ _target_chipset_map = { "pineapple": [ "peach", "kiwi-v2", + "qca6750", ], "sun": [ "peach", @@ -19,6 +20,7 @@ _target_chipset_map = { _chipset_hw_map = { "kiwi-v2": "BERYLLIUM", "peach": "BERYLLIUM", + "qca6750": "MOSELLE", } _chipset_header_map = { @@ -30,12 +32,19 @@ _chipset_header_map = { "api/hw/kiwi/v2", "cmn/hal/wifi3.0/kiwi", ], + "qca6750" : [ + "api/hw/qca6750/v1", + "cmn/hal/wifi3.0/qca6750", + ], } _hw_header_map = { "BERYLLIUM": [ "cmn/hal/wifi3.0/be", ], + "MOSELLE" : [ + "cmn/hal/wifi3.0/li", + ], } _fixed_includes = [ @@ -66,6 +75,7 @@ _fixed_ipaths = [ "cmn/hif/src/ce", "cmn/hif/src/dispatcher", "cmn/hif/src/pcie", + "cmn/hif/src/ipcie", "cmn/htc", "cmn/init_deinit/dispatcher/inc", "cmn/ipa/core/inc", @@ -683,6 +693,12 @@ _conditional_srcs = { "cmn/hif/src/kiwidef.c", ], }, + "CONFIG_QCA6750_HEADERS_DEF": { + True: [ + "cmn/hal/wifi3.0/qca6750/hal_6750.c", + "cmn/hif/src/qca6750def.c", + ], + }, "CONFIG_CNSS_PEACH": { True: [ "cmn/hal/wifi3.0/kiwi/hal_kiwi.c", @@ -963,6 +979,7 @@ _conditional_srcs = { "CONFIG_HIF_IPCI": { True: [ "cmn/hif/src/dispatcher/multibus_ipci.c", + "cmn/hif/src/ipcie/if_ipci.c", ], }, "CONFIG_HIF_PCI": { @@ -2217,6 +2234,29 @@ def _define_module_for_target_variant_chipset(target, variant, chipset): kconfig = "Kconfig" defconfig = ":configs/{}_defconfig_generate_{}".format(tvc, variant) + if chipset == "qca6750": + deps = [ + "//vendor/qcom/opensource/wlan/platform:{}_icnss2".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), + ] + else: + 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), + ] + print("name=", name) print("hw=", hw) print("ipaths=", ipaths) @@ -2226,6 +2266,7 @@ def _define_module_for_target_variant_chipset(target, variant, chipset): print("copts=", copts) print("kconfig=", kconfig) print("defconfig=", defconfig) + print("deps = ", deps) ddk_module( name = name, @@ -2237,16 +2278,7 @@ def _define_module_for_target_variant_chipset(target, variant, chipset): copts = copts, out = out, 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), - ], + deps = deps, ) def define_dist(target, variant, chipsets):