OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

comp: dai: Verify config ib params() and be verbose about any errors 

Verify the configuration in params and send any errors to host and trace.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
This commit is contained in:
Liam Girdwood 2017-08-25 19:56:59 +01:00
parent 26e11996b6
commit 3d640ff6af
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/audio/dai.c
View File

@ -252,11 +252,15 @@ static int dai_playback_params(struct comp_dev *dev)
buffer_size = source_config->periods_sink * dd->period_bytes;
/* resize the buffer if space is available to align with period size */
if (buffer_size <= dma_buffer->alloc_size)
dma_buffer->size = buffer_size;
else {
trace_dai_error("eSz");
if (buffer_size == 0 || buffer_size > dma_buffer->alloc_size) {
trace_dai_error("ep1");
trace_value(source_config->periods_sink);
trace_value(dd->period_bytes);
trace_value(buffer_size);
trace_value(dma_buffer->alloc_size);
return -EINVAL;
} else {
dma_buffer->size = buffer_size;
}
if (list_is_empty(&config->elem_list)) {
@ -283,6 +287,7 @@ static int dai_playback_params(struct comp_dev *dev)
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);
@ -316,11 +321,15 @@ static int dai_capture_params(struct comp_dev *dev)
buffer_size = sink_config->periods_source * dd->period_bytes;
/* resize the buffer if space is available to align with period size */
if (buffer_size <= dma_buffer->alloc_size)
dma_buffer->size = buffer_size;
else {
trace_dai_error("eSz");
if (buffer_size == 0 || buffer_size > dma_buffer->alloc_size) {
trace_dai_error("ec1");
trace_value(sink_config->periods_sink);
trace_value(dd->period_bytes);
trace_value(buffer_size);
trace_value(dma_buffer->alloc_size);
return -EINVAL;
} else {
dma_buffer->size = buffer_size;
}
if (list_is_empty(&config->elem_list)) {
@ -345,6 +354,7 @@ static int dai_capture_params(struct comp_dev *dev)
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);
@ -368,7 +378,16 @@ static int dai_params(struct comp_dev *dev)
/* calculate period size based on config */
dev->frame_bytes = comp_frame_bytes(dev);
if (dev->frame_bytes == 0) {
trace_dai_error("ed1");
return -EINVAL;
}
dd->period_bytes = dev->frames * dev->frame_bytes;
if (dd->period_bytes == 0) {
trace_dai_error("ed2");
return -EINVAL;
}
if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK) {
dma_buffer = list_first_item(&dev->bsource_list,