userspace: make the shared heap depend on a Kconfig option

Add a SOF_ZEPHYR_USE_SHARED_HEAP Kconfig option to explicitly enable
or disable the shared heap.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

zephyr/Kconfig

@@ -38,8 +38,16 @@ config SOF_ZEPHYR_HEAP_SIZE
 	 NOTE: Keep in mind that the heap size should not be greater than the physical
 	 memory size of the system defined in DT (and this includes baseFW text/data).
 
+config SOF_USERSPACE_USE_SHARED_HEAP
+	bool "Use shared heap for SOF userspace modules"
+	depends on USERSPACE
+	help
+	  When set a shared heap will be used for audio buffers between SOF
+	  kernel and userspace modules.
+
 config SOF_ZEPHYR_SHARED_BUFFER_HEAP_SIZE
 	hex "Size of the shared buffer heap for SOF userspace modules"
+	default 0x0 if !SOF_USERSPACE_USE_SHARED_HEAP
 	default 0x1E000 if SOC_INTEL_ACE15_MTPM || SOC_INTEL_ACE20_LNL
 	default 0x1A000 if SOC_INTEL_ACE30
 	default 0x0

zephyr/include/rtos/alloc.h

@@ -129,7 +129,7 @@ static inline void heap_trace_all(int force) {}
 
 /** @}*/
 
-#if CONFIG_USERSPACE
+#if CONFIG_SOF_USERSPACE_USE_SHARED_HEAP
 /**
  * Returns the start address of shared memory heap for buffers.
  *

zephyr/lib/alloc.c

@@ -105,8 +105,10 @@ static uint8_t __aligned(PLATFORM_DCACHE_ALIGN) heapmem[HEAPMEM_SIZE];
 #undef SHARED_BUFFER_HEAP_MEM_SIZE
 #define SHARED_BUFFER_HEAP_MEM_SIZE	ROUND_UP(CONFIG_SOF_ZEPHYR_SHARED_BUFFER_HEAP_SIZE, \
 						 HOST_PAGE_SIZE)
+#if CONFIG_SOF_USERSPACE_USE_SHARED_HEAP
 __section(".shared_heap_mem")
 static uint8_t __aligned(HOST_PAGE_SIZE) shared_heapmem[SHARED_BUFFER_HEAP_MEM_SIZE];
+#endif
 #endif /* CONFIG_USERSPACE */
 __section(".heap_mem")
 static uint8_t __aligned(HOST_PAGE_SIZE) heapmem[HEAPMEM_SIZE - SHARED_BUFFER_HEAP_MEM_SIZE];
@@ -149,7 +151,7 @@ extern char _end[], _heap_sentry[];
 
 static struct k_heap sof_heap;
 
-#if CONFIG_USERSPACE
+#if CONFIG_SOF_USERSPACE_USE_SHARED_HEAP
 static struct k_heap shared_buffer_heap;
 
 static bool is_shared_buffer_heap_pointer(void *ptr)
@@ -181,7 +183,7 @@ size_t get_shared_buffer_heap_size(void)
 {
 	return ROUND_DOWN(SHARED_BUFFER_HEAP_MEM_SIZE, HOST_PAGE_SIZE);
 }
-#endif /* CONFIG_USERSPACE */
+#endif /* CONFIG_SOF_USERSPACE_USE_SHARED_HEAP */
 
 #if CONFIG_L3_HEAP
 static struct k_heap l3_heap;
@@ -466,7 +468,7 @@ void *rmalloc_align(uint32_t flags, size_t bytes, uint32_t alignment)
 #else
 		k_panic();
 #endif
-#if CONFIG_USERSPACE
+#if CONFIG_SOF_USERSPACE_USE_SHARED_HEAP
 	} else if (flags & SOF_MEM_FLAG_USER_SHARED_BUFFER) {
 		heap = &shared_buffer_heap;
 #endif
@@ -555,7 +557,7 @@ void *rballoc_align(uint32_t flags, size_t bytes,
 		tr_err(&zephyr_tr, "L3_HEAP not available.");
 		return NULL;
 #endif
-#if CONFIG_USERSPACE
+#if CONFIG_SOF_USERSPACE_USE_SHARED_HEAP
 	} else if (flags & SOF_MEM_FLAG_USER_SHARED_BUFFER) {
 		heap = &shared_buffer_heap;
 #endif /* CONFIG_USERSPACE */
@@ -598,7 +600,7 @@ void rfree(void *ptr)
 	}
 #endif
 
-#if CONFIG_USERSPACE
+#if CONFIG_SOF_USERSPACE_USE_SHARED_HEAP
 	if (is_shared_buffer_heap_pointer(ptr)) {
 		heap_free(&shared_buffer_heap, ptr);
 		return;
@@ -637,7 +639,7 @@ static int heap_init(void)
 {
 	sys_heap_init(&sof_heap.heap, heapmem, HEAPMEM_SIZE - SHARED_BUFFER_HEAP_MEM_SIZE);
 
-#if CONFIG_USERSPACE
+#if CONFIG_SOF_USERSPACE_USE_SHARED_HEAP
 	sys_heap_init(&shared_buffer_heap.heap, shared_heapmem, SHARED_BUFFER_HEAP_MEM_SIZE);
 #endif