Skip to content

Re-enable DMA trace initialization in Zephyr #4452

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

Closed
marc-hb wants to merge 3 commits into from
Closed

Re-enable DMA trace initialization in Zephyr #4452

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
e4febe6
zephyr_ll.c: declare missing ll_tr trace context
marc-hb Jul 6, 2021
13e245a
cavs/platform.c: don't guard trace initialization with #ifdef ZEPHYR
marc-hb Jul 6, 2021
76cbafd
ipc3/handler.c: re-enable DMA trace for Zephyr
marc-hb Jul 6, 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
4 changes: 2 additions & 2 deletions src/ipc/ipc3/handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ static int ipc_glb_pm_message(uint32_t header)
/*
* Debug IPC Operations.
*/
#if CONFIG_SUECREEK || defined __ZEPHYR__
#if CONFIG_SUECREEK
static int ipc_dma_trace_config(uint32_t header)
{
return 0;
Expand Down Expand Up @@ -799,7 +799,7 @@ static int ipc_dma_trace_config(uint32_t header)
error:
return err;
}
#endif /* CONFIG_SUECREEK || defined __ZEPHYR__ */
#endif /* CONFIG_SUECREEK */

static int ipc_trace_filter_update(uint32_t header)
{
Expand Down
3 changes: 1 addition & 2 deletions src/platform/intel/cavs/platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,6 @@ int platform_init(struct sof *sof)
if (ret < 0)
return ret;

#ifndef __ZEPHYR__
#if CONFIG_DW_SPI
/* initialize the SPI slave */
trace_point(TRACE_BOOT_PLATFORM_SPI);
Expand All @@ -530,7 +529,7 @@ int platform_init(struct sof *sof)

/* show heap status */
heap_trace_all(1);
#endif /* __ZEPHYR__ */

return 0;
}

Expand Down
6 changes: 6 additions & 0 deletions src/schedule/zephyr_ll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@

#include <kernel.h>

/* 1547fe68-de0c-11eb-8461-3158a1294853 */
DECLARE_SOF_UUID("zll-schedule", zll_sched_uuid, 0x1547fe68, 0xde0c, 0x11eb,
0x84, 0x61, 0x31, 0x58, 0xa1, 0x29, 0x48, 0x53);

DECLARE_TR_CTX(ll_tr, SOF_UUID(zll_sched_uuid), LOG_LEVEL_INFO);

/* per-scheduler data */
struct zephyr_ll {
struct list_item tasks; /* list of ll tasks */
Expand Down