LLEXT: convert most remaining Module Adapter drivers

app/configs/lnl/modules.conf

@@ -1,8 +1,22 @@
+CONFIG_DTS_CODEC=m
 CONFIG_SAMPLE_SMART_AMP=m
+CONFIG_COMP_STUBS=y
 CONFIG_COMP_MIXIN_MIXOUT=m
 CONFIG_COMP_FIR=m
 CONFIG_COMP_IIR=m
 CONFIG_COMP_DRC=m
+CONFIG_COMP_MUX=m
+CONFIG_COMP_SEL=m
 CONFIG_COMP_SRC=m
+CONFIG_COMP_ARIA=m
 CONFIG_COMP_ASRC=m
+CONFIG_COMP_MFCC=m
+CONFIG_COMP_RTNR=m
+CONFIG_COMP_TDFB=m
+CONFIG_COMP_IGO_NR=m
 CONFIG_COMP_VOLUME=m
+CONFIG_COMP_DCBLOCK=m
+CONFIG_COMP_CROSSOVER=m
+CONFIG_COMP_MULTIBAND_DRC=m
+CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING=m
+CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=m

app/configs/mtl/modules.conf

@@ -1,8 +1,22 @@
+CONFIG_DTS_CODEC=m
 CONFIG_SAMPLE_SMART_AMP=m
+CONFIG_COMP_STUBS=y
 CONFIG_COMP_MIXIN_MIXOUT=m
 CONFIG_COMP_FIR=m
 CONFIG_COMP_IIR=m
 CONFIG_COMP_DRC=m
+CONFIG_COMP_MUX=m
+CONFIG_COMP_SEL=m
 CONFIG_COMP_SRC=m
+CONFIG_COMP_ARIA=m
 CONFIG_COMP_ASRC=m
+CONFIG_COMP_MFCC=m
+CONFIG_COMP_RTNR=m
+CONFIG_COMP_TDFB=m
+CONFIG_COMP_IGO_NR=m
 CONFIG_COMP_VOLUME=m
+CONFIG_COMP_DCBLOCK=m
+CONFIG_COMP_CROSSOVER=m
+CONFIG_COMP_MULTIBAND_DRC=m
+CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING=m
+CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=m

src/audio/aria/Kconfig

@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 config COMP_ARIA
-        bool "ARIA component"
-        default n
-        depends on IPC_MAJOR_4
-        help
-          Select for Automatic Regressive Input Amplifier Module component
+	tristate "ARIA component"
+	default n
+	depends on IPC_MAJOR_4
+	help
+	  Select for Automatic Regressive Input Amplifier Module component
 	  ARIA applies variable gain into incoming signal.
 	  Applied gain is in range <1, 2 power attenuation>
 	  Currently ARIA introduces gain transition and algorithmic

src/audio/aria/aria.c

@@ -292,3 +292,22 @@ static const struct module_interface aria_interface = {
 
 DECLARE_MODULE_ADAPTER(aria_interface, aria_uuid, aria_comp_tr);
 SOF_MODULE_INIT(aria, sys_comp_module_aria_interface_init);
+
+#if CONFIG_COMP_ARIA_MODULE
+/* modular: llext dynamic link */
+
+#include <module/module/api_ver.h>
+#include <module/module/llext.h>
+#include <rimage/sof/user/manifest.h>
+
+#define UUID_ARIA 0x6D, 0x16, 0xF7, 0x99, 0x2C, 0x37, 0xEF, 0x43, 0xF6, 0x81, \
+	0x22, 0x00, 0x7A, 0xA1, 0x5F, 0x03
+
+SOF_LLEXT_MOD_ENTRY(aria, &aria_interface);
+
+static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
+	SOF_LLEXT_MODULE_MANIFEST("ARIA", aria_llext_entry, 1, UUID_ARIA, 8);
+
+SOF_LLEXT_BUILDINFO;
+
+#endif

src/audio/aria/aria.toml

@@ -1,11 +1,15 @@
+#ifndef LOAD_TYPE
+#define LOAD_TYPE "0"
+#endif
+
 	REM # Aria module config
 	[[module.entry]]
 	name = "ARIA"
 	uuid = "99F7166D-372C-43EF-81F6-22007AA15F03"
 	affinity_mask = "0x1"
 	instance_count = "8"
 	domain_types = "0"
-	load_type = "0"
+	load_type = LOAD_TYPE
 	init_config = "1"
 	module_type = "30"
 	auto_start = "0"

src/audio/aria/llext/CMakeLists.txt

@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+sof_llext_build("aria"
+	SOURCES ../aria.c
+		../aria_hifi5.c
+		../aria_hifi3.c
+		../aria_generic.c
+)

src/audio/aria/llext/llext.toml.h

@@ -0,0 +1,6 @@
+#include <tools/rimage/config/platform.toml>
+#define LOAD_TYPE "2"
+#include "../aria.toml"
+
+[module]
+count = __COUNTER__

src/audio/codec/Kconfig

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 config DTS_CODEC
-        bool "DTS codec"
+        tristate "DTS codec"
         default n
         select DTS_CODEC_STUB if COMP_STUBS
         help

src/audio/codec/dts/dts.c

@@ -419,7 +419,9 @@ dts_codec_set_configuration(struct processing_module *mod, uint32_t config_id,
 			    const uint8_t *fragment, size_t fragment_size, uint8_t *response,
 			    size_t response_size)
 {
+#if CONFIG_IPC_MAJOR_3
 	struct module_data *md = &mod->priv;
+#endif
 	struct comp_dev *dev = mod->dev;
 	int ret;
 
@@ -469,3 +471,22 @@ static const struct module_interface dts_interface = {
 
 DECLARE_MODULE_ADAPTER(dts_interface, dts_uuid, dts_tr);
 SOF_MODULE_INIT(dts, sys_comp_module_dts_interface_init);
+
+#if CONFIG_DTS_CODEC_MODULE
+/* modular: llext dynamic link */
+
+#include <module/module/api_ver.h>
+#include <module/module/llext.h>
+#include <rimage/sof/user/manifest.h>
+
+#define UUID_DTS 0x4F, 0xC3, 0x5F, 0xD9, 0x0F, 0x37, 0xC7, 0x4A, 0x86, 0xBC, \
+		0xBF, 0xDC, 0x5B, 0xE2, 0x41, 0xE6
+
+SOF_LLEXT_MOD_ENTRY(dts, &dts_interface);
+
+static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
+	SOF_LLEXT_MODULE_MANIFEST("DTS", dts_llext_entry, 1, UUID_DTS, 40);
+
+SOF_LLEXT_BUILDINFO;
+
+#endif

src/audio/codec/dts/dts.toml

@@ -1,11 +1,15 @@
+#ifndef LOAD_TYPE
+#define LOAD_TYPE "0"
+#endif
+
 	REM # dts codec module config
 	[[module.entry]]
 	name = "DTS"
 	uuid = "D95FC34F-370F-4AC7-BC86-BFDC5BE241E6"
 	affinity_mask = "0x1"
 	instance_count = "40"
 	domain_types = "0"
-	load_type = "0"
+	load_type = LOAD_TYPE
 	module_type = "9"
 	auto_start = "0"
 	sched_caps = [1, 0x00008000]

src/audio/codec/dts/llext/CMakeLists.txt

@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+if(CONFIG_DTS_CODEC_STUB)
+sof_llext_build("dts"
+	SOURCES ../dts.c
+		../dts_stub.c
+)
+target_include_directories(dts_llext_lib PRIVATE
+	"../../../../../third_party/include"
+)
+else()
+message(FATAL_ERROR "Add library linking support in src/audio/codec/dts/llext/CMakeLists.txt")
+endif()

src/audio/codec/dts/llext/llext.toml.h

@@ -0,0 +1,6 @@
+#include <tools/rimage/config/platform.toml>
+#define LOAD_TYPE "2"
+#include "../dts.toml"
+
+[module]
+count = __COUNTER__

src/audio/crossover/Kconfig

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 config COMP_CROSSOVER
-	bool "Crossover Filter component"
+	tristate "Crossover Filter component"
 	select COMP_BLOB
 	select MATH_IIR_DF2T
 	default n

src/audio/crossover/crossover.c

@@ -636,3 +636,22 @@ static const struct module_interface crossover_interface = {
 
 DECLARE_MODULE_ADAPTER(crossover_interface, crossover_uuid, crossover_tr);
 SOF_MODULE_INIT(crossover, sys_comp_module_crossover_interface_init);
+
+#if CONFIG_COMP_CROSSOVER_MODULE
+/* modular: llext dynamic link */
+
+#include <module/module/api_ver.h>
+#include <module/module/llext.h>
+#include <rimage/sof/user/manifest.h>
+
+#define UUID_CROSSOVER 0xD1, 0x9A, 0x8C, 0x94, 0x6A, 0x80, 0x31, 0x41, 0x6C, 0xAD, \
+		0xB2, 0xBD, 0xA9, 0xE3, 0x5A, 0x9F
+
+SOF_LLEXT_MOD_ENTRY(crossover, &crossover_interface);
+
+static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
+	SOF_LLEXT_MODULE_MANIFEST("XOVER", crossover_llext_entry, 1, UUID_CROSSOVER, 40);
+
+SOF_LLEXT_BUILDINFO;
+
+#endif

src/audio/crossover/crossover.toml

@@ -1,3 +1,7 @@
+#ifndef LOAD_TYPE
+#define LOAD_TYPE "0"
+#endif
+
 	REM # Crossover module config
 	REM # Note: Crossover has init_config set to 1 to let kernel know that the base_cfg_ext needs to
 	REM # be appended to the IPC payload. The Extension is needed to know the output pin indices.
@@ -7,7 +11,7 @@
 	affinity_mask = "0x1"
 	instance_count = "40"
 	domain_types = "0"
-	load_type = "0"
+	load_type = LOAD_TYPE
 	module_type = "9"
 	init_config = "1"
 	auto_start = "0"

src/audio/crossover/llext/CMakeLists.txt

@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+sof_llext_build("crossover"
+	SOURCES ../crossover.c
+		../crossover_generic.c
+		../crossover_ipc4.c
+)

src/audio/crossover/llext/llext.toml.h

@@ -0,0 +1,6 @@
+#include <tools/rimage/config/platform.toml>
+#define LOAD_TYPE "2"
+#include "../crossover.toml"
+
+[module]
+count = __COUNTER__

src/audio/dcblock/Kconfig

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 config COMP_DCBLOCK
-	bool "DC Blocking Filter component"
+	tristate "DC Blocking Filter component"
 	default y
 	help
 	  Select for DC Blocking Filter component. This component filters out

src/audio/dcblock/dcblock.c

@@ -257,3 +257,22 @@ static const struct module_interface dcblock_interface = {
 
 DECLARE_MODULE_ADAPTER(dcblock_interface, dcblock_uuid, dcblock_tr);
 SOF_MODULE_INIT(dcblock, sys_comp_module_dcblock_interface_init);
+
+#if CONFIG_COMP_DCBLOCK_MODULE
+/* modular: llext dynamic link */
+
+#include <module/module/api_ver.h>
+#include <module/module/llext.h>
+#include <rimage/sof/user/manifest.h>
+
+#define UUID_DCBLOCK 0xAF, 0xEF, 0x09, 0xB8, 0x81, 0x56, 0xB1, 0x42, 0xD6, 0x9E, \
+		0x04, 0xBB, 0x01, 0x2D, 0xD3, 0x84
+
+SOF_LLEXT_MOD_ENTRY(dcblock, &dcblock_interface);
+
+static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
+	SOF_LLEXT_MODULE_MANIFEST("DCBLOCK", dcblock_llext_entry, 1, UUID_DCBLOCK, 40);
+
+SOF_LLEXT_BUILDINFO;
+
+#endif

src/audio/dcblock/dcblock.toml

@@ -1,11 +1,15 @@
+#ifndef LOAD_TYPE
+#define LOAD_TYPE "0"
+#endif
+
 	REM # DCblock module config
 	[[module.entry]]
 	name = "DCBLOCK"
 	uuid = "B809EFAF-5681-42B1-9ED6-04BB012DD384"
 	affinity_mask = "0x1"
 	instance_count = "40"
 	domain_types = "0"
-	load_type = "0"
+	load_type = LOAD_TYPE
 	module_type = "9"
 	auto_start = "0"
 	sched_caps = [1, 0x00008000]

src/audio/dcblock/llext/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+sof_llext_build("dcblock"
+	SOURCES ../dcblock.c
+		../dcblock_generic.c
+		../dcblock_hifi3.c
+		../dcblock_hifi4.c
+		../dcblock_ipc4.c
+)

src/audio/dcblock/llext/llext.toml.h

@@ -0,0 +1,6 @@
+#include <tools/rimage/config/platform.toml>
+#define LOAD_TYPE "2"
+#include "../dcblock.toml"
+
+[module]
+count = __COUNTER__

src/audio/google/Kconfig

@@ -13,7 +13,7 @@ config COMP_GOOGLE_HOTWORD_DETECT
 	  detector.
 
 config COMP_GOOGLE_RTC_AUDIO_PROCESSING
-	bool "Google Real Time Communication Audio processing"
+	tristate "Google Real Time Communication Audio processing"
 	select COMP_BLOB
 	default n
 	help
@@ -26,7 +26,6 @@ config COMP_GOOGLE_RTC_AUDIO_PROCESSING
 if COMP_GOOGLE_RTC_AUDIO_PROCESSING
 
 config COMP_GOOGLE_RTC_AUDIO_PROCESSING_SAMPLE_RATE_HZ
-	depends on COMP_GOOGLE_RTC_AUDIO_PROCESSING
 	int "Sample rate for Google Real Time Communication Audio processing"
 	default 48000
 	help
@@ -55,23 +54,20 @@ config COMP_GOOGLE_RTC_AUDIO_REFERENCE_CHANNEL_MAX
 	  are ignored
 
 config COMP_GOOGLE_RTC_AUDIO_PROCESSING_MEMORY_BUFFER_SIZE_KB
-	depends on COMP_GOOGLE_RTC_AUDIO_PROCESSING
 	int "Memory buffer size for Google Real Time Communication Audio processing"
 	default 200
 	help
 	  Sets the size of the memory buffer for the Google real-time
 	  communication audio processing.
 
 config COMP_GOOGLE_RTC_AUDIO_PROCESSING_ECHO_PATH_DELAY_MS
-	depends on COMP_GOOGLE_RTC_AUDIO_PROCESSING
 	int "Echo path delay for Google Real Time Communication Audio processing"
 	default 44
 	help
 	  Sets the echo path delay to use for the Google real-time communication
 	  audio processing.
 
 config COMP_GOOGLE_RTC_AUDIO_PROCESSING_MIC_HEADROOM_LINEAR
-	depends on COMP_GOOGLE_RTC_AUDIO_PROCESSING
 	int "Microphone headroom for Google Real Time Communication Audio processing"
 	default 4
 	help
@@ -81,15 +77,14 @@ config COMP_GOOGLE_RTC_AUDIO_PROCESSING_MIC_HEADROOM_LINEAR
 config GOOGLE_RTC_AUDIO_PROCESSING_MOCK
 	bool "Google Real Time Communication Audio processing mock"
 	default y if COMP_STUBS
-	depends on COMP_GOOGLE_RTC_AUDIO_PROCESSING
 	help
 	  Mock Google real-time communication audio processing.
 	  It allows for compilation check and basic audio flow checking.
 
 endif # COMP_GOOGLE_RTC_AUDIO_PROCESSING
 
 config COMP_GOOGLE_CTC_AUDIO_PROCESSING
-	bool "Google Crosstalk Cancellation Audio processing"
+	tristate "Google Crosstalk Cancellation Audio processing"
 	select COMP_BLOB
 	select GOOGLE_CTC_AUDIO_PROCESSING_MOCK if COMP_STUBS
 	select STATIC_INIT_GNU if ZEPHYR_SOF_MODULE