Просмотр исходного кода

cnss_prealloc: Update DDK for cnss_prealloc dependencies

Commit 97303bf33097 ("cnss_prealloc: update prealloc mem pool based on
device type") introduced several new dependencies:
- cnss_prealloc has a dependency upon a new header file
  cnss_utils/cnss_common.h
- cnss2 has a dependency upon cnss_prealloc
- icnss2 has a dependency upon cnss_prealloc
- icnss2 has dependency upon cnss_utils and wlan_firmware_service

Add those dependencies to the DDK build rules.
Also add CNSS_OUT_OF_TREE config in icnss2/Kconfig file.

Change-Id: If00eb7623cffb82e02ed0f8001254082f2a19b93
CRs-Fixed: 3495407
Jeff Johnson 1 год назад
Родитель
Сommit
6b432e8d56
3 измененных файлов с 31 добавлено и 2 удалено
  1. 8 0
      cnss2/Kconfig
  2. 15 0
      icnss2/Kconfig
  3. 8 2
      wlan_platform_modules.bzl

+ 8 - 0
cnss2/Kconfig

@@ -156,3 +156,11 @@ config CNSS_OUT_OF_TREE
 	help
 	help
 	  If enabled, CNSS platform driver modules would be able to access
 	  If enabled, CNSS platform driver modules would be able to access
 	  functions from the other modules in the platform driver.
 	  functions from the other modules in the platform driver.
+
+config WCNSS_MEM_PRE_ALLOC
+	tristate "WCNSS pre-alloc memory support"
+	help
+	  Pre-allocate memory for the WLAN driver module.
+	  This feature enable cld wlan driver to use pre allocated memory
+	  for it's internal usage and release it to back to pre allocated pool.
+	  This memory is allocated at the cold boot time.

+ 15 - 0
icnss2/Kconfig

@@ -36,3 +36,18 @@ config CNSS_QCA6750
 	  CNSS QCA6750 chipset.
 	  CNSS QCA6750 chipset.
 	  These changes are needed to support the new hardware architecture
 	  These changes are needed to support the new hardware architecture
 	  for CNSS QCA6750 chipset.
 	  for CNSS QCA6750 chipset.
+
+config CNSS_OUT_OF_TREE
+	bool "Enable Out of Tree Usage"
+	depends on ICNSS2
+	help
+	  If enabled, ICNSS platform driver modules would be able to access
+	  functions from the other modules in the platform driver.
+
+config WCNSS_MEM_PRE_ALLOC
+	tristate "WCNSS pre-alloc memory support"
+	help
+	  Pre-allocate memory for the WLAN driver module.
+	  This feature enable cld wlan driver to use pre allocated memory
+	  for it's internal usage and release it to back to pre allocated pool.
+	  This memory is allocated at the cold boot time.

+ 8 - 2
wlan_platform_modules.bzl

@@ -67,6 +67,7 @@ def _define_modules_for_target_variant(target, variant):
         deps = [
         deps = [
             "//vendor/qcom/opensource/securemsm-kernel:{}_smcinvoke_dlkm".format(tv),
             "//vendor/qcom/opensource/securemsm-kernel:{}_smcinvoke_dlkm".format(tv),
             ":{}_cnss_utils".format(tv),
             ":{}_cnss_utils".format(tv),
+            ":{}_cnss_prealloc".format(tv),
             ":{}_wlan_firmware_service".format(tv),
             ":{}_wlan_firmware_service".format(tv),
             ":{}_cnss_plat_ipc_qmi_svc".format(tv),
             ":{}_cnss_plat_ipc_qmi_svc".format(tv),
             "//msm-kernel:all_headers",
             "//msm-kernel:all_headers",
@@ -97,6 +98,9 @@ def _define_modules_for_target_variant(target, variant):
         out = "icnss2.ko",
         out = "icnss2.ko",
         kernel_build = "//msm-kernel:{}".format(tv),
         kernel_build = "//msm-kernel:{}".format(tv),
         deps = [
         deps = [
+            ":{}_cnss_utils".format(tv),
+            ":{}_cnss_prealloc".format(tv),
+            ":{}_wlan_firmware_service".format(tv),
             "//msm-kernel:all_headers",
             "//msm-kernel:all_headers",
             ":wlan-platform-headers",
             ":wlan-platform-headers",
         ],
         ],
@@ -119,9 +123,11 @@ def _define_modules_for_target_variant(target, variant):
 
 
     ddk_module(
     ddk_module(
         name = "{}_cnss_prealloc".format(tv),
         name = "{}_cnss_prealloc".format(tv),
-        srcs = [
+        srcs = native.glob([
             "cnss_prealloc/cnss_prealloc.c",
             "cnss_prealloc/cnss_prealloc.c",
-        ],
+            "cnss_utils/*.h",
+        ]),
+        includes = ["cnss_utils"],
         kconfig = "cnss_prealloc/Kconfig",
         kconfig = "cnss_prealloc/Kconfig",
         defconfig = "build/{}_defconfig".format(tv),
         defconfig = "build/{}_defconfig".format(tv),
         out = "cnss_prealloc.ko",
         out = "cnss_prealloc.ko",