zephyr: move threads to use SOF heap

Some Zephyr heap allocations use per-thread heap pointers. By default
those allocations end up using the default Zephyr system heap, which
is rather small in the SOF case. To overcome that assign the common
SOF heap to EDF and IDC threads.

Signed-off-by: Guennadi Liakhovetski <[email protected]>

Author: lyakh

src/idc/zephyr_idc.c

@@ -185,6 +185,11 @@ void idc_init_thread(void)
 
 	k_p4wq_enable_static_thread(q_zephyr_idc + cpu,
 				    _p4threads_q_zephyr_idc + cpu, BIT(cpu));
+	/*
+	 * Assign SOF system heap to the IDC thread. Otherwise by default it
+	 * uses the Zephyr heap for DP stack allocation
+	 */
+	k_thread_heap_assign(_p4threads_q_zephyr_idc + cpu, sof_sys_heap_get());
 }
 
 #endif /* CONFIG_MULTICORE */

zephyr/edf_schedule.c

@@ -5,6 +5,7 @@
 // Author: Bartosz Kokoszko <[email protected]>
 
 #include <sof/audio/component.h>
+#include <rtos/alloc.h>
 #include <rtos/task.h>
 #include <stdint.h>
 #include <sof/schedule/edf_schedule.h>
@@ -111,6 +112,7 @@ int scheduler_init_edf(void)
 
 	k_thread_suspend(thread);
 
+	k_thread_heap_assign(thread, sof_sys_heap_get());
 	k_thread_cpu_mask_clear(thread);
 	k_thread_cpu_mask_enable(thread, PLATFORM_PRIMARY_CORE_ID);
 	k_thread_name_set(thread, "edf_workq");

zephyr/include/rtos/alloc.h

@@ -123,6 +123,7 @@ void l3_heap_save(void);
 void *sof_heap_alloc(struct k_heap *heap, uint32_t flags, size_t bytes,
 		     size_t alignment);
 void sof_heap_free(struct k_heap *heap, void *addr);
+struct k_heap *sof_sys_heap_get(void);
 
 /* TODO: remove - debug only - only needed for linking */
 static inline void heap_trace_all(int force) {}

zephyr/lib/alloc.c

@@ -370,6 +370,11 @@ SYS_INIT(virtual_heap_init, POST_KERNEL, 1);
 
 #endif /* CONFIG_VIRTUAL_HEAP */
 
+struct k_heap *sof_sys_heap_get(void)
+{
+	return &sof_heap;
+}
+
 static void *heap_alloc_aligned(struct k_heap *h, size_t min_align, size_t bytes)
 {
 	k_spinlock_key_t key;