April 2018 - Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] [PATCH] sof: scripts: build rimage in xtensa scripts
by Pierre-Louis Bossart 04 Apr '18

04 Apr '18

rimage is not built by default, which can lead to disconnects and awful bugs when the memory layout changes. Add rimage build+install as default for xtensa scripts The BKM should be to rely on executing ./scripts/xtensa-build-all.sh [byt|cht|apl|cnl] instead of manual commands... Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- scripts/xtensa-build-all.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index 227254f..35ff9d9 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -6,6 +6,12 @@ set -e pwd=`pwd` +# make sure rimage is built and aligned with code +./configure --enable-rimage +make +sudo make install + +# now build the firmware (depends on rimage) rm -fr src/arch/xtensa/*.ri SUPPORTED_PLATFORMS=(byt cht bdw hsw apl cnl) -- 2.14.1

2 1

[Sound-open-firmware] [PATCH 0/3] Long overdue minor fixes
by Pierre-Louis Bossart 03 Apr '18

03 Apr '18

one patch to make the scripts more useful for people creating releases (i don't think we should use always-obsolete BKMs but working scripts) and two patches to fix coverity (was on the back burner since January...) Pierre-Louis Bossart (3): sof: scripts: force PATH to compile xtensa without environment dependencies sof: solve circular dependencies, move rmemcpy/arch_memcpy definitions mailbox: move multi-line macros to static inlines scripts/xtensa-build-all.sh | 1 + src/arch/xtensa/include/arch/reef.h | 5 --- src/arch/xtensa/include/arch/string.h | 40 ++++++++++++++++++++++++ src/include/reef/mailbox.h | 59 ++++++++++++++++++++++------------- src/include/reef/string.h | 47 ++++++++++++++++++++++++++++ 5 files changed, 125 insertions(+), 27 deletions(-) create mode 100644 src/arch/xtensa/include/arch/string.h create mode 100644 src/include/reef/string.h -- 2.14.1

2 4

[Sound-open-firmware] [PATCH] Host: fix error return handlings for some dma invokings.
by Keyon Jie 03 Apr '18

03 Apr '18

Add hanle for error on dma_set_config(), dma_start() and dma_copy(). Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/audio/host.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/src/audio/host.c b/src/audio/host.c index 930cace..d346b5e 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -462,14 +462,19 @@ static int host_trigger(struct comp_dev *dev, int cmd) ret = comp_set_state(dev, cmd); if (ret < 0) - return ret; + goto out; switch (cmd) { case COMP_TRIGGER_STOP: ret = host_stop(dev); break; case COMP_TRIGGER_START: - dma_start(hd->dma, hd->chan); + ret = dma_start(hd->dma, hd->chan); + if (ret < 0) { + trace_host_error("TsF"); + trace_error_value(ret); + goto out; + } /* preload first playback period for preloader task */ if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK) { @@ -485,6 +490,7 @@ static int host_trigger(struct comp_dev *dev, int cmd) break; } +out: return ret; } @@ -700,7 +706,12 @@ static int host_params(struct comp_dev *dev) trace_host_error("eDC"); return -ENODEV; } - dma_set_config(hd->dma, hd->chan, &hd->config); + err = dma_set_config(hd->dma, hd->chan, &hd->config); + if (err < 0) { + trace_host_error("eDc"); + dma_channel_put(hd->dma, hd->chan); + return err; + } #endif return 0; @@ -844,6 +855,7 @@ static int host_copy(struct comp_dev *dev) { struct host_data *hd = comp_get_drvdata(dev); struct dma_sg_elem *local_elem; + int ret; tracev_host("cpy"); @@ -888,13 +900,23 @@ static int host_copy(struct comp_dev *dev) host_gw_dma_update(dev); /* tell gateway to copy another period */ - dma_copy(hd->dma, hd->chan, hd->period_bytes); + ret = dma_copy(hd->dma, hd->chan, hd->period_bytes); + if (ret < 0) + goto out; #else /* do DMA transfer */ - dma_set_config(hd->dma, hd->chan, &hd->config); - dma_start(hd->dma, hd->chan); + ret = dma_set_config(hd->dma, hd->chan, &hd->config); + if (ret < 0) + goto out; + ret = dma_start(hd->dma, hd->chan); + if (ret < 0) + goto out; #endif return dev->frames; +out: + trace_host_error("CpF"); + trace_error_value(ret); + return ret; } struct comp_driver comp_host = { -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] Use tracev instead of trace for dai irq event.
by yan.wang＠linux.intel.com 02 Apr '18

02 Apr '18

From: Yan Wang <yan.wang(a)linux.intel.com> This event is in pipeline and will produce many trace data in a short time. It should use tracev to disable it by default. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Test with: Mininow max rt5651 and APL UP^2 nocodec and CNL nocodec SOF 1.1-stable: 7f9110c4c0ca26a67e0e4baa91e5f0bcc31a1c3e SOF-Tool 1.1-stable: 99c09871a85111e52d4fa68a4d6f96770d1aabbd https://github.com/plbossart/sound/tree/topic/sof-v4.14: c33cfed51fff5eb156dcf70ba849e6ffb3008377 --- src/audio/dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 1383c14..0a96ee1 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -79,7 +79,7 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) struct dai_data *dd = comp_get_drvdata(dev); struct comp_buffer *dma_buffer; - trace_dai("irq"); + tracev_dai("irq"); /* stop dma copy for pause/stop/xrun */ if (dev->state != COMP_STATE_ACTIVE || dd->xrun) { -- 2.14.3

3 2

[Sound-open-firmware] [PATCH] Revert "dai: copy: Move buffer pointer updates into dai_copy()"
by Liam Girdwood 02 Apr '18

02 Apr '18

This reverts commit 7f9110c4c0ca26a67e0e4baa91e5f0bcc31a1c3e. This does not work when both buffer data consumer and producer are DMACs. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/dai.c | 108 +++++++++++++++++++++++++++----------------------------- 1 file changed, 52 insertions(+), 56 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 1383c14f..ed2f9f65 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -78,6 +78,7 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) struct comp_dev *dev = (struct comp_dev *)data; struct dai_data *dd = comp_get_drvdata(dev); struct comp_buffer *dma_buffer; + uint32_t copied_size; trace_dai("irq"); @@ -113,6 +114,57 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) return; } + if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK) { + dma_buffer = list_first_item(&dev->bsource_list, + struct comp_buffer, sink_list); + + copied_size = dd->last_bytes ? dd->last_bytes : dd->period_bytes; + + /* recalc available buffer space */ + comp_update_buffer_consume(dma_buffer, copied_size); + + /* writeback buffer contents from cache */ + dcache_writeback_region(dma_buffer->r_ptr, copied_size); + + /* update host position(in bytes offset) for drivers */ + dev->position += copied_size; + if (dd->dai_pos) { + dd->dai_pos_blks += copied_size; + *dd->dai_pos = dd->dai_pos_blks + + dma_buffer->r_ptr - dma_buffer->addr; + } + + /* make sure there is availble bytes for next period */ + if (dma_buffer->avail < dd->period_bytes) { + trace_dai_error("xru"); + comp_underrun(dev, dma_buffer, copied_size, 0); + } + + } else { + dma_buffer = list_first_item(&dev->bsink_list, + struct comp_buffer, source_list); + + /* invalidate buffer contents */ + dcache_invalidate_region(dma_buffer->w_ptr, dd->period_bytes); + + /* recalc available buffer space */ + comp_update_buffer_produce(dma_buffer, dd->period_bytes); + + /* update positions */ + dev->position += dd->period_bytes; + if (dd->dai_pos) { + dd->dai_pos_blks += dd->period_bytes; + *dd->dai_pos = dd->dai_pos_blks + + dma_buffer->w_ptr - dma_buffer->addr; + } + + /* make sure there is free bytes for next period */ + if (dma_buffer->free < dd->period_bytes) { + trace_dai_error("xro"); + comp_overrun(dev, dma_buffer, dd->period_bytes, 0); + } + } + /* notify pipeline that DAI needs its buffer processed */ if (dev->state == COMP_STATE_ACTIVE) pipeline_schedule_copy(dev->pipeline, 0); @@ -550,62 +602,6 @@ static int dai_comp_trigger(struct comp_dev *dev, int cmd) /* copy and process stream data from source to sink buffers */ static int dai_copy(struct comp_dev *dev) { - struct dai_data *dd = comp_get_drvdata(dev); - struct comp_buffer *dma_buffer; - uint32_t copied_size; - - if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK) { - dma_buffer = list_first_item(&dev->bsource_list, - struct comp_buffer, sink_list); - - copied_size = dd->last_bytes ? - dd->last_bytes : dd->period_bytes; - - /* recalc available buffer space */ - comp_update_buffer_consume(dma_buffer, copied_size); - - /* writeback buffer contents from cache */ - dcache_writeback_region(dma_buffer->r_ptr, copied_size); - - /* update host position(in bytes offset) for drivers */ - dev->position += copied_size; - if (dd->dai_pos) { - dd->dai_pos_blks += copied_size; - *dd->dai_pos = dd->dai_pos_blks + - dma_buffer->r_ptr - dma_buffer->addr; - } - - /* make sure there is available bytes for next period */ - if (dma_buffer->avail < dd->period_bytes) { - trace_dai_error("xru"); - comp_underrun(dev, dma_buffer, copied_size, 0); - } - - } else { - dma_buffer = list_first_item(&dev->bsink_list, - struct comp_buffer, source_list); - - /* invalidate buffer contents */ - dcache_invalidate_region(dma_buffer->w_ptr, dd->period_bytes); - - /* recalc available buffer space */ - comp_update_buffer_produce(dma_buffer, dd->period_bytes); - - /* update positions */ - dev->position += dd->period_bytes; - if (dd->dai_pos) { - dd->dai_pos_blks += dd->period_bytes; - *dd->dai_pos = dd->dai_pos_blks + - dma_buffer->w_ptr - dma_buffer->addr; - } - - /* make sure there is free bytes for next period */ - if (dma_buffer->free < dd->period_bytes) { - trace_dai_error("xro"); - comp_overrun(dev, dma_buffer, dd->period_bytes, 0); - } - } - return 0; } -- 2.14.1

1 0