asrc: enable building as an llext module

Add support for LLEXT building to asrc.

Signed-off-by: Guennadi Liakhovetski <[email protected]>

Author: lyakh

app/overlays/lnl/module_overlay.conf

@@ -5,4 +5,5 @@ CONFIG_COMP_FIR=m
 CONFIG_COMP_IIR=m
 CONFIG_COMP_DRC=m
 CONFIG_COMP_SRC=m
+CONFIG_COMP_ASRC=m
 CONFIG_COMP_VOLUME=m

app/overlays/mtl/module_overlay.conf

@@ -5,4 +5,5 @@ CONFIG_COMP_FIR=m
 CONFIG_COMP_IIR=m
 CONFIG_COMP_DRC=m
 CONFIG_COMP_SRC=m
+CONFIG_COMP_ASRC=m
 CONFIG_COMP_VOLUME=m

src/audio/asrc/CMakeLists.txt

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 add_local_sources(sof asrc.c asrc_farrow.c asrc_farrow_generic.c
-	asrc_farrow_hifi3.c)
+	asrc_farrow_hifi3.c asrc_log.c)
 
 if(CONFIG_IPC_MAJOR_3)
 	add_local_sources(sof asrc_ipc3.c)

src/audio/asrc/Kconfig

@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 config COMP_ASRC
-	bool "ASRC component"
+	tristate "ASRC component"
+	default m if LIBRARY_DEFAULT_MODULAR
 	default y
 	help
 	  Select for Asynchronous sample rate conversion (ASRC)
@@ -14,7 +15,7 @@ config COMP_ASRC
 	  not have pre-computed filter coefficients for every
 	  conversion fraction that SRC does.
 
-if COMP_ASRC
+if COMP_ASRC != n
 
 rsource "Kconfig.simd"
 

src/audio/asrc/asrc.c

@@ -32,7 +32,7 @@
 #include <stdint.h>
 #include "asrc.h"
 
-LOG_MODULE_REGISTER(asrc, CONFIG_SOF_LOG_LEVEL);
+LOG_MODULE_DECLARE(asrc, CONFIG_SOF_LOG_LEVEL);
 
 /* In-line functions */
 
@@ -318,7 +318,7 @@ static int asrc_free(struct processing_module *mod)
 	struct comp_data *cd = module_get_private_data(mod);
 	struct comp_dev *dev = mod->dev;
 
-	comp_info(dev, "asrc_free()");
+	comp_dbg(dev, "asrc_free()");
 
 	rfree(cd->buf);
 	asrc_release_buffers(cd->asrc_obj);
@@ -850,8 +850,7 @@ static int asrc_reset(struct processing_module *mod)
 	struct comp_dev *dev = mod->dev;
 	struct comp_data *cd = module_get_private_data(mod);
 
-	comp_info(dev, "asrc_reset(), skew_min=%d, skew_max=%d", cd->skew_min, cd->skew_max);
-
+	comp_dbg(dev, "asrc_reset(), skew_min=%d, skew_max=%d", cd->skew_min, cd->skew_max);
 
 	/* If any resources feasible to stop */
 	if (cd->track_drift)
@@ -879,3 +878,21 @@ static const struct module_interface asrc_interface = {
 
 DECLARE_MODULE_ADAPTER(asrc_interface, ASRC_UUID, asrc_tr);
 SOF_MODULE_INIT(asrc, sys_comp_module_asrc_interface_init);
+
+#if CONFIG_COMP_ASRC_MODULE
+/* modular: llext dynamic link */
+
+#include <module/module/api_ver.h>
+#include <module/module/llext.h>
+#include <rimage/sof/user/manifest.h>
+
+#define UUID_ASRC 0x2d, 0x40, 0xb4, 0x66, 0x68, 0xb4, 0xf2, 0x42, \
+		  0x81, 0xa7, 0xb3, 0x71, 0x21, 0x86, 0x3d, 0xd4
+SOF_LLEXT_MOD_ENTRY(asrc, &asrc_interface);
+
+static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
+	SOF_LLEXT_MODULE_MANIFEST("ASRC", asrc_llext_entry, 1, UUID_ASRC, 2),
+};
+
+SOF_LLEXT_BUILDINFO;
+#endif

src/audio/asrc/asrc.toml

@@ -1,11 +1,15 @@
+#ifndef LOAD_TYPE
+#define LOAD_TYPE "0"
+#endif
+
 	[[module.entry]]
 	name = "ASRC"
 	uuid = "66B4402D-B468-42F2-81A7-B37121863DD4"
 	affinity_mask = "0x3"
 	instance_count = "2"
 	domain_types = "0"
 
-	load_type = "0"
+	load_type = LOAD_TYPE
 	module_type = "9"
 	auto_start = "0"
 	sched_caps = [1, 0x00008000]

src/audio/asrc/asrc_ipc3.c

@@ -16,10 +16,6 @@
 #include <errno.h>
 #include "asrc.h"
 
-SOF_DEFINE_REG_UUID(asrc);
-
-DECLARE_TR_CTX(asrc_tr, SOF_UUID(asrc_uuid), LOG_LEVEL_INFO);
-
 int asrc_dai_configure_timestamp(struct comp_data *cd)
 {
 	if (cd->dai_dev)

src/audio/asrc/asrc_ipc4.c

@@ -16,10 +16,6 @@
 #include <errno.h>
 #include "asrc.h"
 
-SOF_DEFINE_REG_UUID(asrc4);
-
-DECLARE_TR_CTX(asrc_tr, SOF_UUID(asrc4_uuid), LOG_LEVEL_INFO);
-
 int asrc_dai_configure_timestamp(struct comp_data *cd)
 {
 	if (!cd->dai_dev)

src/audio/asrc/asrc_log.c

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2024 Intel Corporation.
+
+#include <rtos/symbol.h>
+#include <sof/lib/uuid.h>
+#include <sof/trace/trace.h>
+#include <user/trace.h>
+
+LOG_MODULE_REGISTER(asrc, CONFIG_SOF_LOG_LEVEL);
+#if CONFIG_IPC_MAJOR_4
+SOF_DEFINE_REG_UUID(asrc4);
+DECLARE_TR_CTX(asrc_tr, SOF_UUID(asrc4_uuid), LOG_LEVEL_INFO);
+EXPORT_SYMBOL(asrc4_uuid);
+#elif CONFIG_IPC_MAJOR_3
+SOF_DEFINE_REG_UUID(asrc);
+DECLARE_TR_CTX(asrc_tr, SOF_UUID(asrc_uuid), LOG_LEVEL_INFO);
+EXPORT_SYMBOL(asrc_uuid);
+#endif
+EXPORT_SYMBOL(asrc_tr);
+EXPORT_SYMBOL(log_const_asrc);

src/audio/asrc/llext/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+sof_llext_build("asrc"
+	SOURCES ../asrc.c
+		../asrc_farrow_hifi3.c
+		../asrc_farrow.c
+		../asrc_farrow_generic.c
+		../asrc_ipc4.c
+)