Skip to content

[CIONLY] west: test for PR 86473 in zephyr #9867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tmleman wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

[CIONLY] west: test for PR 86473 in zephyr #9867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
297bd50
[CIONLY] west: test for PR 86473 in zephyr
tmleman Feb 28, 2025
4d57367
debug: enable mtrace autostart in debug overlay
tmleman Mar 3, 2025
09a0fb4
logging: fix mtrace backend activation on IPC log enable
tmleman Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/debug_overlay.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ CONFIG_DAI_VERBOSE_GLITCH_WARNINGS=y
# CONFIG_SYS_HEAP_VALIDATE=y
# CONFIG_SPIN_VALIDATE=y
# CONFIG_SPIN_LOCK_TIME_LIMIT=50000
CONFIG_LOG_BACKEND_ADSP_MTRACE_AUTOSTART=y
7 changes: 3 additions & 4 deletions src/ipc/ipc4/logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include <ipc4/error_status.h>
#include <ipc4/logging.h>
#if !CONFIG_LIBRARY
#include <zephyr/logging/log_backend.h>
#include <zephyr/logging/log.h>
#include <zephyr/logging/log_ctrl.h>
#endif
#if CONFIG_LOG_BACKEND_SOF_PROBE
#include <sof/probe/probe.h>
Expand Down Expand Up @@ -135,8 +135,7 @@ int ipc4_logging_enable_logs(bool first_block,

if (log_state->enable) {
adsp_mtrace_log_init(mtrace_log_hook);

log_backend_activate(log_backend, mtrace_log_hook);
log_backend_enable(log_backend, mtrace_log_hook, CONFIG_SOF_LOG_LEVEL);

mtrace_aging_timer = log_state->aging_timer_period;
if (mtrace_aging_timer < IPC4_MTRACE_AGING_TIMER_MIN_MS) {
Expand All @@ -150,7 +149,7 @@ int ipc4_logging_enable_logs(bool first_block,
schedule_task(&mtrace_task, mtrace_aging_timer * 1000, 0);
} else {
adsp_mtrace_log_init(NULL);
log_backend_deactivate(log_backend);
log_backend_disable(log_backend);
schedule_task_cancel(&mtrace_task);
}

Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ manifest:

- name: zephyr
repo-path: zephyr
revision: fe29c40a9366b5ffdcdd2eac26023ce4502413b1
revision: pull/86473/head
remote: zephyrproject

# Import some projects listed in zephyr/west.yml@revision
Expand Down
Loading