Skip to content
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.

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

ipc4: logging: fix builds with mtrace and probes both disabled #8222

Merged
Merged
Changes from all commits
Commits
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
ipc4: logging: fix builds with mtrace and probes both disabled
If both SOF_PROBES and MTRACE logging backends are disabled at build
time, IPC4 build failed due to undefined ipc4_logging_enable_logs().
Fixes a bug in commit 1721f70 ("logging: add logging through
probes").

Signed-off-by: Kai Vehmanen <[email protected]>
kv2019i committed Sep 19, 2023
commit c8d331166106b0ae2f69523fe2e6db3b843efe0c
13 changes: 11 additions & 2 deletions src/ipc/ipc4/logging.c
Original file line number Diff line number Diff line change
@@ -158,9 +158,8 @@ int ipc4_logging_enable_logs(bool first_block,
return 0;
}

#endif
#elif CONFIG_LOG_BACKEND_SOF_PROBE

#ifdef CONFIG_LOG_BACKEND_SOF_PROBE
int ipc4_logging_enable_logs(bool first_block,
bool last_block,
uint32_t data_offset_or_size,
@@ -196,6 +195,16 @@ int ipc4_logging_enable_logs(bool first_block,
return 0;
}

#else /* unsupported logging method */

int ipc4_logging_enable_logs(bool first_block,
bool last_block,
uint32_t data_offset_or_size,
const char *data)
{
return IPC4_UNKNOWN_MESSAGE_TYPE;
}

#endif

int ipc4_logging_shutdown(void)