sof _ctx_alloc() followup: Remove the ctx_alloc.h header and move the implementation into rtos/alloc.h.

src/audio/buffers/comp_buffer.c

@@ -17,7 +17,6 @@
 #include <rtos/alloc.h>
 #include <rtos/cache.h>
 #include <sof/lib/vregion.h>
-#include <sof/ctx_alloc.h>
 #include <sof/list.h>
 #include <sof/schedule/dp_schedule.h>
 #include <rtos/spinlock.h>

src/audio/buffers/ring_buffer.c

@@ -7,7 +7,6 @@
 #include <sof/trace/trace.h>
 #include <sof/lib/uuid.h>
 #include <sof/lib/vregion.h>
-#include <sof/ctx_alloc.h>
 
 #include <sof/audio/module_adapter/module/generic.h>
 #include <sof/audio/ring_buffer.h>

src/audio/module_adapter/module/generic.c

@@ -18,7 +18,6 @@
 #include <sof/audio/data_blob.h>
 #include <sof/lib/fast-get.h>
 #include <sof/lib/vregion.h>
-#include <sof/ctx_alloc.h>
 #include <sof/schedule/dp_schedule.h>
 #if CONFIG_IPC_MAJOR_4
 #include <ipc4/header.h>

src/include/sof/audio/component.h

@@ -23,7 +23,6 @@
 #include <rtos/idc.h>
 #include <rtos/mutex.h>
 #include <rtos/userspace_helper.h>
-#include <sof/ctx_alloc.h>
 #include <sof/lib/dai.h>
 #include <sof/schedule/schedule.h>
 #include <ipc/control.h>

src/include/sof/lib/dai-zephyr.h

@@ -26,7 +26,6 @@
 #include <rtos/spinlock.h>
 #include <sof/trace/trace.h>
 #include <sof/ipc/topology.h>
-#include <sof/ctx_alloc.h>
 #include <sof/audio/pcm_converter.h>
 #include <sof/audio/ipc-config.h>
 #include <sof/audio/component.h>

zephyr/include/rtos/alloc.h

@@ -150,4 +150,73 @@ size_t get_shared_buffer_heap_size(void);
 
 #endif
 
+#include <sof/lib/vregion.h>
+#include <string.h>
+
+struct mod_alloc_ctx {
+	struct k_heap *heap;
+	struct vregion *vreg;
+};
+
+/**
+ * Allocate memory from a mod_alloc_ctx context.
+ *
+ * When the context has a vregion, allocates from the vregion interim
+ * partition. Coherent memory is used when SOF_MEM_FLAG_COHERENT is set
+ * in flags. Falls back to sof_heap_alloc() otherwise.
+ *
+ * @param ctx		Allocation context (heap + optional vregion).
+ * @param flags		Allocation flags (SOF_MEM_FLAG_*).
+ * @param size		Size in bytes.
+ * @param alignment	Required alignment in bytes.
+ * @return Pointer to allocated memory or NULL on failure.
+ */
+static inline void *sof_ctx_alloc(struct mod_alloc_ctx *ctx, uint32_t flags,
+				  size_t size, size_t alignment)
+{
+	if (!ctx || !ctx->vreg)
+		return sof_heap_alloc(ctx ? ctx->heap : NULL, flags, size, alignment);
+
+	if (flags & SOF_MEM_FLAG_COHERENT)
+		return vregion_alloc_coherent_align(ctx->vreg, VREGION_MEM_TYPE_INTERIM,
+						    size, alignment);
+
+	return vregion_alloc_align(ctx->vreg, VREGION_MEM_TYPE_INTERIM, size, alignment);
+}
+
+/**
+ * Allocate zero-initialized memory from a mod_alloc_ctx context.
+ * @param ctx		Allocation context.
+ * @param flags		Allocation flags (SOF_MEM_FLAG_*).
+ * @param size		Size in bytes.
+ * @param alignment	Required alignment in bytes.
+ * @return Pointer to allocated memory or NULL on failure.
+ */
+static inline void *sof_ctx_zalloc(struct mod_alloc_ctx *ctx, uint32_t flags,
+				   size_t size, size_t alignment)
+{
+	void *ptr = sof_ctx_alloc(ctx, flags, size, alignment);
+
+	if (ptr)
+		memset(ptr, 0, size);
+
+	return ptr;
+}
+
+/**
+ * Free memory allocated from a mod_alloc_ctx context.
+ * @param ctx	Allocation context.
+ * @param ptr	Pointer to free.
+ */
+static inline void sof_ctx_free(struct mod_alloc_ctx *ctx, void *ptr)
+{
+	if (!ptr)
+		return;
+
+	if (ctx && ctx->vreg)
+		vregion_free(ctx->vreg, ptr);
+	else
+		sof_heap_free(ctx ? ctx->heap : NULL, ptr);
+}
+
 #endif /* __ZEPHYR_RTOS_ALLOC_H__ */