alloc: add functions to use a private heap

Add sof_heap_alloc() and sof_heap_free() to allocate and free memory
on a private heap.

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

Author: lyakh

zephyr/include/rtos/alloc.h

@@ -106,6 +106,10 @@ void rfree(void *ptr);
  */
 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);
+
 /* TODO: remove - debug only - only needed for linking */
 static inline void heap_trace_all(int force) {}
 

zephyr/lib/alloc.c

@@ -353,7 +353,7 @@ static void __sparse_cache *heap_alloc_aligned_cached(struct k_heap *h,
 	 */
 #ifdef CONFIG_SOF_ZEPHYR_HEAP_CACHED
 	min_align = MAX(PLATFORM_DCACHE_ALIGN, min_align);
-	bytes = ALIGN_UP(bytes, min_align);
+	bytes = ALIGN_UP(bytes, PLATFORM_DCACHE_ALIGN);
 #endif
 
 	ptr = (__sparse_force void __sparse_cache *)heap_alloc_aligned(h, min_align, bytes);
@@ -533,6 +533,30 @@ void rfree(void *ptr)
 }
 EXPORT_SYMBOL(rfree);
 
+/*
+ * To match the fall-back SOF main heap all private heaps should also be in the
+ * uncached address range.
+ */
+void *sof_heap_alloc(struct k_heap *heap, uint32_t flags, size_t bytes,
+		     size_t alignment)
+{
+	if (!heap)
+		heap = &sof_heap;
+
+	if (flags & SOF_MEM_FLAG_COHERENT)
+		return heap_alloc_aligned(heap, alignment, bytes);
+
+	return (__sparse_force void *)heap_alloc_aligned_cached(heap, alignment, bytes);
+}
+
+void sof_heap_free(struct k_heap *heap, void *addr)
+{
+	if (!heap)
+		heap = &sof_heap;
+
+	heap_free(heap, addr);
+}
+
 static int heap_init(void)
 {
 	sys_heap_init(&sof_heap.heap, heapmem, HEAPMEM_SIZE);