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 <[email protected]>

Author: lyakh

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)

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.

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);

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
+)

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

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);

zephyr/CMakeLists.txt

@@ -549,6 +549,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
@@ -617,6 +623,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
 )