From 6b432e8d56a286f423aa93499fa6554b112470d7 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <quic_jjohnson@quicinc.com>
Date: Thu, 11 May 2023 13:03:13 -0700
Subject: [PATCH] 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
---
 cnss2/Kconfig             |  8 ++++++++
 icnss2/Kconfig            | 15 +++++++++++++++
 wlan_platform_modules.bzl | 10 ++++++++--
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/cnss2/Kconfig b/cnss2/Kconfig
index f04d168d52..7897ddee43 100644
--- a/cnss2/Kconfig
+++ b/cnss2/Kconfig
@@ -156,3 +156,11 @@ config CNSS_OUT_OF_TREE
 	help
 	  If enabled, CNSS 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.
diff --git a/icnss2/Kconfig b/icnss2/Kconfig
index 829db44f2c..91a4cbc75b 100644
--- a/icnss2/Kconfig
+++ b/icnss2/Kconfig
@@ -36,3 +36,18 @@ config CNSS_QCA6750
 	  CNSS QCA6750 chipset.
 	  These changes are needed to support the new hardware architecture
 	  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.
diff --git a/wlan_platform_modules.bzl b/wlan_platform_modules.bzl
index 87f8151873..51b465f773 100644
--- a/wlan_platform_modules.bzl
+++ b/wlan_platform_modules.bzl
@@ -67,6 +67,7 @@ def _define_modules_for_target_variant(target, variant):
         deps = [
             "//vendor/qcom/opensource/securemsm-kernel:{}_smcinvoke_dlkm".format(tv),
             ":{}_cnss_utils".format(tv),
+            ":{}_cnss_prealloc".format(tv),
             ":{}_wlan_firmware_service".format(tv),
             ":{}_cnss_plat_ipc_qmi_svc".format(tv),
             "//msm-kernel:all_headers",
@@ -97,6 +98,9 @@ def _define_modules_for_target_variant(target, variant):
         out = "icnss2.ko",
         kernel_build = "//msm-kernel:{}".format(tv),
         deps = [
+            ":{}_cnss_utils".format(tv),
+            ":{}_cnss_prealloc".format(tv),
+            ":{}_wlan_firmware_service".format(tv),
             "//msm-kernel:all_headers",
             ":wlan-platform-headers",
         ],
@@ -119,9 +123,11 @@ def _define_modules_for_target_variant(target, variant):
 
     ddk_module(
         name = "{}_cnss_prealloc".format(tv),
-        srcs = [
+        srcs = native.glob([
             "cnss_prealloc/cnss_prealloc.c",
-        ],
+            "cnss_utils/*.h",
+        ]),
+        includes = ["cnss_utils"],
         kconfig = "cnss_prealloc/Kconfig",
         defconfig = "build/{}_defconfig".format(tv),
         out = "cnss_prealloc.ko",