Kernel/user partition: remove the SOF DMA trace

AGENTS.md

@@ -29,12 +29,11 @@ memory-partition markers and Kconfig hierarchy are documented in
 [`src/include/sof/userspace/README.md`](src/include/sof/userspace/README.md). When adding or
 moving code, follow it:
 
-* **Place code in the right tier.** OS/HAL/boot/inter-core → a kernel-only directory
-  (`kernel/`, which is built into the `sof_kernel` library, and the directories not yet
-  moved there: `trace/`); audio
-  application logic → `audio/`; reusable pure code → a shared-library directory (`lib/`,
-  `math/`, `module/`) kept free of privileged operations. Each top-level directory's
-  `README.md` states its tier in a "Runs in:" banner — keep it accurate.
+* **Place code in the right tier.** OS/HAL/boot/inter-core → the kernel-only directory
+  (`kernel/`, which is built into the `sof_kernel` library); audio application logic →
+  `audio/`; reusable pure code → a shared-library directory (`lib/`, `math/`, `module/`) kept
+  free of privileged operations. Each top-level directory's `README.md` states its tier in a
+  "Runs in:" banner — keep it accurate.
 * **Cross the boundary only via a syscall.** Add a `__syscall` declaration, put the `z_vrfy_`
   validator in the boundary tier (preferably `zephyr/syscall/<subsystem>.c`), validate every
   user-supplied argument, and add the call to

app/boards/acp_7_0_adsp.conf

@@ -18,7 +18,6 @@ CONFIG_DMA_AMD_ACP_TDM=y
 CONFIG_DAI_AMD_TDM=y
 CONFIG_AMS=n
 CONFIG_WRAP_ACTUAL_POSITION=y
-CONFIG_TRACE=n
 CONFIG_COMP_VOLUME=y
 CONFIG_COMP_SRC=n
 CONFIG_COMP_FIR=n

app/boards/acp_7_x_adsp.conf

@@ -19,7 +19,6 @@ CONFIG_DAI_AMD_SDW=y
 CONFIG_DAI_AMD_TDM=y
 CONFIG_AMS=n
 CONFIG_WRAP_ACTUAL_POSITION=y
-CONFIG_TRACE=n
 CONFIG_COMP_VOLUME=y
 CONFIG_COMP_SRC=n
 CONFIG_COMP_FIR=n

app/boards/imx8mp_evk_mimx8ml8_adsp.conf

@@ -5,7 +5,6 @@ CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n
 CONFIG_DMA=y
 CONFIG_DMA_NXP_SDMA=y
 CONFIG_DAI_NXP_MICFIL=y
-CONFIG_TRACE=n
 CONFIG_SHARED_INTERRUPTS=y
 CONFIG_ZEPHYR_NATIVE_DRIVERS=y
 CONFIG_SAI_HAS_MCLK_CONFIG_OPTION=y

app/boards/intel_adsp_ace40_nvl.conf

@@ -31,7 +31,6 @@ CONFIG_LIBRARY_BUILD_LIB=y
 CONFIG_LIBRARY_DEFAULT_MODULAR=y
 
 # SOF / logging
-CONFIG_TRACE=n
 CONFIG_SOF_LOG_LEVEL_INF=y
 
 # Zephyr / OS features

app/boards/intel_adsp_ace40_nvls.conf

@@ -31,7 +31,6 @@ CONFIG_LIBRARY_BUILD_LIB=y
 CONFIG_LIBRARY_DEFAULT_MODULAR=y
 
 # SOF / logging
-CONFIG_TRACE=n
 CONFIG_SOF_LOG_LEVEL_INF=y
 
 # Zephyr / OS features

app/prj.conf

@@ -15,7 +15,6 @@ CONFIG_HAVE_AGENT=n
 CONFIG_MINIMAL_LIBC=y
 
 CONFIG_ZEPHYR_LOG=y
-CONFIG_TRACE=n
 CONFIG_LOG=y
 CONFIG_LOG_PRINTK=y
 # Log processing is offloaded to a low-priority thread.

doc/sof.doxygen.in

@@ -45,7 +45,6 @@ PREDEFINED	 = "__attribute__(x)= " \
 		   "CONFIG_FORMAT_S16LE=1" \
 		   "CONFIG_FORMAT_S32LE=1" \
 		   "CONFIG_FORMAT_S24LE=1" \
-		   "CONFIG_TRACE=1" \
 		   "CONFIG_IPC4=1" \
 		   "CONFIG_IPC3=1" \
 		   "CONFIG_IPC_MAJOR_4=1" \

posix/include/rtos/sof.h

@@ -17,7 +17,6 @@ struct clock_info;
 struct comp_driver_list;
 struct dai_info;
 struct dma_info;
-struct dma_trace_data;
 struct ipc;
 struct ll_schedule_domain;
 struct mm;
@@ -27,7 +26,6 @@ struct notify_data;
 struct pm_runtime_data;
 struct sa;
 struct timer;
-struct trace;
 struct pipeline_posn;
 struct probe_pdata;
 
@@ -49,11 +47,7 @@ struct sof {
 	/* system agent */
 	struct sa *sa;
 
-	/* DMA for Trace*/
-	struct dma_trace_data *dmat;
 
-	/* generic trace structure */
-	struct trace *trace;
 
 	/* platform clock information */
 	struct clock_info *clocks;

scripts/kernel_user_partition.txt

@@ -40,7 +40,6 @@ src/include/sof/drivers/*
 src/include/sof/platform.h
 src/include/sof/llext_manager.h
 src/include/sof/ipc/driver.h
-src/include/sof/trace/dma-trace.h
 src/include/sof/lib/agent.h
 src/include/sof/lib/cpu-clk-manager.h
 src/include/sof/lib/mailbox.h

src/CMakeLists.txt

@@ -12,6 +12,3 @@ endif()
 
 add_subdirectory(kernel)
 
-if (CONFIG_TRACE)
-	add_subdirectory(trace)
-endif()

src/Kconfig

@@ -6,8 +6,6 @@ rsource "kernel/platform/Kconfig"
 
 rsource "audio/Kconfig"
 
-rsource "trace/Kconfig"
-
 rsource "samples/Kconfig"
 
 rsource "schedule/Kconfig"

src/audio/Kconfig

@@ -422,14 +422,6 @@ config PCM_REMAPPING_CONVERTERS
 	  Enable conversion functions that perform both format conversion
 	  and channel remapping simultaneously.
 
-config TRACE_CHANNEL
-	int "TRACE DMA Channel configuration"
-	default 0
-	help
-	  This option is used for custom configuration of trace dma channel other
-	  than zero dma channel.Define macro DMA_TRACE_CHANNEL in platform to
-	  configure the required channel number.
-
 config WRAP_ACTUAL_POSITION
 	bool "Buffer wrapping"
 	help

src/audio/module_adapter/module/waves/waves.c

@@ -432,31 +432,6 @@ static int waves_effect_revision(struct processing_module *mod)
 		return -EINVAL;
 	}
 
-#if CONFIG_TRACEV
-	if (revision_len) {
-		const uint32_t *ptr = (uint32_t *)revision;
-		uint32_t len = revision_len / sizeof(uint32_t);
-		uint32_t idx = 0;
-
-		/* get requests from codec_adapter are not supported
-		 * printing strings is not supported
-		 * so dumping revision string to trace log as ascii values
-		 * if simply write a for loop here then depending on trace filtering settings
-		 * some parts of revision might not be printed - this is highly unwanted
-		 */
-		dump_hex(ptr, idx, len);
-		dump_hex(ptr, idx, len);
-		dump_hex(ptr, idx, len);
-		dump_hex(ptr, idx, len);
-		dump_hex(ptr, idx, len);
-		dump_hex(ptr, idx, len);
-		dump_hex(ptr, idx, len);
-		dump_hex(ptr, idx, len);
-		dump_hex(ptr, idx, len);
-		dump_hex(ptr, idx, len);
-	}
-#endif
-
 	comp_info(dev, "done");
 	return 0;
 }
@@ -528,20 +503,6 @@ static int waves_effect_message(struct processing_module *mod, void *data, uint3
 		}
 	}
 
-#if CONFIG_TRACEV
-	/* at time of writing codec adapter does not support getting something from codec
-	 * so response is stored to internal structure and dumped into trace messages
-	 */
-	if (response_size) {
-		uint32_t idx;
-		uint32_t len = response_size / sizeof(uint32_t);
-		const uint32_t *ptr = (uint32_t *)waves_codec->response;
-
-		for (idx = 0; idx < len; )
-			dump_hex(ptr, idx, len);
-	}
-#endif
-
 	return 0;
 }
 

src/debug/panic.c

@@ -87,10 +87,6 @@ void panic_dump(uint32_t p, struct sof_ipc_panic_info *panic_info,
 	dump_panicinfo(ext_offset, panic_info);
 	ext_offset += sizeof(struct sof_ipc_panic_info);
 
-#if CONFIG_TRACE
-	trace_flush_dma_to_mbox();
-#endif
-
 	/* Dump stack frames and override panic code 'p' if ext_offset is
 	 * off stack_limit. Find stack_ptr.
 	 */

src/include/sof/debug/debug.h

@@ -143,34 +143,5 @@
 	((n & 0x00FF0000) >> 8) | \
 	((n & 0xFF000000) >> 24); })
 
-#if CONFIG_TRACE
-/* dump up to 4 32-bit words into trace starting in ptr, idx is incremented inside
- * unconditionally swaps endianness of data
- * todo: use cpu_to_endianness so trace data will be independent of platform
- */
-#define dump_hex(ptr, idx, len) \
-	do { \
-		__typeof__(idx) __i = (idx); \
-		__typeof__(ptr) __p = (ptr) + __i; \
-		__typeof__(idx) __l = (len) - __i; \
-		__typeof__(idx) __n = __l > 4 ? 4 : __l; \
-		if (__n == 4) { \
-			comp_info(dev, "%08x%08x%08x%08x", bswap32(__p[0]), bswap32(__p[1]), \
-				  bswap32(__p[2]), bswap32(__p[3])); \
-		} else if (__n == 3) { \
-			comp_info(dev, "%08x%08x%08x", bswap32(__p[0]), bswap32(__p[1]), \
-				  bswap32(__p[2])); \
-		} else if (__n == 2) { \
-			comp_info(dev, "%08x%08x", bswap32(__p[0]), bswap32(__p[1])); \
-		} else if (__n == 1) { \
-			comp_info(dev, "%08x", bswap32(__p[0])); \
-		} \
-		idx += __n; \
-	} while (0)
-#else
-
-#define dump_hex() do {} while (0)
-
-#endif
 
 #endif /* __SOF_DEBUG_DEBUG_H__ */

src/include/sof/ipc/common.h

@@ -242,12 +242,6 @@ int ipc_process_host_buffer(struct ipc *ipc,
 			    struct dma_sg_elem_array *elem_array,
 			    uint32_t *ring_size);
 
-/**
- * \brief Send DMA trace host buffer position to host.
- * @return 0 on success.
- */
-int ipc_dma_trace_send_position(void);
-
 /**
  * \brief send a IPC buffer status notify message
  */

src/include/sof/ipc/msg.h

@@ -138,16 +138,4 @@ void ipc_build_stream_posn(struct sof_ipc_stream_posn *posn, uint32_t type,
 void ipc_build_comp_event(struct sof_ipc_comp_event *event, uint32_t type,
 			  uint32_t id);
 
-/**
- * \brief Check if trace buffer is ready for transmission.
- * @param[in,out] avail Data available in trace buffer
- */
-bool ipc_trigger_trace_xfer(uint32_t avail);
-
-/**
- * \brief Build trace position IPC message.
- * @param[in,out] posn Trace position message
- */
-void ipc_build_trace_posn(struct sof_ipc_dma_trace_posn *posn);
-
 #endif