posix: add Zephyr logging and util stubs for testbench build

Add posix stub headers for <zephyr/logging/log.h> and
<zephyr/sys/util.h> so that firmware source files using LOG_ERR,
LOG_INF, LOG_WRN, LOG_DBG, KB, or MB can compile in the testbench /
posix build without modification.

Remove the #ifdef __ZEPHYR__ guard around the <zephyr/logging/log.h>
include in sof/trace/trace.h and the <zephyr/sys/util.h> include in
sof/common.h so the posix stubs are picked up automatically. The
redundant LOG_MODULE_REGISTER / LOG_MODULE_DECLARE definitions in
trace.h are removed since the posix stub now provides them. Remove the
macros and fix couple of format string issues.

Also the tools/logger CMakeList.txt requires some tuning to find the
now unconditionally included zephyr/sys/util.h.

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>

Author: Jyri Sarha

posix/include/zephyr/logging/log.h

@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+/*
+ * Copyright(c) 2026 Intel Corporation. All rights reserved.
+ *
+ * Stub for <zephyr/logging/log.h> used by testbench / posix builds.
+ */
+
+#ifndef __POSIX_ZEPHYR_LOGGING_LOG_H__
+#define __POSIX_ZEPHYR_LOGGING_LOG_H__
+
+#include <stdio.h>
+
+#ifndef LOG_ERR
+#define LOG_ERR(fmt, ...)	fprintf(stderr, "ERR: " fmt "\n", ##__VA_ARGS__)
+#endif
+#ifndef LOG_WRN
+#define LOG_WRN(fmt, ...)	fprintf(stderr, "WRN: " fmt "\n", ##__VA_ARGS__)
+#endif
+#ifndef LOG_INF
+#define LOG_INF(fmt, ...)	printf("INF: " fmt "\n", ##__VA_ARGS__)
+#endif
+#ifndef LOG_DBG
+#define LOG_DBG(fmt, ...)	do { } while (0)
+#endif
+
+#ifndef LOG_MODULE_REGISTER
+#define LOG_MODULE_REGISTER(ctx, level)
+#endif
+#ifndef LOG_MODULE_DECLARE
+#define LOG_MODULE_DECLARE(ctx, level)
+#endif
+
+#endif /* __POSIX_ZEPHYR_LOGGING_LOG_H__ */

posix/include/zephyr/sys/util.h

@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+/*
+ * Copyright(c) 2026 Intel Corporation. All rights reserved.
+ *
+ * Stub for <zephyr/sys/util.h> used by testbench / posix builds.
+ */
+
+#ifndef __POSIX_ZEPHYR_SYS_UTIL_H__
+#define __POSIX_ZEPHYR_SYS_UTIL_H__
+
+#include <stddef.h>
+
+#ifndef KB
+#define KB(x) (((size_t)(x)) << 10)
+#endif
+
+#ifndef MB
+#define MB(x) (KB(x) << 10)
+#endif
+
+#endif /* __POSIX_ZEPHYR_SYS_UTIL_H__ */

src/include/sof/common.h

@@ -14,9 +14,7 @@
 /* callers must check/use the return value */
 #define __must_check __attribute__((warn_unused_result))
 
-#ifdef __ZEPHYR__
 #include <zephyr/sys/util.h>
-#endif
 
 /* Align the number to the nearest alignment value */
 #ifndef IS_ALIGNED

src/include/sof/trace/trace.h

@@ -23,8 +23,8 @@
 
 #ifdef __ZEPHYR__
 #include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
 #endif
+#include <zephyr/logging/log.h>
 
 #if !CONFIG_LIBRARY
 #include <platform/trace/trace.h>
@@ -155,12 +155,4 @@ struct tr_ctx {
 		.level = default_log_level,			\
 	}
 
-/* Only define these two macros for XTOS to avoid the collision with
- * zephyr/include/zephyr/logging/log.h
- */
-#ifndef __ZEPHYR__
-#define LOG_MODULE_REGISTER(ctx, level)
-#define LOG_MODULE_DECLARE(ctx, level)
-#endif
-
 #endif /* __SOF_TRACE_TRACE_H__ */

tools/logger/CMakeLists.txt

@@ -38,6 +38,7 @@ target_compile_options(sof-logger PRIVATE
 
 target_include_directories(sof-logger PRIVATE
 	"${SOF_ROOT_SOURCE_DIRECTORY}/src/include"
+	"${SOF_ROOT_SOURCE_DIRECTORY}/posix/include"
 	"${SOF_ROOT_SOURCE_DIRECTORY}/tools/rimage/src/include"
 	"${SOF_ROOT_SOURCE_DIRECTORY}"
 )

zephyr/lib/fast-get.c

@@ -19,14 +19,7 @@
 #include <rtos/symbol.h>
 #include <ipc/topology.h>
 
-#ifdef __ZEPHYR__
 #include <zephyr/logging/log.h>
-#else
-#define LOG_DBG(...) do {} while (0)
-#define LOG_INF(...) do {} while (0)
-#define LOG_WRN(...) do {} while (0)
-#define LOG_ERR(...) do {} while (0)
-#endif
 
 struct sof_fast_get_entry {
 	const void *dram_ptr;
@@ -154,7 +147,7 @@ const void *fast_get(struct mod_alloc_ctx *alloc, const void *dram_ptr, size_t s
 
 	if (entry->sram_ptr) {
 		if (entry->size != size || entry->dram_ptr != dram_ptr) {
-			LOG_ERR("size %u != %u or ptr %p != %p mismatch",
+			LOG_ERR("size %zu != %zu or ptr %p != %p mismatch",
 				entry->size, size, entry->dram_ptr, dram_ptr);
 			ret = NULL;
 			goto out;