Skip to content

dma-trace: Align dma trace buffer correctly, fixed Zephyr dtrace issue#5329

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 3 commits into from
Feb 10, 2022
Merged

dma-trace: Align dma trace buffer correctly, fixed Zephyr dtrace issue #5329

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
d419849
dma-trace: Align DMA buffer correctly to fix dma tracing issues
jsarha Feb 8, 2022
d2b4056
drivers: Intel: hda-dma: DMA buffer address should be correctly aligned
jsarha Feb 8, 2022
0f65d69
dma-trace: Fix potential race issue by using blocking DMA copy
jsarha Feb 8, 2022
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
10 changes: 9 additions & 1 deletion src/drivers/intel/hda/hda-dma.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -818,12 +818,20 @@ static int hda_dma_set_config(struct dma_chan_data *channel,

/* buffer size must be multiple of hda dma burst size */
if (buffer_bytes % HDA_DMA_BUFFER_ALIGNMENT) {
tr_err(&hdma_tr, "hda-dmac: %d chan %d - buffer not DMA aligned 0x%x",
tr_err(&hdma_tr, "hda-dmac: %d chan %d - buffer size not DMA aligned 0x%x",
dma->plat_data.id,
channel->index, buffer_bytes);
ret = -EINVAL;
goto out;
}
/* buffer base address must be correctly aligned */
if (buffer_addr % HDA_DMA_BUFFER_ADDRESS_ALIGNMENT) {
tr_err(&hdma_tr, "hda-dmac: %d chan %d - buffer address not DMA aligned 0x%x",
dma->plat_data.id,
channel->index, buffer_addr);
ret = -EINVAL;
goto out;
}
hda_chan = dma_chan_get_data(channel);
hda_chan->period_bytes = period_bytes;
hda_chan->buffer_bytes = buffer_bytes;
Expand Down
4 changes: 2 additions & 2 deletions src/include/sof/lib/dma.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -541,8 +541,8 @@ int dma_copy_from_host_nowait(struct dma_copy *dc,
int32_t size);
Comment thread
jsarha marked this conversation as resolved.
Outdated

/* DMA copy data from DSP to host */
int dma_copy_to_host_nowait(struct dma_copy *dc, struct dma_sg_config *host_sg,
int32_t host_offset, void *local_ptr, int32_t size);
int dma_copy_to_host(struct dma_copy *dc, struct dma_sg_config *host_sg,
int32_t host_offset, void *local_ptr, int32_t size);
Comment thread
jsarha marked this conversation as resolved.
Outdated

int dma_copy_set_stream_tag(struct dma_copy *dc, uint32_t stream_tag);

Expand Down
10 changes: 5 additions & 5 deletions src/ipc/dma-copy.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,13 @@ static struct dma_sg_elem *sg_get_elem_at(struct dma_sg_config *host_sg,
*/
#if CONFIG_DMA_GW

int dma_copy_to_host_nowait(struct dma_copy *dc, struct dma_sg_config *host_sg,
int32_t host_offset, void *local_ptr, int32_t size)
int dma_copy_to_host(struct dma_copy *dc, struct dma_sg_config *host_sg,
int32_t host_offset, void *local_ptr, int32_t size)
{
int ret;

/* tell gateway to copy */
ret = dma_copy(dc->chan, size, 0);
ret = dma_copy(dc->chan, size, DMA_COPY_BLOCKING);
if (ret < 0)
return ret;

Expand All@@ -75,8 +75,8 @@ int dma_copy_to_host_nowait(struct dma_copy *dc, struct dma_sg_config *host_sg,

#else /* CONFIG_DMA_GW */

int dma_copy_to_host_nowait(struct dma_copy *dc, struct dma_sg_config *host_sg,
int32_t host_offset, void *local_ptr, int32_t size)
int dma_copy_to_host(struct dma_copy *dc, struct dma_sg_config *host_sg,
int32_t host_offset, void *local_ptr, int32_t size)
{
struct dma_sg_config config;
struct dma_sg_elem *host_sg_elem;
Expand Down
10 changes: 5 additions & 5 deletions src/probe/probe.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -201,15 +201,15 @@ static enum task_state probe_task(void *data)
int err;

if (_probe->ext_dma.dmapb.avail > 0)
err = dma_copy_to_host_nowait(&_probe->ext_dma.dc,
&_probe->ext_dma.config, 0,
(void *)_probe->ext_dma.dmapb.r_ptr,
_probe->ext_dma.dmapb.avail);
err = dma_copy_to_host(&_probe->ext_dma.dc,
&_probe->ext_dma.config, 0,
(void *)_probe->ext_dma.dmapb.r_ptr,
_probe->ext_dma.dmapb.avail);
else
return SOF_TASK_STATE_RESCHEDULE;

if (err < 0) {
tr_err(&pr_tr, "probe_task(): dma_copy_to_host_nowait() failed.");
tr_err(&pr_tr, "probe_task(): dma_copy_to_host() failed.");
return err;
}

Expand Down
25 changes: 19 additions & 6 deletions src/trace/dma-trace.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,10 +83,10 @@ static enum task_state trace_work(void *data)
d->copy_in_progress = 1;

/* copy this section to host */
size = dma_copy_to_host_nowait(&d->dc, config, d->posn.host_offset,
buffer->r_ptr, size);
size = dma_copy_to_host(&d->dc, config, d->posn.host_offset,
buffer->r_ptr, size);
if (size < 0) {
tr_err(&dt_tr, "trace_work(): dma_copy_to_host_nowait() failed");
tr_err(&dt_tr, "trace_work(): dma_copy_to_host() failed");
goto out;
}

Expand DownExpand Up@@ -223,10 +223,23 @@ static int dma_trace_buffer_init(struct dma_trace_data *d)
struct dma_trace_buf *buffer = &d->dmatb;
void *buf;
k_spinlock_key_t key;
uint32_t addr_align;
int err;

if (!d || !d->dc.dmac) {
mtrace_printf(LOG_LEVEL_ERROR,
"%s failed: no DMAC!", __func__);
return -ENODEV;
}

err = dma_get_attribute(d->dc.dmac, DMA_ATTR_BUFFER_ADDRESS_ALIGNMENT,
&addr_align);
if (err < 0)
return err;

/* allocate new buffer */
Comment thread
jsarha marked this conversation as resolved.
Outdated
buf = rballoc(0, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA,
DMA_TRACE_LOCAL_SIZE);
/* For DMA to work properly the buffer must be correctly aligned */
buf = rballoc_align(0, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA,
Comment thread
jsarha marked this conversation as resolved.
Outdated
DMA_TRACE_LOCAL_SIZE, addr_align);
if (!buf) {
tr_err(&dt_tr, "dma_trace_buffer_init(): alloc failed");
return -ENOMEM;
Expand Down