Skip to content

Zephyr: fix log filtering #5066

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

Merged
lgirdwood merged 2 commits into from
Dec 25, 2021
Merged

Zephyr: fix log filtering #5066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4a60e1
Revert "trace: do not set trace_ctx section for Zephyr [REVERTME]"
marc-hb Dec 9, 2021
6a4e615
Revert "zephyr: fix build after a recent trace filter PR"
marc-hb Dec 9, 2021
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
2 changes: 1 addition & 1 deletion src/include/sof/trace/trace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ struct tr_ctx {
uint32_t level; /**< Default log level */
};

#if defined(UNIT_TEST) || defined(__ZEPHYR__)
#if defined(UNIT_TEST)
#define TRACE_CONTEXT_SECTION
#else
#define TRACE_CONTEXT_SECTION __section(".trace_ctx")
Expand Down
2 changes: 1 addition & 1 deletion src/trace/trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ struct sof_ipc_trace_filter_elem *trace_filter_fill(struct sof_ipc_trace_filter_
static int trace_filter_update_global(int32_t log_level, uint32_t uuid_id)
{
int cnt = 0;
#if !defined(__ZEPHYR__) && !defined(CONFIG_LIBRARY)
#if !defined(CONFIG_LIBRARY)
extern void *_trace_ctx_start;
extern void *_trace_ctx_end;
struct tr_ctx *ptr = (struct tr_ctx *)&_trace_ctx_start;
Expand Down