Skip to content

dma: SG elem lists replaced with arrays #458

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 1 commit into from
Oct 8, 2018
Merged

dma: SG elem lists replaced with arrays #458

Show file tree
Hide file tree
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
104 changes: 25 additions & 79 deletions src/audio/dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ static struct comp_dev *dai_new(struct sof_ipc_comp *comp)
goto error;
}

list_init(&dd->config.elem_list);
dma_sg_init(&dd->config.elem_array);
dd->dai_pos = NULL;
dd->dai_pos_blks = 0;
dd->xrun = 0;
Expand Down Expand Up @@ -248,11 +248,7 @@ static int dai_playback_params(struct comp_dev *dev)
struct dai_data *dd = comp_get_drvdata(dev);
struct dma_sg_config *config = &dd->config;
struct sof_ipc_comp_config *source_config;
struct dma_sg_elem *elem;
struct comp_buffer *dma_buffer;
struct list_item *elist;
struct list_item *tlist;
int i;
int err;
uint32_t buffer_size;

Expand Down Expand Up @@ -281,47 +277,28 @@ static int dai_playback_params(struct comp_dev *dev)
return err;
}

if (list_is_empty(&config->elem_list)) {
/* set up cyclic list of DMA elems */
for (i = 0; i < source_config->periods_sink; i++) {

elem = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM,
sizeof(*elem));
if (elem == NULL)
goto err_unwind;

elem->size = dd->period_bytes;
elem->src = (uintptr_t)(dma_buffer->r_ptr) +
i * dd->period_bytes;

elem->dest = dai_fifo(dd->dai, SOF_IPC_STREAM_PLAYBACK);

list_item_append(&elem->list, &config->elem_list);
if (!config->elem_array.elems) {
err = dma_sg_alloc(&config->elem_array, RZONE_RUNTIME,
config->direction,
source_config->periods_sink,
dd->period_bytes,
(uintptr_t)(dma_buffer->r_ptr),
dai_fifo(dd->dai, SOF_IPC_STREAM_PLAYBACK));
if (err < 0) {
trace_dai_error("ep3");
return err;
}
}

return 0;

err_unwind:
trace_dai_error("ep3");
list_for_item_safe(elist, tlist, &config->elem_list) {
elem = container_of(elist, struct dma_sg_elem, list);
list_item_del(&elem->list);
rfree(elem);
}
return -ENOMEM;
}

static int dai_capture_params(struct comp_dev *dev)
{
struct dai_data *dd = comp_get_drvdata(dev);
struct dma_sg_config *config = &dd->config;
struct sof_ipc_comp_config *sink_config;
struct dma_sg_elem *elem;
struct comp_buffer *dma_buffer;
struct list_item *elist;
struct list_item *tlist;
int i;
int err;
uint32_t buffer_size;

Expand Down Expand Up @@ -350,33 +327,20 @@ static int dai_capture_params(struct comp_dev *dev)
return err;
}

if (list_is_empty(&config->elem_list)) {
/* set up cyclic list of DMA elems */
for (i = 0; i < sink_config->periods_source; i++) {

elem = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM,
sizeof(*elem));
if (elem == NULL)
goto err_unwind;

elem->size = dd->period_bytes;
elem->dest = (uintptr_t)(dma_buffer->w_ptr) +
i * dd->period_bytes;
elem->src = dai_fifo(dd->dai, SOF_IPC_STREAM_CAPTURE);
list_item_append(&elem->list, &config->elem_list);
if (!config->elem_array.elems) {
err = dma_sg_alloc(&config->elem_array, RZONE_RUNTIME,
config->direction,
sink_config->periods_source,
dd->period_bytes,
(uintptr_t)(dma_buffer->w_ptr),
dai_fifo(dd->dai, SOF_IPC_STREAM_CAPTURE));
if (err < 0) {
trace_dai_error("ec3");
return err;
}
}

return 0;

err_unwind:
trace_dai_error("ec3");
list_for_item_safe(elist, tlist, &config->elem_list) {
elem = container_of(elist, struct dma_sg_elem, list);
list_item_del(&elem->list);
rfree(elem);
}
return -ENOMEM;
}

static int dai_params(struct comp_dev *dev)
Expand Down Expand Up @@ -450,7 +414,7 @@ static int dai_prepare(struct comp_dev *dev)

dev->position = 0;

if (list_is_empty(&dd->config.elem_list)) {
if (!dd->config.elem_array.elems) {
trace_dai_error("wdm");
comp_set_state(dev, COMP_TRIGGER_RESET);
return -EINVAL;
Expand Down Expand Up @@ -489,19 +453,12 @@ static int dai_reset(struct comp_dev *dev)
{
struct dai_data *dd = comp_get_drvdata(dev);
struct dma_sg_config *config = &dd->config;
struct list_item *elist;
struct list_item *tlist;
struct dma_sg_elem *elem;

trace_dai("res");

dma_channel_put(dd->dma, dd->chan);

list_for_item_safe(elist, tlist, &config->elem_list) {
elem = container_of(elist, struct dma_sg_elem, list);
list_item_del(&elem->list);
rfree(elem);
}
dma_sg_free(&config->elem_array);

dd->dai_pos_blks = 0;
if (dd->dai_pos)
Expand Down Expand Up @@ -750,21 +707,14 @@ static int dai_config(struct comp_dev *dev, struct sof_ipc_dai_config *config)
static void dai_cache(struct comp_dev *dev, int cmd)
{
struct dai_data *dd;
struct list_item *item;
struct dma_sg_elem *e;

switch (cmd) {
case COMP_CACHE_WRITEBACK_INV:
trace_dai("wtb");

dd = comp_get_drvdata(dev);

list_for_item(item, &dd->config.elem_list) {
e = container_of(item, struct dma_sg_elem, list);
dcache_writeback_invalidate_region(e, sizeof(*e));
dcache_writeback_invalidate_region(item,
sizeof(*item));
}
dma_sg_cache_wb_inv(&dd->config.elem_array);

dcache_writeback_invalidate_region(dd->dai, sizeof(*dd->dai));
dcache_writeback_invalidate_region(dd->dma, sizeof(*dd->dma));
Expand All @@ -782,11 +732,7 @@ static void dai_cache(struct comp_dev *dev, int cmd)
dcache_invalidate_region(dd->dma, sizeof(*dd->dma));
dcache_invalidate_region(dd->dai, sizeof(*dd->dai));

list_for_item(item, &dd->config.elem_list) {
dcache_invalidate_region(item, sizeof(*item));
e = container_of(item, struct dma_sg_elem, list);
dcache_invalidate_region(e, sizeof(*e));
}
dma_sg_cache_inv(&dd->config.elem_array);
break;
}
}
Expand Down
Loading