Merge branch 'main' into main

Signed-off-by: Sivasubramanian678 <sravisar@amd.com>

Author: Sivasubramanian678

src/audio/base_fw_intel.c

@@ -109,7 +109,8 @@ static const struct device *uaol_devs[] = {
 	DT_FOREACH_STATUS_OKAY(intel_adsp_uaol, DEV_AND_COMMA)
 };
 
-static void tlv_value_set_uaol_caps(struct sof_tlv *tuple, uint32_t type)
+#if !CONFIG_SOF_OS_LINUX_COMPAT_PRIORITY
+__cold static void tlv_value_set_uaol_caps(struct sof_tlv *tuple, uint32_t type)
 {
 	const size_t dev_count = ARRAY_SIZE(uaol_devs);
 	struct uaol_capabilities dev_cap;
@@ -118,6 +119,8 @@ static void tlv_value_set_uaol_caps(struct sof_tlv *tuple, uint32_t type)
 	size_t i;
 	int ret;
 
+	assert_can_be_cold();
+
 	memset(caps, 0, caps_size);
 
 	caps->link_count = dev_count;
@@ -135,12 +138,15 @@ static void tlv_value_set_uaol_caps(struct sof_tlv *tuple, uint32_t type)
 
 	tlv_value_set(tuple, type, caps_size, caps);
 }
+#endif /* CONFIG_SOF_OS_LINUX_COMPAT_PRIORITY */
 
-static int uaol_stream_id_to_hda_link_stream_id(int uaol_stream_id)
+__cold static int uaol_stream_id_to_hda_link_stream_id(int uaol_stream_id)
 {
 	size_t dev_count = ARRAY_SIZE(uaol_devs);
 	size_t i;
 
+	assert_can_be_cold();
+
 	for (i = 0; i < dev_count; i++) {
 		int hda_link_stream_id = uaol_get_mapped_hda_link_stream_id(uaol_devs[i],
 									    uaol_stream_id);

src/audio/buffers/comp_buffer.c

@@ -16,6 +16,7 @@
 #include <rtos/interrupt.h>
 #include <rtos/alloc.h>
 #include <rtos/cache.h>
+#include <sof/lib/vregion.h>
 #include <sof/list.h>
 #include <sof/schedule/dp_schedule.h>
 #include <rtos/spinlock.h>
@@ -146,22 +147,22 @@ static void comp_buffer_free(struct sof_audio_buffer *audio_buffer)
 
 	struct comp_buffer *buffer = container_of(audio_buffer, struct comp_buffer, audio_buffer);
 
-	buf_dbg(buffer, "buffer_free()");
+	buf_dbg(buffer, "entry");
 
 #if CONFIG_PROBE
 	if (buffer->probe_cb_free)
 		buffer->probe_cb_free(buffer->probe_cb_arg);
 #endif
 
-	struct k_heap *heap = buffer->audio_buffer.heap;
+	struct mod_alloc_ctx *alloc = buffer->audio_buffer.alloc;
 
 	rfree(buffer->stream.addr);
-	sof_heap_free(heap, buffer);
-	if (heap) {
-		struct dp_heap_user *mod_heap_user = container_of(heap, struct dp_heap_user, heap);
-
-		if (!--mod_heap_user->client_count)
-			rfree(mod_heap_user);
+	if (alloc && alloc->vreg) {
+		vregion_free(alloc->vreg, buffer);
+		if (!vregion_put(alloc->vreg))
+			rfree(alloc);
+	} else {
+		sof_heap_free(alloc ? alloc->heap : NULL, buffer);
 	}
 }
 
@@ -192,19 +193,24 @@ static const struct audio_buffer_ops audio_buffer_ops = {
 	.set_alignment_constants = comp_buffer_set_alignment_constants,
 };
 
-static struct comp_buffer *buffer_alloc_struct(struct k_heap *heap,
+static struct comp_buffer *buffer_alloc_struct(struct mod_alloc_ctx *alloc,
 					       void *stream_addr, size_t size,
 					       uint32_t flags, bool is_shared)
 {
 	struct comp_buffer *buffer;
 
-	tr_dbg(&buffer_tr, "buffer_alloc_struct()");
+	tr_dbg(&buffer_tr, "entry");
 
 	/* allocate new buffer, but add coherent if shared with other cores */
 	if (is_shared)
 		flags |= SOF_MEM_FLAG_COHERENT;
 
-	buffer = sof_heap_alloc(heap, flags, sizeof(*buffer), 0);
+	if (!alloc || !alloc->vreg)
+		buffer = sof_heap_alloc(alloc ? alloc->heap : NULL, flags, sizeof(*buffer), 0);
+	else if (is_shared)
+		buffer = vregion_alloc_coherent(alloc->vreg, VREGION_MEM_TYPE_INTERIM, sizeof(*buffer));
+	else
+		buffer = vregion_alloc(alloc->vreg, VREGION_MEM_TYPE_INTERIM, sizeof(*buffer));
 	if (!buffer) {
 		tr_err(&buffer_tr, "could not alloc structure");
 		return NULL;
@@ -226,21 +232,21 @@ static struct comp_buffer *buffer_alloc_struct(struct k_heap *heap,
 
 	audio_stream_set_underrun(&buffer->stream, !!(flags & SOF_BUF_UNDERRUN_PERMITTED));
 	audio_stream_set_overrun(&buffer->stream, !!(flags & SOF_BUF_OVERRUN_PERMITTED));
-	buffer->audio_buffer.heap = heap;
+	buffer->audio_buffer.alloc = alloc;
 
 	comp_buffer_reset_source_list(buffer);
 	comp_buffer_reset_sink_list(buffer);
 
 	return buffer;
 }
 
-struct comp_buffer *buffer_alloc(struct k_heap *heap, size_t size, uint32_t flags, uint32_t align,
-				 bool is_shared)
+struct comp_buffer *buffer_alloc(struct mod_alloc_ctx *alloc, size_t size, uint32_t flags,
+				 uint32_t align, bool is_shared)
 {
 	struct comp_buffer *buffer;
 	void *stream_addr;
 
-	tr_dbg(&buffer_tr, "buffer_alloc()");
+	tr_dbg(&buffer_tr, "entry");
 
 	/* validate request */
 	if (size == 0) {
@@ -255,7 +261,7 @@ struct comp_buffer *buffer_alloc(struct k_heap *heap, size_t size, uint32_t flag
 		return NULL;
 	}
 
-	buffer = buffer_alloc_struct(heap, stream_addr, size, flags, is_shared);
+	buffer = buffer_alloc_struct(alloc, stream_addr, size, flags, is_shared);
 	if (!buffer) {
 		tr_err(&buffer_tr, "could not alloc buffer structure");
 		rfree(stream_addr);
@@ -264,7 +270,7 @@ struct comp_buffer *buffer_alloc(struct k_heap *heap, size_t size, uint32_t flag
 	return buffer;
 }
 
-struct comp_buffer *buffer_alloc_range(struct k_heap *heap, size_t preferred_size,
+struct comp_buffer *buffer_alloc_range(struct mod_alloc_ctx *alloc, size_t preferred_size,
 				       size_t minimum_size,
 				       uint32_t flags, uint32_t align, bool is_shared)
 {
@@ -299,7 +305,7 @@ struct comp_buffer *buffer_alloc_range(struct k_heap *heap, size_t preferred_siz
 		return NULL;
 	}
 
-	buffer = buffer_alloc_struct(heap, stream_addr, size, flags, is_shared);
+	buffer = buffer_alloc_struct(alloc, stream_addr, size, flags, is_shared);
 	if (!buffer) {
 		tr_err(&buffer_tr, "could not alloc buffer structure");
 		rfree(stream_addr);
@@ -310,7 +316,7 @@ struct comp_buffer *buffer_alloc_range(struct k_heap *heap, size_t preferred_siz
 
 void buffer_zero(struct comp_buffer *buffer)
 {
-	buf_dbg(buffer, "stream_zero()");
+	buf_dbg(buffer, "entry");
 	CORE_CHECK_STRUCT(&buffer->audio_buffer);
 
 	bzero(audio_stream_get_addr(&buffer->stream), audio_stream_get_size(&buffer->stream));

src/audio/buffers/ring_buffer.c

@@ -6,6 +6,7 @@
 #include <sof/common.h>
 #include <sof/trace/trace.h>
 #include <sof/lib/uuid.h>
+#include <sof/lib/vregion.h>
 
 #include <sof/audio/module_adapter/module/generic.h>
 #include <sof/audio/ring_buffer.h>
@@ -96,9 +97,15 @@ static void ring_buffer_free(struct sof_audio_buffer *audio_buffer)
 
 	struct ring_buffer *ring_buffer = container_of(audio_buffer,
 						       struct ring_buffer, audio_buffer);
-
-	sof_heap_free(audio_buffer->heap, (__sparse_force void *)ring_buffer->_data_buffer);
-	sof_heap_free(audio_buffer->heap, ring_buffer);
+	struct mod_alloc_ctx *alloc = audio_buffer->alloc;
+
+	if (alloc->vreg) {
+		vregion_free(alloc->vreg, (__sparse_force void *)ring_buffer->_data_buffer);
+		vregion_free(alloc->vreg, ring_buffer);
+	} else {
+		sof_heap_free(alloc->heap, (__sparse_force void *)ring_buffer->_data_buffer);
+		sof_heap_free(alloc->heap, ring_buffer);
+	}
 }
 
 static void ring_buffer_reset(struct sof_audio_buffer *audio_buffer)
@@ -287,12 +294,19 @@ 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;
+	struct mod_alloc_ctx *alloc = dev->mod->priv.resources.alloc;
+	struct k_heap *heap = alloc->heap;
+	struct vregion *vreg = alloc->vreg;
 	int memory_flags = (is_shared ? SOF_MEM_FLAG_COHERENT : 0) |
 			   user_get_buffer_memory_region(dev->drv);
 
 	/* allocate ring_buffer structure */
-	ring_buffer = sof_heap_alloc(heap, memory_flags, sizeof(*ring_buffer), 0);
+	if (!vreg)
+		ring_buffer = sof_heap_alloc(heap, memory_flags, sizeof(*ring_buffer), 0);
+	else if (is_shared)
+		ring_buffer = vregion_alloc_coherent(vreg, VREGION_MEM_TYPE_INTERIM, sizeof(*ring_buffer));
+	else
+		ring_buffer = vregion_alloc(vreg, VREGION_MEM_TYPE_INTERIM, sizeof(*ring_buffer));
 	if (!ring_buffer)
 		return NULL;
 
@@ -307,7 +321,8 @@ 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;
+	ring_buffer->audio_buffer.alloc = alloc;
+	ring_buffer->audio_buffer.alloc->heap = heap;
 
 	/* set obs/ibs in sink/source interfaces */
 	sink_set_min_free_space(audio_buffer_get_sink(&ring_buffer->audio_buffer),
@@ -364,12 +379,21 @@ struct ring_buffer *ring_buffer_create(struct comp_dev *dev, size_t min_availabl
 	/* allocate data buffer - always in cached memory alias */
 	ring_buffer->data_buffer_size = ALIGN_UP(ring_buffer->data_buffer_size,
 						 PLATFORM_DCACHE_ALIGN);
-	ring_buffer->_data_buffer = (__sparse_force __sparse_cache void *)sof_heap_alloc(heap,
-					user_get_buffer_memory_region(dev->drv),
-					ring_buffer->data_buffer_size, PLATFORM_DCACHE_ALIGN);
-	if (!ring_buffer->_data_buffer)
+
+	void *data_buf;
+
+	if (vreg)
+		data_buf = vregion_alloc_align(vreg, VREGION_MEM_TYPE_INTERIM, ring_buffer->data_buffer_size,
+					       PLATFORM_DCACHE_ALIGN);
+	else
+		data_buf = sof_heap_alloc(heap, user_get_buffer_memory_region(dev->drv),
+					  ring_buffer->data_buffer_size, PLATFORM_DCACHE_ALIGN);
+
+	if (!data_buf)
 		goto err;
 
+	ring_buffer->_data_buffer = (__sparse_force __sparse_cache void *)data_buf;
+
 	tr_info(&ring_buffer_tr, "Ring buffer created, id: %u shared: %u min_available: %u min_free_space %u, size %u",
 		id, ring_buffer_is_shared(ring_buffer), min_available, min_free_space,
 		ring_buffer->data_buffer_size);
@@ -378,6 +402,9 @@ 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");
-	sof_heap_free(heap, ring_buffer);
+	if (vreg)
+		vregion_free(vreg, ring_buffer);
+	else
+		sof_heap_free(heap, ring_buffer);
 	return NULL;
 }

src/audio/dai-zephyr.c

@@ -873,7 +873,7 @@ static int dai_set_dma_config(struct dai_data *dd, struct comp_dev *dev)
 
 	comp_dbg(dev, "entry");
 
-	dma_cfg = rballoc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT | SOF_MEM_FLAG_DMA,
+	dma_cfg = rmalloc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT | SOF_MEM_FLAG_DMA,
 			  sizeof(struct dma_config));
 	if (!dma_cfg) {
 		comp_err(dev, "dma_cfg allocation failed");

tools/tune/mfcc/README.txt src/audio/mfcc/tune/README.txttools/tune/mfcc/README.txt renamed to src/audio/mfcc/tune/README.txt

@@ -1,16 +1,15 @@
 #!/bin/sh
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2022 Intel Corporation. All rights reserved.
+# Copyright(c) 2022-2026 Intel Corporation. All rights reserved.
 
 set -e
 
 RAW_INPUT=in.raw
 RAW_OUTPUT=mfcc.raw
 
-export LD_LIBRARY_PATH=../../testbench/build_testbench/sof_ep/install/lib:../../testbench/build_testbench/sof_parser/install/lib
-
-TESTBENCH=../../testbench/build_testbench/install/bin/testbench
-OPT="-q -r 16000 -R 16000 -c 1 -n 1 -b S16_LE -t ../../build_tools/test/topology/test-playback-ssp5-mclk-0-I2S-mfcc-s16le-s16le-48k-24576k-codec.tplg"
+TESTBENCH=$SOF_WORKSPACE/sof/tools/testbench/build_testbench/install/bin/sof-testbench4
+TOPOLOGY=$SOF_WORKSPACE/sof/tools/build_tools/topology/topology2/development/sof-hda-benchmark-mfcc16.tplg
+OPT="-r 16000 -c 2 -b S16_LE -p 3,4 -t $TOPOLOGY -i $RAW_INPUT -o $RAW_OUTPUT"
 
 # Convert input audio file raw 16 kHz 1 channel 16 bit
 sox --encoding signed-integer "$1" -L -r 16000 -c 1 -b 16 "$RAW_INPUT"

tools/tune/mfcc/decode_ceps.m src/audio/mfcc/tune/decode_ceps.mtools/tune/mfcc/decode_ceps.m renamed to src/audio/mfcc/tune/decode_ceps.m

@@ -5,11 +5,12 @@
 %         below from code
 %
 % Create binary configuration blob for MFCC component. The hex data
-% is written to tools/topology/topology1/m4/mfcc/mfcc_config.m4
+% is written to tools/topology/topology2/include/components/mfcc and
+% tools/topology/topology1/m4/mfcc.
 
 % SPDX-License-Identifier: BSD-3-Clause
 %
-% Copyright (c) 2018-2020, Intel Corporation. All rights reserved.
+% Copyright (c) 2018-2026, Intel Corporation. All rights reserved.
 
 function setup_mfcc(cfg)
 
@@ -45,12 +46,14 @@ function setup_mfcc(cfg)
 	cfg.top_db = 200; % Set to 80 for librosa
 end
 
-cfg.tplg_fn = '../../topology/topology1/m4/mfcc/mfcc_config.m4';
+cfg.tools = '../../../../tools/';
+
+cfg.tplg_fn = [cfg.tools 'topology/topology1/m4/mfcc/mfcc_config.m4'];
 cfg.tplg_ver = 1;
 cfg.ipc_ver = 3;
 export_mfcc_setup(cfg);
 
-cfg.tplg_fn = '../../topology/topology2/include/components/mfcc/default.conf';
+cfg.tplg_fn = [cfg.tools 'topology/topology2/include/components/mfcc/default.conf'];
 cfg.tplg_ver = 2;
 cfg.ipc_ver = 4;
 export_mfcc_setup(cfg);
@@ -60,7 +63,7 @@ function setup_mfcc(cfg)
 function export_mfcc_setup(cfg)
 
 %% Use blob tool from EQ
-addpath('../common');
+addpath([cfg.tools 'tune/common']);
 
 %% Blob size, size plus reserved(8) + current parameters
 nbytes_data = 104;
@@ -122,16 +125,16 @@ function export_mfcc_setup(cfg)
        case 1
 	       sof_tplg_write(cfg.tplg_fn, b8, "DEF_MFCC_PRIV", ...
 			      "Exported with script setup_mfcc.m", ...
-			      "cd tools/tune/mfcc; octave setup_mfcc.m");
+			      "cd src/audio/mfcc/tune; octave setup_mfcc.m");
        case 2
 	       sof_tplg2_write(cfg.tplg_fn, b8, "mfcc_config", ...
 			       "Exported MFCC configuration", ...
-			       "cd tools/tune/mfcc; octave setup_mfcc.m");
+			       "cd src/audio/mfcc/tune; octave setup_mfcc.m");
        otherwise
 	       error("Illegal cfg.tplg_ver, use 1 for topology v1 or 2 topology v2.");
 end
 
-rmpath('../common');
+rmpath([cfg.tools 'tune/common']);
 
 end