Skip to content

dai-zephyr: check max block count supported by DMA #6823

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
kv2019i merged 1 commit into from
Jan 4, 2023
Merged

dai-zephyr: check max block count supported by DMA #6823

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 44 additions & 2 deletions src/audio/dai-zephyr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ static int dai_playback_params(struct comp_dev *dev, uint32_t period_bytes,
*local_buf = buffer_acquire(dd->local_buffer);
uint32_t local_fmt = local_buf->stream.frame_fmt;
uint32_t dma_fmt = dma_buf->stream.frame_fmt;
uint32_t fifo;
uint32_t fifo, max_block_count, buf_size;
int i, err = 0;

buffer_release(local_buf);
Expand Down Expand Up @@ -487,6 +487,27 @@ static int dai_playback_params(struct comp_dev *dev, uint32_t period_bytes,

comp_info(dev, "dai_playback_params() fifo 0x%x", fifo);

err = dma_get_attribute(dd->dma->z_dev, DMA_ATTR_MAX_BLOCK_COUNT,
&max_block_count);
if (err < 0) {
comp_err(dev, "dai_playback_params(): could not get dma attr max block count, err = %d", err);
goto out;
}

if (max_block_count < period_count) {
comp_dbg(dev, "dai_playback_params(): block count = %d not supported by DMA", period_count);
buf_size = period_count * period_bytes;
do {
if (IS_ALIGNED(buf_size, max_block_count)) {
period_count = max_block_count;
period_bytes = buf_size / period_count;
break;
} else {
comp_warn(dev, "dai_playback_params(): alignment error for buffer = %d, block count = %d", buf_size, max_block_count);
}
} while (--max_block_count > 0);
}

err = dma_sg_alloc(&config->elem_array, SOF_MEM_ZONE_RUNTIME,
config->direction,
period_count,
Expand Down Expand Up @@ -569,7 +590,7 @@ static int dai_capture_params(struct comp_dev *dev, uint32_t period_bytes,
*local_buf = buffer_acquire(dd->local_buffer);
uint32_t local_fmt = local_buf->stream.frame_fmt;
uint32_t dma_fmt = dma_buf->stream.frame_fmt;
uint32_t fifo;
uint32_t fifo, max_block_count, buf_size;
int i, err = 0;

buffer_release(local_buf);
Expand Down Expand Up @@ -616,6 +637,27 @@ static int dai_capture_params(struct comp_dev *dev, uint32_t period_bytes,

comp_info(dev, "dai_capture_params() fifo 0x%x", fifo);

err = dma_get_attribute(dd->dma->z_dev, DMA_ATTR_MAX_BLOCK_COUNT,
&max_block_count);
if (err < 0) {
comp_err(dev, "dai_capture_params(): could not get dma attr max block count, err = %d", err);
goto out;
}

if (max_block_count < period_count) {
comp_dbg(dev, "dai_capture_params(): block count = %d not supported by DMA", period_count);
buf_size = period_count * period_bytes;
do {
if (IS_ALIGNED(buf_size, max_block_count)) {
period_count = max_block_count;
period_bytes = buf_size / period_count;
break;
} else {
comp_warn(dev, "dai_capture_params(): alignment error for buffer = %d, block count = %d", buf_size, max_block_count);
}
} while (--max_block_count > 0);
}

err = dma_sg_alloc(&config->elem_array, SOF_MEM_ZONE_RUNTIME,
config->direction,
period_count,
Expand Down