eq-iir: convert to a loadable module

lyakh · lgirdwood · commit f86ad4fa2075 · 2024-05-14T14:37:44.000+01:00
Build eq-iir as a loadable llext module.

Signed-off-by: Guennadi Liakhovetski &lt;guennadi.liakhovetski@linux.intel.com&gt;
diff --git a/app/overlays/mtl/module_overlay.conf b/app/overlays/mtl/module_overlay.conf
@@ -1,2 +1,3 @@
 CONFIG_SAMPLE_SMART_AMP=m
 CONFIG_COMP_MIXIN_MIXOUT=m
+CONFIG_COMP_IIR=m
diff --git a/src/audio/eq_iir/Kconfig b/src/audio/eq_iir/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 config COMP_IIR
-	bool "IIR component"
+	tristate "IIR component"
 	select COMP_BLOB
 	default y
 	depends on COMP_MODULE_ADAPTER
diff --git a/src/audio/eq_iir/eq_iir.c b/src/audio/eq_iir/eq_iir.c
@@ -257,3 +257,23 @@ static const struct module_interface eq_iir_interface = {
 
 DECLARE_MODULE_ADAPTER(eq_iir_interface, eq_iir_uuid, eq_iir_tr);
 SOF_MODULE_INIT(eq_iir, sys_comp_module_eq_iir_interface_init);
+
+#if CONFIG_COMP_IIR_MODULE
+/* modular: llext dynamic link */
+
+#include <module/module/api_ver.h>
+#include <rimage/sof/user/manifest.h>
+
+#include <module/module/llext.h>
+
+#define UUID_EQIIR 0xE6, 0xC0, 0x50, 0x51, 0xF9, 0x27, 0xC8, 0x4E, \
+		0x83, 0x51, 0xC7, 0x05, 0xB6, 0x42, 0xD1, 0x2F
+
+SOF_LLEXT_MOD_ENTRY(eq_iir, &eq_iir_interface);
+
+static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
+	SOF_LLEXT_MODULE_MANIFEST("EQIIR", eq_iir_llext_entry, 1, UUID_EQIIR);
+
+SOF_LLEXT_BUILDINFO;
+
+#endif
diff --git a/src/audio/eq_iir/eq_iir.toml b/src/audio/eq_iir/eq_iir.toml
@@ -1,11 +1,15 @@
+#ifndef LOAD_TYPE
+#define LOAD_TYPE "0"
+#endif
+
 	REM # eq iir module config
 	[[module.entry]]
 	name = "EQIIR"
 	uuid = "5150C0E6-27F9-4EC8-8351-C705B642D12F"
 	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]
diff --git a/src/audio/eq_iir/llext/CMakeLists.txt b/src/audio/eq_iir/llext/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+# Hard-coded .text address to be moved to a common place
+sof_llext_build("eq_iir"
+	SOURCES ../eq_iir.c
+		../eq_iir_ipc4.c
+		../eq_iir_generic.c
+	TEXT_ADDR 0xa06ea000
+)
diff --git a/src/audio/eq_iir/llext/llext.toml.h b/src/audio/eq_iir/llext/llext.toml.h
@@ -0,0 +1,6 @@
+#include <tools/rimage/config/platform.toml>
+#define LOAD_TYPE "2"
+#include "../eq_iir.toml"
+
+[module]
+count = __COUNTER__
diff --git a/src/math/iir_df1.c b/src/math/iir_df1.c
@@ -12,6 +12,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <rtos/symbol.h>
+
 int iir_delay_size_df1(struct sof_eq_iir_header *config)
 {
 	int n = config->num_sections; /* One section uses two unit delays */
@@ -21,6 +23,7 @@ int iir_delay_size_df1(struct sof_eq_iir_header *config)
 
 	return 4 * n * sizeof(int32_t);
 }
+EXPORT_SYMBOL(iir_delay_size_df1);
 
 int iir_init_coef_df1(struct iir_state_df1 *iir,
 		      struct sof_eq_iir_header *config)
@@ -31,6 +34,7 @@ int iir_init_coef_df1(struct iir_state_df1 *iir,
 
 	return 0;
 }
+EXPORT_SYMBOL(iir_init_coef_df1);
 
 void iir_init_delay_df1(struct iir_state_df1 *iir, int32_t **delay)
 {
@@ -40,6 +44,7 @@ void iir_init_delay_df1(struct iir_state_df1 *iir, int32_t **delay)
 	/* Point to next IIR delay line start. */
 	*delay += 4 * iir->biquads;
 }
+EXPORT_SYMBOL(iir_init_delay_df1);
 
 void iir_reset_df1(struct iir_state_df1 *iir)
 {
@@ -50,3 +55,4 @@ void iir_reset_df1(struct iir_state_df1 *iir)
 	 * omitting setting iir->delay to NULL.
 	 */
 }
+EXPORT_SYMBOL(iir_reset_df1);
diff --git a/src/math/iir_df1_generic.c b/src/math/iir_df1_generic.c
@@ -11,6 +11,8 @@
 #include <sof/math/iir_df1.h>
 #include <user/eq.h>
 
+#include <rtos/symbol.h>
+
 #if SOF_USE_HIFI(NONE, FILTER)
 
 /*
@@ -105,5 +107,6 @@ int32_t iir_df1(struct iir_state_df1 *iir, int32_t x)
 	}
 	return sat_int32(out);
 }
+EXPORT_SYMBOL(iir_df1);
 
 #endif
diff --git a/src/math/iir_df1_hifi3.c b/src/math/iir_df1_hifi3.c
@@ -12,6 +12,8 @@
 #include <user/eq.h>
 #include <sof/common.h>
 
+#include <rtos/symbol.h>
+
 #if SOF_USE_HIFI(3, FILTER) || SOF_USE_HIFI(4, FILTER)
 
 /*
@@ -122,5 +124,6 @@ int32_t iir_df1(struct iir_state_df1 *iir, int32_t x)
 	}
 	return out;
 }
+EXPORT_SYMBOL(iir_df1);
 
 #endif
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
@@ -530,11 +530,17 @@ elseif(CONFIG_IPC_MAJOR_4)
 		${SOF_AUDIO_PATH}/eq_fir/eq_fir_ipc4.c
 	)
 
-	zephyr_library_sources_ifdef(CONFIG_COMP_IIR
-		${SOF_AUDIO_PATH}/eq_iir/eq_iir.c
-		${SOF_AUDIO_PATH}/eq_iir/eq_iir_ipc4.c
-		${SOF_AUDIO_PATH}/eq_iir/eq_iir_generic.c
-	)
+	if(CONFIG_COMP_IIR STREQUAL "m")
+		add_subdirectory(${SOF_AUDIO_PATH}/eq_iir/llext
+				 ${PROJECT_BINARY_DIR}/eq_iir_llext)
+		add_dependencies(app eq_iir)
+	elseif(CONFIG_COMP_IIR)
+		zephyr_library_sources(
+			${SOF_AUDIO_PATH}/eq_iir/eq_iir.c
+			${SOF_AUDIO_PATH}/eq_iir/eq_iir_ipc4.c
+			${SOF_AUDIO_PATH}/eq_iir/eq_iir_generic.c
+		)
+	endif()
 endif()
 
 zephyr_library_sources_ifdef(CONFIG_MATH_FIR

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`CONFIG_SAMPLE_SMART_AMP=m`
`2`	`2`	`CONFIG_COMP_MIXIN_MIXOUT=m`
	`3`	`+CONFIG_COMP_IIR=m`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`	`#include <stddef.h>`
`13`	`13`	`#include <stdint.h>`
`14`	`14`
	`15`	`+#include <rtos/symbol.h>`
	`16`	`+`
`15`	`17`	`int iir_delay_size_df1(struct sof_eq_iir_header *config)`
`16`	`18`	`{`
`17`	`19`	`int n = config->num_sections; /* One section uses two unit delays */`
`@@ -21,6 +23,7 @@ int iir_delay_size_df1(struct sof_eq_iir_header *config)`
`21`	`23`
`22`	`24`	`return 4 * n * sizeof(int32_t);`
`23`	`25`	`}`
	`26`	`+EXPORT_SYMBOL(iir_delay_size_df1);`
`24`	`27`
`25`	`28`	`int iir_init_coef_df1(struct iir_state_df1 *iir,`
`26`	`29`	`struct sof_eq_iir_header *config)`
`@@ -31,6 +34,7 @@ int iir_init_coef_df1(struct iir_state_df1 *iir,`
`31`	`34`
`32`	`35`	`return 0;`
`33`	`36`	`}`
	`37`	`+EXPORT_SYMBOL(iir_init_coef_df1);`
`34`	`38`
`35`	`39`	`void iir_init_delay_df1(struct iir_state_df1 iir, int32_t *delay)`
`36`	`40`	`{`
`@@ -40,6 +44,7 @@ void iir_init_delay_df1(struct iir_state_df1 iir, int32_t *delay)`
`40`	`44`	`/* Point to next IIR delay line start. */`
`41`	`45`	`delay += 4 iir->biquads;`
`42`	`46`	`}`
	`47`	`+EXPORT_SYMBOL(iir_init_delay_df1);`
`43`	`48`
`44`	`49`	`void iir_reset_df1(struct iir_state_df1 *iir)`
`45`	`50`	`{`
`@@ -50,3 +55,4 @@ void iir_reset_df1(struct iir_state_df1 *iir)`
`50`	`55`	`* omitting setting iir->delay to NULL.`
`51`	`56`	`*/`
`52`	`57`	`}`
	`58`	`+EXPORT_SYMBOL(iir_reset_df1);`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`#include <sof/math/iir_df1.h>`
`12`	`12`	`#include <user/eq.h>`
`13`	`13`
	`14`	`+#include <rtos/symbol.h>`
	`15`	`+`
`14`	`16`	`#if SOF_USE_HIFI(NONE, FILTER)`
`15`	`17`
`16`	`18`	`/*`
`@@ -105,5 +107,6 @@ int32_t iir_df1(struct iir_state_df1 *iir, int32_t x)`
`105`	`107`	`}`
`106`	`108`	`return sat_int32(out);`
`107`	`109`	`}`
	`110`	`+EXPORT_SYMBOL(iir_df1);`
`108`	`111`
`109`	`112`	`#endif`