rtos: alloc.h: add sof_sys_user_heap_get()

Add sof_sys_user_heap_get() to get heap object to use for SOF audio
application heap allocations. When SOF is built with
CONFIG_SOF_USERSPACE_LL, this will return a heap that can be
used for user-space code.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Author: kv2019i

posix/include/rtos/alloc.h

@@ -141,6 +141,7 @@ 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);
+struct k_heap *sof_sys_user_heap_get(void);
 
 /**
  * Calculates length of the null-terminated string.

src/platform/library/lib/alloc.c

@@ -75,3 +75,8 @@ struct k_heap *sof_sys_heap_get(void)
 {
 	return NULL;
 }
+
+struct k_heap *sof_sys_user_heap_get(void)
+{
+	return NULL;
+}

zephyr/include/rtos/alloc.h

@@ -127,6 +127,17 @@ void *sof_heap_alloc(struct k_heap *heap, uint32_t flags, size_t bytes,
 void sof_heap_free(struct k_heap *heap, void *addr);
 struct k_heap *sof_sys_heap_get(void);
 
+/**
+ * Returns heap object to use for SOF heap allocations
+ * for audio application code.
+ *
+ * This should not be used for heap allocations for objects that
+ * are only used in SOF kernel space.
+ *
+ * Note: audio modules should use mod_alloc() instead!
+ */
+struct k_heap *sof_sys_user_heap_get(void);
+
 /* TODO: remove - debug only - only needed for linking */
 static inline void heap_trace_all(int force) {}
 

zephyr/lib/alloc.c

@@ -13,6 +13,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/lib/pm_runtime.h>
 #include <sof/audio/pipeline.h>
+#include <sof/schedule/ll_schedule_domain.h> /* for zephyr_ll_user_heap() */
 #include <sof/trace/trace.h>
 #include <rtos/symbol.h>
 #include <rtos/wait.h>
@@ -380,6 +381,16 @@ struct k_heap *sof_sys_heap_get(void)
 	return &sof_heap;
 }
 
+struct k_heap *sof_sys_user_heap_get(void)
+{
+#ifdef CONFIG_SOF_USERSPACE_LL
+	return zephyr_ll_user_heap();
+#else
+	/* let sof_heap_alloc() pick */
+	return NULL;
+#endif
+}
+
 static void *heap_alloc_aligned(struct k_heap *h, size_t min_align, size_t bytes)
 {
 	k_spinlock_key_t key;