drivers: wifi: Introduce option to use K_HEAP

Provide option to revert to K_HEAP instead of using
dedicated heaps in Wi-Fi driver.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>

Author: rado17

drivers/wifi/nrf_wifi/Kconfig.nrfwifi

@@ -570,6 +570,21 @@ config NRF70_RSSI_STALE_TIMEOUT_MS
 	  value as the driver does not store it and requires RPU to provide the
 	  information.
 
+config NRF_WIFI_GLOBAL_HEAP
+	bool "Use Zephyr kernel heap for Wi-Fi driver"
+	depends on KERNEL_MEM_POOL && ((HEAP_MEM_POOL_SIZE > 0) || HEAP_MEM_POOL_IGNORE_MIN)
+	help
+	  Enable this option to use K_HEAP for memory allocations in Wi-Fi driver.
+
+if NRF_WIFI_GLOBAL_HEAP
+config HEAP_MEM_POOL_ADD_SIZE_NRF70
+	# Use a maximum that works for typical use cases and boards, each sample/app can override
+	# this value if needed by using CONFIG_HEAP_MEM_POOL_IGNORE_MIN
+	def_int 25000 if NRF70_SCAN_ONLY
+	def_int 150000
+endif # NRF_WIFI_GLOBAL_HEAP
+
+if !NRF_WIFI_GLOBAL_HEAP
 config NRF_WIFI_CTRL_HEAP_SIZE
 	int "Dedicated memory pool for control plane"
 	default 20000
@@ -580,6 +595,7 @@ config NRF_WIFI_DATA_HEAP_SIZE
 	default 8000 if NRF70_SCAN_ONLY
 	default 110000 if !SOC_FAMILY_NORDIC_NRF
 	default 130000
+endif
 
 if NETWORKING
 # Finetune defaults for certain system components used by the driver

modules/nrf_wifi/os/shim.c

@@ -33,13 +33,17 @@
 #include "common/hal_structs_common.h"
 
 LOG_MODULE_REGISTER(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
+
+#if !defined(CONFIG_NRF_WIFI_GLOBAL_HEAP)
 #if defined(CONFIG_NOCACHE_MEMORY)
 K_HEAP_DEFINE_NOCACHE(wifi_drv_ctrl_mem_pool, CONFIG_NRF_WIFI_CTRL_HEAP_SIZE);
 K_HEAP_DEFINE_NOCACHE(wifi_drv_data_mem_pool, CONFIG_NRF_WIFI_DATA_HEAP_SIZE);
 #else
 K_HEAP_DEFINE(wifi_drv_ctrl_mem_pool, CONFIG_NRF_WIFI_CTRL_HEAP_SIZE);
 K_HEAP_DEFINE(wifi_drv_data_mem_pool, CONFIG_NRF_WIFI_DATA_HEAP_SIZE);
 #endif /* CONFIG_NOCACHE_MEMORY */
+#endif /* CONFIG_NRF_WIFI_GLOBAL_HEAP */
+
 #define WORD_SIZE 4
 
 struct zep_shim_intr_priv *intr_priv;
@@ -48,14 +52,22 @@ static void *zep_shim_mem_alloc(size_t size)
 {
 	size_t size_aligned = ROUND_UP(size, 4);
 
+#if defined(CONFIG_NRF_WIFI_GLOBAL_HEAP)
+	return k_malloc(size_aligned);
+#else /* CONFIG_NRF_WIFI_GLOBAL_HEAP */
 	return k_heap_aligned_alloc(&wifi_drv_ctrl_mem_pool, WORD_SIZE, size_aligned, K_FOREVER);
+#endif /* CONFIG_NRF_WIFI_GLOBAL_HEAP */
 }
 
 static void *zep_shim_data_mem_alloc(size_t size)
 {
 	size_t size_aligned = ROUND_UP(size, 4);
 
+#if defined(CONFIG_NRF_WIFI_GLOBAL_HEAP)
+	return k_malloc(size_aligned);
+#else /* CONFIG_NRF_WIFI_GLOBAL_HEAP */
 	return k_heap_aligned_alloc(&wifi_drv_data_mem_pool, WORD_SIZE, size_aligned, K_FOREVER);
+#endif /* CONFIG_NRF_WIFI_GLOBAL_HEAP */
 }
 
 static void *zep_shim_mem_zalloc(size_t size)
@@ -99,14 +111,22 @@ static void *zep_shim_data_mem_zalloc(size_t size)
 static void zep_shim_mem_free(void *buf)
 {
 	if (buf) {
+#if defined(CONFIG_NRF_WIFI_GLOBAL_HEAP)
+		k_free(buf);
+#else /* CONFIG_NRF_WIFI_GLOBAL_HEAP */
 		k_heap_free(&wifi_drv_ctrl_mem_pool, buf);
+#endif /* CONFIG_NRF_WIFI_GLOBAL_HEAP */
 	}
 }
 
 static void zep_shim_data_mem_free(void *buf)
 {
 	if (buf) {
+#if defined(CONFIG_NRF_WIFI_GLOBAL_HEAP)
+		k_free(buf);
+#else /* CONFIG_NRF_WIFI_GLOBAL_HEAP */
 		k_heap_free(&wifi_drv_data_mem_pool, buf);
+#endif /* CONFIG_NRF_WIFI_GLOBAL_HEAP */
 	}
 }
 
@@ -197,7 +217,11 @@ static void *zep_shim_spinlock_alloc(void)
 
 static void zep_shim_spinlock_free(void *lock)
 {
+#if defined(CONFIG_NRF_WIFI_GLOBAL_HEAP)
+	k_free(lock);
+#else /* CONFIG_NRF_WIFI_GLOBAL_HEAP */
 	k_heap_free(&wifi_drv_ctrl_mem_pool, lock);
+#endif /* CONFIG_NRF_WIFI_GLOBAL_HEAP */
 }
 
 static void zep_shim_spinlock_init(void *lock)