From 491d4bd6ecba15a2cdf000a714552f863bed921d Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Wed, 25 Sep 2024 15:11:07 +0300 Subject: [PATCH 1/2] app: shell_overlay: disable SOF telemetry perf measurements SOF telemetry performance measurement tools use the same window 3 as the DSP winstream log backend and the latter is enabled in the shell overlay. Disable the conflicting feature. Signed-off-by: Kai Vehmanen --- app/shell_overlay.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/shell_overlay.conf b/app/shell_overlay.conf index e50413b76a1d..963acd1d6e60 100644 --- a/app/shell_overlay.conf +++ b/app/shell_overlay.conf @@ -12,3 +12,9 @@ CONFIG_LOG_BACKEND_ADSP_MTRACE=n # as mtrace is disable, enable logging via winstream/window3 CONFIG_LOG_BACKEND_ADSP=y CONFIG_WINSTREAM_CONSOLE=y + +# The SOF telemetry performance measurements use +# the same window 3 as winstream ADSP log backend, so +# these must be disabled in order to use the console. +CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=n +CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=n From 206a23bdded88d14bf1c0ecae8f7ef9d79b8a437 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Wed, 25 Sep 2024 15:12:12 +0300 Subject: [PATCH 2/2] app: winconsole_overlay: disable SOF telemetry perf measurements SOF telemetry performance measurement tools use the same window 3 as the DSP winstream log backend, so the two cannot be enabled at the same time. Signed-off-by: Kai Vehmanen --- app/winconsole_overlay.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/winconsole_overlay.conf b/app/winconsole_overlay.conf index d9ddc206dde8..cc2ddf227fec 100644 --- a/app/winconsole_overlay.conf +++ b/app/winconsole_overlay.conf @@ -11,3 +11,9 @@ # CONFIG_LOG_BACKEND_ADSP=y CONFIG_WINSTREAM_CONSOLE=y + +# The SOF telemetry performance measurements use +# the same window 3 as winstream ADSP log backend, so +# these must be disabled in order to use the console. +CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=n +CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=n