ring-buffer: allocate on module heap

Allocate the ring-buffer object on module heap too for DP access.

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

Author: lyakh

src/audio/buffers/ring_buffer.c

@@ -7,6 +7,7 @@
 #include <sof/trace/trace.h>
 #include <sof/lib/uuid.h>
 
+#include <sof/audio/module_adapter/module/generic.h>
 #include <sof/audio/ring_buffer.h>
 #include <sof/audio/component.h>
 
@@ -97,7 +98,7 @@ static void ring_buffer_free(struct sof_audio_buffer *audio_buffer)
 			container_of(audio_buffer, struct ring_buffer, audio_buffer);
 
 	rfree((__sparse_force void *)ring_buffer->_data_buffer);
-	rfree(ring_buffer);
+	sof_heap_free(audio_buffer->heap, ring_buffer);
 }
 
 static void ring_buffer_reset(struct sof_audio_buffer *audio_buffer)
@@ -286,14 +287,17 @@ struct ring_buffer *ring_buffer_create(struct comp_dev *dev, size_t min_availabl
 				       uint32_t id)
 {
 	struct ring_buffer *ring_buffer;
+	struct k_heap *heap = dev->mod->priv.resources.heap;
 	int memory_flags = (is_shared ? SOF_MEM_FLAG_COHERENT : 0) |
 			   user_get_buffer_memory_region(dev->drv);
 
 	/* allocate ring_buffer structure */
-	ring_buffer = rzalloc(memory_flags, sizeof(*ring_buffer));
+	ring_buffer = sof_heap_alloc(heap, memory_flags, sizeof(*ring_buffer), 0);
 	if (!ring_buffer)
 		return NULL;
 
+	memset(ring_buffer, 0, sizeof(*ring_buffer));
+
 	/* init base structure. The audio_stream_params is NULL because ring_buffer
 	 * is currently used as a secondary buffer for DP only
 	 *
@@ -303,6 +307,7 @@ struct ring_buffer *ring_buffer_create(struct comp_dev *dev, size_t min_availabl
 	audio_buffer_init(&ring_buffer->audio_buffer, BUFFER_TYPE_RING_BUFFER,
 			  is_shared, &ring_buffer_source_ops, &ring_buffer_sink_ops,
 			  &audio_buffer_ops, NULL);
+	ring_buffer->audio_buffer.heap = heap;
 
 	/* set obs/ibs in sink/source interfaces */
 	sink_set_min_free_space(audio_buffer_get_sink(&ring_buffer->audio_buffer),
@@ -374,6 +379,6 @@ struct ring_buffer *ring_buffer_create(struct comp_dev *dev, size_t min_availabl
 	return ring_buffer;
 err:
 	tr_err(&ring_buffer_tr, "Ring buffer creation failure");
-	rfree(ring_buffer);
+	sof_heap_free(heap, ring_buffer);
 	return NULL;
 }

src/include/sof/audio/audio_buffer.h

@@ -110,6 +110,8 @@ struct sof_audio_buffer {
 	 * should not be in struct sof_audio_buffer at all, kept for pipeline2.0 transition
 	 */
 	bool walking;		/**< indicates if the buffer is being walked */
+
+	struct k_heap *heap;
 };
 
 #if CONFIG_PIPELINE_2_0