Skip to content

dma-trace: Allow DMA re-configuration #4850

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
Oct 12, 2021
Merged

dma-trace: Allow DMA re-configuration #4850

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
fa37322
dma-trace: Implement clenaup on error in dma_trace_start()
ujfalusi Oct 7, 2021
69f2d54
dma-trace: Allow DMA re-configuration
ujfalusi Oct 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
1 change: 1 addition & 0 deletions src/include/sof/trace/dma-trace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ struct dma_trace_data {
uint32_t enabled;
uint32_t copy_in_progress;
uint32_t stream_tag;
uint32_t active_stream_tag;
uint32_t dma_copy_align; /**< Minimal chunk of data possible to be
* copied by dma connected to host
*/
Expand Down
40 changes: 37 additions & 3 deletions src/trace/dma-trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,35 @@ static int dma_trace_start(struct dma_trace_data *d)
return -ENODEV;
}

err = dma_copy_set_stream_tag(&d->dc, d->stream_tag);
if (d->dc.chan) {
/* We already have DMA channel for dtrace, stop it */
mtrace_printf(LOG_LEVEL_WARNING,
"dma_trace_start(): DMA reconfiguration (active stream_tag: %u)",
d->active_stream_tag);

err = dma_stop(d->dc.chan);
if (err < 0) {
mtrace_printf(LOG_LEVEL_ERROR,
"dma_trace_start(): DMA channel failed to stop");
Copy link
Collaborator

@marc-hb marc-hb Oct 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could adding some reference to the channel in the log be helpful?

} else if (d->active_stream_tag != d->stream_tag) {
/* Re-request a channel if different tag is provided */
mtrace_printf(LOG_LEVEL_WARNING,
"dma_trace_start(): stream_tag change from %u to %u",
d->active_stream_tag, d->stream_tag);

dma_channel_put(d->dc.chan);
d->dc.chan = NULL;
err = dma_copy_set_stream_tag(&d->dc, d->stream_tag);
}
} else {
err = dma_copy_set_stream_tag(&d->dc, d->stream_tag);
}

if (err < 0)
return err;

d->active_stream_tag = d->stream_tag;

/* size of every trace record */
elem_size = sizeof(uint64_t) * 2;

Expand All @@ -300,15 +325,24 @@ static int dma_trace_start(struct dma_trace_data *d)
config.direction,
elem_num, elem_size, elem_addr, 0);
if (err < 0)
return err;
goto err_alloc;

err = dma_set_config(d->dc.chan, &config);
if (err < 0) {
mtrace_printf(LOG_LEVEL_ERROR, "dma_set_config() failed: %d", err);
return err;
goto err_config;
}

err = dma_start(d->dc.chan);
if (err == 0)
return 0;

err_config:
dma_sg_free(&config.elem_array);

err_alloc:
dma_channel_put(d->dc.chan);
d->dc.chan = NULL;

return err;
}
Expand Down