audio: buffers: ring_buffer: Allocate memory from shared heap for userspace

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>

Author: softwarecki

src/audio/buffers/ring_buffer.c

@@ -8,6 +8,7 @@
 #include <sof/lib/uuid.h>
 
 #include <sof/audio/ring_buffer.h>
+#include <sof/audio/component.h>
 
 #include <rtos/alloc.h>
 #include <ipc/topology.h>
@@ -261,7 +262,7 @@ static struct source_ops ring_buffer_source_ops = {
 	.release_data = ring_buffer_release_data,
 };
 
-static struct sink_ops ring_buffer_sink_ops = {
+APP_TASK_DATA static struct sink_ops ring_buffer_sink_ops = {
 	.get_free_size = ring_buffer_get_free_size,
 	.get_buffer = ring_buffer_get_buffer,
 	.commit_buffer = ring_buffer_commit_buffer,
@@ -273,18 +274,17 @@ static const struct audio_buffer_ops audio_buffer_ops = {
 	.reset = ring_buffer_reset
 };
 
-struct ring_buffer *ring_buffer_create(size_t min_available, size_t min_free_space, bool is_shared,
+struct ring_buffer *ring_buffer_create(struct comp_dev *dev, size_t min_available,
+				       size_t min_free_space, bool is_shared,
 				       uint32_t id)
 {
 	struct ring_buffer *ring_buffer;
+	enum mem_zone zone = is_shared ?
+		SOF_MEM_ZONE_RUNTIME_SHARED : SOF_MEM_ZONE_RUNTIME;
+	int memory_caps = SOF_MEM_CAPS_RAM | (dev->drv->drv_heap ? SOF_MEM_CAPS_MMU_SHD : 0);
 
 	/* allocate ring_buffer structure */
-	if (is_shared)
-		ring_buffer = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM,
-				      sizeof(*ring_buffer));
-	else
-		ring_buffer = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM,
-				      sizeof(*ring_buffer));
+	ring_buffer = rzalloc(zone, 0, memory_caps, sizeof(*ring_buffer));
 	if (!ring_buffer)
 		return NULL;
 
@@ -354,7 +354,8 @@ struct ring_buffer *ring_buffer_create(size_t min_available, size_t min_free_spa
 	ring_buffer->data_buffer_size =
 			ALIGN_UP(ring_buffer->data_buffer_size, PLATFORM_DCACHE_ALIGN);
 	ring_buffer->_data_buffer = (__sparse_force __sparse_cache void *)
-			rballoc_align(0, 0, ring_buffer->data_buffer_size, PLATFORM_DCACHE_ALIGN);
+			rballoc_align(0, memory_caps, ring_buffer->data_buffer_size,
+				      PLATFORM_DCACHE_ALIGN);
 	if (!ring_buffer->_data_buffer)
 		goto err;
 

src/include/sof/audio/ring_buffer.h

@@ -97,6 +97,7 @@
  *		always means "buffer full"
  */
 
+struct comp_dev;
 struct ring_buffer;
 struct sof_audio_stream_params;
 
@@ -122,7 +123,8 @@ struct ring_buffer {
  * @param id a stream ID, accessible later by sink_get_id/source_get_id
  *
  */
-struct ring_buffer *ring_buffer_create(size_t min_available, size_t min_free_space, bool is_shared,
+struct ring_buffer *ring_buffer_create(struct comp_dev *dev, size_t min_available,
+				       size_t min_free_space, bool is_shared,
 				       uint32_t id);
 
 #endif /* __SOF_RING_BUFFER_H__ */

src/ipc/ipc4/helper.c

@@ -603,25 +603,23 @@ __cold int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
 
 	if (sink->ipc_config.proc_domain == COMP_PROCESSING_DOMAIN_DP ||
 	    source->ipc_config.proc_domain == COMP_PROCESSING_DOMAIN_DP) {
-		struct sof_source *source = audio_buffer_get_source(&buffer->audio_buffer);
-		struct sof_sink *sink = audio_buffer_get_sink(&buffer->audio_buffer);
+		bool dp_on_source = source->ipc_config.proc_domain == COMP_PROCESSING_DOMAIN_DP;
+		struct sof_source *src = audio_buffer_get_source(&buffer->audio_buffer);
+		struct sof_sink *snk = audio_buffer_get_sink(&buffer->audio_buffer);
 
-		ring_buffer = ring_buffer_create(source_get_min_available(source),
-						 sink_get_min_free_space(sink),
+		ring_buffer = ring_buffer_create(dp_on_source ? source : sink,
+						 source_get_min_available(src),
+						 sink_get_min_free_space(snk),
 						 audio_buffer_is_shared(&buffer->audio_buffer),
 						 buf_get_id(buffer));
 		if (!ring_buffer)
 			goto free;
-	}
 
-	if (sink->ipc_config.proc_domain == COMP_PROCESSING_DOMAIN_DP)
 		/* data destination module needs to use ring_buffer */
-		audio_buffer_attach_secondary_buffer(&buffer->audio_buffer, false, /* at_input */
-						     &ring_buffer->audio_buffer);
-	else if (source->ipc_config.proc_domain == COMP_PROCESSING_DOMAIN_DP)
-		/* data source module needs to use ring_buffer */
-		audio_buffer_attach_secondary_buffer(&buffer->audio_buffer, true, /* at_input */
+		audio_buffer_attach_secondary_buffer(&buffer->audio_buffer, dp_on_source,
 						     &ring_buffer->audio_buffer);
+	}
+
 #endif /* CONFIG_ZEPHYR_DP_SCHEDULER */
 	/*
 	 * Connect and bind the buffer to both source and sink components with LL processing been