From 736e7a93732d26b06ef38489341c61735f3a36cd Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Thu, 13 Jun 2024 14:32:27 +0200
Subject: [PATCH 01/22] llext: add a convenience Kconfig option to build LLEXT
 modules

Add a Kconfig option that can be used to flip all LLEXT-supporting
code to a modular build. Use that global flag for smart-amp-test,
mixin-mixout and eq-iir.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/audio/eq_iir/Kconfig       | 1 +
 src/audio/mixin_mixout/Kconfig | 1 +
 src/library_manager/Kconfig    | 8 ++++++++
 src/samples/audio/Kconfig      | 1 +
 4 files changed, 11 insertions(+)

diff --git a/src/audio/eq_iir/Kconfig b/src/audio/eq_iir/Kconfig
index 2fee46d9a29f..11433d27cfb3 100644
--- a/src/audio/eq_iir/Kconfig
+++ b/src/audio/eq_iir/Kconfig
@@ -3,6 +3,7 @@
 config COMP_IIR
 	tristate "IIR component"
 	select COMP_BLOB
+	default m if LIBRARY_DEFAULT_MODULAR
 	default y
 	depends on COMP_MODULE_ADAPTER
 	select MATH_IIR_DF1
diff --git a/src/audio/mixin_mixout/Kconfig b/src/audio/mixin_mixout/Kconfig
index 852b23f18e08..73016a667bd7 100644
--- a/src/audio/mixin_mixout/Kconfig
+++ b/src/audio/mixin_mixout/Kconfig
@@ -3,6 +3,7 @@
 config COMP_MIXIN_MIXOUT
 	tristate "Mixin_mixout component"
 	depends on IPC_MAJOR_4
+	default m if LIBRARY_DEFAULT_MODULAR
 	default y
 	help
 	  Select for Mixin_mixout component
diff --git a/src/library_manager/Kconfig b/src/library_manager/Kconfig
index e167f956a37a..d0657aefc9fb 100644
--- a/src/library_manager/Kconfig
+++ b/src/library_manager/Kconfig
@@ -33,4 +33,12 @@ config LIBRARY_AUTH_SUPPORT
 	  could be used if enabled.
 	  If unsure say N.
 
+config LIBRARY_DEFAULT_MODULAR
+	bool "Build LLEXT modules by default"
+	depends on LLEXT
+	help
+	  Build code, that can be built as LLEXT modules as such. Usually such
+	  code has tristate Kconfig entries, they will default to "m" if this
+	  option is selected.
+
 endmenu
diff --git a/src/samples/audio/Kconfig b/src/samples/audio/Kconfig
index 0338ced15875..7463d8c31412 100644
--- a/src/samples/audio/Kconfig
+++ b/src/samples/audio/Kconfig
@@ -4,6 +4,7 @@ menu "Audio component samples"
 
 	config SAMPLE_SMART_AMP
 		tristate "Smart amplifier test component"
+		default m if LIBRARY_DEFAULT_MODULAR
 		default y
 		help
 		  Select for test smart amplifier component

From 11e76b63d15cf30d1c2780610f9957a38524968c Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Tue, 23 Jul 2024 15:30:00 +0200
Subject: [PATCH 02/22] lnl: build all supporting code as LLEXT modules

Enable CONFIG_LIBRARY_DEFAULT_MODULAR for LNL to build all supporting
code as LLEXT modules.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 app/boards/intel_adsp_ace20_lnl.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf
index 8a9e4b295f5d..443f0a7bae71 100644
--- a/app/boards/intel_adsp_ace20_lnl.conf
+++ b/app/boards/intel_adsp_ace20_lnl.conf
@@ -82,7 +82,7 @@ CONFIG_MEMORY_WIN_2_SIZE=12288
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_MODULES=y
-
+CONFIG_LIBRARY_DEFAULT_MODULAR=y
 
 # Temporary disabled options
 CONFIG_TRACE=n

From afc30e42f25a5982641b66dba0e054085ea18cc8 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Thu, 30 May 2024 16:04:38 +0200
Subject: [PATCH 03/22] llext: automatically calculate module addresses

Currently LLEXT module starting addresses are hard-coded in their
respective CMakeLists.txt files. This is very wasteful, since it's
unknown in what order modules are loaded, inflexible and not easily
extendible to other platforms. Switch to calculating addresses
automatically based on a single per-platform Kconfig value.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 app/boards/intel_adsp_ace15_mtpm.conf         |  1 +
 app/boards/intel_adsp_ace20_lnl.conf          |  1 +
 app/overlays/lnl/module_overlay.conf          |  1 +
 app/overlays/mtl/module_overlay.conf          |  1 +
 scripts/llext_link_helper.py                  | 17 ++++++-
 scripts/llext_offset_calc.py                  | 47 +++++++++++++++++++
 src/audio/drc/llext/CMakeLists.txt            |  2 -
 src/audio/eq_iir/llext/CMakeLists.txt         |  2 -
 src/audio/mixin_mixout/llext/CMakeLists.txt   |  2 -
 src/library_manager/Kconfig                   |  9 ++++
 .../audio/smart_amp_test_llext/CMakeLists.txt |  2 -
 zephyr/CMakeLists.txt                         | 28 +++++++++--
 12 files changed, 100 insertions(+), 13 deletions(-)
 create mode 100755 scripts/llext_offset_calc.py

diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf
index 293ffe747e82..fbc2385845b8 100644
--- a/app/boards/intel_adsp_ace15_mtpm.conf
+++ b/app/boards/intel_adsp_ace15_mtpm.conf
@@ -88,6 +88,7 @@ CONFIG_MEMORY_WIN_2_SIZE=12288
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_MODULES=y
+CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
 
 # Temporary disabled options
 CONFIG_TRACE=n
diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf
index 443f0a7bae71..7ed0811b1d56 100644
--- a/app/boards/intel_adsp_ace20_lnl.conf
+++ b/app/boards/intel_adsp_ace20_lnl.conf
@@ -83,6 +83,7 @@ CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_MODULES=y
 CONFIG_LIBRARY_DEFAULT_MODULAR=y
+CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
 
 # Temporary disabled options
 CONFIG_TRACE=n
diff --git a/app/overlays/lnl/module_overlay.conf b/app/overlays/lnl/module_overlay.conf
index 88006880acd9..7ff56ce53e03 100644
--- a/app/overlays/lnl/module_overlay.conf
+++ b/app/overlays/lnl/module_overlay.conf
@@ -1,2 +1,3 @@
+CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
 CONFIG_SAMPLE_SMART_AMP=m
 CONFIG_COMP_DRC=m
diff --git a/app/overlays/mtl/module_overlay.conf b/app/overlays/mtl/module_overlay.conf
index 1fb5549e9d82..0a258780e545 100644
--- a/app/overlays/mtl/module_overlay.conf
+++ b/app/overlays/mtl/module_overlay.conf
@@ -1,3 +1,4 @@
+CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
 CONFIG_SAMPLE_SMART_AMP=m
 CONFIG_COMP_MIXIN_MIXOUT=m
 CONFIG_COMP_IIR=m
diff --git a/scripts/llext_link_helper.py b/scripts/llext_link_helper.py
index b1674e523784..98514c35a6cd 100755
--- a/scripts/llext_link_helper.py
+++ b/scripts/llext_link_helper.py
@@ -28,6 +28,8 @@ def parse_args():
 						help='Object file name')
 	parser.add_argument("-t", "--text-addr", required=True, type=str,
 						help='.text section address')
+	parser.add_argument("-s", "--size-file", required=True, type=str,
+						help='File with stored accumulated size')
 
 	args = parser.parse_args()
 
@@ -43,11 +45,20 @@ def max_alignment(addr, align1, align2):
 	return upper - (upper % align1)
 
 def main():
+	global args
+
 	parse_args()
 
-	elf = ELFFile(open(args.file, 'rb'))
+	# Get the size of the previous module, if this isn't the first one.
+	# It is used to automatically calculate starting address of the current
+	# module.
+	try:
+		with open(args.size_file, 'r') as f_size:
+			size = int(f_size.read().strip(), base = 0)
+	except OSError:
+		size = 0
 
-	text_addr = int(args.text_addr, 0)
+	text_addr = int(args.text_addr, 0) + size
 	text_size = 0
 
 	# File names differ when building shared or relocatable objects
@@ -65,6 +76,8 @@ def main():
 	writable = []
 	readonly = []
 
+	elf = ELFFile(open(args.file, 'rb'))
+
 	# Create an object file with sections grouped by their properties,
 	# similar to how program segments are created: all executable sections,
 	# then all read-only data sections, and eventually all writable data
diff --git a/scripts/llext_offset_calc.py b/scripts/llext_offset_calc.py
new file mode 100755
index 000000000000..cef0662449bf
--- /dev/null
+++ b/scripts/llext_offset_calc.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Add rounded new file size to accumulated module size cache
+
+import argparse
+import pathlib
+import os
+
+args = None
+
+def parse_args():
+	global args
+
+	parser = argparse.ArgumentParser(description='Add a file size to a sum in a file')
+
+	parser.add_argument("-i", "--input", required=True, type=str,
+						help='Object file name')
+	parser.add_argument("-s", "--size-file", required=True, type=str,
+						help='File to store accumulated size')
+
+	args = parser.parse_args()
+
+def main():
+	global args
+
+	parse_args()
+
+	f_output = pathlib.Path(args.size_file)
+
+	try:
+		with open(f_output, 'r') as f_size:
+			size = int(f_size.read().strip(), base = 0)
+	except OSError:
+		size = 0
+
+	# Failure will raise an exception
+	f_size = open(f_output, "w")
+
+	# align to a page border
+	size += os.path.getsize(args.input) + 0xfff
+	size &= ~0xfff
+
+	f_size.write(f'0x{size:x}\n')
+
+if __name__ == "__main__":
+	main()
diff --git a/src/audio/drc/llext/CMakeLists.txt b/src/audio/drc/llext/CMakeLists.txt
index 5a59b9bade98..e658c3acfe0b 100644
--- a/src/audio/drc/llext/CMakeLists.txt
+++ b/src/audio/drc/llext/CMakeLists.txt
@@ -1,7 +1,6 @@
 # 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("drc"
 	SOURCES ../drc.c
 		../drc_generic.c
@@ -9,5 +8,4 @@ sof_llext_build("drc"
 		../drc_hifi3.c
 		../drc_hifi4.c
 		../drc_math_hifi3.c
-	TEXT_ADDR 0xa068a000
 )
diff --git a/src/audio/eq_iir/llext/CMakeLists.txt b/src/audio/eq_iir/llext/CMakeLists.txt
index 9bf8a4b4e7ef..535455105515 100644
--- a/src/audio/eq_iir/llext/CMakeLists.txt
+++ b/src/audio/eq_iir/llext/CMakeLists.txt
@@ -1,10 +1,8 @@
 # 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/mixin_mixout/llext/CMakeLists.txt b/src/audio/mixin_mixout/llext/CMakeLists.txt
index a9743e379d54..fc5278dc47b0 100644
--- a/src/audio/mixin_mixout/llext/CMakeLists.txt
+++ b/src/audio/mixin_mixout/llext/CMakeLists.txt
@@ -1,11 +1,9 @@
 # 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("mixin_mixout"
 	SOURCES ../mixin_mixout.c
 		../mixin_mixout_hifi3.c
 		../mixin_mixout_hifi5.c
 		../mixin_mixout_generic.c
-	TEXT_ADDR 0xa06aa000
 )
diff --git a/src/library_manager/Kconfig b/src/library_manager/Kconfig
index d0657aefc9fb..7791e8839ac2 100644
--- a/src/library_manager/Kconfig
+++ b/src/library_manager/Kconfig
@@ -41,4 +41,13 @@ config LIBRARY_DEFAULT_MODULAR
 	  code has tristate Kconfig entries, they will default to "m" if this
 	  option is selected.
 
+config LIBRARY_BASE_ADDRESS
+	hex "Base address for memory, dedicated to loadable modules"
+	default 0
+	help
+	  When initializing modules SOF will allocate memory for them and map
+	  it to a predefined per-module address. Those addresses are calculated
+	  automatically but the beginning of that area is platform-specific and
+	  should be set by this option.
+
 endmenu
diff --git a/src/samples/audio/smart_amp_test_llext/CMakeLists.txt b/src/samples/audio/smart_amp_test_llext/CMakeLists.txt
index 873eb61de81b..2218f41423b5 100644
--- a/src/samples/audio/smart_amp_test_llext/CMakeLists.txt
+++ b/src/samples/audio/smart_amp_test_llext/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (c) 2023 Intel Corporation.
 # SPDX-License-Identifier: Apache-2.0
 
-# Hard-coded .text address to be moved to a common place
 sof_llext_build("smart_amp_test"
 	SOURCES ../smart_amp_test_ipc4.c
-	TEXT_ADDR 0xa06ca000
 )
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index c74596a060af..7e2e87234987 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -38,6 +38,13 @@ function(sof_append_relative_path_definitions target)
 	endforeach()
 endfunction()
 
+define_property(GLOBAL PROPERTY SOF_LLEXT_LAST_TARGET
+  BRIEF_DOCS "Last LLEXT target"
+  FULL_DOCS "\
+Building LLEXT targets must be serialized. This property contains the \
+previously added LLEXT module for the establishment of a dependency chain."
+)
+
 # Used by LLEXT modules to create a file with module UUIDs
 function(sof_llext_write_uuids module)
 	file(STRINGS ${CMAKE_CURRENT_LIST_DIR}/../${module}.toml uuids REGEX "^[ \t]*uuid *=")
@@ -54,7 +61,6 @@ endfunction()
 # Build an LLEXT module. Provice a module name, a list of sources and an address
 # of the .text section as arguments.
 function(sof_llext_build module)
-	set(single_args TEXT_ADDR)
 	set(multi_args SOURCES)
 	cmake_parse_arguments(PARSE_ARGV 1 SOF_LLEXT "${options}" "${single_args}" "${multi_args}")
 
@@ -91,13 +97,29 @@ function(sof_llext_build module)
 
 	get_target_property(proc_in_file ${module} lib_output)
 	get_target_property(proc_out_file ${module} pkg_input)
+	get_target_property(proc_pkg_file ${module} pkg_output)
+	set(size_file ${PROJECT_BINARY_DIR}/module_size)
+
+	get_property(last_target GLOBAL PROPERTY SOF_LLEXT_LAST_TARGET)
+	if(NOT "${last_target}" STREQUAL "")
+		add_dependencies(${module}_llext_proc ${last_target})
+	endif()
+	set_property(GLOBAL PROPERTY SOF_LLEXT_LAST_TARGET ${module})
+
 	add_llext_command(TARGET ${module}
 		POST_BUILD
-		COMMAND ${PYTHON_EXECUTABLE} ${SOF_BASE}scripts/llext_link_helper.py
-			--text-addr="${SOF_LLEXT_TEXT_ADDR}" -f ${proc_in_file} ${CMAKE_C_COMPILER} --
+		COMMAND ${PYTHON_EXECUTABLE} ${SOF_BASE}scripts/llext_link_helper.py -s ${size_file}
+			--text-addr=${CONFIG_LIBRARY_BASE_ADDRESS}
+			-f ${proc_in_file} ${CMAKE_C_COMPILER} --
 			-o ${proc_out_file} ${EXTRA_LINKER_PARAMS}
 	                $<TARGET_OBJECTS:${module}_llext_lib>
 	)
+
+	add_llext_command(TARGET ${module}
+		POST_PKG
+		COMMAND ${PYTHON_EXECUTABLE} ${SOF_BASE}scripts/llext_offset_calc.py
+			-i ${proc_pkg_file} -s ${size_file}
+	)
 endfunction()
 
 # Initial SOF module will contain

From 859996e69b65edc94c4499859b0a82c3a7272e02 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Thu, 13 Jun 2024 11:43:08 +0200
Subject: [PATCH 04/22] llext: add missing modules to LNL overlay

LNL modules overlay is missing eq_iir and mixin_mixout entries, add
them there.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 app/overlays/lnl/module_overlay.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/overlays/lnl/module_overlay.conf b/app/overlays/lnl/module_overlay.conf
index 7ff56ce53e03..c8624e47b6c9 100644
--- a/app/overlays/lnl/module_overlay.conf
+++ b/app/overlays/lnl/module_overlay.conf
@@ -1,3 +1,5 @@
 CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
+CONFIG_COMP_MIXIN_MIXOUT=m
+CONFIG_COMP_IIR=m
 CONFIG_SAMPLE_SMART_AMP=m
 CONFIG_COMP_DRC=m

From 543ee6ad75df32fd56a03fc769c15187255befdd Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Thu, 13 Jun 2024 12:02:32 +0200
Subject: [PATCH 05/22] src: convert to a loadable module

Build src as a loadable llext module.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 app/boards/intel_adsp_ace15_mtpm.conf |  1 -
 app/boards/intel_adsp_ace20_lnl.conf  |  1 -
 app/overlays/lnl/module_overlay.conf  |  3 ++-
 app/overlays/mtl/module_overlay.conf  |  1 +
 src/audio/src/CMakeLists.txt          | 10 +++++++-
 src/audio/src/Kconfig                 |  1 +
 src/audio/src/llext/CMakeLists.txt    | 23 +++++++++++++++++
 src/audio/src/llext/llext.toml.h      |  6 +++++
 src/audio/src/src.c                   | 28 ++++++++++++++++++++
 src/audio/src/src.toml                |  8 ++++--
 src/audio/src/src_common.c            |  2 +-
 src/audio/src/src_ipc3.c              |  6 ++---
 src/audio/src/src_ipc4.c              |  6 ++---
 src/audio/src/src_lite.c              |  2 +-
 src/audio/src/src_log.c               | 21 +++++++++++++++
 zephyr/CMakeLists.txt                 | 37 ++++++++++++++++++---------
 16 files changed, 128 insertions(+), 28 deletions(-)
 create mode 100644 src/audio/src/llext/CMakeLists.txt
 create mode 100644 src/audio/src/llext/llext.toml.h
 create mode 100644 src/audio/src/src_log.c

diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf
index fbc2385845b8..9c34c85f815b 100644
--- a/app/boards/intel_adsp_ace15_mtpm.conf
+++ b/app/boards/intel_adsp_ace15_mtpm.conf
@@ -2,7 +2,6 @@ CONFIG_METEORLAKE=y
 CONFIG_IPC_MAJOR_4=y
 CONFIG_IPC4_BASE_FW_INTEL=y
 
-CONFIG_COMP_SRC=y
 CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
 CONFIG_COMP_SRC_LITE=y
 CONFIG_COMP_DRC=m
diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf
index 7ed0811b1d56..ae391d252f69 100644
--- a/app/boards/intel_adsp_ace20_lnl.conf
+++ b/app/boards/intel_adsp_ace20_lnl.conf
@@ -2,7 +2,6 @@ CONFIG_LUNARLAKE=y
 CONFIG_IPC_MAJOR_4=y
 CONFIG_IPC4_BASE_FW_INTEL=y
 
-CONFIG_COMP_SRC=y
 CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
 CONFIG_COMP_DRC=m
 
diff --git a/app/overlays/lnl/module_overlay.conf b/app/overlays/lnl/module_overlay.conf
index c8624e47b6c9..ea6688063622 100644
--- a/app/overlays/lnl/module_overlay.conf
+++ b/app/overlays/lnl/module_overlay.conf
@@ -1,5 +1,6 @@
 CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
+CONFIG_SAMPLE_SMART_AMP=m
 CONFIG_COMP_MIXIN_MIXOUT=m
 CONFIG_COMP_IIR=m
-CONFIG_SAMPLE_SMART_AMP=m
 CONFIG_COMP_DRC=m
+CONFIG_COMP_SRC=m
diff --git a/app/overlays/mtl/module_overlay.conf b/app/overlays/mtl/module_overlay.conf
index 0a258780e545..ea6688063622 100644
--- a/app/overlays/mtl/module_overlay.conf
+++ b/app/overlays/mtl/module_overlay.conf
@@ -3,3 +3,4 @@ CONFIG_SAMPLE_SMART_AMP=m
 CONFIG_COMP_MIXIN_MIXOUT=m
 CONFIG_COMP_IIR=m
 CONFIG_COMP_DRC=m
+CONFIG_COMP_SRC=m
diff --git a/src/audio/src/CMakeLists.txt b/src/audio/src/CMakeLists.txt
index bfc6361afedb..650bd2d60ceb 100644
--- a/src/audio/src/CMakeLists.txt
+++ b/src/audio/src/CMakeLists.txt
@@ -1,6 +1,14 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-add_local_sources(sof src_generic.c src_hifi2ep.c src_hifi3.c src_hifi4.c src_common.c src.c)
+add_local_sources(sof
+	src_generic.c
+	src_hifi2ep.c
+	src_hifi3.c
+	src_hifi4.c
+	src_common.c
+	src_log.c
+	src.c
+)
 
 if(CONFIG_IPC_MAJOR_3)
 	add_local_sources(sof src_ipc3.c)
diff --git a/src/audio/src/Kconfig b/src/audio/src/Kconfig
index ef651703a252..0b08e6358a98 100644
--- a/src/audio/src/Kconfig
+++ b/src/audio/src/Kconfig
@@ -2,6 +2,7 @@
 
 config COMP_SRC
 	tristate "SRC component"
+	default m if LIBRARY_DEFAULT_MODULAR
 	default y
 	help
 	  Select for SRC component
diff --git a/src/audio/src/llext/CMakeLists.txt b/src/audio/src/llext/CMakeLists.txt
new file mode 100644
index 000000000000..04a5cc4c5266
--- /dev/null
+++ b/src/audio/src/llext/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Copyright (c) 2024 Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+if(CONFIG_COMP_SRC_LITE)
+sof_llext_build("src"
+	SOURCES ../src_hifi2ep.c
+		../src_generic.c
+		../src_hifi3.c
+		../src_hifi4.c
+		../src.c
+		../src_ipc4.c
+		../src_lite.c
+)
+else()
+sof_llext_build("src"
+	SOURCES ../src_hifi2ep.c
+		../src_generic.c
+		../src_hifi3.c
+		../src_hifi4.c
+		../src.c
+		../src_ipc4.c
+)
+endif()
diff --git a/src/audio/src/llext/llext.toml.h b/src/audio/src/llext/llext.toml.h
new file mode 100644
index 000000000000..cfb334ca24e7
--- /dev/null
+++ b/src/audio/src/llext/llext.toml.h
@@ -0,0 +1,6 @@
+#include <tools/rimage/config/platform.toml>
+#define LOAD_TYPE "2"
+#include "../src.toml"
+
+[module]
+count = __COUNTER__
diff --git a/src/audio/src/src.c b/src/audio/src/src.c
index b064a180b690..d75b1eb53822 100644
--- a/src/audio/src/src.c
+++ b/src/audio/src/src.c
@@ -81,3 +81,31 @@ static const struct module_interface src_interface = {
 
 DECLARE_MODULE_ADAPTER(src_interface, SRC_UUID, src_tr);
 SOF_MODULE_INIT(src, sys_comp_module_src_interface_init);
+
+#if CONFIG_COMP_SRC_MODULE
+/* modular: llext dynamic link */
+
+#include <module/module/api_ver.h>
+#include <module/module/llext.h>
+#include <rimage/sof/user/manifest.h>
+
+#define UUID_SRC 0x8D, 0xB2, 0x1B, 0xE6, 0x9A, 0x14, 0x1F, 0x4C, \
+		 0xB7, 0x09, 0x46, 0x82, 0x3E, 0xF5, 0xF5, 0xAE
+SOF_LLEXT_MOD_ENTRY(src, &src_interface);
+
+#if CONFIG_COMP_SRC_LITE
+#define UUID_SRC_LITE 0x51, 0x10, 0x44, 0x33, 0xCD, 0x44, 0x6A, 0x46, \
+		      0x83, 0xA3, 0x17, 0x84, 0x78, 0x70, 0x8A, 0xEA
+extern const struct module_interface src_lite_interface;
+SOF_LLEXT_MOD_ENTRY(src_lite, &src_lite_interface);
+#endif
+
+static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
+	SOF_LLEXT_MODULE_MANIFEST("SRC", src_llext_entry, 1, UUID_SRC, 1),
+#if CONFIG_COMP_SRC_LITE
+	SOF_LLEXT_MODULE_MANIFEST("SRC_LITE", src_lite_llext_entry, 1, UUID_SRC_LITE, 1),
+#endif
+};
+
+SOF_LLEXT_BUILDINFO;
+#endif
diff --git a/src/audio/src/src.toml b/src/audio/src/src.toml
index 9cd67f28d9ce..448739cf2f19 100644
--- a/src/audio/src/src.toml
+++ b/src/audio/src/src.toml
@@ -1,10 +1,14 @@
+#ifndef LOAD_TYPE
+#define LOAD_TYPE "0"
+#endif
+
 	[[module.entry]]
 	name = "SRC"
 	uuid = "E61BB28D-149A-4C1F-B709-46823EF5F5AE"
 	affinity_mask = "0x1"
 	REM #instance_count = "10"
 	domain_types = "0"
-	load_type = "0"
+	load_type = LOAD_TYPE
 	module_type = "7"
 	auto_start = "0"
 	sched_caps = [1, 0x00008000]
@@ -77,7 +81,7 @@
 	affinity_mask = "0x1"
 	REM #instance_count = "10"
 	domain_types = "0"
-	load_type = "0"
+	load_type = LOAD_TYPE
 	module_type = "0x1F"
 	auto_start = "0"
 	sched_caps = [1, 0x00008000]
diff --git a/src/audio/src/src_common.c b/src/audio/src/src_common.c
index e2d16dc7e2d3..f79f4b7bd912 100644
--- a/src/audio/src/src_common.c
+++ b/src/audio/src/src_common.c
@@ -41,7 +41,7 @@
 #include "src_common.h"
 #include "src_config.h"
 
-LOG_MODULE_REGISTER(src, CONFIG_SOF_LOG_LEVEL);
+LOG_MODULE_DECLARE(src, CONFIG_SOF_LOG_LEVEL);
 
 /* Calculates buffers to allocate for a SRC mode */
 static int src_buffer_lengths(struct comp_dev *dev, struct comp_data *cd, int nch)
diff --git a/src/audio/src/src_ipc3.c b/src/audio/src/src_ipc3.c
index f61c2345f2d9..5e8b00a4d98b 100644
--- a/src/audio/src/src_ipc3.c
+++ b/src/audio/src/src_ipc3.c
@@ -41,11 +41,9 @@
 #include "src_common.h"
 #include "src_config.h"
 
-SOF_DEFINE_REG_UUID(src);
-
-DECLARE_TR_CTX(src_tr, SOF_UUID(src_uuid), LOG_LEVEL_INFO);
-
 LOG_MODULE_DECLARE(src, CONFIG_SOF_LOG_LEVEL);
+extern const struct sof_uuid src_uuid;
+extern struct tr_ctx src_tr;
 
 int src_rate_check(const void *spec)
 {
diff --git a/src/audio/src/src_ipc4.c b/src/audio/src/src_ipc4.c
index c337f34b404c..0458c8bd3b50 100644
--- a/src/audio/src/src_ipc4.c
+++ b/src/audio/src/src_ipc4.c
@@ -41,11 +41,9 @@
 #include "src_common.h"
 #include "src_config.h"
 
-SOF_DEFINE_REG_UUID(src4);
-
-DECLARE_TR_CTX(src_tr, SOF_UUID(src4_uuid), LOG_LEVEL_INFO);
-
 LOG_MODULE_DECLARE(src, CONFIG_SOF_LOG_LEVEL);
+extern const struct sof_uuid src4_uuid;
+extern struct tr_ctx src_tr;
 
 int src_rate_check(const void *spec)
 {
diff --git a/src/audio/src/src_lite.c b/src/audio/src/src_lite.c
index 249c6a57d2de..35423dad9225 100644
--- a/src/audio/src/src_lite.c
+++ b/src/audio/src/src_lite.c
@@ -53,7 +53,7 @@ static int src_lite_prepare(struct processing_module *mod,
 	return src_prepare_general(mod, sources[0], sinks[0]);
 }
 
-static const struct module_interface src_lite_interface = {
+const struct module_interface src_lite_interface = {
 	.init = src_init,
 	.prepare = src_lite_prepare,
 	.process = src_process,
diff --git a/src/audio/src/src_log.c b/src/audio/src/src_log.c
new file mode 100644
index 000000000000..847642d902b1
--- /dev/null
+++ b/src/audio/src/src_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(src, CONFIG_SOF_LOG_LEVEL);
+#if CONFIG_IPC_MAJOR_4
+SOF_DEFINE_REG_UUID(src4);
+DECLARE_TR_CTX(src_tr, SOF_UUID(src4_uuid), LOG_LEVEL_INFO);
+EXPORT_SYMBOL(src4_uuid);
+#elif CONFIG_IPC_MAJOR_3
+SOF_DEFINE_REG_UUID(src);
+DECLARE_TR_CTX(src_tr, SOF_UUID(src_uuid), LOG_LEVEL_INFO);
+EXPORT_SYMBOL(src_uuid);
+#endif
+EXPORT_SYMBOL(src_tr);
+EXPORT_SYMBOL(log_const_src);
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 7e2e87234987..5785bd4e070e 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -744,19 +744,32 @@ zephyr_library_sources_ifdef(CONFIG_COMP_CHAIN_DMA
 	${SOF_AUDIO_PATH}/chain_dma.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_COMP_SRC
-	${SOF_AUDIO_PATH}/src/src_hifi2ep.c
-	${SOF_AUDIO_PATH}/src/src_generic.c
-	${SOF_AUDIO_PATH}/src/src_hifi3.c
-	${SOF_AUDIO_PATH}/src/src_hifi4.c
-	${SOF_AUDIO_PATH}/src/src_common.c
-	${SOF_AUDIO_PATH}/src/src.c
-	${SOF_AUDIO_PATH}/src/src_${ipc_suffix}.c
-)
+if(CONFIG_COMP_SRC STREQUAL "m")
+	add_subdirectory(${SOF_AUDIO_PATH}/src/llext
+			 ${PROJECT_BINARY_DIR}/src_llext)
+	add_dependencies(app src)
+elseif(CONFIG_COMP_SRC)
+	zephyr_library_sources_ifdef(CONFIG_COMP_SRC
+		${SOF_AUDIO_PATH}/src/src_hifi2ep.c
+		${SOF_AUDIO_PATH}/src/src_generic.c
+		${SOF_AUDIO_PATH}/src/src_hifi3.c
+		${SOF_AUDIO_PATH}/src/src_hifi4.c
+		${SOF_AUDIO_PATH}/src/src_common.c
+		${SOF_AUDIO_PATH}/src/src.c
+		${SOF_AUDIO_PATH}/src/src_${ipc_suffix}.c
+	)
+
+	zephyr_library_sources_ifdef(CONFIG_COMP_SRC_LITE
+		${SOF_AUDIO_PATH}/src/src_lite.c
+	)
+endif()
+
+if(NOT CONFIG_COMP_SRC STREQUAL "n")
+	zephyr_library_sources(
+		${SOF_AUDIO_PATH}/src/src_log.c
+	)
+endif()
 
-zephyr_library_sources_ifdef(CONFIG_COMP_SRC_LITE
-	${SOF_AUDIO_PATH}/src/src_lite.c
-)
 zephyr_library_sources_ifdef(CONFIG_COMP_BASEFW_IPC4
 	${SOF_AUDIO_PATH}/base_fw.c
 )

From 45ae3a233f7e050413b9195466bf198c1a64bb63 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Tue, 28 May 2024 14:17:03 +0200
Subject: [PATCH 06/22] volume: move gain.toml and peakvol.toml into
 volume.toml

To make volume an LLEXT module it should have a single TOML
configuration file named volume.toml. This is easy to do, using
respective Kconfig options.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/audio/volume/gain.toml     | 33 ----------------
 src/audio/volume/peakvol.toml  | 33 ----------------
 src/audio/volume/volume.toml   | 71 ++++++++++++++++++++++++++++++++++
 tools/rimage/config/lnl.toml.h |  8 +---
 tools/rimage/config/mtl.toml.h |  8 +---
 5 files changed, 75 insertions(+), 78 deletions(-)
 delete mode 100644 src/audio/volume/gain.toml
 delete mode 100644 src/audio/volume/peakvol.toml
 create mode 100644 src/audio/volume/volume.toml

diff --git a/src/audio/volume/gain.toml b/src/audio/volume/gain.toml
deleted file mode 100644
index 1bd8defc4e2b..000000000000
--- a/src/audio/volume/gain.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-	[[module.entry]]
-	name = "GAIN"
-	uuid = "61BCA9A8-18D0-4A18-8E7B-2639219804B7"
-	affinity_mask = "0x1"
-	instance_count = "40"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "9"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	REM # pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
-			1, 0, 0xfeef, 0xf, 0xf, 0x45ff]
-
-	REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-#if CONFIG_METEORLAKE
-	mod_cfg = [1, 0, 0, 0, 416, 12100000, 1536, 1536, 0, 12100, 0,
-			2, 0, 0, 0, 416, 10183000, 384, 384, 0, 10183, 0,
-			3, 0, 0, 0, 416, 8192000, 512, 512, 0, 8192, 0,
-			4, 0, 0, 0, 416, 10091000, 128, 128, 0, 10091, 0,
-			5, 0, 0, 0, 416, 5908000, 768, 768, 0, 5908, 0]
-#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE)
-	mod_cfg = [0, 0, 0, 0, 416, 914000, 48, 64, 0, 0, 0,
-			1, 0, 0, 0, 416, 1321600, 192, 256, 0, 0, 0,
-			2, 0, 0, 0, 416, 1786000, 192, 256, 0, 0, 0,
-			3, 0, 0, 0, 416, 2333000, 48, 64, 0, 0, 0,
-			4, 0, 0, 0, 416, 2910000, 192, 256, 0, 0, 0,
-			5, 0, 0, 0, 416, 3441000, 192, 256, 0, 0, 0,
-			6, 0, 0, 0, 416, 4265000, 192, 256, 0, 0, 0]
-#endif
-
-	index = __COUNTER__
diff --git a/src/audio/volume/peakvol.toml b/src/audio/volume/peakvol.toml
deleted file mode 100644
index c7a3bea647f3..000000000000
--- a/src/audio/volume/peakvol.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-	[[module.entry]]
-	name = "PEAKVOL"
-	uuid = "8A171323-94A3-4E1D-AFE9-FE5DBAA4C393"
-	affinity_mask = "0x1"
-	instance_count = "10"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "4"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	REM # pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
-			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
-
-	REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-#if CONFIG_METEORLAKE
-	mod_cfg = [1, 0, 0, 0, 480, 11667000, 384, 384, 0, 11667, 0,
-			2, 0, 0, 0, 480, 5943000, 192, 192, 0, 5943, 0,
-			3, 0, 0, 0, 480, 12567000, 720, 720, 0, 12567, 0,
-			4, 0, 0, 0, 480, 7360000, 768, 768, 0, 7360, 0,
-			5, 0, 0, 0, 480, 12236000, 1536, 1536, 0, 12236, 0]
-#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE)
-	mod_cfg = [0, 0, 0, 0, 480, 1114000, 48, 64, 0, 0, 0,
-			1, 0, 0, 0, 480, 3321600, 192, 256, 0, 0, 0,
-			2, 0, 0, 0, 480, 3786000, 192, 256, 0, 0, 0,
-			3, 0, 0, 0, 480, 4333000, 48, 64, 0, 0, 0,
-			4, 0, 0, 0, 480, 4910000, 192, 256, 0, 0, 0,
-			5, 0, 0, 0, 480, 5441000, 192, 256, 0, 0, 0,
-			6, 0, 0, 0, 480, 6265000, 192, 256, 0, 0, 0]
-#endif
-
-	index = __COUNTER__
diff --git a/src/audio/volume/volume.toml b/src/audio/volume/volume.toml
new file mode 100644
index 000000000000..2aaa0bbccbc3
--- /dev/null
+++ b/src/audio/volume/volume.toml
@@ -0,0 +1,71 @@
+#if CONFIG_COMP_PEAK_VOL
+	[[module.entry]]
+	name = "PEAKVOL"
+	uuid = "8A171323-94A3-4E1D-AFE9-FE5DBAA4C393"
+	affinity_mask = "0x1"
+	instance_count = "10"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "4"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	REM # pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+#if CONFIG_METEORLAKE
+	mod_cfg = [1, 0, 0, 0, 480, 11667000, 384, 384, 0, 11667, 0,
+			2, 0, 0, 0, 480, 5943000, 192, 192, 0, 5943, 0,
+			3, 0, 0, 0, 480, 12567000, 720, 720, 0, 12567, 0,
+			4, 0, 0, 0, 480, 7360000, 768, 768, 0, 7360, 0,
+			5, 0, 0, 0, 480, 12236000, 1536, 1536, 0, 12236, 0]
+#elif CONFIG_LUNARLAKE || CONFIG_PANTHERLAKE
+	mod_cfg = [0, 0, 0, 0, 480, 1114000, 48, 64, 0, 0, 0,
+			1, 0, 0, 0, 480, 3321600, 192, 256, 0, 0, 0,
+			2, 0, 0, 0, 480, 3786000, 192, 256, 0, 0, 0,
+			3, 0, 0, 0, 480, 4333000, 48, 64, 0, 0, 0,
+			4, 0, 0, 0, 480, 4910000, 192, 256, 0, 0, 0,
+			5, 0, 0, 0, 480, 5441000, 192, 256, 0, 0, 0,
+			6, 0, 0, 0, 480, 6265000, 192, 256, 0, 0, 0]
+#endif
+
+	index = __COUNTER__
+#endif
+
+#if CONFIG_COMP_GAIN
+	[[module.entry]]
+	name = "GAIN"
+	uuid = "61BCA9A8-18D0-4A18-8E7B-2639219804B7"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	REM # pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x45ff]
+
+	REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+#if CONFIG_METEORLAKE
+	mod_cfg = [1, 0, 0, 0, 416, 12100000, 1536, 1536, 0, 12100, 0,
+			2, 0, 0, 0, 416, 10183000, 384, 384, 0, 10183, 0,
+			3, 0, 0, 0, 416, 8192000, 512, 512, 0, 8192, 0,
+			4, 0, 0, 0, 416, 10091000, 128, 128, 0, 10091, 0,
+			5, 0, 0, 0, 416, 5908000, 768, 768, 0, 5908, 0]
+#elif CONFIG_LUNARLAKE || CONFIG_PANTHERLAKE
+	mod_cfg = [0, 0, 0, 0, 416, 914000, 48, 64, 0, 0, 0,
+			1, 0, 0, 0, 416, 1321600, 192, 256, 0, 0, 0,
+			2, 0, 0, 0, 416, 1786000, 192, 256, 0, 0, 0,
+			3, 0, 0, 0, 416, 2333000, 48, 64, 0, 0, 0,
+			4, 0, 0, 0, 416, 2910000, 192, 256, 0, 0, 0,
+			5, 0, 0, 0, 416, 3441000, 192, 256, 0, 0, 0,
+			6, 0, 0, 0, 416, 4265000, 192, 256, 0, 0, 0]
+#endif
+
+	index = __COUNTER__
+#endif
diff --git a/tools/rimage/config/lnl.toml.h b/tools/rimage/config/lnl.toml.h
index 3386f06fe074..247a4975f9c8 100644
--- a/tools/rimage/config/lnl.toml.h
+++ b/tools/rimage/config/lnl.toml.h
@@ -32,12 +32,8 @@
 #include <audio/copier/copier.toml>
 #endif
 
-#ifdef CONFIG_COMP_PEAK_VOL
-#include <audio/volume/peakvol.toml>
-#endif
-
-#ifdef CONFIG_COMP_GAIN
-#include <audio/volume/gain.toml>
+#ifdef CONFIG_COMP_VOLUME
+#include <audio/volume/volume.toml>
 #endif
 
 #ifdef CONFIG_COMP_ASRC
diff --git a/tools/rimage/config/mtl.toml.h b/tools/rimage/config/mtl.toml.h
index b0e92b60ca1a..b549c76c3658 100644
--- a/tools/rimage/config/mtl.toml.h
+++ b/tools/rimage/config/mtl.toml.h
@@ -32,12 +32,8 @@
 #include <audio/copier/copier.toml>
 #endif
 
-#ifdef CONFIG_COMP_PEAK_VOL
-#include <audio/volume/peakvol.toml>
-#endif
-
-#ifdef CONFIG_COMP_GAIN
-#include <audio/volume/gain.toml>
+#ifdef CONFIG_COMP_VOLUME
+#include <audio/volume/volume.toml>
 #endif
 
 #ifdef CONFIG_COMP_ASRC

From 877dbf394f41085a6861e83622f7eb850e33470d Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Tue, 28 May 2024 14:21:43 +0200
Subject: [PATCH 07/22] llext: export 2 symbols, required for modular volume

When building volume as an LLEXT module, two more symbols are
required: __divdi3() and module_set_configuration(), export them.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/audio/module_adapter/module/generic.c | 1 +
 src/math/numbers.c                        | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/audio/module_adapter/module/generic.c b/src/audio/module_adapter/module/generic.c
index ef87c101b8a3..5f6dc96fe236 100644
--- a/src/audio/module_adapter/module/generic.c
+++ b/src/audio/module_adapter/module/generic.c
@@ -491,6 +491,7 @@ int module_set_configuration(struct processing_module *mod,
 
 	return ret;
 }
+EXPORT_SYMBOL(module_set_configuration);
 
 int module_bind(struct processing_module *mod, void *data)
 {
diff --git a/src/math/numbers.c b/src/math/numbers.c
index bd2fa67ffa69..76179b954533 100644
--- a/src/math/numbers.c
+++ b/src/math/numbers.c
@@ -179,4 +179,7 @@ uint32_t crc32(uint32_t base, const void *data, uint32_t bytes)
 #if !CONFIG_64BIT
 uint64_t __udivdi3(uint64_t a, uint64_t b);
 EXPORT_SYMBOL(__udivdi3);
+
+int64_t __divdi3(int64_t a, int64_t b);
+EXPORT_SYMBOL(__divdi3);
 #endif

From 4f0e94caa76d04fe13b676112a6b6f4497ee3b5e Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Tue, 28 May 2024 14:35:26 +0200
Subject: [PATCH 08/22] volume: add LLEXT support

This makes it possible to build volume as an LLEXT module to be
loaded at run-time.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 app/overlays/lnl/module_overlay.conf  |  1 +
 app/overlays/mtl/module_overlay.conf  |  1 +
 src/audio/volume/CMakeLists.txt       |  3 +-
 src/audio/volume/Kconfig              | 13 ++++----
 src/audio/volume/llext/CMakeLists.txt | 13 ++++++++
 src/audio/volume/llext/llext.toml.h   |  6 ++++
 src/audio/volume/volume.c             | 43 +++++++++++++++++++++++++--
 src/audio/volume/volume.toml          |  8 +++--
 src/audio/volume/volume_log.c         | 32 ++++++++++++++++++++
 src/audio/volume/volume_uuid.h        | 28 -----------------
 zephyr/CMakeLists.txt                 | 32 +++++++++++++-------
 11 files changed, 131 insertions(+), 49 deletions(-)
 create mode 100644 src/audio/volume/llext/CMakeLists.txt
 create mode 100644 src/audio/volume/llext/llext.toml.h
 create mode 100644 src/audio/volume/volume_log.c
 delete mode 100644 src/audio/volume/volume_uuid.h

diff --git a/app/overlays/lnl/module_overlay.conf b/app/overlays/lnl/module_overlay.conf
index ea6688063622..1d08e10e5a48 100644
--- a/app/overlays/lnl/module_overlay.conf
+++ b/app/overlays/lnl/module_overlay.conf
@@ -4,3 +4,4 @@ CONFIG_COMP_MIXIN_MIXOUT=m
 CONFIG_COMP_IIR=m
 CONFIG_COMP_DRC=m
 CONFIG_COMP_SRC=m
+CONFIG_COMP_VOLUME=m
diff --git a/app/overlays/mtl/module_overlay.conf b/app/overlays/mtl/module_overlay.conf
index ea6688063622..1d08e10e5a48 100644
--- a/app/overlays/mtl/module_overlay.conf
+++ b/app/overlays/mtl/module_overlay.conf
@@ -4,3 +4,4 @@ CONFIG_COMP_MIXIN_MIXOUT=m
 CONFIG_COMP_IIR=m
 CONFIG_COMP_DRC=m
 CONFIG_COMP_SRC=m
+CONFIG_COMP_VOLUME=m
diff --git a/src/audio/volume/CMakeLists.txt b/src/audio/volume/CMakeLists.txt
index 790bd37e4d6a..d171f9d2e191 100644
--- a/src/audio/volume/CMakeLists.txt
+++ b/src/audio/volume/CMakeLists.txt
@@ -8,10 +8,11 @@ if(CONFIG_COMP_VOLUME)
 		volume_generic_with_peakvol.c
 		volume_hifi3_with_peakvol.c
 		volume_hifi4_with_peakvol.c
+		volume_log.c
 		volume.c)
 	if(CONFIG_IPC_MAJOR_3)
 		add_local_sources(sof volume_ipc3.c)
 	elseif(CONFIG_IPC_MAJOR_4)
 		add_local_sources(sof volume_ipc4.c)
 	endif()
-endif()
\ No newline at end of file
+endif()
diff --git a/src/audio/volume/Kconfig b/src/audio/volume/Kconfig
index 35f71cd68e05..bed49b6403f9 100644
--- a/src/audio/volume/Kconfig
+++ b/src/audio/volume/Kconfig
@@ -1,10 +1,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-	config COMP_VOLUME
-		bool "Volume component"
-		default y
-		help
-		  Select for Volume component
+config COMP_VOLUME
+	tristate "Volume component"
+	default m if LIBRARY_DEFAULT_MODULAR
+	default y
+	help
+	  Select for Volume component
 
 if COMP_VOLUME
 
@@ -78,4 +79,4 @@ config COMP_GAIN
 	  This option enables gain to change volume. It works
 	  as peak volume without updating peak vol to host
 
-endif # volume
\ No newline at end of file
+endif # volume
diff --git a/src/audio/volume/llext/CMakeLists.txt b/src/audio/volume/llext/CMakeLists.txt
new file mode 100644
index 000000000000..74a78873eba6
--- /dev/null
+++ b/src/audio/volume/llext/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright (c) 2024 Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+sof_llext_build("volume"
+	SOURCES ../volume_generic.c
+		../volume_hifi3.c
+		../volume_hifi4.c
+		../volume_generic_with_peakvol.c
+		../volume_hifi3_with_peakvol.c
+		../volume_hifi4_with_peakvol.c
+		../volume.c
+		../volume_ipc4.c
+)
diff --git a/src/audio/volume/llext/llext.toml.h b/src/audio/volume/llext/llext.toml.h
new file mode 100644
index 000000000000..98db03706286
--- /dev/null
+++ b/src/audio/volume/llext/llext.toml.h
@@ -0,0 +1,6 @@
+#include <tools/rimage/config/platform.toml>
+#define LOAD_TYPE "2"
+#include "../volume.toml"
+
+[module]
+count = __COUNTER__
diff --git a/src/audio/volume/volume.c b/src/audio/volume/volume.c
index 0cbbcdde925a..8ee7a9070c17 100644
--- a/src/audio/volume/volume.c
+++ b/src/audio/volume/volume.c
@@ -45,9 +45,13 @@
 #include <stddef.h>
 #include <stdint.h>
 
-LOG_MODULE_REGISTER(volume, CONFIG_SOF_LOG_LEVEL);
+LOG_MODULE_DECLARE(volume, CONFIG_SOF_LOG_LEVEL);
+extern const struct sof_uuid volume_uuid;
+extern const struct sof_uuid volume4_uuid;
+extern struct tr_ctx volume_tr;
+extern const struct sof_uuid gain_uuid;
+extern struct tr_ctx gain_tr;
 
-#include "volume_uuid.h"
 #include "volume.h"
 
 #if CONFIG_FORMAT_S16LE
@@ -783,7 +787,11 @@ static const struct module_interface volume_interface = {
 	.free = volume_free
 };
 
+#if CONFIG_IPC_MAJOR_3
 DECLARE_MODULE_ADAPTER(volume_interface, volume_uuid, volume_tr);
+#elif CONFIG_IPC_MAJOR_4
+DECLARE_MODULE_ADAPTER(volume_interface, volume4_uuid, volume_tr);
+#endif
 SOF_MODULE_INIT(volume, sys_comp_module_volume_interface_init);
 
 #if CONFIG_COMP_GAIN
@@ -800,3 +808,34 @@ static const struct module_interface gain_interface = {
 DECLARE_MODULE_ADAPTER(gain_interface, gain_uuid, gain_tr);
 SOF_MODULE_INIT(gain, sys_comp_module_gain_interface_init);
 #endif
+
+#if CONFIG_COMP_VOLUME_MODULE
+/* modular: llext dynamic link */
+
+#include <module/module/api_ver.h>
+#include <module/module/llext.h>
+#include <rimage/sof/user/manifest.h>
+
+#if CONFIG_COMP_PEAK_VOL
+#define UUID_PEAKVOL 0x23, 0x13, 0x17, 0x8a, 0xa3, 0x94, 0x1d, 0x4e, \
+		     0xaf, 0xe9, 0xfe, 0x5d, 0xba, 0xa4, 0xc3, 0x93
+SOF_LLEXT_MOD_ENTRY(peakvol, &volume_interface);
+#endif
+
+#if CONFIG_COMP_GAIN
+#define UUID_GAIN 0xa8, 0xa9, 0xbc, 0x61, 0xd0, 0x18, 0x18, 0x4a, \
+		  0x8e, 0x7b, 0x26, 0x39, 0x21, 0x98, 0x04, 0xb7
+SOF_LLEXT_MOD_ENTRY(gain, &gain_interface);
+#endif
+
+static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
+#if CONFIG_COMP_PEAK_VOL
+	SOF_LLEXT_MODULE_MANIFEST("PEAKVOL", peakvol_llext_entry, 1, UUID_PEAKVOL, 10),
+#endif
+#if CONFIG_COMP_GAIN
+	SOF_LLEXT_MODULE_MANIFEST("GAIN", gain_llext_entry, 1, UUID_GAIN, 40),
+#endif
+};
+
+SOF_LLEXT_BUILDINFO;
+#endif
diff --git a/src/audio/volume/volume.toml b/src/audio/volume/volume.toml
index 2aaa0bbccbc3..7ba4fc53ae83 100644
--- a/src/audio/volume/volume.toml
+++ b/src/audio/volume/volume.toml
@@ -1,3 +1,7 @@
+#ifndef LOAD_TYPE
+#define LOAD_TYPE "0"
+#endif
+
 #if CONFIG_COMP_PEAK_VOL
 	[[module.entry]]
 	name = "PEAKVOL"
@@ -5,7 +9,7 @@
 	affinity_mask = "0x1"
 	instance_count = "10"
 	domain_types = "0"
-	load_type = "0"
+	load_type = LOAD_TYPE
 	module_type = "4"
 	auto_start = "0"
 	sched_caps = [1, 0x00008000]
@@ -41,7 +45,7 @@
 	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/volume/volume_log.c b/src/audio/volume/volume_log.c
new file mode 100644
index 000000000000..a833fa7acf06
--- /dev/null
+++ b/src/audio/volume/volume_log.c
@@ -0,0 +1,32 @@
+// 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(volume, CONFIG_SOF_LOG_LEVEL);
+EXPORT_SYMBOL(log_const_volume);
+
+#if CONFIG_IPC_MAJOR_4
+
+SOF_DEFINE_REG_UUID(volume4);
+DECLARE_TR_CTX(volume_tr, SOF_UUID(volume4_uuid), LOG_LEVEL_INFO);
+EXPORT_SYMBOL(volume4_uuid);
+
+SOF_DEFINE_REG_UUID(gain);
+DECLARE_TR_CTX(gain_tr, SOF_UUID(gain_uuid), LOG_LEVEL_INFO);
+EXPORT_SYMBOL(gain_uuid);
+
+#elif CONFIG_IPC_MAJOR_3
+
+SOF_DEFINE_REG_UUID(volume);
+DECLARE_TR_CTX(volume_tr, SOF_UUID(volume_uuid), LOG_LEVEL_INFO);
+EXPORT_SYMBOL(volume_uuid);
+
+#endif
+
+EXPORT_SYMBOL(gain_tr);
+EXPORT_SYMBOL(volume_tr);
diff --git a/src/audio/volume/volume_uuid.h b/src/audio/volume/volume_uuid.h
deleted file mode 100644
index d68b0ab5b4cd..000000000000
--- a/src/audio/volume/volume_uuid.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- *
- * Copyright(c) 2023 Intel Corporation. All rights reserved.
- *
- * Author: Baofeng Tian <baofeng.tian@intel.com>
- */
-
-#ifndef __SOF_AUDIO_VOLUME_UUID_H__
-#define __SOF_AUDIO_VOLUME_UUID_H__
-
-#include <sof/lib/uuid.h>
-#include <sof/trace/trace.h>
-
-#if CONFIG_IPC_MAJOR_3
-SOF_DEFINE_REG_UUID(volume);
-#else
-/* these ids aligns windows driver requirement to support windows driver */
-SOF_DEFINE_REG_UUID(volume4);
-#define volume_uuid volume4_uuid
-
-SOF_DEFINE_REG_UUID(gain);
-
-DECLARE_TR_CTX(gain_tr, SOF_UUID(gain_uuid), LOG_LEVEL_INFO);
-#endif
-
-DECLARE_TR_CTX(volume_tr, SOF_UUID(volume_uuid), LOG_LEVEL_INFO);
-
-#endif /* __SOF_AUDIO_VOLUME_UUID_H__ */
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 5785bd4e070e..7e32ce043d82 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -676,16 +676,28 @@ zephyr_library_sources_ifdef(CONFIG_SAMPLE_KEYPHRASE
 	${SOF_SAMPLES_PATH}/audio/detect_test.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_COMP_VOLUME
-	${SOF_AUDIO_PATH}/volume/volume_hifi4.c
-	${SOF_AUDIO_PATH}/volume/volume_hifi3.c
-	${SOF_AUDIO_PATH}/volume/volume_generic.c
-	${SOF_AUDIO_PATH}/volume/volume_hifi4_with_peakvol.c
-	${SOF_AUDIO_PATH}/volume/volume_hifi3_with_peakvol.c
-	${SOF_AUDIO_PATH}/volume/volume_generic_with_peakvol.c
-	${SOF_AUDIO_PATH}/volume/volume.c
-	${SOF_AUDIO_PATH}/volume/volume_${ipc_suffix}.c
-)
+if(CONFIG_COMP_VOLUME STREQUAL "m")
+	add_subdirectory(${SOF_AUDIO_PATH}/volume/llext
+			 ${PROJECT_BINARY_DIR}/volume_llext)
+	add_dependencies(app volume)
+elseif(CONFIG_COMP_VOLUME)
+	zephyr_library_sources(
+		${SOF_AUDIO_PATH}/volume/volume_hifi4.c
+		${SOF_AUDIO_PATH}/volume/volume_hifi3.c
+		${SOF_AUDIO_PATH}/volume/volume_generic.c
+		${SOF_AUDIO_PATH}/volume/volume_hifi4_with_peakvol.c
+		${SOF_AUDIO_PATH}/volume/volume_hifi3_with_peakvol.c
+		${SOF_AUDIO_PATH}/volume/volume_generic_with_peakvol.c
+		${SOF_AUDIO_PATH}/volume/volume.c
+		${SOF_AUDIO_PATH}/volume/volume_${ipc_suffix}.c
+	)
+endif()
+
+if(NOT CONFIG_COMP_VOLUME STREQUAL "n")
+	zephyr_library_sources(
+		${SOF_AUDIO_PATH}/volume/volume_log.c
+	)
+endif()
 
 zephyr_library_sources_ifdef(CONFIG_COMP_MODULE_ADAPTER
 	${SOF_AUDIO_PATH}/module_adapter/module_adapter.c

From 4c2eca8a5b344758ef0b24bc195630493fdce859 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Mon, 3 Jun 2024 10:49:52 +0200
Subject: [PATCH 09/22] eq-fir: enable building as an llext module

Add support for LLEXT building to eq-fir.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 app/overlays/lnl/module_overlay.conf  |  1 +
 app/overlays/mtl/module_overlay.conf  |  1 +
 src/audio/eq_fir/CMakeLists.txt       |  2 +-
 src/audio/eq_fir/Kconfig              |  3 ++-
 src/audio/eq_fir/eq_fir.c             | 30 +++++++++++++++++++++------
 src/audio/eq_fir/eq_fir.toml          |  9 ++++++--
 src/audio/eq_fir/eq_fir_log.c         | 17 +++++++++++++++
 src/audio/eq_fir/llext/CMakeLists.txt | 10 +++++++++
 src/audio/eq_fir/llext/llext.toml.h   |  6 ++++++
 zephyr/CMakeLists.txt                 | 26 ++++++++++++++++-------
 10 files changed, 88 insertions(+), 17 deletions(-)
 create mode 100644 src/audio/eq_fir/eq_fir_log.c
 create mode 100644 src/audio/eq_fir/llext/CMakeLists.txt
 create mode 100644 src/audio/eq_fir/llext/llext.toml.h

diff --git a/app/overlays/lnl/module_overlay.conf b/app/overlays/lnl/module_overlay.conf
index 1d08e10e5a48..3237779fc7e6 100644
--- a/app/overlays/lnl/module_overlay.conf
+++ b/app/overlays/lnl/module_overlay.conf
@@ -1,6 +1,7 @@
 CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
 CONFIG_SAMPLE_SMART_AMP=m
 CONFIG_COMP_MIXIN_MIXOUT=m
+CONFIG_COMP_FIR=m
 CONFIG_COMP_IIR=m
 CONFIG_COMP_DRC=m
 CONFIG_COMP_SRC=m
diff --git a/app/overlays/mtl/module_overlay.conf b/app/overlays/mtl/module_overlay.conf
index 1d08e10e5a48..3237779fc7e6 100644
--- a/app/overlays/mtl/module_overlay.conf
+++ b/app/overlays/mtl/module_overlay.conf
@@ -1,6 +1,7 @@
 CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
 CONFIG_SAMPLE_SMART_AMP=m
 CONFIG_COMP_MIXIN_MIXOUT=m
+CONFIG_COMP_FIR=m
 CONFIG_COMP_IIR=m
 CONFIG_COMP_DRC=m
 CONFIG_COMP_SRC=m
diff --git a/src/audio/eq_fir/CMakeLists.txt b/src/audio/eq_fir/CMakeLists.txt
index 250ca910658c..4da268a12ce7 100644
--- a/src/audio/eq_fir/CMakeLists.txt
+++ b/src/audio/eq_fir/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-add_local_sources(sof eq_fir.c eq_fir_generic.c eq_fir_hifi2ep.c eq_fir_hifi3.c)
+add_local_sources(sof eq_fir.c eq_fir_generic.c eq_fir_hifi2ep.c eq_fir_hifi3.c eq_fir_log.c)
 if(CONFIG_IPC_MAJOR_3)
 	add_local_sources(sof eq_fir_ipc3.c)
 elseif(CONFIG_IPC_MAJOR_4)
diff --git a/src/audio/eq_fir/Kconfig b/src/audio/eq_fir/Kconfig
index 49ae33e98c81..0ac2074e499b 100644
--- a/src/audio/eq_fir/Kconfig
+++ b/src/audio/eq_fir/Kconfig
@@ -1,10 +1,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 config COMP_FIR
-	bool "FIR component"
+	tristate "FIR component"
 	select MATH_FIR
 	select COMP_BLOB
 	depends on COMP_MODULE_ADAPTER
+	default m if LIBRARY_DEFAULT_MODULAR
 	default y
 	help
 	  Select for FIR component. FIR performance can differ between DSP
diff --git a/src/audio/eq_fir/eq_fir.c b/src/audio/eq_fir/eq_fir.c
index adf649743cea..451152e4d037 100644
--- a/src/audio/eq_fir/eq_fir.c
+++ b/src/audio/eq_fir/eq_fir.c
@@ -38,11 +38,10 @@
 
 #include "eq_fir.h"
 
-LOG_MODULE_REGISTER(eq_fir, CONFIG_SOF_LOG_LEVEL);
+LOG_MODULE_DECLARE(eq_fir, CONFIG_SOF_LOG_LEVEL);
 
-SOF_DEFINE_REG_UUID(eq_fir);
-
-DECLARE_TR_CTX(eq_fir_tr, SOF_UUID(eq_fir_uuid), LOG_LEVEL_INFO);
+extern const struct sof_uuid eq_fir_uuid;
+extern struct tr_ctx eq_fir_tr;
 
 /* Pass-through functions to replace FIR core while not configured for
  * response.
@@ -309,7 +308,7 @@ static int eq_fir_free(struct processing_module *mod)
 {
 	struct comp_data *cd = module_get_private_data(mod);
 
-	comp_info(mod->dev, "eq_fir_free()");
+	comp_dbg(mod->dev, "eq_fir_free()");
 
 	eq_fir_free_delaylines(cd);
 	comp_data_blob_handler_free(cd->model_handler);
@@ -456,7 +455,7 @@ static int eq_fir_reset(struct processing_module *mod)
 	int i;
 	struct comp_data *cd = module_get_private_data(mod);
 
-	comp_info(mod->dev, "eq_fir_reset()");
+	comp_dbg(mod->dev, "eq_fir_reset()");
 
 	comp_data_blob_set_validator(cd->model_handler, NULL);
 
@@ -481,3 +480,22 @@ static const struct module_interface eq_fir_interface = {
 
 DECLARE_MODULE_ADAPTER(eq_fir_interface, eq_fir_uuid, eq_fir_tr);
 SOF_MODULE_INIT(eq_fir, sys_comp_module_eq_fir_interface_init);
+
+#if CONFIG_COMP_FIR_MODULE
+/* modular: llext dynamic link */
+
+#include <module/module/api_ver.h>
+#include <module/module/llext.h>
+#include <rimage/sof/user/manifest.h>
+
+#define UUID_EQFIR 0xe7, 0x0c, 0xa9, 0x43, 0xa5, 0xf3, 0xdf, 0x41, \
+		 0xac, 0x06, 0xba, 0x98, 0x65, 0x1a, 0xe6, 0xa3
+
+SOF_LLEXT_MOD_ENTRY(eq_fir, &eq_fir_interface);
+
+static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
+	SOF_LLEXT_MODULE_MANIFEST("EQFIR", eq_fir_llext_entry, 1, UUID_EQFIR, 40);
+
+SOF_LLEXT_BUILDINFO;
+
+#endif
diff --git a/src/audio/eq_fir/eq_fir.toml b/src/audio/eq_fir/eq_fir.toml
index 2e647fe97ab8..416c068e95ce 100644
--- a/src/audio/eq_fir/eq_fir.toml
+++ b/src/audio/eq_fir/eq_fir.toml
@@ -1,11 +1,15 @@
+#ifndef LOAD_TYPE
+#define LOAD_TYPE "0"
+#endif
+
 	REM # eq fir module config
 	[[module.entry]]
 	name = "EQFIR"
-	uuid = "43A90CE7-f3A5-41Df-AC06-BA98651AE6A3"
+	uuid = "43A90CE7-F3A5-41DF-AC06-BA98651AE6A3"
 	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]
@@ -15,6 +19,7 @@
 		1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
 
 	REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	REM # identical for MTL and LNL
 	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
 
 	index = __COUNTER__
diff --git a/src/audio/eq_fir/eq_fir_log.c b/src/audio/eq_fir/eq_fir_log.c
new file mode 100644
index 000000000000..4c244047353f
--- /dev/null
+++ b/src/audio/eq_fir/eq_fir_log.c
@@ -0,0 +1,17 @@
+// 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(eq_fir, CONFIG_SOF_LOG_LEVEL);
+EXPORT_SYMBOL(log_const_eq_fir);
+
+SOF_DEFINE_REG_UUID(eq_fir);
+EXPORT_SYMBOL(eq_fir_uuid);
+
+DECLARE_TR_CTX(eq_fir_tr, SOF_UUID(eq_fir_uuid), LOG_LEVEL_INFO);
+EXPORT_SYMBOL(eq_fir_tr);
diff --git a/src/audio/eq_fir/llext/CMakeLists.txt b/src/audio/eq_fir/llext/CMakeLists.txt
new file mode 100644
index 000000000000..9b4f47308c49
--- /dev/null
+++ b/src/audio/eq_fir/llext/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+sof_llext_build("eq_fir"
+	SOURCES ../eq_fir_hifi3.c
+	../eq_fir_hifi2ep.c
+	../eq_fir_generic.c
+	../eq_fir.c
+	../eq_fir_ipc4.c
+)
diff --git a/src/audio/eq_fir/llext/llext.toml.h b/src/audio/eq_fir/llext/llext.toml.h
new file mode 100644
index 000000000000..4a73c827c860
--- /dev/null
+++ b/src/audio/eq_fir/llext/llext.toml.h
@@ -0,0 +1,6 @@
+#include <tools/rimage/config/platform.toml>
+#define LOAD_TYPE "2"
+#include "../eq_fir.toml"
+
+[module]
+count = __COUNTER__
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 7e32ce043d82..c8a355ee5e4b 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -566,13 +566,25 @@ elseif(CONFIG_IPC_MAJOR_4)
 set(ipc_suffix ipc4)
 endif()
 
-zephyr_library_sources_ifdef(CONFIG_COMP_FIR
-	${SOF_AUDIO_PATH}/eq_fir/eq_fir_hifi3.c
-	${SOF_AUDIO_PATH}/eq_fir/eq_fir_hifi2ep.c
-	${SOF_AUDIO_PATH}/eq_fir/eq_fir_generic.c
-	${SOF_AUDIO_PATH}/eq_fir/eq_fir.c
-	${SOF_AUDIO_PATH}/eq_fir/eq_fir_${ipc_suffix}.c
-)
+if(CONFIG_COMP_FIR STREQUAL "m")
+	add_subdirectory(${SOF_AUDIO_PATH}/eq_fir/llext
+			 ${PROJECT_BINARY_DIR}/eq_fir_llext)
+	add_dependencies(app eq_iir)
+elseif(CONFIG_COMP_FIR)
+	zephyr_library_sources(
+		${SOF_AUDIO_PATH}/eq_fir/eq_fir_hifi3.c
+		${SOF_AUDIO_PATH}/eq_fir/eq_fir_hifi2ep.c
+		${SOF_AUDIO_PATH}/eq_fir/eq_fir_generic.c
+		${SOF_AUDIO_PATH}/eq_fir/eq_fir.c
+		${SOF_AUDIO_PATH}/eq_fir/eq_fir_${ipc_suffix}.c
+	)
+endif()
+
+if(NOT CONFIG_COMP_FIR STREQUAL "n")
+	zephyr_library_sources(
+		${SOF_AUDIO_PATH}/eq_fir/eq_fir_log.c
+	)
+endif()
 
 if(CONFIG_COMP_IIR STREQUAL "m")
 	add_subdirectory(${SOF_AUDIO_PATH}/eq_iir/llext

From 830f9a23ced8200c52b3ba9fcd2ebea419723666 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Wed, 21 Aug 2024 16:53:45 +0200
Subject: [PATCH 10/22] llext: move logging context to base firmware

Move the logging context of eq_iir and mixin_mixout to the base
firmware image too. This improves logging entries, dropped due to
LLEXT unloading.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/audio/eq_iir/CMakeLists.txt           |  2 +-
 src/audio/eq_iir/eq_iir.c                 |  7 +++----
 src/audio/eq_iir/eq_iir_log.c             | 17 +++++++++++++++
 src/audio/mixin_mixout/CMakeLists.txt     |  8 +++++++-
 src/audio/mixin_mixout/mixin_mixout.c     | 12 +++++------
 src/audio/mixin_mixout/mixin_mixout_log.c | 25 +++++++++++++++++++++++
 zephyr/CMakeLists.txt                     | 12 +++++++++++
 7 files changed, 70 insertions(+), 13 deletions(-)
 create mode 100644 src/audio/eq_iir/eq_iir_log.c
 create mode 100644 src/audio/mixin_mixout/mixin_mixout_log.c

diff --git a/src/audio/eq_iir/CMakeLists.txt b/src/audio/eq_iir/CMakeLists.txt
index 0c9853540ad5..a90ae1fae469 100644
--- a/src/audio/eq_iir/CMakeLists.txt
+++ b/src/audio/eq_iir/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-add_local_sources(sof eq_iir.c eq_iir_generic.c)
+add_local_sources(sof eq_iir.c eq_iir_generic.c eq_iir_log.c)
 if(CONFIG_IPC_MAJOR_3)
 	add_local_sources(sof eq_iir_ipc3.c)
 elseif(CONFIG_IPC_MAJOR_4)
diff --git a/src/audio/eq_iir/eq_iir.c b/src/audio/eq_iir/eq_iir.c
index a5b04a418691..e109fd050aa7 100644
--- a/src/audio/eq_iir/eq_iir.c
+++ b/src/audio/eq_iir/eq_iir.c
@@ -35,11 +35,10 @@
 #include <stddef.h>
 #include <stdint.h>
 
-LOG_MODULE_REGISTER(eq_iir, CONFIG_SOF_LOG_LEVEL);
+LOG_MODULE_DECLARE(eq_iir, CONFIG_SOF_LOG_LEVEL);
 
-SOF_DEFINE_REG_UUID(eq_iir);
-
-DECLARE_TR_CTX(eq_iir_tr, SOF_UUID(eq_iir_uuid), LOG_LEVEL_INFO);
+extern const struct sof_uuid eq_iir_uuid;
+extern struct tr_ctx eq_iir_tr;
 
 /*
  * End of EQ setup code. Next the standard component methods.
diff --git a/src/audio/eq_iir/eq_iir_log.c b/src/audio/eq_iir/eq_iir_log.c
new file mode 100644
index 000000000000..72a272cda4ca
--- /dev/null
+++ b/src/audio/eq_iir/eq_iir_log.c
@@ -0,0 +1,17 @@
+// 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(eq_iir, CONFIG_SOF_LOG_LEVEL);
+EXPORT_SYMBOL(log_const_eq_iir);
+
+SOF_DEFINE_REG_UUID(eq_iir);
+EXPORT_SYMBOL(eq_iir_uuid);
+
+DECLARE_TR_CTX(eq_iir_tr, SOF_UUID(eq_iir_uuid), LOG_LEVEL_INFO);
+EXPORT_SYMBOL(eq_iir_tr);
diff --git a/src/audio/mixin_mixout/CMakeLists.txt b/src/audio/mixin_mixout/CMakeLists.txt
index 2e6dc7456ae5..1704f71d0e75 100644
--- a/src/audio/mixin_mixout/CMakeLists.txt
+++ b/src/audio/mixin_mixout/CMakeLists.txt
@@ -1 +1,7 @@
-add_local_sources(sof mixin_mixout.c mixin_mixout_generic.c mixin_mixout_hifi3.c mixin_mixout_hifi5.c)
+add_local_sources(sof
+	mixin_mixout.c
+	mixin_mixout_generic.c
+	mixin_mixout_hifi3.c
+	mixin_mixout_hifi5.c
+	mixin_mixout_log.c
+)
diff --git a/src/audio/mixin_mixout/mixin_mixout.c b/src/audio/mixin_mixout/mixin_mixout.c
index 24f30ff31677..b6eeddb7bab8 100644
--- a/src/audio/mixin_mixout/mixin_mixout.c
+++ b/src/audio/mixin_mixout/mixin_mixout.c
@@ -31,15 +31,13 @@
 
 #include "mixin_mixout.h"
 
-LOG_MODULE_REGISTER(mixin_mixout, CONFIG_SOF_LOG_LEVEL);
+LOG_MODULE_DECLARE(mixin_mixout, CONFIG_SOF_LOG_LEVEL);
 
-/* mixin 39656eb2-3b71-4049-8d3f-f92cd5c43c09 */
-SOF_DEFINE_REG_UUID(mixin);
-DECLARE_TR_CTX(mixin_tr, SOF_UUID(mixin_uuid), LOG_LEVEL_INFO);
+extern const struct sof_uuid mixin_uuid;
+extern struct tr_ctx mixin_tr;
 
-/* mixout 3c56505a-24d7-418f-bddc-c1f5a3ac2ae0 */
-SOF_DEFINE_REG_UUID(mixout);
-DECLARE_TR_CTX(mixout_tr, SOF_UUID(mixout_uuid), LOG_LEVEL_INFO);
+extern const struct sof_uuid mixout_uuid;
+extern struct tr_ctx mixout_tr;
 
 #define MIXIN_MAX_SINKS IPC4_MIXIN_MODULE_MAX_OUTPUT_QUEUES
 #define MIXOUT_MAX_SOURCES IPC4_MIXOUT_MODULE_MAX_INPUT_QUEUES
diff --git a/src/audio/mixin_mixout/mixin_mixout_log.c b/src/audio/mixin_mixout/mixin_mixout_log.c
new file mode 100644
index 000000000000..16fbddaac358
--- /dev/null
+++ b/src/audio/mixin_mixout/mixin_mixout_log.c
@@ -0,0 +1,25 @@
+// 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(mixin_mixout, CONFIG_SOF_LOG_LEVEL);
+EXPORT_SYMBOL(log_const_mixin_mixout);
+
+/* mixin 39656eb2-3b71-4049-8d3f-f92cd5c43c09 */
+SOF_DEFINE_REG_UUID(mixin);
+EXPORT_SYMBOL(mixin_uuid);
+
+DECLARE_TR_CTX(mixin_tr, SOF_UUID(mixin_uuid), LOG_LEVEL_INFO);
+EXPORT_SYMBOL(mixin_tr);
+
+/* mixout 3c56505a-24d7-418f-bddc-c1f5a3ac2ae0 */
+SOF_DEFINE_REG_UUID(mixout);
+EXPORT_SYMBOL(mixout_uuid);
+
+DECLARE_TR_CTX(mixout_tr, SOF_UUID(mixout_uuid), LOG_LEVEL_INFO);
+EXPORT_SYMBOL(mixout_tr);
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index c8a355ee5e4b..3a40d54bd143 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -598,6 +598,12 @@ elseif(CONFIG_COMP_IIR)
 	)
 endif()
 
+if(NOT CONFIG_COMP_IIR STREQUAL "n")
+	zephyr_library_sources(
+		${SOF_AUDIO_PATH}/eq_iir/eq_iir_log.c
+	)
+endif()
+
 zephyr_library_sources_ifdef(CONFIG_MATH_FIR
 	${SOF_MATH_PATH}/fir_generic.c
 	${SOF_MATH_PATH}/fir_hifi2ep.c
@@ -666,6 +672,12 @@ elseif(CONFIG_COMP_MIXIN_MIXOUT)
 	)
 endif()
 
+if(NOT CONFIG_COMP_MIXIN_MIXOUT STREQUAL "n")
+	zephyr_library_sources(
+		${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout_log.c
+	)
+endif()
+
 zephyr_library_sources_ifdef(CONFIG_COMP_TONE
 	${SOF_AUDIO_PATH}/tone.c
 )

From 80abcf78cdda4887ce2fc7d46979f3324db2ead5 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Mon, 3 Jun 2024 11:50:42 +0200
Subject: [PATCH 11/22] asrc: enable building as an llext module

Add support for LLEXT building to asrc.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 app/overlays/lnl/module_overlay.conf |  1 +
 app/overlays/mtl/module_overlay.conf |  1 +
 src/audio/asrc/CMakeLists.txt        |  2 +-
 src/audio/asrc/Kconfig               |  5 +++--
 src/audio/asrc/asrc.c                | 25 +++++++++++++++++++++----
 src/audio/asrc/asrc.toml             |  6 +++++-
 src/audio/asrc/asrc_ipc3.c           |  4 ----
 src/audio/asrc/asrc_ipc4.c           |  4 ----
 src/audio/asrc/asrc_log.c            | 21 +++++++++++++++++++++
 src/audio/asrc/llext/CMakeLists.txt  | 10 ++++++++++
 src/audio/asrc/llext/llext.toml.h    |  6 ++++++
 zephyr/CMakeLists.txt                | 25 +++++++++++++++++--------
 12 files changed, 86 insertions(+), 24 deletions(-)
 create mode 100644 src/audio/asrc/asrc_log.c
 create mode 100644 src/audio/asrc/llext/CMakeLists.txt
 create mode 100644 src/audio/asrc/llext/llext.toml.h

diff --git a/app/overlays/lnl/module_overlay.conf b/app/overlays/lnl/module_overlay.conf
index 3237779fc7e6..7dd35cc66cf0 100644
--- a/app/overlays/lnl/module_overlay.conf
+++ b/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
diff --git a/app/overlays/mtl/module_overlay.conf b/app/overlays/mtl/module_overlay.conf
index 3237779fc7e6..7dd35cc66cf0 100644
--- a/app/overlays/mtl/module_overlay.conf
+++ b/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
diff --git a/src/audio/asrc/CMakeLists.txt b/src/audio/asrc/CMakeLists.txt
index e87e2b1202d2..7b35fafccdbe 100644
--- a/src/audio/asrc/CMakeLists.txt
+++ b/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)
diff --git a/src/audio/asrc/Kconfig b/src/audio/asrc/Kconfig
index 7bdbf68d2a94..b9b8604e667e 100644
--- a/src/audio/asrc/Kconfig
+++ b/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"
 
diff --git a/src/audio/asrc/asrc.c b/src/audio/asrc/asrc.c
index 4df5a5afd17f..5878a9229190 100644
--- a/src/audio/asrc/asrc.c
+++ b/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
diff --git a/src/audio/asrc/asrc.toml b/src/audio/asrc/asrc.toml
index 0bf6ace59bd9..ace84d85e733 100644
--- a/src/audio/asrc/asrc.toml
+++ b/src/audio/asrc/asrc.toml
@@ -1,3 +1,7 @@
+#ifndef LOAD_TYPE
+#define LOAD_TYPE "0"
+#endif
+
 	[[module.entry]]
 	name = "ASRC"
 	uuid = "66B4402D-B468-42F2-81A7-B37121863DD4"
@@ -5,7 +9,7 @@
 	instance_count = "2"
 	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/asrc/asrc_ipc3.c b/src/audio/asrc/asrc_ipc3.c
index ef002e1b0310..696b4b1f7736 100644
--- a/src/audio/asrc/asrc_ipc3.c
+++ b/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)
diff --git a/src/audio/asrc/asrc_ipc4.c b/src/audio/asrc/asrc_ipc4.c
index 9caf3a898e12..3e764b32c6d9 100644
--- a/src/audio/asrc/asrc_ipc4.c
+++ b/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)
diff --git a/src/audio/asrc/asrc_log.c b/src/audio/asrc/asrc_log.c
new file mode 100644
index 000000000000..f6dbab5743b0
--- /dev/null
+++ b/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);
diff --git a/src/audio/asrc/llext/CMakeLists.txt b/src/audio/asrc/llext/CMakeLists.txt
new file mode 100644
index 000000000000..93f26a228913
--- /dev/null
+++ b/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
+)
diff --git a/src/audio/asrc/llext/llext.toml.h b/src/audio/asrc/llext/llext.toml.h
new file mode 100644
index 000000000000..680a68ece6d8
--- /dev/null
+++ b/src/audio/asrc/llext/llext.toml.h
@@ -0,0 +1,6 @@
+#include <tools/rimage/config/platform.toml>
+#define LOAD_TYPE "2"
+#include "../asrc.toml"
+
+[module]
+count = __COUNTER__
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 3a40d54bd143..3feb98a41b1a 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -622,15 +622,24 @@ zephyr_library_sources_ifdef(CONFIG_MATH_IIR_DF2T
 	${SOF_MATH_PATH}/iir_df2t.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_COMP_ASRC
-	${SOF_AUDIO_PATH}/asrc/asrc.c
-	${SOF_AUDIO_PATH}/asrc/asrc_farrow_hifi3.c
-	${SOF_AUDIO_PATH}/asrc/asrc_farrow.c
-	${SOF_AUDIO_PATH}/asrc/asrc_farrow_generic.c
-)
+if(CONFIG_COMP_ASRC STREQUAL "m")
+	add_subdirectory(${SOF_AUDIO_PATH}/asrc/llext
+			 ${PROJECT_BINARY_DIR}/asrc_llext)
+	add_dependencies(app asrc)
+elseif(CONFIG_COMP_ASRC)
+	zephyr_library_sources(
+		${SOF_AUDIO_PATH}/asrc/asrc.c
+		${SOF_AUDIO_PATH}/asrc/asrc_farrow_hifi3.c
+		${SOF_AUDIO_PATH}/asrc/asrc_farrow.c
+		${SOF_AUDIO_PATH}/asrc/asrc_farrow_generic.c
+		${SOF_AUDIO_PATH}/asrc/asrc_${ipc_suffix}.c
+	)
+endif()
 
-if(CONFIG_COMP_ASRC)
-	zephyr_library_sources(${SOF_AUDIO_PATH}/asrc/asrc_${ipc_suffix}.c)
+if(NOT CONFIG_COMP_ASRC STREQUAL "n")
+	zephyr_library_sources(
+		${SOF_AUDIO_PATH}/asrc/asrc_log.c
+	)
 endif()
 
 zephyr_library_sources_ifdef(CONFIG_COMP_DCBLOCK

From 75ee4a070f47854d6dcbb7809b86a359d20ef15b Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Wed, 19 Jun 2024 08:09:43 +0200
Subject: [PATCH 12/22] llext: export symbols, required for eq_fir

When built as an llext module, eq_fir requires several base-firmware
provided symbols, export them.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/audio/data_blob.c         | 1 +
 src/audio/sink_source_utils.c | 2 ++
 src/audio/source_api_helper.c | 3 +++
 src/math/fir_generic.c        | 5 +++++
 src/math/fir_hifi2ep.c        | 6 ++++++
 src/math/fir_hifi3.c          | 7 +++++++
 src/module/audio/sink_api.c   | 4 ++++
 7 files changed, 28 insertions(+)

diff --git a/src/audio/data_blob.c b/src/audio/data_blob.c
index 3e6415d5d22e..7e1bc11f1f17 100644
--- a/src/audio/data_blob.c
+++ b/src/audio/data_blob.c
@@ -58,6 +58,7 @@ void comp_data_blob_set_validator(struct comp_data_blob_handler *blob_handler,
 
 	blob_handler->validator = validator;
 }
+EXPORT_SYMBOL(comp_data_blob_set_validator);
 
 void *comp_get_data_blob(struct comp_data_blob_handler *blob_handler,
 			 size_t *size, uint32_t *crc)
diff --git a/src/audio/sink_source_utils.c b/src/audio/sink_source_utils.c
index 3b79c8c2d5e1..cc75c3b848d3 100644
--- a/src/audio/sink_source_utils.c
+++ b/src/audio/sink_source_utils.c
@@ -9,6 +9,7 @@
 #include <sof/common.h>
 #include <rtos/panic.h>
 #include <rtos/string.h>
+#include <rtos/symbol.h>
 #include <sof/math/numbers.h>
 #include <limits.h>
 
@@ -71,3 +72,4 @@ int source_to_sink_copy(struct sof_source *source,
 	sink_commit_buffer(sink, INT_MAX);
 	return 0;
 }
+EXPORT_SYMBOL(source_to_sink_copy);
diff --git a/src/audio/source_api_helper.c b/src/audio/source_api_helper.c
index c7ca28c71720..0e742694508a 100644
--- a/src/audio/source_api_helper.c
+++ b/src/audio/source_api_helper.c
@@ -3,6 +3,8 @@
  * Copyright(c) 2023 Intel Corporation. All rights reserved.
  */
 
+#include <rtos/symbol.h>
+
 #include <sof/audio/source_api.h>
 #include <sof/audio/audio_stream.h>
 
@@ -96,6 +98,7 @@ int source_set_alignment_constants(struct sof_source *source,
 		return source->ops->set_alignment_constants(source, byte_align, frame_align_req);
 	return 0;
 }
+EXPORT_SYMBOL(source_set_alignment_constants);
 
 void source_set_min_available(struct sof_source *source, size_t min_available)
 {
diff --git a/src/math/fir_generic.c b/src/math/fir_generic.c
index 0b19c6e14da1..24fbdc665988 100644
--- a/src/math/fir_generic.c
+++ b/src/math/fir_generic.c
@@ -15,6 +15,7 @@
 #include <sof/audio/format.h>
 #include <sof/math/fir_generic.h>
 #include <user/fir.h>
+#include <rtos/symbol.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -33,6 +34,7 @@ void fir_reset(struct fir_state_32x16 *fir)
 	 * reset so omitting setting also fir->delay to NULL.
 	 */
 }
+EXPORT_SYMBOL(fir_reset);
 
 int fir_delay_size(struct sof_fir_coef_data *config)
 {
@@ -49,6 +51,7 @@ int fir_delay_size(struct sof_fir_coef_data *config)
 	 */
 	return (config->length + 4) * sizeof(int32_t);
 }
+EXPORT_SYMBOL(fir_delay_size);
 
 int fir_init_coef(struct fir_state_32x16 *fir,
 		  struct sof_fir_coef_data *config)
@@ -60,12 +63,14 @@ int fir_init_coef(struct fir_state_32x16 *fir,
 	fir->coef = ASSUME_ALIGNED(&config->coef[0], 4);
 	return 0;
 }
+EXPORT_SYMBOL(fir_init_coef);
 
 void fir_init_delay(struct fir_state_32x16 *fir, int32_t **data)
 {
 	fir->delay = *data;
 	*data += fir->length; /* Point to next delay line start */
 }
+EXPORT_SYMBOL(fir_init_delay);
 
 int32_t fir_32x16(struct fir_state_32x16 *fir, int32_t x)
 {
diff --git a/src/math/fir_hifi2ep.c b/src/math/fir_hifi2ep.c
index f95b039a15fa..7f3a2d42a829 100644
--- a/src/math/fir_hifi2ep.c
+++ b/src/math/fir_hifi2ep.c
@@ -14,6 +14,7 @@
 #include <user/fir.h>
 #include <xtensa/config/defs.h>
 #include <xtensa/tie/xt_hifi2.h>
+#include <rtos/symbol.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -32,6 +33,7 @@ void fir_reset(struct fir_state_32x16 *fir)
 	 * reset so omitting setting also fir->delay to NULL.
 	 */
 }
+EXPORT_SYMBOL(fir_reset);
 
 int fir_delay_size(struct sof_fir_coef_data *config)
 {
@@ -47,6 +49,7 @@ int fir_delay_size(struct sof_fir_coef_data *config)
 	 */
 	return (config->length + 2) * sizeof(int32_t);
 }
+EXPORT_SYMBOL(fir_delay_size);
 
 int fir_init_coef(struct fir_state_32x16 *fir,
 		  struct sof_fir_coef_data *config)
@@ -62,6 +65,7 @@ int fir_init_coef(struct fir_state_32x16 *fir,
 	fir->coef = (ae_p16x2s *)&config->coef[0];
 	return 0;
 }
+EXPORT_SYMBOL(fir_init_coef);
 
 void fir_init_delay(struct fir_state_32x16 *fir, int32_t **data)
 {
@@ -70,6 +74,7 @@ void fir_init_delay(struct fir_state_32x16 *fir, int32_t **data)
 	fir->rwp = (ae_p24x2f *)(fir->delay + fir->length - 1);
 	*data += fir->length; /* Point to next delay line start */
 }
+EXPORT_SYMBOL(fir_init_delay);
 
 void fir_get_lrshifts(struct fir_state_32x16 *fir, int *lshift,
 		      int *rshift)
@@ -77,6 +82,7 @@ void fir_get_lrshifts(struct fir_state_32x16 *fir, int *lshift,
 	*lshift = (fir->out_shift < 0) ? -fir->out_shift : 0;
 	*rshift = (fir->out_shift > 0) ? fir->out_shift : 0;
 }
+EXPORT_SYMBOL(fir_get_lrshifts);
 
 /* HiFi EP has the follow number of reqisters that should not be exceeded
  * 4x 56 bit registers in register file Q
diff --git a/src/math/fir_hifi3.c b/src/math/fir_hifi3.c
index 30be6b8196cc..a9cb19e3072f 100644
--- a/src/math/fir_hifi3.c
+++ b/src/math/fir_hifi3.c
@@ -14,6 +14,7 @@
 #include <user/fir.h>
 #include <xtensa/config/defs.h>
 #include <xtensa/tie/xt_hifi3.h>
+#include <rtos/symbol.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -32,6 +33,7 @@ void fir_reset(struct fir_state_32x16 *fir)
 	 * reset so omitting setting also fir->delay to NULL.
 	 */
 }
+EXPORT_SYMBOL(fir_reset);
 
 int fir_delay_size(struct sof_fir_coef_data *config)
 {
@@ -48,6 +50,7 @@ int fir_delay_size(struct sof_fir_coef_data *config)
 	 */
 	return (config->length + 2) * sizeof(int32_t);
 }
+EXPORT_SYMBOL(fir_delay_size);
 
 int fir_init_coef(struct fir_state_32x16 *fir,
 		  struct sof_fir_coef_data *config)
@@ -63,6 +66,7 @@ int fir_init_coef(struct fir_state_32x16 *fir,
 	fir->coef = (ae_f16x4 *)&config->coef[0];
 	return 0;
 }
+EXPORT_SYMBOL(fir_init_coef);
 
 void fir_init_delay(struct fir_state_32x16 *fir, int32_t **data)
 {
@@ -71,6 +75,7 @@ void fir_init_delay(struct fir_state_32x16 *fir, int32_t **data)
 	fir->rwp = (ae_int32 *)(fir->delay + fir->length - 1);
 	*data += fir->length; /* Point to next delay line start */
 }
+EXPORT_SYMBOL(fir_init_delay);
 
 void fir_get_lrshifts(struct fir_state_32x16 *fir, int *lshift,
 		      int *rshift)
@@ -78,6 +83,7 @@ void fir_get_lrshifts(struct fir_state_32x16 *fir, int *lshift,
 	*lshift = (fir->out_shift < 0) ? -fir->out_shift : 0;
 	*rshift = (fir->out_shift > 0) ? fir->out_shift : 0;
 }
+EXPORT_SYMBOL(fir_get_lrshifts);
 
 /* HiFi EP has the follow number of reqisters that should not be exceeded
  * 4x 56 bit registers in register file Q
@@ -245,5 +251,6 @@ void fir_32x16_2x_hifi3(struct fir_state_32x16 *fir, ae_int32 x0, ae_int32 x1,
 	AE_S32_L_I(AE_ROUND32F48SSYM(b), (ae_int32 *)y1, 0);
 	AE_S32_L_I(AE_ROUND32F48SSYM(a), (ae_int32 *)y0, 0);
 }
+EXPORT_SYMBOL(fir_32x16_2x_hifi3);
 
 #endif
diff --git a/src/module/audio/sink_api.c b/src/module/audio/sink_api.c
index 856a6bb5689e..5ec904d61b2f 100644
--- a/src/module/audio/sink_api.c
+++ b/src/module/audio/sink_api.c
@@ -97,6 +97,7 @@ int sink_set_rate(struct sof_sink *sink, unsigned int rate)
 		return sink->ops->on_audio_format_set(sink);
 	return 0;
 }
+EXPORT_SYMBOL(sink_set_rate);
 
 int sink_set_channels(struct sof_sink *sink, unsigned int channels)
 {
@@ -114,6 +115,7 @@ int sink_set_buffer_fmt(struct sof_sink *sink, uint32_t buffer_fmt)
 		return sink->ops->on_audio_format_set(sink);
 	return 0;
 }
+EXPORT_SYMBOL(sink_set_buffer_fmt);
 
 int sink_set_overrun(struct sof_sink *sink, bool overrun_permitted)
 {
@@ -129,6 +131,7 @@ int sink_set_params(struct sof_sink *sink, struct sof_ipc_stream_params *params,
 		return sink->ops->audio_set_ipc_params(sink, params, force_update);
 	return 0;
 }
+EXPORT_SYMBOL(sink_set_params);
 
 int sink_set_alignment_constants(struct sof_sink *sink, const uint32_t byte_align,
 				 const uint32_t frame_align_req)
@@ -137,3 +140,4 @@ int sink_set_alignment_constants(struct sof_sink *sink, const uint32_t byte_alig
 		return sink->ops->set_alignment_constants(sink, byte_align, frame_align_req);
 	return 0;
 }
+EXPORT_SYMBOL(sink_set_alignment_constants);

From 951ea732014bc72e1754364ea39288770a1dac5c Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Wed, 26 Jun 2024 16:59:03 +0200
Subject: [PATCH 13/22] llext: fix multi-core use cases

MOD_INIT_INSTANCE IPCs can be processed on different cores, different
cores can use the same modules. Make shared data uncached.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/library_manager/lib_manager.c   | 4 ++--
 src/library_manager/llext_manager.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c
index 40dce7169daa..39885b4ed89c 100644
--- a/src/library_manager/lib_manager.c
+++ b/src/library_manager/lib_manager.c
@@ -464,8 +464,8 @@ static void lib_manager_update_sof_ctx(void *base_addr, uint32_t lib_id)
 {
 	struct ext_library *_ext_lib = ext_lib_get();
 	/* Never freed, will panic if fails */
-	struct lib_manager_mod_ctx *ctx = rzalloc(SOF_MEM_ZONE_SYS, 0, SOF_MEM_CAPS_RAM,
-						  sizeof(*ctx));
+	struct lib_manager_mod_ctx *ctx = rzalloc(SOF_MEM_ZONE_SYS, SOF_MEM_FLAG_COHERENT,
+						  SOF_MEM_CAPS_RAM, sizeof(*ctx));
 
 	ctx->base_addr = base_addr;
 
diff --git a/src/library_manager/llext_manager.c b/src/library_manager/llext_manager.c
index 196d87c343df..f64461ede909 100644
--- a/src/library_manager/llext_manager.c
+++ b/src/library_manager/llext_manager.c
@@ -343,8 +343,8 @@ uintptr_t llext_manager_allocate_module(struct processing_module *proc,
 		size_t offset = (uintptr_t)mod_manifest - imr_rodata;
 
 		/* ctx->mod_manifest points to an array of module manifests */
-		ctx->mod_manifest = (const struct sof_man_module_manifest *)(va_rodata_base +
-									     offset);
+		ctx->mod_manifest = sys_cache_uncached_ptr_get((__sparse_force void __sparse_cache *)
+							       (va_rodata_base + offset));
 	}
 
 	return ctx->mod_manifest[entry_index].module.entry_point;

From dfe4bcecfa88ea055da4f1f6991b2622a6bdbc8c Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Thu, 4 Jul 2024 12:48:07 +0200
Subject: [PATCH 14/22] tdfb: enable building as an llext module

Add support for LLEXT building to tdfb.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 app/overlays/lnl/module_overlay.conf |  1 +
 app/overlays/mtl/module_overlay.conf |  1 +
 src/audio/tdfb/Kconfig               |  3 ++-
 src/audio/tdfb/llext/CMakeLists.txt  | 11 +++++++++++
 src/audio/tdfb/llext/llext.toml.h    |  6 ++++++
 src/audio/tdfb/tdfb.c                | 23 +++++++++++++++++++++--
 src/audio/tdfb/tdfb.toml             |  6 +++++-
 zephyr/CMakeLists.txt                | 22 ++++++++++++++--------
 8 files changed, 61 insertions(+), 12 deletions(-)
 create mode 100644 src/audio/tdfb/llext/CMakeLists.txt
 create mode 100644 src/audio/tdfb/llext/llext.toml.h

diff --git a/app/overlays/lnl/module_overlay.conf b/app/overlays/lnl/module_overlay.conf
index 7dd35cc66cf0..ff331e700b29 100644
--- a/app/overlays/lnl/module_overlay.conf
+++ b/app/overlays/lnl/module_overlay.conf
@@ -1,6 +1,7 @@
 CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
 CONFIG_SAMPLE_SMART_AMP=m
 CONFIG_COMP_MIXIN_MIXOUT=m
+CONFIG_COMP_TDFB=m
 CONFIG_COMP_FIR=m
 CONFIG_COMP_IIR=m
 CONFIG_COMP_DRC=m
diff --git a/app/overlays/mtl/module_overlay.conf b/app/overlays/mtl/module_overlay.conf
index 7dd35cc66cf0..ff331e700b29 100644
--- a/app/overlays/mtl/module_overlay.conf
+++ b/app/overlays/mtl/module_overlay.conf
@@ -1,6 +1,7 @@
 CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
 CONFIG_SAMPLE_SMART_AMP=m
 CONFIG_COMP_MIXIN_MIXOUT=m
+CONFIG_COMP_TDFB=m
 CONFIG_COMP_FIR=m
 CONFIG_COMP_IIR=m
 CONFIG_COMP_DRC=m
diff --git a/src/audio/tdfb/Kconfig b/src/audio/tdfb/Kconfig
index f30f8aa4fe8a..3a8cff21431a 100644
--- a/src/audio/tdfb/Kconfig
+++ b/src/audio/tdfb/Kconfig
@@ -1,13 +1,14 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 config COMP_TDFB
-	bool "TDFB component"
+	tristate "TDFB component"
 	depends on COMP_MODULE_ADAPTER
 	select MATH_FIR
 	select MATH_IIR_DF1
 	select SQRT_FIXED
 	select CORDIC_FIXED
 	select COMP_BLOB
+	default m if LIBRARY_DEFAULT_MODULAR
 	default y
 	help
 	  Select for time domain fixed beamformer (TDFB) component. The
diff --git a/src/audio/tdfb/llext/CMakeLists.txt b/src/audio/tdfb/llext/CMakeLists.txt
new file mode 100644
index 000000000000..3f9e301947dd
--- /dev/null
+++ b/src/audio/tdfb/llext/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (c) 2024 Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+sof_llext_build("tdfb"
+	SOURCES ../tdfb.c
+		../tdfb_direction.c
+		../tdfb_generic.c
+		../tdfb_hifiep.c
+		../tdfb_hifi3.c
+		../tdfb_ipc4.c
+)
diff --git a/src/audio/tdfb/llext/llext.toml.h b/src/audio/tdfb/llext/llext.toml.h
new file mode 100644
index 000000000000..f5dbd89a4cc2
--- /dev/null
+++ b/src/audio/tdfb/llext/llext.toml.h
@@ -0,0 +1,6 @@
+#include <tools/rimage/config/platform.toml>
+#define LOAD_TYPE "2"
+#include "../tdfb.toml"
+
+[module]
+count = __COUNTER__
diff --git a/src/audio/tdfb/tdfb.c b/src/audio/tdfb/tdfb.c
index 128a39b19e1c..b45fd04773d5 100644
--- a/src/audio/tdfb/tdfb.c
+++ b/src/audio/tdfb/tdfb.c
@@ -613,7 +613,7 @@ static int tdfb_free(struct processing_module *mod)
 {
 	struct tdfb_comp_data *cd = module_get_private_data(mod);
 
-	comp_info(mod->dev, "tdfb_free()");
+	comp_dbg(mod->dev, "tdfb_free()");
 
 	ipc_msg_free(cd->msg);
 	tdfb_free_delaylines(cd);
@@ -797,7 +797,7 @@ static int tdfb_reset(struct processing_module *mod)
 	struct tdfb_comp_data *cd = module_get_private_data(mod);
 	int i;
 
-	comp_info(mod->dev, "tdfb_reset()");
+	comp_dbg(mod->dev, "tdfb_reset()");
 
 	tdfb_free_delaylines(cd);
 
@@ -824,3 +824,22 @@ static const struct module_interface tdfb_interface = {
 
 DECLARE_MODULE_ADAPTER(tdfb_interface, tdfb_uuid, tdfb_tr);
 SOF_MODULE_INIT(tdfb, sys_comp_module_tdfb_interface_init);
+
+#if CONFIG_COMP_TDFB_MODULE
+/* modular: llext dynamic link */
+
+#include <module/module/api_ver.h>
+#include <module/module/llext.h>
+#include <rimage/sof/user/manifest.h>
+
+#define UUID_TDFB 0x49, 0x17, 0x51, 0xdd, 0xfa, 0xd9, 0x5c, 0x45, 0xb3, 0xa7, \
+		  0x13, 0x58, 0x56, 0x93, 0xf1, 0xaf
+
+SOF_LLEXT_MOD_ENTRY(tdfb, &tdfb_interface);
+
+static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
+	SOF_LLEXT_MODULE_MANIFEST("TDFB", tdfb_llext_entry, 1, UUID_TDFB, 40);
+
+SOF_LLEXT_BUILDINFO;
+
+#endif
diff --git a/src/audio/tdfb/tdfb.toml b/src/audio/tdfb/tdfb.toml
index 4cabb78ae081..ee1f7ffaee31 100644
--- a/src/audio/tdfb/tdfb.toml
+++ b/src/audio/tdfb/tdfb.toml
@@ -1,3 +1,7 @@
+#ifndef LOAD_TYPE
+#define LOAD_TYPE "0"
+#endif
+
 	REM # TDFB module config
 	[[module.entry]]
 	name = "TDFB"
@@ -5,7 +9,7 @@
 	affinity_mask = "0x1"
 	instance_count = "40"
 	domain_types = "0"
-	load_type = "0"
+	load_type = LOAD_TYPE
         init_config = "1"
 	module_type = "9"
 	auto_start = "0"
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 3feb98a41b1a..6f29bc338778 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -972,14 +972,20 @@ zephyr_library_sources_ifdef(CONFIG_COMP_RTNR_STUB
 	${SOF_AUDIO_PATH}/rtnr/rtnr_stub.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_COMP_TDFB
-	${SOF_AUDIO_PATH}/tdfb/tdfb.c
-	${SOF_AUDIO_PATH}/tdfb/tdfb_direction.c
-	${SOF_AUDIO_PATH}/tdfb/tdfb_generic.c
-	${SOF_AUDIO_PATH}/tdfb/tdfb_hifiep.c
-	${SOF_AUDIO_PATH}/tdfb/tdfb_hifi3.c
-	${SOF_AUDIO_PATH}/tdfb/tdfb_${ipc_suffix}.c
-)
+if(CONFIG_COMP_TDFB STREQUAL "m")
+	add_subdirectory(${SOF_AUDIO_PATH}/tdfb/llext
+			 ${PROJECT_BINARY_DIR}/tdfb_llext)
+	add_dependencies(app tdfb)
+elseif(CONFIG_COMP_TDFB)
+	zephyr_library_sources(
+		${SOF_AUDIO_PATH}/tdfb/tdfb.c
+		${SOF_AUDIO_PATH}/tdfb/tdfb_direction.c
+		${SOF_AUDIO_PATH}/tdfb/tdfb_generic.c
+		${SOF_AUDIO_PATH}/tdfb/tdfb_hifiep.c
+		${SOF_AUDIO_PATH}/tdfb/tdfb_hifi3.c
+		${SOF_AUDIO_PATH}/tdfb/tdfb_${ipc_suffix}.c
+	)
+endif()
 
 zephyr_library_sources_ifdef(CONFIG_SQRT_FIXED
 	${SOF_MATH_PATH}/sqrt_int16.c

From 1bc75fc04134e4b944ed9c0d11c893354af8e4c1 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Thu, 4 Jul 2024 12:51:39 +0200
Subject: [PATCH 15/22] llext: add auxiliary library type

Add a dedicated type for auxiliary LLEXT objects, not implementing
the Module Adapter API.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/include/module/module/llext.h                  | 14 +++++++++++++-
 src/include/sof/llext_manager.h                    |  3 ++-
 .../rimage/src/include/rimage/sof/user/manifest.h  |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/include/module/module/llext.h b/src/include/module/module/llext.h
index 05b8f0ffb5f5..2daab49a4ede 100644
--- a/src/include/module/module/llext.h
+++ b/src/include/module/module/llext.h
@@ -10,7 +10,7 @@
 { \
 	.module = { \
 		.name = manifest_name, \
-		.uuid = {mod_uuid},			  \
+		.uuid = {mod_uuid}, \
 		.entry_point = (uint32_t)(entry), \
 		.instance_max_count = instances, \
 		.type = { \
@@ -21,6 +21,18 @@
 	} \
 }
 
+#define SOF_LLEXT_AUX_MANIFEST(manifest_name, entry, mod_uuid) \
+{ \
+	.module = { \
+		.name = manifest_name, \
+		.uuid = {mod_uuid}, \
+		.entry_point = (uint32_t)(entry), \
+		.type = { \
+			.load_type = SOF_MAN_MOD_TYPE_LLEXT_AUX, \
+		}, \
+	} \
+}
+
 #define SOF_LLEXT_MOD_ENTRY(name, interface) \
 static const struct module_interface *name##_llext_entry(void *mod_cfg, \
 					void *parent_ppl, void **mod_ptr) \
diff --git a/src/include/sof/llext_manager.h b/src/include/sof/llext_manager.h
index c963ef4adfd6..3192fdf7eeea 100644
--- a/src/include/sof/llext_manager.h
+++ b/src/include/sof/llext_manager.h
@@ -18,7 +18,8 @@ struct comp_ipc_config;
 
 static inline bool module_is_llext(const struct sof_man_module *mod)
 {
-	return mod->type.load_type == SOF_MAN_MOD_TYPE_LLEXT;
+	return mod->type.load_type == SOF_MAN_MOD_TYPE_LLEXT ||
+		mod->type.load_type == SOF_MAN_MOD_TYPE_LLEXT_AUX;
 }
 
 uintptr_t llext_manager_allocate_module(struct processing_module *proc,
diff --git a/tools/rimage/src/include/rimage/sof/user/manifest.h b/tools/rimage/src/include/rimage/sof/user/manifest.h
index 6e1dc09df89e..063c6a2fa790 100644
--- a/tools/rimage/src/include/rimage/sof/user/manifest.h
+++ b/tools/rimage/src/include/rimage/sof/user/manifest.h
@@ -26,6 +26,7 @@
 #define SOF_MAN_MOD_TYPE_BUILTIN	0
 #define SOF_MAN_MOD_TYPE_MODULE		1
 #define SOF_MAN_MOD_TYPE_LLEXT		2	/* Zephyr LLEXT-style dynamically linked */
+#define SOF_MAN_MOD_TYPE_LLEXT_AUX	3	/* Zephyr LLEXT-style dynamically linked auxiliary */
 
 /* module init config */
 #define SOF_MAN_MOD_INIT_CONFIG_BASE_CFG               0 /* Base config only */

From ba52d85060e08a4e1d411c7d64400d4cd56cbdf0 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Thu, 4 Jul 2024 12:55:45 +0200
Subject: [PATCH 16/22] fir: enable building FIR support code as an LLEXT
 object

FIR support code is used by eq-fir and by tdfb. When both of them are
built as LLEXT modules, FIR supporting functions can be dynamically
loaded too.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/math/Kconfig                  |  2 +-
 src/math/fir.toml                 |  6 ++++++
 src/math/fir_common.c             | 21 +++++++++++++++++++++
 src/math/fir_generic.c            | 10 ++++++----
 src/math/fir_hifi2ep.c            | 12 +++++++-----
 src/math/fir_hifi3.c              | 13 +++++++------
 src/math/fir_llext/CMakeLists.txt |  9 +++++++++
 src/math/fir_llext/llext.toml.h   |  5 +++++
 zephyr/CMakeLists.txt             | 16 +++++++++++-----
 9 files changed, 73 insertions(+), 21 deletions(-)
 create mode 100644 src/math/fir.toml
 create mode 100644 src/math/fir_common.c
 create mode 100644 src/math/fir_llext/CMakeLists.txt
 create mode 100644 src/math/fir_llext/llext.toml.h

diff --git a/src/math/Kconfig b/src/math/Kconfig
index 08e4f9a554f0..dcd03add6549 100644
--- a/src/math/Kconfig
+++ b/src/math/Kconfig
@@ -172,7 +172,7 @@ choice "FILTER_SIMD_LEVEL_SELECT"
 endchoice
 
 config MATH_FIR
-	bool "FIR filter library"
+	tristate "FIR filter library"
 	default n
 	help
 	  This option builds FIR (Finite Impulse Response) filter library. It
diff --git a/src/math/fir.toml b/src/math/fir.toml
new file mode 100644
index 000000000000..a81268637761
--- /dev/null
+++ b/src/math/fir.toml
@@ -0,0 +1,6 @@
+	[[module.entry]]
+	name = "FIR"
+	uuid = "93446E12-1864-4E04-AFE0-3B1D778FFB79"
+	load_type = "3"
+
+	index = __COUNTER__
diff --git a/src/math/fir_common.c b/src/math/fir_common.c
new file mode 100644
index 000000000000..beca09dc5590
--- /dev/null
+++ b/src/math/fir_common.c
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2024 Intel Corporation.
+
+/* modular: llext dynamic link */
+
+#include <sof/compiler_attributes.h>
+#include <module/module/api_ver.h>
+#include <module/module/llext.h>
+#include <rimage/sof/user/manifest.h>
+
+#include <stddef.h>
+
+/* 93446e12-1864-4e04-afe0-3b1d778ffb79 */
+#define UUID_FIR 0x12, 0x6e, 0x44, 0x93, 0x64, 0x18, 0x04, 0x4e, \
+		 0xaf, 0xe0, 0x3b, 0x1d, 0x77, 0x8f, 0xfb, 0x79
+
+static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
+	SOF_LLEXT_AUX_MANIFEST("FIR", NULL, UUID_FIR);
+
+SOF_LLEXT_BUILDINFO;
diff --git a/src/math/fir_generic.c b/src/math/fir_generic.c
index 24fbdc665988..05aace7988d2 100644
--- a/src/math/fir_generic.c
+++ b/src/math/fir_generic.c
@@ -34,7 +34,7 @@ void fir_reset(struct fir_state_32x16 *fir)
 	 * reset so omitting setting also fir->delay to NULL.
 	 */
 }
-EXPORT_SYMBOL(fir_reset);
+LL_EXTENSION_SYMBOL(fir_reset);
 
 int fir_delay_size(struct sof_fir_coef_data *config)
 {
@@ -51,7 +51,7 @@ int fir_delay_size(struct sof_fir_coef_data *config)
 	 */
 	return (config->length + 4) * sizeof(int32_t);
 }
-EXPORT_SYMBOL(fir_delay_size);
+LL_EXTENSION_SYMBOL(fir_delay_size);
 
 int fir_init_coef(struct fir_state_32x16 *fir,
 		  struct sof_fir_coef_data *config)
@@ -63,14 +63,14 @@ int fir_init_coef(struct fir_state_32x16 *fir,
 	fir->coef = ASSUME_ALIGNED(&config->coef[0], 4);
 	return 0;
 }
-EXPORT_SYMBOL(fir_init_coef);
+LL_EXTENSION_SYMBOL(fir_init_coef);
 
 void fir_init_delay(struct fir_state_32x16 *fir, int32_t **data)
 {
 	fir->delay = *data;
 	*data += fir->length; /* Point to next delay line start */
 }
-EXPORT_SYMBOL(fir_init_delay);
+LL_EXTENSION_SYMBOL(fir_init_delay);
 
 int32_t fir_32x16(struct fir_state_32x16 *fir, int32_t x)
 {
@@ -118,6 +118,7 @@ int32_t fir_32x16(struct fir_state_32x16 *fir, int32_t x)
 	/* Q2.46 -> Q2.31, saturate to Q1.31 */
 	return sat_int32(y >> shift);
 }
+LL_EXTENSION_SYMBOL(fir_32x16);
 
 void fir_32x16_2x(struct fir_state_32x16 *fir, int32_t x0, int32_t x1, int32_t *y0, int32_t *y1)
 {
@@ -184,5 +185,6 @@ void fir_32x16_2x(struct fir_state_32x16 *fir, int32_t x0, int32_t x1, int32_t *
 	*y0 = sat_int32(a0 >> shift);
 	*y1 = sat_int32(a1 >> shift);
 }
+LL_EXTENSION_SYMBOL(fir_32x16_2x);
 
 #endif
diff --git a/src/math/fir_hifi2ep.c b/src/math/fir_hifi2ep.c
index 7f3a2d42a829..8a471dfbb85b 100644
--- a/src/math/fir_hifi2ep.c
+++ b/src/math/fir_hifi2ep.c
@@ -33,7 +33,7 @@ void fir_reset(struct fir_state_32x16 *fir)
 	 * reset so omitting setting also fir->delay to NULL.
 	 */
 }
-EXPORT_SYMBOL(fir_reset);
+LL_EXTENSION_SYMBOL(fir_reset);
 
 int fir_delay_size(struct sof_fir_coef_data *config)
 {
@@ -49,7 +49,7 @@ int fir_delay_size(struct sof_fir_coef_data *config)
 	 */
 	return (config->length + 2) * sizeof(int32_t);
 }
-EXPORT_SYMBOL(fir_delay_size);
+LL_EXTENSION_SYMBOL(fir_delay_size);
 
 int fir_init_coef(struct fir_state_32x16 *fir,
 		  struct sof_fir_coef_data *config)
@@ -65,7 +65,7 @@ int fir_init_coef(struct fir_state_32x16 *fir,
 	fir->coef = (ae_p16x2s *)&config->coef[0];
 	return 0;
 }
-EXPORT_SYMBOL(fir_init_coef);
+LL_EXTENSION_SYMBOL(fir_init_coef);
 
 void fir_init_delay(struct fir_state_32x16 *fir, int32_t **data)
 {
@@ -74,7 +74,7 @@ void fir_init_delay(struct fir_state_32x16 *fir, int32_t **data)
 	fir->rwp = (ae_p24x2f *)(fir->delay + fir->length - 1);
 	*data += fir->length; /* Point to next delay line start */
 }
-EXPORT_SYMBOL(fir_init_delay);
+LL_EXTENSION_SYMBOL(fir_init_delay);
 
 void fir_get_lrshifts(struct fir_state_32x16 *fir, int *lshift,
 		      int *rshift)
@@ -82,7 +82,7 @@ void fir_get_lrshifts(struct fir_state_32x16 *fir, int *lshift,
 	*lshift = (fir->out_shift < 0) ? -fir->out_shift : 0;
 	*rshift = (fir->out_shift > 0) ? fir->out_shift : 0;
 }
-EXPORT_SYMBOL(fir_get_lrshifts);
+LL_EXTENSION_SYMBOL(fir_get_lrshifts);
 
 /* HiFi EP has the follow number of reqisters that should not be exceeded
  * 4x 56 bit registers in register file Q
@@ -156,6 +156,7 @@ void fir_32x16_hifiep(struct fir_state_32x16 *fir, int32_t x, int32_t *y, int ls
 	a = AE_SRAAQ56(AE_SLLASQ56S(a, lshift), rshift);
 	AE_SQ32F_I(AE_ROUNDSQ32SYM(a), (ae_q32s *)y, 0);
 }
+LL_EXTENSION_SYMBOL(fir_32x16_hifiep);
 
 /* HiFi EP has the follow number of reqisters that should not be exceeded
  * 4x 56 bit registers in register file Q
@@ -249,5 +250,6 @@ void fir_32x16_2x_hifiep(struct fir_state_32x16 *fir, int32_t x0, int32_t x1,
 	AE_SQ32F_I(AE_ROUNDSQ32SYM(b), (ae_q32s *)y1, 0);
 	AE_SQ32F_I(AE_ROUNDSQ32SYM(a), (ae_q32s *)y0, 0);
 }
+LL_EXTENSION_SYMBOL(fir_32x16_2x_hifiep);
 
 #endif
diff --git a/src/math/fir_hifi3.c b/src/math/fir_hifi3.c
index a9cb19e3072f..06822a438f8a 100644
--- a/src/math/fir_hifi3.c
+++ b/src/math/fir_hifi3.c
@@ -33,7 +33,7 @@ void fir_reset(struct fir_state_32x16 *fir)
 	 * reset so omitting setting also fir->delay to NULL.
 	 */
 }
-EXPORT_SYMBOL(fir_reset);
+LL_EXTENSION_SYMBOL(fir_reset);
 
 int fir_delay_size(struct sof_fir_coef_data *config)
 {
@@ -50,7 +50,7 @@ int fir_delay_size(struct sof_fir_coef_data *config)
 	 */
 	return (config->length + 2) * sizeof(int32_t);
 }
-EXPORT_SYMBOL(fir_delay_size);
+LL_EXTENSION_SYMBOL(fir_delay_size);
 
 int fir_init_coef(struct fir_state_32x16 *fir,
 		  struct sof_fir_coef_data *config)
@@ -66,7 +66,7 @@ int fir_init_coef(struct fir_state_32x16 *fir,
 	fir->coef = (ae_f16x4 *)&config->coef[0];
 	return 0;
 }
-EXPORT_SYMBOL(fir_init_coef);
+LL_EXTENSION_SYMBOL(fir_init_coef);
 
 void fir_init_delay(struct fir_state_32x16 *fir, int32_t **data)
 {
@@ -75,7 +75,7 @@ void fir_init_delay(struct fir_state_32x16 *fir, int32_t **data)
 	fir->rwp = (ae_int32 *)(fir->delay + fir->length - 1);
 	*data += fir->length; /* Point to next delay line start */
 }
-EXPORT_SYMBOL(fir_init_delay);
+LL_EXTENSION_SYMBOL(fir_init_delay);
 
 void fir_get_lrshifts(struct fir_state_32x16 *fir, int *lshift,
 		      int *rshift)
@@ -83,7 +83,7 @@ void fir_get_lrshifts(struct fir_state_32x16 *fir, int *lshift,
 	*lshift = (fir->out_shift < 0) ? -fir->out_shift : 0;
 	*rshift = (fir->out_shift > 0) ? fir->out_shift : 0;
 }
-EXPORT_SYMBOL(fir_get_lrshifts);
+LL_EXTENSION_SYMBOL(fir_get_lrshifts);
 
 /* HiFi EP has the follow number of reqisters that should not be exceeded
  * 4x 56 bit registers in register file Q
@@ -162,6 +162,7 @@ void fir_32x16_hifi3(struct fir_state_32x16 *fir, ae_int32 x, ae_int32 *y,
 	a = AE_SLAA64S(a, shift);
 	AE_S32_L_I(AE_ROUND32F48SSYM(a), (ae_int32 *)y, 0);
 }
+LL_EXTENSION_SYMBOL(fir_32x16_hifi3);
 
 /* HiFi EP has the follow number of reqisters that should not be exceeded
  * 4x 56 bit registers in register file Q
@@ -251,6 +252,6 @@ void fir_32x16_2x_hifi3(struct fir_state_32x16 *fir, ae_int32 x0, ae_int32 x1,
 	AE_S32_L_I(AE_ROUND32F48SSYM(b), (ae_int32 *)y1, 0);
 	AE_S32_L_I(AE_ROUND32F48SSYM(a), (ae_int32 *)y0, 0);
 }
-EXPORT_SYMBOL(fir_32x16_2x_hifi3);
+LL_EXTENSION_SYMBOL(fir_32x16_2x_hifi3);
 
 #endif
diff --git a/src/math/fir_llext/CMakeLists.txt b/src/math/fir_llext/CMakeLists.txt
new file mode 100644
index 000000000000..266075831ede
--- /dev/null
+++ b/src/math/fir_llext/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+sof_llext_build("fir"
+	SOURCES ../fir_common.c
+		../fir_generic.c
+		../fir_hifi2ep.c
+		../fir_hifi3.c
+)
diff --git a/src/math/fir_llext/llext.toml.h b/src/math/fir_llext/llext.toml.h
new file mode 100644
index 000000000000..fa2eab98627b
--- /dev/null
+++ b/src/math/fir_llext/llext.toml.h
@@ -0,0 +1,5 @@
+#include <tools/rimage/config/platform.toml>
+#include "../fir.toml"
+
+[module]
+count = __COUNTER__
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 6f29bc338778..4df2414edd1f 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -604,11 +604,17 @@ if(NOT CONFIG_COMP_IIR STREQUAL "n")
 	)
 endif()
 
-zephyr_library_sources_ifdef(CONFIG_MATH_FIR
-	${SOF_MATH_PATH}/fir_generic.c
-	${SOF_MATH_PATH}/fir_hifi2ep.c
-	${SOF_MATH_PATH}/fir_hifi3.c
-)
+if(CONFIG_MATH_FIR STREQUAL "m")
+	add_subdirectory(${SOF_MATH_PATH}/fir_llext
+			 ${PROJECT_BINARY_DIR}/fir_llext)
+	add_dependencies(app fir)
+elseif(CONFIG_MATH_FIR)
+	zephyr_library_sources(
+		${SOF_MATH_PATH}/fir_generic.c
+		${SOF_MATH_PATH}/fir_hifi2ep.c
+		${SOF_MATH_PATH}/fir_hifi3.c
+	)
+endif()
 
 zephyr_library_sources_ifdef(CONFIG_MATH_IIR_DF1
 	${SOF_MATH_PATH}/iir_df1_generic.c

From b83285d1601ab9f110d5dea957a32969f20216bf Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Tue, 16 Jul 2024 11:04:38 +0200
Subject: [PATCH 17/22] llext: change a function parameter

llext_manager_link() doesn't the whole of struct module_data, it only
needs a pointer to a pointer to struct llext. Modify it to only
receive the scope, that it needs.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/library_manager/llext_manager.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/library_manager/llext_manager.c b/src/library_manager/llext_manager.c
index f64461ede909..395c399483b4 100644
--- a/src/library_manager/llext_manager.c
+++ b/src/library_manager/llext_manager.c
@@ -220,7 +220,7 @@ static int llext_manager_unload_module(uint32_t module_id, const struct sof_man_
 }
 
 static int llext_manager_link(struct sof_man_fw_desc *desc, struct sof_man_module *mod,
-			      uint32_t module_id, struct module_data *md, const void **buildinfo,
+			      uint32_t module_id, struct llext **llext, const void **buildinfo,
 			      const struct sof_man_module_manifest **mod_manifest)
 {
 	size_t mod_size = desc->header.preload_page_count * PAGE_SZ - FILE_TEXT_OFFSET_V1_8;
@@ -233,14 +233,14 @@ static int llext_manager_link(struct sof_man_fw_desc *desc, struct sof_man_modul
 		.relocate_local = !ctx->segment[LIB_MANAGER_TEXT].size,
 		.pre_located = true,
 	};
-	int ret = llext_load(&ebl.loader, mod->name, &md->llext, &ldr_parm);
+	int ret = llext_load(&ebl.loader, mod->name, llext, &ldr_parm);
 
 	if (ret)
 		return ret;
 
 	ctx->segment[LIB_MANAGER_TEXT].addr = ebl.loader.sects[LLEXT_MEM_TEXT].sh_addr;
 	ctx->segment[LIB_MANAGER_TEXT].file_offset =
-		(uintptr_t)md->llext->mem[LLEXT_MEM_TEXT] - imr_base;
+		(uintptr_t)(*llext)->mem[LLEXT_MEM_TEXT] - imr_base;
 	ctx->segment[LIB_MANAGER_TEXT].size = ebl.loader.sects[LLEXT_MEM_TEXT].sh_size;
 
 	tr_dbg(&lib_manager_tr, ".text: start: %#lx size %#x offset %#x",
@@ -252,7 +252,7 @@ static int llext_manager_link(struct sof_man_fw_desc *desc, struct sof_man_modul
 	ctx->segment[LIB_MANAGER_RODATA].addr =
 		ebl.loader.sects[LLEXT_MEM_RODATA].sh_addr;
 	ctx->segment[LIB_MANAGER_RODATA].file_offset =
-		(uintptr_t)md->llext->mem[LLEXT_MEM_RODATA] - imr_base;
+		(uintptr_t)(*llext)->mem[LLEXT_MEM_RODATA] - imr_base;
 	ctx->segment[LIB_MANAGER_RODATA].size = ebl.loader.sects[LLEXT_MEM_RODATA].sh_size;
 
 	tr_dbg(&lib_manager_tr, ".rodata: start: %#lx size %#x offset %#x",
@@ -263,7 +263,7 @@ static int llext_manager_link(struct sof_man_fw_desc *desc, struct sof_man_modul
 	ctx->segment[LIB_MANAGER_DATA].addr =
 		ebl.loader.sects[LLEXT_MEM_DATA].sh_addr;
 	ctx->segment[LIB_MANAGER_DATA].file_offset =
-		(uintptr_t)md->llext->mem[LLEXT_MEM_DATA] - imr_base;
+		(uintptr_t)(*llext)->mem[LLEXT_MEM_DATA] - imr_base;
 	ctx->segment[LIB_MANAGER_DATA].size = ebl.loader.sects[LLEXT_MEM_DATA].sh_size;
 
 	tr_dbg(&lib_manager_tr, ".data: start: %#lx size %#x offset %#x",
@@ -317,8 +317,8 @@ uintptr_t llext_manager_allocate_module(struct processing_module *proc,
 	mod_array = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(0));
 
 	/* LLEXT linking is only needed once for all the modules in the library */
-	ret = llext_manager_link(desc, mod_array, module_id, &proc->priv, (const void **)&buildinfo,
-				 &mod_manifest);
+	ret = llext_manager_link(desc, mod_array, module_id, &proc->priv.llext,
+				 (const void **)&buildinfo, &mod_manifest);
 	if (ret < 0)
 		return 0;
 

From 21a52460d9019e585e9b728334bcec73a460500c Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Tue, 16 Jul 2024 12:33:09 +0200
Subject: [PATCH 18/22] llext: move the llext pointer to struct
 lib_manager_mod_ctx

The LLEXT context is currently bound to the Module Adapter API which
shouldn't be the case because we also need generic LLEXT-based
loadable SOF objects. This patch moves the context to struct
lib_manager_mod_ctx which is safe, because the library manager is
always needed when dynamically loading modules.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/audio/module_adapter/module/modules.c |  2 +-
 src/include/module/module/base.h          |  3 ---
 src/include/sof/lib_manager.h             |  6 ++++--
 src/include/sof/llext_manager.h           |  5 ++---
 src/library_manager/lib_manager.c         | 24 ++++++++---------------
 src/library_manager/llext_manager.c       |  5 ++---
 6 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/audio/module_adapter/module/modules.c b/src/audio/module_adapter/module/modules.c
index 9ad88d5a5bb7..468b416e9de6 100644
--- a/src/audio/module_adapter/module/modules.c
+++ b/src/audio/module_adapter/module/modules.c
@@ -61,7 +61,7 @@ static int modules_init(struct processing_module *mod)
 	const struct comp_ipc_config *config = &dev->ipc_config;
 	void *system_agent;
 
-	uintptr_t module_entry_point = lib_manager_allocate_module(mod, config, src_cfg);
+	uintptr_t module_entry_point = lib_manager_allocate_module(config, src_cfg);
 
 	if (module_entry_point == 0) {
 		comp_err(dev, "modules_init(), lib_manager_allocate_module() failed!");
diff --git a/src/include/module/module/base.h b/src/include/module/module/base.h
index d3f912957791..83b165f176f2 100644
--- a/src/include/module/module/base.h
+++ b/src/include/module/module/base.h
@@ -37,8 +37,6 @@ struct module_config {
 #endif
 };
 
-struct llext;
-
 /*
  * A structure containing a module's private data, intended for its exclusive use.
  *
@@ -60,7 +58,6 @@ struct module_data {
 	void *runtime_params;
 	struct module_memory memory; /**< memory allocated by module */
 	struct module_processing_data mpd; /**< shared data comp <-> module */
-	struct llext *llext; /**< Zephyr loadable extension context */
 #endif /* SOF_MODULE_PRIVATE */
 };
 
diff --git a/src/include/sof/lib_manager.h b/src/include/sof/lib_manager.h
index 4429efdd938b..30cbc80d6cb4 100644
--- a/src/include/sof/lib_manager.h
+++ b/src/include/sof/lib_manager.h
@@ -97,9 +97,12 @@ struct lib_manager_segment_desc {
 	size_t file_offset;
 };
 
+struct llext;
+
 struct lib_manager_mod_ctx {
 	void *base_addr;
 	const struct sof_man_module_manifest *mod_manifest;
+	struct llext *llext; /**< Zephyr loadable extension context */
 	struct lib_manager_segment_desc segment[LIB_MANAGER_N_SEGMENTS];
 };
 
@@ -184,8 +187,7 @@ struct processing_module;
  * Function is responsible to allocate module in available free memory and assigning proper address.
  * (WIP) These feature will contain module validation and proper memory management.
  */
-uintptr_t lib_manager_allocate_module(struct processing_module *proc,
-				      const struct comp_ipc_config *ipc_config,
+uintptr_t lib_manager_allocate_module(const struct comp_ipc_config *ipc_config,
 				      const void *ipc_specific_config);
 
 /*
diff --git a/src/include/sof/llext_manager.h b/src/include/sof/llext_manager.h
index 3192fdf7eeea..0022551159c5 100644
--- a/src/include/sof/llext_manager.h
+++ b/src/include/sof/llext_manager.h
@@ -22,8 +22,7 @@ static inline bool module_is_llext(const struct sof_man_module *mod)
 		mod->type.load_type == SOF_MAN_MOD_TYPE_LLEXT_AUX;
 }
 
-uintptr_t llext_manager_allocate_module(struct processing_module *proc,
-					const struct comp_ipc_config *ipc_config,
+uintptr_t llext_manager_allocate_module(const struct comp_ipc_config *ipc_config,
 					const void *ipc_specific_config);
 
 int llext_manager_free_module(const uint32_t component_id);
@@ -31,7 +30,7 @@ int llext_manager_free_module(const uint32_t component_id);
 bool comp_is_llext(struct comp_dev *comp);
 #else
 #define module_is_llext(mod) false
-#define llext_manager_allocate_module(proc, ipc_config, ipc_specific_config) 0
+#define llext_manager_allocate_module(ipc_config, ipc_specific_config) 0
 #define llext_manager_free_module(component_id) 0
 #define llext_unload(ext) 0
 #define comp_is_llext(comp) false
diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c
index 39885b4ed89c..c48204685552 100644
--- a/src/library_manager/lib_manager.c
+++ b/src/library_manager/lib_manager.c
@@ -339,8 +339,7 @@ static int lib_manager_free_module_instance(uint32_t module_id, uint32_t instanc
 	return sys_mm_drv_unmap_region((__sparse_force void *)va_base, bss_size);
 }
 
-uintptr_t lib_manager_allocate_module(struct processing_module *proc,
-				      const struct comp_ipc_config *ipc_config,
+uintptr_t lib_manager_allocate_module(const struct comp_ipc_config *ipc_config,
 				      const void *ipc_specific_config)
 {
 	const struct sof_man_module *mod;
@@ -359,7 +358,7 @@ uintptr_t lib_manager_allocate_module(struct processing_module *proc,
 	}
 
 	if (module_is_llext(mod))
-		return llext_manager_allocate_module(proc, ipc_config, ipc_specific_config);
+		return llext_manager_allocate_module(ipc_config, ipc_specific_config);
 
 	ret = lib_manager_load_module(module_id, mod);
 	if (ret < 0)
@@ -424,8 +423,7 @@ int lib_manager_free_module(const uint32_t component_id)
 
 #define PAGE_SZ		4096 /* equals to MAN_PAGE_SIZE used by rimage */
 
-uintptr_t lib_manager_allocate_module(struct processing_module *proc,
-				      const struct comp_ipc_config *ipc_config,
+uintptr_t lib_manager_allocate_module(const struct comp_ipc_config *ipc_config,
 				      const void *ipc_specific_config, const void **buildinfo)
 {
 	tr_err(&lib_manager_tr,
@@ -517,12 +515,10 @@ static struct comp_dev *lib_manager_module_create(const struct comp_driver *drv,
 	 * Variable used by llext_manager to temporary store llext handle before creation
 	 * a instance of processing_module.
 	 */
-	struct processing_module tmp_proc;
 	struct comp_dev *dev;
 
 	/* At this point module resources are allocated and it is moved to L2 memory. */
-	tmp_proc.priv.llext = NULL;
-	const uint32_t module_entry_point = lib_manager_allocate_module(&tmp_proc, config,
+	const uint32_t module_entry_point = lib_manager_allocate_module(config,
 									args->data);
 
 	if (!module_entry_point) {
@@ -549,28 +545,24 @@ static struct comp_dev *lib_manager_module_create(const struct comp_driver *drv,
 	}
 
 	dev = module_adapter_new(drv, config, spec);
-	if (dev) {
-		struct processing_module *mod = comp_mod(dev);
-
-		mod->priv.llext = tmp_proc.priv.llext;
-	} else {
+	if (!dev)
 		lib_manager_free_module(module_id);
-	}
+
 	return dev;
 }
 
 static void lib_manager_module_free(struct comp_dev *dev)
 {
 	struct processing_module *mod = comp_mod(dev);
-	struct llext *llext = mod->priv.llext;
 	const struct comp_ipc_config *const config = &mod->dev->ipc_config;
 	const uint32_t module_id = config->id;
+	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
 	int ret;
 
 	/* This call invalidates dev, mod and config pointers! */
 	module_adapter_free(dev);
 
-	if (!llext || !llext_unload(&llext)) {
+	if (!ctx->llext || !llext_unload(&ctx->llext)) {
 		/* Free module resources allocated in L2 memory. */
 		ret = lib_manager_free_module(module_id);
 		if (ret < 0)
diff --git a/src/library_manager/llext_manager.c b/src/library_manager/llext_manager.c
index 395c399483b4..7a9b7f97bdcf 100644
--- a/src/library_manager/llext_manager.c
+++ b/src/library_manager/llext_manager.c
@@ -291,8 +291,7 @@ static int llext_manager_link(struct sof_man_fw_desc *desc, struct sof_man_modul
 	return binfo_o >= 0 && mod_o >= 0 ? 0 : -EPROTO;
 }
 
-uintptr_t llext_manager_allocate_module(struct processing_module *proc,
-					const struct comp_ipc_config *ipc_config,
+uintptr_t llext_manager_allocate_module(const struct comp_ipc_config *ipc_config,
 					const void *ipc_specific_config)
 {
 	struct sof_man_fw_desc *desc;
@@ -317,7 +316,7 @@ uintptr_t llext_manager_allocate_module(struct processing_module *proc,
 	mod_array = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(0));
 
 	/* LLEXT linking is only needed once for all the modules in the library */
-	ret = llext_manager_link(desc, mod_array, module_id, &proc->priv.llext,
+	ret = llext_manager_link(desc, mod_array, module_id, &ctx->llext,
 				 (const void **)&buildinfo, &mod_manifest);
 	if (ret < 0)
 		return 0;

From 8d47ad3195943da036a883751823ca2374535def Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Fri, 23 Aug 2024 11:34:23 +0200
Subject: [PATCH 19/22] llext: (cosmetic) remove function names from logs

Zephyr logging adds function names automatically, no need to also
provide them explicitly in format strings.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/library_manager/llext_manager.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/library_manager/llext_manager.c b/src/library_manager/llext_manager.c
index 7a9b7f97bdcf..7d9a06b73437 100644
--- a/src/library_manager/llext_manager.c
+++ b/src/library_manager/llext_manager.c
@@ -303,13 +303,11 @@ uintptr_t llext_manager_allocate_module(const struct comp_ipc_config *ipc_config
 	const struct sof_module_api_build_info *buildinfo;
 	const struct sof_man_module_manifest *mod_manifest;
 
-	tr_dbg(&lib_manager_tr, "llext_manager_allocate_module(): mod_id: %#x",
-	       ipc_config->id);
+	tr_dbg(&lib_manager_tr, "mod_id: %#x", ipc_config->id);
 
 	desc = (struct sof_man_fw_desc *)lib_manager_get_library_manifest(module_id);
 	if (!ctx || !desc) {
-		tr_err(&lib_manager_tr,
-		       "llext_manager_allocate_module(): failed to get module descriptor");
+		tr_err(&lib_manager_tr, "Failed to get module descriptor");
 		return 0;
 	}
 
@@ -325,8 +323,7 @@ uintptr_t llext_manager_allocate_module(const struct comp_ipc_config *ipc_config
 		/* First instance: check that the module is native */
 		if (buildinfo->format != SOF_MODULE_API_BUILD_INFO_FORMAT ||
 		    buildinfo->api_version_number.full != SOF_MODULE_API_CURRENT_VERSION) {
-			tr_err(&lib_manager_tr,
-			       "llext_manager_allocate_module(): Unsupported module API version");
+			tr_err(&lib_manager_tr, "Unsupported module API version");
 			return -ENOEXEC;
 		}
 
@@ -356,7 +353,7 @@ int llext_manager_free_module(const uint32_t component_id)
 	const unsigned int base_module_id = LIB_MANAGER_GET_LIB_ID(module_id) <<
 		LIB_MANAGER_LIB_ID_SHIFT;
 
-	tr_dbg(&lib_manager_tr, "llext_manager_free_module(): mod_id: %#x", component_id);
+	tr_dbg(&lib_manager_tr, "mod_id: %#x", component_id);
 
 	mod = lib_manager_get_module_manifest(base_module_id);
 

From b8c5357cfb4262ca61e9e00736f81e4b6979f61c Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Fri, 23 Aug 2024 11:52:17 +0200
Subject: [PATCH 20/22] llext: call llext_unload() internally

Currently lib_manager_module_free() first checks, if an LLEXT module
is being freed. If so, it first calls llext_unload() and then - if
the use-count is reported as zero, calls llext_manager_free_module().
Simplify this process by just calling llext_manager_free_module() and
letting it handle llext_unload() internally.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/library_manager/lib_manager.c   | 11 ++++-------
 src/library_manager/llext_manager.c | 10 ++++++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c
index c48204685552..a68077a44a72 100644
--- a/src/library_manager/lib_manager.c
+++ b/src/library_manager/lib_manager.c
@@ -556,18 +556,15 @@ static void lib_manager_module_free(struct comp_dev *dev)
 	struct processing_module *mod = comp_mod(dev);
 	const struct comp_ipc_config *const config = &mod->dev->ipc_config;
 	const uint32_t module_id = config->id;
-	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
 	int ret;
 
 	/* This call invalidates dev, mod and config pointers! */
 	module_adapter_free(dev);
 
-	if (!ctx->llext || !llext_unload(&ctx->llext)) {
-		/* Free module resources allocated in L2 memory. */
-		ret = lib_manager_free_module(module_id);
-		if (ret < 0)
-			comp_err(dev, "modules_free(), lib_manager_free_module() failed!");
-	}
+	/* Free module resources allocated in L2 memory. */
+	ret = lib_manager_free_module(module_id);
+	if (ret < 0)
+		comp_err(dev, "modules_free(), lib_manager_free_module() failed!");
 }
 
 static void lib_manager_prepare_module_adapter(struct comp_driver *drv, const struct sof_uuid *uuid)
diff --git a/src/library_manager/llext_manager.c b/src/library_manager/llext_manager.c
index 7d9a06b73437..a8a68461e910 100644
--- a/src/library_manager/llext_manager.c
+++ b/src/library_manager/llext_manager.c
@@ -352,9 +352,19 @@ int llext_manager_free_module(const uint32_t component_id)
 	const uint32_t module_id = IPC4_MOD_ID(component_id);
 	const unsigned int base_module_id = LIB_MANAGER_GET_LIB_ID(module_id) <<
 		LIB_MANAGER_LIB_ID_SHIFT;
+	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(base_module_id);
 
 	tr_dbg(&lib_manager_tr, "mod_id: %#x", component_id);
 
+	if (!ctx->llext) {
+		tr_err(&lib_manager_tr, "NULL llext: ID %#x ctx %p", component_id, ctx);
+		return -ENOENT;
+	}
+
+	if (llext_unload(&ctx->llext))
+		/* More users are active */
+		return 0;
+
 	mod = lib_manager_get_module_manifest(base_module_id);
 
 	return llext_manager_unload_module(base_module_id, mod);

From 7381cd1f3667fad5955de63d2107fd820b414bf6 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Fri, 23 Aug 2024 12:51:25 +0200
Subject: [PATCH 21/22] llext: add auxiliary library dependency support

LLEXT modules can depend on other LLEXT auxiliary libraries. Zephyr
LLEXT core takes core to link them. This commit implements their
loading into and unloading from SRAM when the first dependent is
added or the last one is removed respectively.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/include/sof/llext_manager.h     |   3 +
 src/library_manager/lib_manager.c   |  11 ++-
 src/library_manager/llext_manager.c | 118 +++++++++++++++++++++++++---
 3 files changed, 118 insertions(+), 14 deletions(-)

diff --git a/src/include/sof/llext_manager.h b/src/include/sof/llext_manager.h
index 0022551159c5..cb6777142960 100644
--- a/src/include/sof/llext_manager.h
+++ b/src/include/sof/llext_manager.h
@@ -27,11 +27,14 @@ uintptr_t llext_manager_allocate_module(const struct comp_ipc_config *ipc_config
 
 int llext_manager_free_module(const uint32_t component_id);
 
+int llext_manager_add_library(const struct sof_man_module *mod, uint32_t module_id);
+
 bool comp_is_llext(struct comp_dev *comp);
 #else
 #define module_is_llext(mod) false
 #define llext_manager_allocate_module(ipc_config, ipc_specific_config) 0
 #define llext_manager_free_module(component_id) 0
+#define llext_manager_add_library(mod, module_id) 0
 #define llext_unload(ext) 0
 #define comp_is_llext(comp) false
 #endif
diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c
index a68077a44a72..c878b36e091b 100644
--- a/src/library_manager/lib_manager.c
+++ b/src/library_manager/lib_manager.c
@@ -1050,12 +1050,21 @@ int lib_manager_load_library(uint32_t dma_id, uint32_t lib_id, uint32_t type)
 	rfree((__sparse_force void *)man_tmp_buffer);
 
 cleanup:
-	core_kcps_adjust(cpu_get_id(), -(CLK_MAX_CPU_HZ / 1000));
 	rfree((void *)dma_ext->dma_addr);
 	lib_manager_dma_deinit(dma_ext, dma_id);
 	rfree(dma_ext);
 	_ext_lib->runtime_data = NULL;
 
+	uint32_t module_id = lib_id << LIB_MANAGER_LIB_ID_SHIFT;
+
+	const struct sof_man_module *mod = lib_manager_get_module_manifest(module_id);
+
+	if (module_is_llext(mod) && !ret)
+		/* Auxiliary LLEXT libraries need to be linked upon loading */
+		ret = llext_manager_add_library(mod, module_id);
+
+	core_kcps_adjust(cpu_get_id(), -(CLK_MAX_CPU_HZ / 1000));
+
 	if (!ret)
 		tr_info(&ipc_tr, "loaded library id: %u", lib_id);
 
diff --git a/src/library_manager/llext_manager.c b/src/library_manager/llext_manager.c
index a8a68461e910..d7bf466aa10a 100644
--- a/src/library_manager/llext_manager.c
+++ b/src/library_manager/llext_manager.c
@@ -104,7 +104,7 @@ static int llext_manager_load_data_from_storage(void __sparse_cache *vma, void *
 	return ret;
 }
 
-static int llext_manager_load_module(uint32_t module_id, const struct sof_man_module *mod)
+static int llext_manager_load_module(uint32_t module_id)
 {
 	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
 	uint8_t *load_base = (uint8_t *)ctx->base_addr;
@@ -185,9 +185,8 @@ static int llext_manager_load_module(uint32_t module_id, const struct sof_man_mo
 	return ret;
 }
 
-static int llext_manager_unload_module(uint32_t module_id, const struct sof_man_module *mod)
+static int llext_manager_unload_module(struct lib_manager_mod_ctx *ctx)
 {
-	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
 	/* Executable code (.text) */
 	void __sparse_cache *va_base_text = (void __sparse_cache *)
 		ctx->segment[LIB_MANAGER_TEXT].addr;
@@ -219,8 +218,9 @@ static int llext_manager_unload_module(uint32_t module_id, const struct sof_man_
 	return err;
 }
 
-static int llext_manager_link(struct sof_man_fw_desc *desc, struct sof_man_module *mod,
-			      uint32_t module_id, struct llext **llext, const void **buildinfo,
+static int llext_manager_link(const struct sof_man_fw_desc *desc, const struct sof_man_module *mod,
+			      uint32_t module_id, struct llext **llext,
+			      const struct sof_module_api_build_info **buildinfo,
 			      const struct sof_man_module_manifest **mod_manifest)
 {
 	size_t mod_size = desc->header.preload_page_count * PAGE_SZ - FILE_TEXT_OFFSET_V1_8;
@@ -291,10 +291,34 @@ static int llext_manager_link(struct sof_man_fw_desc *desc, struct sof_man_modul
 	return binfo_o >= 0 && mod_o >= 0 ? 0 : -EPROTO;
 }
 
+static int llext_lib_find(const struct llext *llext, struct lib_manager_mod_ctx **dep_ctx)
+{
+	struct ext_library *_ext_lib = ext_lib_get();
+	unsigned int i;
+
+	if (!llext)
+		return -EINVAL;
+
+	for (i = 0; i < ARRAY_SIZE(_ext_lib->desc); i++)
+		if (_ext_lib->desc[i] && _ext_lib->desc[i]->llext == llext) {
+			*dep_ctx = _ext_lib->desc[i];
+			return i;
+		}
+
+	return -ENOENT;
+}
+
+static void llext_depend_unlink(struct lib_manager_mod_ctx *dep_ctx[], int n)
+{
+	for (; n >= 0; n--)
+		if (dep_ctx[n]->llext->use_count == 1)
+			llext_manager_unload_module(dep_ctx[n]);
+}
+
 uintptr_t llext_manager_allocate_module(const struct comp_ipc_config *ipc_config,
 					const void *ipc_specific_config)
 {
-	struct sof_man_fw_desc *desc;
+	const struct sof_man_fw_desc *desc;
 	struct sof_man_module *mod_array;
 	int ret;
 	uint32_t module_id = IPC4_MOD_ID(ipc_config->id);
@@ -311,11 +335,16 @@ uintptr_t llext_manager_allocate_module(const struct comp_ipc_config *ipc_config
 		return 0;
 	}
 
-	mod_array = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(0));
+	mod_array = (struct sof_man_module *)((const char *)desc + SOF_MAN_MODULE_OFFSET(0));
 
-	/* LLEXT linking is only needed once for all the modules in the library */
+	/*
+	 * LLEXT linking is only needed once for all the modules in the library.
+	 * This calls llext_load(), which also takes references to any
+	 * dependencies, sets up sections and retrieves buildinfo and
+	 * mod_manifest
+	 */
 	ret = llext_manager_link(desc, mod_array, module_id, &ctx->llext,
-				 (const void **)&buildinfo, &mod_manifest);
+				 &buildinfo, &mod_manifest);
 	if (ret < 0)
 		return 0;
 
@@ -327,8 +356,49 @@ uintptr_t llext_manager_allocate_module(const struct comp_ipc_config *ipc_config
 			return -ENOEXEC;
 		}
 
+		int i;
+
+		/* Check if any dependencies need to be mapped */
+		for (i = 0; i < ARRAY_SIZE(ctx->llext->dependency); i++) {
+			/* Dependencies are filled from the beginning of the array upwards */
+			if (!ctx->llext->dependency[i])
+				break;
+
+			/*
+			 * Protected by the IPC serialization, but maybe we should protect the
+			 * use-count explicitly too. Currently the use-count is first incremented
+			 * when an auxiliary library is loaded, it was then additionally incremented
+			 * when the current dependent module was mapped. If it's higher than two,
+			 * then some other modules also depend on it and have already mapped it.
+			 */
+			if (ctx->llext->dependency[i]->use_count > 2)
+				continue;
+
+			/* First user of this dependency, load it into SRAM */
+			struct lib_manager_mod_ctx *dep_ctx[LLEXT_MAX_DEPENDENCIES];
+			int dep_id = llext_lib_find(ctx->llext->dependency[i], &dep_ctx[i]);
+
+			if (dep_id < 0) {
+				tr_err(&lib_manager_tr,
+				       "Unmet dependency: cannot find dependency %u", i);
+				continue;
+			}
+
+			tr_info(&lib_manager_tr, "%s depending on %s base %p, %u users",
+				ctx->llext->name,
+				ctx->llext->dependency[i]->name,
+				dep_ctx[i]->base_addr,
+				ctx->llext->dependency[i]->use_count);
+
+			ret = llext_manager_load_module(dep_id << LIB_MANAGER_LIB_ID_SHIFT);
+			if (ret < 0) {
+				llext_depend_unlink(dep_ctx, i - 1);
+				return 0;
+			}
+		}
+
 		/* Map executable code and data */
-		ret = llext_manager_load_module(module_id, mod_array);
+		ret = llext_manager_load_module(module_id);
 		if (ret < 0)
 			return 0;
 
@@ -348,7 +418,6 @@ uintptr_t llext_manager_allocate_module(const struct comp_ipc_config *ipc_config
 
 int llext_manager_free_module(const uint32_t component_id)
 {
-	const struct sof_man_module *mod;
 	const uint32_t module_id = IPC4_MOD_ID(component_id);
 	const unsigned int base_module_id = LIB_MANAGER_GET_LIB_ID(module_id) <<
 		LIB_MANAGER_LIB_ID_SHIFT;
@@ -361,13 +430,36 @@ int llext_manager_free_module(const uint32_t component_id)
 		return -ENOENT;
 	}
 
+	struct lib_manager_mod_ctx *dep_ctx[LLEXT_MAX_DEPENDENCIES] = {};
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(ctx->llext->dependency); i++)
+		if (llext_lib_find(ctx->llext->dependency[i], &dep_ctx[i]) < 0)
+			break;
+
 	if (llext_unload(&ctx->llext))
 		/* More users are active */
 		return 0;
 
-	mod = lib_manager_get_module_manifest(base_module_id);
+	/* Last user cleaning up, put dependencies */
+	if (i > 0)
+		llext_depend_unlink(dep_ctx, i - 1);
+
+	return llext_manager_unload_module(ctx);
+}
+
+/* An auxiliary library has been loaded, need to read in its exported symbols */
+int llext_manager_add_library(const struct sof_man_module *mod, uint32_t module_id)
+{
+	if (mod->type.load_type != SOF_MAN_MOD_TYPE_LLEXT_AUX)
+		return 0;
+
+	struct lib_manager_mod_ctx *const ctx = lib_manager_get_mod_ctx(module_id);
+	const struct sof_man_fw_desc *desc = lib_manager_get_library_manifest(module_id);
+	const struct sof_module_api_build_info *buildinfo;
+	const struct sof_man_module_manifest *mod_manifest;
 
-	return llext_manager_unload_module(base_module_id, mod);
+	return llext_manager_link(desc, mod, module_id, &ctx->llext, &buildinfo, &mod_manifest);
 }
 
 bool comp_is_llext(struct comp_dev *comp)

From 4bc7ca5f54c24f28f84bc113dcbe075cc9dc6d11 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Fri, 23 Aug 2024 14:30:05 +0200
Subject: [PATCH 22/22] test Zephyr PR 77473

Test https://github.com/zephyrproject-rtos/zephyr/pull/77473

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 4ae5c9285efc..8e8a9740678a 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: 494f88070f6bb909389630264e4f89c71072ae53
+      revision: pull/77473/head
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision