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

[Sound-open-firmware] [RFC/RFT] dai: Make system stable by moving DAI buffer pointer update location
by Keyon Jie 31 Mar '18

31 Mar '18

From: Wu Zhigang <zhigang.wu(a)linux.intel.com> Move the DAI's buffer pointer update location from dai_dma_cb() to dai_copy(). This will make pipeline more stable. The xrun possibility will be lower.Even in xrun it will recover, it will not have dsp oops. DAI's buffer pointer will be updated in the pipeline copy sequence as other components did. Then the DMA will not update the buffer pointer by itself. in HOST--->VOL--->DAI pipeline, when DMA finished, it has to reschedule the pipeline to let the pointer update. this could avoid the xrun when adjust the read and write pointers by different componets. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> Tested-by: Keyon Jie <yang.jie(a)linux.intel.com> --- Tested on APL-GPMRB kernel: sof-v4.14 commit <c33cfed51fff5eb156dcf70ba849e6ffb3008377> sof: 1.1-stable commit <949de92142aa9cdd4a31fda68f05d29212683cc1> tools: 1.1-stable commit <b799e3fa3bab7f5df70f2458bda42de167e65fb3> RFT: can someone help test it on byt also? src/audio/dai.c | 108 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 52 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index e1ea9ab..6d0c1fa 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -78,7 +78,6 @@ 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"); @@ -114,57 +113,6 @@ 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); @@ -607,6 +555,62 @@ 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

3 3

[Sound-open-firmware] [PATCH] dai: handle xrun with more clear logic
by Keyon Jie 30 Mar '18

30 Mar '18

1. xrun happens. 2. trigger pipeline xrun and recover. 3. set dd->xrun in XRUN cmd from pipeline recover. 4. stop dma and reset buffer to 0s. 5. dai prepare and clear dd->xrun in prepare calling from recover. 6. start dma again in START cmd from pipeline recover. This fix APL pause/release Xrun issue in my test. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/audio/dai.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 2888c40..e1ea9ab 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -82,8 +82,8 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) trace_dai("irq"); - /* is stream stopped or paused and we are not handling XRUN ? */ - if (dev->state != COMP_STATE_ACTIVE && dd->xrun == 0) { + /* stop dma copy for pause/stop/xrun */ + if (dev->state != COMP_STATE_ACTIVE || dd->xrun) { /* stop the DAI */ dai_trigger(dd->dai, COMP_TRIGGER_STOP, dev->params.direction); @@ -111,9 +111,6 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) dcache_writeback_region(dma_buffer->addr, dma_buffer->size); } - - /* inform waiters */ - wait_completed(&dd->complete); return; } @@ -456,8 +453,11 @@ static int dai_prepare(struct comp_dev *dev) } /* dma reconfig not required if XRUN handling */ - if (dd->xrun) + if (dd->xrun) { + /* after prepare, we have recovered from xrun */ + dd->xrun = 0; return ret; + } ret = dma_set_config(dd->dma, dd->chan, &dd->config); if (ret < 0) -- 2.14.1

2 1

[Sound-open-firmware] [PATCH v2] cnl: core: Add support for xcc
by Liam Girdwood 30 Mar '18

30 Mar '18

xcc has more strict rules than gcc: - Add missing sections to linker scripts - Fix compile warnings - Extend memory enabling timeout to infinite (too small delay for xcc) Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> # Conflicts: # src/platform/apollolake/platform.c # src/platform/cannonlake/platform.c --- rimage/manifest.c | 9 +- rimage/manifest.h | 3 + src/arch/xtensa/boot_loader.c | 11 +-- .../apollolake/include/platform/platform.h | 2 +- src/platform/apollolake/platform.c | 98 +++++++++++----------- src/platform/baytrail/platform.c | 84 ++++++++++--------- src/platform/cannonlake/boot_ldr.x.in | 7 +- src/platform/cannonlake/cannonlake.x.in | 49 +++++------ .../cannonlake/include/platform/platform.h | 2 +- src/platform/cannonlake/platform.c | 98 +++++++++++----------- src/platform/haswell/platform.c | 84 ++++++++++--------- 11 files changed, 230 insertions(+), 217 deletions(-) diff --git a/rimage/manifest.c b/rimage/manifest.c index 243c194f..f3f85600 100644 --- a/rimage/manifest.c +++ b/rimage/manifest.c @@ -211,11 +211,18 @@ static int man_get_module_manifest(struct image *image, struct module *module, section = &module->section[man_section_idx]; /* load in manifest data */ - ret = fseek(module->fd, section->sh_offset, SEEK_SET); + /* module built using xcc has preceding bytes */ + if (section->sh_size > sizeof(sof_mod)) + ret = fseek(module->fd, + section->sh_offset + XCC_MOD_OFFSET, SEEK_SET); + else + ret = fseek(module->fd, section->sh_offset, SEEK_SET); + if (ret < 0) { fprintf(stderr, "error: can't seek to section %d\n", ret); return ret; } + count = fread(&sof_mod, 1, sizeof(sof_mod), module->fd); if (count != sizeof(sof_mod)) { fprintf(stderr, "error: can't read section %d\n", -errno); diff --git a/rimage/manifest.h b/rimage/manifest.h index ca951321..8d1d3d2c 100644 --- a/rimage/manifest.h +++ b/rimage/manifest.h @@ -22,6 +22,9 @@ #define MAN_PAGE_SIZE 4096 +/* start offset for modules built using xcc */ +#define XCC_MOD_OFFSET 0x8 + /* start offset for base FW module */ #define FILE_TEXT_OFFSET 0x8000 diff --git a/src/arch/xtensa/boot_loader.c b/src/arch/xtensa/boot_loader.c index 862db458..05d6bf90 100644 --- a/src/arch/xtensa/boot_loader.c +++ b/src/arch/xtensa/boot_loader.c @@ -121,7 +121,7 @@ static void parse_manifest(void) /* power on HPSRAM */ static int32_t hp_sram_init(void) { - int delay_count = 256, timeout = 256; + int delay_count = 256; uint32_t status; shim_write(SHIM_LDOCTL, SHIM_HPMEM_POWER_ON); @@ -141,24 +141,15 @@ static int32_t hp_sram_init(void) status = io_reg_read(HSPGISTS0); while (status) { idelay(delay_count); - status = io_reg_read(HSPGISTS0); - if (timeout-- < 0) { - return -EIO; - } } /* query the power status of second part of HP memory */ /* and do as above code */ - timeout = 256; status = io_reg_read(HSPGISTS1); while (status) { idelay(delay_count); - status = io_reg_read(HSPGISTS1); - if (timeout-- < 0) { - return -EIO; - } } /* add some delay before touch power register */ diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index 86172bfa..3a2d40bc 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -125,7 +125,7 @@ struct reef; #define platform_trace_point(__x) \ sw_reg_write(SRAM_REG_FW_TRACEP, __x) -struct timer *platform_timer; +extern struct timer *platform_timer; /* * APIs declared here are defined for every platform and IPC mechanism. diff --git a/src/platform/apollolake/platform.c b/src/platform/apollolake/platform.c index 2b41028b..ce408da6 100644 --- a/src/platform/apollolake/platform.c +++ b/src/platform/apollolake/platform.c @@ -78,54 +78,56 @@ static const struct sof_ipc_window sram_window = { .type = SOF_IPC_EXT_WINDOW, }, .num_windows = NUM_APL_WINDOWS, - .window[0] = { - .type = SOF_IPC_REGION_REGS, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_SW_REG_SIZE, - .offset = 0, - }, - .window[1] = { - .type = SOF_IPC_REGION_UPBOX, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_DSPBOX_SIZE, - .offset = MAILBOX_SW_REG_SIZE, - }, - .window[2] = { - .type = SOF_IPC_REGION_DOWNBOX, - .id = 1, /* map to host window 1 */ - .flags = 0, // TODO: set later - .size = MAILBOX_HOSTBOX_SIZE, - .offset = 0, - }, - .window[3] = { - .type = SOF_IPC_REGION_DEBUG, - .id = 2, /* map to host window 2 */ - .flags = 0, // TODO: set later - .size = MAILBOX_DEBUG_SIZE, - .offset = 0, - }, - .window[4] = { - .type = SOF_IPC_REGION_EXCEPTION, - .id = 2, /* map to host window 2 */ - .flags = 0, // TODO: set later - .size = MAILBOX_EXCEPTION_SIZE, - .offset = MAILBOX_EXCEPTION_OFFSET, - }, - .window[5] = { - .type = SOF_IPC_REGION_STREAM, - .id = 2, /* map to host window 2 */ - .flags = 0, // TODO: set later - .size = MAILBOX_STREAM_SIZE, - .offset = MAILBOX_STREAM_OFFSET, - }, - .window[6] = { - .type = SOF_IPC_REGION_TRACE, - .id = 3, /* map to host window 3 */ - .flags = 0, // TODO: set later - .size = MAILBOX_TRACE_SIZE, - .offset = 0, + .window = { + { + .type = SOF_IPC_REGION_REGS, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_SW_REG_SIZE, + .offset = 0, + }, + { + .type = SOF_IPC_REGION_UPBOX, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_DSPBOX_SIZE, + .offset = MAILBOX_SW_REG_SIZE, + }, + { + .type = SOF_IPC_REGION_DOWNBOX, + .id = 1, /* map to host window 1 */ + .flags = 0, // TODO: set later + .size = MAILBOX_HOSTBOX_SIZE, + .offset = 0, + }, + { + .type = SOF_IPC_REGION_DEBUG, + .id = 2, /* map to host window 2 */ + .flags = 0, // TODO: set later + .size = MAILBOX_EXCEPTION_SIZE + MAILBOX_DEBUG_SIZE, + .offset = 0, + }, + { + .type = SOF_IPC_REGION_EXCEPTION, + .id = 2, /* map to host window 2 */ + .flags = 0, // TODO: set later + .size = MAILBOX_EXCEPTION_SIZE, + .offset = MAILBOX_EXCEPTION_OFFSET, + }, + { + .type = SOF_IPC_REGION_STREAM, + .id = 2, /* map to host window 2 */ + .flags = 0, // TODO: set later + .size = MAILBOX_STREAM_SIZE, + .offset = MAILBOX_STREAM_OFFSET, + }, + { + .type = SOF_IPC_REGION_TRACE, + .id = 3, /* map to host window 3 */ + .flags = 0, // TODO: set later + .size = MAILBOX_TRACE_SIZE, + .offset = 0, + }, }, }; diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index 8fa03a75..1917054e 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -79,47 +79,49 @@ static const struct sof_ipc_window sram_window = { .type = SOF_IPC_EXT_WINDOW, }, .num_windows = NUM_BYT_WINDOWS, - .window[0] = { - .type = SOF_IPC_REGION_UPBOX, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_DSPBOX_SIZE, - .offset = MAILBOX_DSPBOX_OFFSET, - }, - .window[1] = { - .type = SOF_IPC_REGION_DOWNBOX, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_HOSTBOX_SIZE, - .offset = MAILBOX_HOSTBOX_OFFSET, - }, - .window[2] = { - .type = SOF_IPC_REGION_DEBUG, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_DEBUG_SIZE, - .offset = MAILBOX_DEBUG_OFFSET, - }, - .window[3] = { - .type = SOF_IPC_REGION_TRACE, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_TRACE_SIZE, - .offset = MAILBOX_TRACE_OFFSET, - }, - .window[4] = { - .type = SOF_IPC_REGION_STREAM, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_STREAM_SIZE, - .offset = MAILBOX_STREAM_OFFSET, - }, - .window[5] = { - .type = SOF_IPC_REGION_EXCEPTION, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_EXCEPTION_SIZE, - .offset = MAILBOX_EXCEPTION_OFFSET, + .window = { + { + .type = SOF_IPC_REGION_UPBOX, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_DSPBOX_SIZE, + .offset = MAILBOX_DSPBOX_OFFSET, + }, + { + .type = SOF_IPC_REGION_DOWNBOX, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_HOSTBOX_SIZE, + .offset = MAILBOX_HOSTBOX_OFFSET, + }, + { + .type = SOF_IPC_REGION_DEBUG, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_DEBUG_SIZE, + .offset = MAILBOX_DEBUG_OFFSET, + }, + { + .type = SOF_IPC_REGION_TRACE, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_TRACE_SIZE, + .offset = MAILBOX_TRACE_OFFSET, + }, + { + .type = SOF_IPC_REGION_STREAM, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_STREAM_SIZE, + .offset = MAILBOX_STREAM_OFFSET, + }, + { + .type = SOF_IPC_REGION_EXCEPTION, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_EXCEPTION_SIZE, + .offset = MAILBOX_EXCEPTION_OFFSET, + }, }, }; diff --git a/src/platform/cannonlake/boot_ldr.x.in b/src/platform/cannonlake/boot_ldr.x.in index a42fd897..b85bfab2 100644 --- a/src/platform/cannonlake/boot_ldr.x.in +++ b/src/platform/cannonlake/boot_ldr.x.in @@ -21,7 +21,7 @@ MEMORY org = IMR_BOOT_LDR_LIT_BASE, len = IMR_BOOT_LDR_LIT_SIZE reef_text : - org = IMR_BOOT_LDR_TEXT_BASE, + org = IMR_BOOT_LDR_TEXT_BASE, len = IMR_BOOT_LDR_TEXT_SIZE, vector_base_text : org = XCHAL_VECBASE_RESET_PADDR, @@ -81,7 +81,7 @@ MEMORY org = XCHAL_DOUBLEEXC_VECTOR_PADDR, len = REEF_MEM_VECT_TEXT_SIZE reef_data : - org = IMR_BOOT_LDR_DATA_BASE, + org = IMR_BOOT_LDR_DATA_BASE, len = IMR_BOOT_LDR_DATA_SIZE reef_bss_data : org = IMR_BOOT_LDR_BSS_BASE, @@ -148,6 +148,9 @@ SECTIONS *(.fini.literal) KEEP(*(.fini)) *(.gnu.version) + KEEP (*(.ResetVector.text)) + KEEP (*(.ResetHandler.text)) + KEEP (*(.MemoryExceptionVector.text)) _text_end = ABSOLUTE(.); _etext = .; } >reef_text :reef_text_phdr diff --git a/src/platform/cannonlake/cannonlake.x.in b/src/platform/cannonlake/cannonlake.x.in index 47acd5e0..2a52d674 100644 --- a/src/platform/cannonlake/cannonlake.x.in +++ b/src/platform/cannonlake/cannonlake.x.in @@ -21,79 +21,79 @@ MEMORY org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, len = REEF_MEM_RESET_LIT_SIZE vector_memory_lit : - org = XCHAL_MEMERROR_VECTOR_PADDR + REEF_MEM_ERROR_LIT_SIZE, + org = XCHAL_MEMERROR_VECTOR_PADDR + REEF_MEM_ERROR_LIT_SIZE, len = REEF_MEM_ERROR_LIT_SIZE vector_memory_text : - org = XCHAL_MEMERROR_VECTOR_PADDR, + org = XCHAL_MEMERROR_VECTOR_PADDR, len = REEF_MEM_ERROR_TEXT_SIZE vector_base_text : - org = XCHAL_VECBASE_RESET_PADDR, + org = XCHAL_VECBASE_RESET_PADDR, len = REEF_MEM_VECBASE_LIT_SIZE vector_int2_lit : - org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, len = REEF_MEM_VECT_LIT_SIZE vector_int2_text : org = XCHAL_INTLEVEL2_VECTOR_PADDR, len = REEF_MEM_VECT_TEXT_SIZE vector_int3_lit : - org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, len = REEF_MEM_VECT_LIT_SIZE vector_int3_text : - org = XCHAL_INTLEVEL3_VECTOR_PADDR, + org = XCHAL_INTLEVEL3_VECTOR_PADDR, len = REEF_MEM_VECT_TEXT_SIZE vector_int4_lit : - org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, len = REEF_MEM_VECT_LIT_SIZE vector_int4_text : - org = XCHAL_INTLEVEL4_VECTOR_PADDR, + org = XCHAL_INTLEVEL4_VECTOR_PADDR, len = REEF_MEM_VECT_TEXT_SIZE vector_int5_lit : - org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, len = REEF_MEM_VECT_LIT_SIZE vector_int5_text : - org = XCHAL_INTLEVEL5_VECTOR_PADDR, + org = XCHAL_INTLEVEL5_VECTOR_PADDR, len = REEF_MEM_VECT_TEXT_SIZE vector_int6_lit : - org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, len = REEF_MEM_VECT_LIT_SIZE vector_int6_text : - org = XCHAL_INTLEVEL6_VECTOR_PADDR, + org = XCHAL_INTLEVEL6_VECTOR_PADDR, len = REEF_MEM_VECT_TEXT_SIZE vector_int7_lit : - org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, len = REEF_MEM_VECT_LIT_SIZE vector_int7_text : - org = XCHAL_INTLEVEL7_VECTOR_PADDR, + org = XCHAL_INTLEVEL7_VECTOR_PADDR, len = REEF_MEM_VECT_TEXT_SIZE vector_kernel_lit : - org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, len = REEF_MEM_VECT_LIT_SIZE vector_kernel_text : - org = XCHAL_KERNEL_VECTOR_PADDR, + org = XCHAL_KERNEL_VECTOR_PADDR, len = REEF_MEM_VECT_TEXT_SIZE vector_user_lit : - org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, len = REEF_MEM_VECT_LIT_SIZE vector_user_text : - org = XCHAL_USER_VECTOR_PADDR, + org = XCHAL_USER_VECTOR_PADDR, len = REEF_MEM_VECT_TEXT_SIZE vector_double_lit : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, len = REEF_MEM_VECT_LIT_SIZE vector_double_text : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR, + org = XCHAL_DOUBLEEXC_VECTOR_PADDR, len = REEF_MEM_VECT_TEXT_SIZE reef_text_start : - org = REEF_TEXT_START, + org = REEF_TEXT_START, len = REEF_TEXT_START_SIZE, reef_text : - org = REEF_TEXT_BASE, + org = REEF_TEXT_BASE, len = REEF_TEXT_SIZE, reef_data : - org = REEF_TEXT_BASE + REEF_TEXT_SIZE, + org = REEF_TEXT_BASE + REEF_TEXT_SIZE, len = REEF_DATA_SIZE reef_bss_data : - org = REEF_TEXT_BASE + REEF_TEXT_SIZE + REEF_DATA_SIZE, + org = REEF_TEXT_BASE + REEF_TEXT_SIZE + REEF_DATA_SIZE, len = REEF_BSS_DATA_SIZE system_heap : org = HEAP_SYSTEM_BASE, @@ -350,6 +350,7 @@ SECTIONS *(.fini.literal) KEEP(*(.fini)) *(.gnu.version) + KEEP (*(.ResetHandler.text)) _text_end = ABSOLUTE(.); _etext = .; } >reef_text :reef_text_phdr diff --git a/src/platform/cannonlake/include/platform/platform.h b/src/platform/cannonlake/include/platform/platform.h index 764ef76a..44345bc3 100644 --- a/src/platform/cannonlake/include/platform/platform.h +++ b/src/platform/cannonlake/include/platform/platform.h @@ -120,7 +120,7 @@ struct reef; #define platform_trace_point(__x) \ sw_reg_write(SRAM_REG_FW_TRACEP, __x) -struct timer *platform_timer; +extern struct timer *platform_timer; /* * APIs declared here are defined for every platform and IPC mechanism. diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index 1f1fd2fc..a0198e5b 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -80,54 +80,56 @@ static const struct sof_ipc_window sram_window = { .type = SOF_IPC_EXT_WINDOW, }, .num_windows = NUM_CNL_WINDOWS, - .window[0] = { - .type = SOF_IPC_REGION_REGS, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_SW_REG_SIZE, - .offset = 0, - }, - .window[1] = { - .type = SOF_IPC_REGION_UPBOX, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_DSPBOX_SIZE, - .offset = MAILBOX_SW_REG_SIZE, - }, - .window[2] = { - .type = SOF_IPC_REGION_DOWNBOX, - .id = 1, /* map to host window 1 */ - .flags = 0, // TODO: set later - .size = MAILBOX_HOSTBOX_SIZE, - .offset = 0, - }, - .window[3] = { - .type = SOF_IPC_REGION_DEBUG, - .id = 2, /* map to host window 2 */ - .flags = 0, // TODO: set later - .size = MAILBOX_DEBUG_SIZE, - .offset = 0, - }, - .window[4] = { - .type = SOF_IPC_REGION_EXCEPTION, - .id = 2, /* map to host window 2 */ - .flags = 0, // TODO: set later - .size = MAILBOX_EXCEPTION_SIZE, - .offset = MAILBOX_EXCEPTION_OFFSET, - }, - .window[5] = { - .type = SOF_IPC_REGION_STREAM, - .id = 2, /* map to host window 2 */ - .flags = 0, // TODO: set later - .size = MAILBOX_STREAM_SIZE, - .offset = MAILBOX_STREAM_OFFSET, - }, - .window[6] = { - .type = SOF_IPC_REGION_TRACE, - .id = 3, /* map to host window 3 */ - .flags = 0, // TODO: set later - .size = MAILBOX_TRACE_SIZE, - .offset = 0, + .window = { + { + .type = SOF_IPC_REGION_REGS, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_SW_REG_SIZE, + .offset = 0, + }, + { + .type = SOF_IPC_REGION_UPBOX, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_DSPBOX_SIZE, + .offset = MAILBOX_SW_REG_SIZE, + }, + { + .type = SOF_IPC_REGION_DOWNBOX, + .id = 1, /* map to host window 1 */ + .flags = 0, // TODO: set later + .size = MAILBOX_HOSTBOX_SIZE, + .offset = 0, + }, + { + .type = SOF_IPC_REGION_DEBUG, + .id = 2, /* map to host window 2 */ + .flags = 0, // TODO: set later + .size = MAILBOX_EXCEPTION_SIZE + MAILBOX_DEBUG_SIZE, + .offset = 0, + }, + { + .type = SOF_IPC_REGION_EXCEPTION, + .id = 2, /* map to host window 2 */ + .flags = 0, // TODO: set later + .size = MAILBOX_EXCEPTION_SIZE, + .offset = MAILBOX_EXCEPTION_OFFSET, + }, + { + .type = SOF_IPC_REGION_STREAM, + .id = 2, /* map to host window 2 */ + .flags = 0, // TODO: set later + .size = MAILBOX_STREAM_SIZE, + .offset = MAILBOX_STREAM_OFFSET, + }, + { + .type = SOF_IPC_REGION_TRACE, + .id = 3, /* map to host window 3 */ + .flags = 0, // TODO: set later + .size = MAILBOX_TRACE_SIZE, + .offset = 0, + }, }, }; diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index e9270ac1..30e8e5d7 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -78,47 +78,49 @@ static const struct sof_ipc_window sram_window = { .type = SOF_IPC_EXT_WINDOW, }, .num_windows = NUM_HSW_WINDOWS, - .window[0] = { - .type = SOF_IPC_REGION_UPBOX, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_DSPBOX_SIZE, - .offset = MAILBOX_DSPBOX_OFFSET, - }, - .window[1] = { - .type = SOF_IPC_REGION_DOWNBOX, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_HOSTBOX_SIZE, - .offset = MAILBOX_HOSTBOX_OFFSET, - }, - .window[2] = { - .type = SOF_IPC_REGION_DEBUG, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_DEBUG_SIZE, - .offset = MAILBOX_DEBUG_OFFSET, - }, - .window[3] = { - .type = SOF_IPC_REGION_TRACE, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_TRACE_SIZE, - .offset = MAILBOX_TRACE_OFFSET, - }, - .window[4] = { - .type = SOF_IPC_REGION_STREAM, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_STREAM_SIZE, - .offset = MAILBOX_STREAM_OFFSET, - }, - .window[5] = { - .type = SOF_IPC_REGION_EXCEPTION, - .id = 0, /* map to host window 0 */ - .flags = 0, // TODO: set later - .size = MAILBOX_EXCEPTION_SIZE, - .offset = MAILBOX_EXCEPTION_OFFSET, + .window = { + { + .type = SOF_IPC_REGION_UPBOX, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_DSPBOX_SIZE, + .offset = MAILBOX_DSPBOX_OFFSET, + }, + { + .type = SOF_IPC_REGION_DOWNBOX, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_HOSTBOX_SIZE, + .offset = MAILBOX_HOSTBOX_OFFSET, + }, + { + .type = SOF_IPC_REGION_DEBUG, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_DEBUG_SIZE, + .offset = MAILBOX_DEBUG_OFFSET, + }, + { + .type = SOF_IPC_REGION_TRACE, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_TRACE_SIZE, + .offset = MAILBOX_TRACE_OFFSET, + }, + { + .type = SOF_IPC_REGION_STREAM, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_STREAM_SIZE, + .offset = MAILBOX_STREAM_OFFSET, + }, + { + .type = SOF_IPC_REGION_EXCEPTION, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_EXCEPTION_SIZE, + .offset = MAILBOX_EXCEPTION_OFFSET, + }, }, }; -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] topology: bdw-rt5640: Fix BE DAI name to match legacy driver
by Liam Girdwood 30 Mar '18

30 Mar '18

Now matches legacy driver. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/reef-bdw-rt5640.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4 index 53c9610..0a083e4 100644 --- a/topology/reef-bdw-rt5640.m4 +++ b/topology/reef-bdw-rt5640.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-bdw-rt5640" { # playback DAI is SSP0 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 0, Audio, + 1, SSP, 0, Codec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP0 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 0, Audio, + 2, SSP, 0, Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] Revert "topology: reef-apl-nocodec: use SSP4 for playback and SSP2 for both"
by Liam Girdwood 30 Mar '18

30 Mar '18

This reverts commit 0d63b75d1e74e2fcb9508fc1585db983c7fb3482. Needs multi DAI support scheduled for 1.2 Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/reef-apl-nocodec.m4 | 96 ++++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 43 deletions(-) diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4 index 72eff0e..78a1a4e 100644 --- a/topology/reef-apl-nocodec.m4 +++ b/topology/reef-apl-nocodec.m4 @@ -19,72 +19,82 @@ include(`dsps/bxt.m4') # # Define the pipelines # -# PCM0 ----> Volume ----> SSP4 -# PCM1 ----> Volume ----> SSP2 -# PCM2 <---- Volume <---- SSP2 +# PCM0 ----> volume ---------------+ +# |--low latency mixer ----> volume ----> SSP2 +# PCM2 ----> SRC -----> volume ----+ +# | +# Tone -----> volume ----+ +# +# PCM1 <---- Volume <---- SSP2 # -# Volume playback pipeline 1 on PCM 0 using max 2 channels of s16le. -# Schedule 48 frames per 1000us deadline on core 0 with priority 0 -# Use DMAC 0 channel 1 for PCM audio playback data -PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4, - 1, 0, 2, s16le, - 48, 1000, 0, 0, 0, 1, SSP, 4, s16le, 2) - -# Volume playback pipeline 1 on PCM 0 using max 2 channels of s16le. +# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 # Use DMAC 0 channel 1 for PCM audio playback data -PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4, - 2, 1, 2, s16le, - 48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2) +PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, + 1, 0, 2, s32le, + 48, 1000, 0, 0, 0, 1) -# Volume playback pipeline 1 on PCM 0 using max 2 channels of s16le. +# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 # Use DMAC 0 channel 2 for PCM audio capture data -PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4, - 3, 1, 2, s16le, - 48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2) +PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, + 2, 0, 2, s32le, + 48, 1000, 0, 0, 0, 2) + +# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le. +# Schedule 96 frames per 2000us deadline on core 0 with priority 1 +# Use DMAC 0 channel 3 for PCM audio playback data +PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, + 3, 1, 2, s32le, + 96, 2000, 1, 0, 0, 3) + +# Tone Playback pipeline 5 using max 2 channels of s32le. +# Schedule 192 frames per 4000us deadline on core 0 with priority 2 +PIPELINE_ADD(sof/pipe-tone.m4, + 5, 2, s32le, + 192, 4000, 2, 0) + +# Connect pipelines together +SectionGraph."pipe-apl-nocodec" { + index "0" + + lines [ + # media 0 + dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3) + #tone + dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5) + ] +} # # DAI configuration # - -# playback DAI is SSP4 using 2 periods -# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 -DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 4, SSP4-NoCodec, - PIPELINE_SOURCE_1, 2, s16le, - 48, 1000, 0, 0) +# SSP port 2 is our only pipeline DAI +# # playback DAI is SSP2 using 2 periods -# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 2, SSP, 2, SSP4-NoCodec, - PIPELINE_SOURCE_2, 2, s16le, + 1, SSP, 2, NoCodec, + PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods -# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 3, SSP, 2, SSP2-NoCodec, - PIPELINE_SINK_3, 2, s16le, + 2, SSP, 2, NoCodec, + PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) # PCM Low Latency -PCM_PLAYBACK_ADD(Port4, 1, 0, 0, PIPELINE_PCM_1) -PCM_DUPLEX_ADD(Port2, 4, 1, 1, PIPELINE_PCM_2, PIPELINE_PCM_3) +PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, SSP2-NoCodec, I2S, 16, - DAI_CLOCK(mclk, 24576000, slave), - DAI_CLOCK(bclk, 1536000, slave), - DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 16, 3, 3)) - -DAI_CONFIG(SSP, 4, SSP4-NoCodec, I2S, 16, - DAI_CLOCK(mclk, 24576000, slave), - DAI_CLOCK(bclk, 1536000, slave), +DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, + DAI_CLOCK(mclk, 19200000, slave), + DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 16, 3, 3)) + DAI_TDM(2, 25, 3, 3)) -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] APL/CNL Fix: Only send position once after copy DMA trace data on APL/CNL.
by yan.wang＠linux.intel.com 30 Mar '18

30 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> Firmware side should not send position in every trace_work() is called. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- Test with: Mininow max rt5651 and APL UP^2 nocodec and CNL nocodec SOF 1.1-stable: 98d3a838cb397e91d6c032cf9b39d3748102803e SOF-Tool 1.1-stable: 78ad1ccce5ac689680adc32f8136f5bf551b0f7c https://github.com/plbossart/sound/tree/topic/sof-v4.14: c33cfed51fff5eb156dcf70ba849e6ffb3008377 --- src/include/reef/dma-trace.h | 1 + src/lib/dma-trace.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/include/reef/dma-trace.h b/src/include/reef/dma-trace.h index bf6e3f3..c5982d2 100644 --- a/src/include/reef/dma-trace.h +++ b/src/include/reef/dma-trace.h @@ -56,6 +56,7 @@ struct dma_trace_data { struct dma_sg_config config; struct dma_trace_buf dmatb; struct dma_copy dc; + uint32_t old_host_offset; uint32_t host_offset; uint32_t overflow; uint32_t messages; diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index d9adb6d..d7ad3d2 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -64,7 +64,10 @@ static uint64_t trace_work(void *data, uint64_t delay) * This function will be called once every 500ms at least even * if no new trace is filled. */ - ipc_dma_trace_send_position(); + if (d->old_host_offset != d->host_offset) { + ipc_dma_trace_send_position(); + d->old_host_offset = d->host_offset; + } #endif /* any data to copy ? */ -- 2.14.3

2 1

[Sound-open-firmware] [PATCH] Fix: Don't update avail trace size when DMA copying fails.
by yan.wang＠linux.intel.com 30 Mar '18

30 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> When DMA copying fails, its returned copy size is negative error number. So it shouldn't be used to update avail variable. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- Test with: Mininow max rt5651 and APL UP^2 nocodec and CNL nocodec SOF 1.1-stable: 98d3a838cb397e91d6c032cf9b39d3748102803e SOF-Tool 1.1-stable: 78ad1ccce5ac689680adc32f8136f5bf551b0f7c https://github.com/plbossart/sound/tree/topic/sof-v4.14: c33cfed51fff5eb156dcf70ba849e6ffb3008377 --- src/lib/dma-trace.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index 21d1a39..d9adb6d 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -122,10 +122,11 @@ out: spin_lock_irq(&d->lock, flags); /* disregard any old messages and dont resend them if we overflow */ - if (d->overflow) { - buffer->avail = DMA_TRACE_LOCAL_SIZE - size; - } else { - buffer->avail -= size; + if (size > 0) { + if (d->overflow) + buffer->avail = DMA_TRACE_LOCAL_SIZE - size; + else + buffer->avail -= size; } /* DMA trace copying is done, allow reschedule */ -- 2.14.3

2 1

[Sound-open-firmware] [PATCH] dw-dma: recover dma status when release
by Xiuli Pan 30 Mar '18

30 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Resume pause will re-start DMA, which will cause the DMA status diff from buffer COMP. Add a release function to recover the status mainily for LLI now. This patch fixes pause/resume noise issues. Tested-by: Keyon Jie <yang.jie(a)linux.intel.com> Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 SOF 1.1-stable: 98d3a838cb397e91d6c032cf9b39d3748102803e SOF-Tool 1.1-stable: 78ad1ccce5ac689680adc32f8136f5bf551b0f7c https://github.com/plbossart/sound/tree/topic/sof-v4.14: c33cfed51fff5eb156dcf70ba849e6ffb3008377 --- src/audio/dai.c | 21 ++++++++++++++++++--- src/drivers/dw-dma.c | 16 ++++++++++------ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 79e877f..9865e02 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -558,12 +558,27 @@ static int dai_comp_trigger(struct comp_dev *dev, int cmd) switch (cmd) { case COMP_TRIGGER_START: dai_pointer_init(dev); - /* fall through */ - case COMP_TRIGGER_RELEASE: - /* only start the DAI if we are not XRUN handling */ if (dd->xrun == 0) { + /* start the DAI */ + ret = dma_start(dd->dma, dd->chan); + if (ret < 0) + return ret; + dai_trigger(dd->dai, cmd, dev->params.direction); + } else { + dd->xrun = 0; + } + /* update starting wallclock */ + platform_dai_wallclock(dev, &dd->wallclock); + break; + case COMP_TRIGGER_RELEASE: + /* only start the DAI if we are not XRUN handling */ + if (dd->xrun == 0) { + /* recover the dma status */ + ret = dma_release(dd->dma, dd->chan); + if (ret < 0) + return ret; /* start the DAI */ ret = dma_start(dd->dma, dd->chan); if (ret < 0) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index aac524e..a21ecc5 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -430,18 +430,22 @@ out: static int dw_dma_release(struct dma *dma, int channel) { struct dma_pdata *p = dma_get_drvdata(dma); + struct dw_lli2 *lli; uint32_t flags; spin_lock_irq(&dma->lock, flags); trace_dma("Dpr"); - if (p->chan[channel].status == COMP_STATE_PAUSED) { - dw_dma_chan_reload_lli(dma, channel); - } - - /* resume and reload DMA */ - p->chan[channel].status = COMP_STATE_ACTIVE; + /* get current lli */ +#if DW_USE_HW_LLI + lli = (struct dw_lli2 *)dw_read(dma, DW_LLP(channel)); +#else + lli = p->chan[channel].lli_current; +#endif + /* get next lli and recover the lli to head for restart */ + lli = (struct dw_lli2 *)lli->llp; + p->chan[channel].lli = lli; spin_unlock_irq(&dma->lock, flags); return 0; -- 2.7.4

3 2

[Sound-open-firmware] [PATCH] topology: test: remove 2 unsupported passthrough tplg
by Keqiao.Zhang 30 Mar '18

30 Mar '18

Signed-off-by: Keqiao.Zhang <keqiao.zhang(a)linux.intel.com> --- topology/test/tplg-build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 5926ee7..ff2d144 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -93,8 +93,6 @@ simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 19200000 I2S simple_test nocodec src "NoCodec" s24le 2 s24le 25 24 2400000 19200000 I2S simple_test codec passthrough "SSP2-Codec" s16le 2 s16le 20 16 1920000 19200000 I2S -simple_test codec passthrough "SSP2-Codec" s24le 2 s16le 20 16 1920000 19200000 I2S -simple_test codec passthrough "SSP2-Codec" s16le 2 s24le 25 24 2400000 19200000 I2S simple_test codec passthrough "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 I2S simple_test codec volume "SSP2-Codec" s16le 2 s16le 20 16 1920000 19200000 I2S simple_test codec volume "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 I2S -- 2.11.0

3 2

[Sound-open-firmware] [PATCH] topology: test: add different ssp modes of topologies for test
by Keqiao.Zhang 30 Mar '18

30 Mar '18

Signed-off-by: Keqiao.Zhang <keqiao.zhang(a)linux.intel.com> --- topology/test/tplg-build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 96f3f9f..5926ee7 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -104,14 +104,17 @@ simple_test codec src "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 I2S # for APL simple_test nocodec volume "NoCodec" s16le 4 s16le 16 16 1536000 24576000 I2S +simple_test nocodec volume "NoCodec" s16le 4 s16le 16 16 1536000 24576000 DSP_A simple_test nocodec volume "NoCodec" s24le 4 s16le 16 16 1536000 24576000 I2S simple_test nocodec volume "NoCodec" s32le 4 s16le 16 16 1536000 24576000 I2S simple_test nocodec volume "NoCodec" s16le 4 s24le 32 24 3072000 24576000 I2S simple_test nocodec volume "NoCodec" s24le 4 s24le 32 24 3072000 24576000 I2S +simple_test nocodec volume "NoCodec" s24le 4 s24le 32 24 3072000 24576000 DSP_B simple_test nocodec volume "NoCodec" s32le 4 s24le 32 24 3072000 24576000 I2S simple_test nocodec volume "NoCodec" s16le 4 s32le 32 32 3072000 24576000 I2S simple_test nocodec volume "NoCodec" s24le 4 s32le 32 32 3072000 24576000 I2S simple_test nocodec volume "NoCodec" s32le 4 s32le 32 32 3072000 24576000 I2S +simple_test nocodec volume "NoCodec" s32le 4 s32le 32 32 3072000 24576000 LEFT_J simple_test codec volume "SSP4-Codec" s16le 4 s16le 16 16 1536000 24576000 I2S simple_test nocodec volume "NoCodec" s16le 5 s16le 16 16 1536000 24576000 I2S simple_test nocodec src "NoCodec" s24le 4 s24le 32 24 3072000 24576000 I2S -- 2.11.0

2 1

[Sound-open-firmware] [PATCH] topology: ssp: add TEST_SSP_MODE for ssp to support more modes
by Keqiao.Zhang 30 Mar '18

30 Mar '18

Signed-off-by: Keqiao.Zhang <keqiao.zhang(a)linux.intel.com> --- topology/test/test-capture-ssp.m4 | 3 +- topology/test/test-playback-ssp.m4 | 3 +- topology/test/test-ssp.m4 | 3 +- topology/test/tplg-build.sh | 69 ++++++++++++++++++++------------------ 4 files changed, 42 insertions(+), 36 deletions(-) diff --git a/topology/test/test-capture-ssp.m4 b/topology/test/test-capture-ssp.m4 index 3d10d7a..78b6479 100644 --- a/topology/test/test-capture-ssp.m4 +++ b/topology/test/test-capture-ssp.m4 @@ -28,6 +28,7 @@ include(`dsps/byt.m4') # TEST_SSP_BCLK - SSP BCLK in Hz # TEST_SSP_PHY_BITS - SSP physical slot size # TEST_SSP_DATA_BITS - SSP data slot size +# TEST_SSP_MODE - SSP mode e.g. I2S, LEFT_J, DSP_A and DSP_B # # @@ -67,7 +68,7 @@ PCM_CAPTURE_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_2) # # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # -DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS, +DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, DAI_CLOCK(mclk, TEST_SSP_MCLK, slave), DAI_CLOCK(bclk, TEST_SSP_BCLK, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/test/test-playback-ssp.m4 b/topology/test/test-playback-ssp.m4 index ab775a4..e4b09ec 100644 --- a/topology/test/test-playback-ssp.m4 +++ b/topology/test/test-playback-ssp.m4 @@ -28,6 +28,7 @@ include(`dsps/byt.m4') # TEST_SSP_BCLK - SSP BCLK in Hz # TEST_SSP_PHY_BITS - SSP physical slot size # TEST_SSP_DATA_BITS - SSP data slot size +# TEST_SSP_MODE - SSP mode e.g. I2S, LEFT_J, DSP_A and DSP_B # # @@ -67,7 +68,7 @@ PCM_PLAYBACK_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1) # # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # -DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS, +DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, DAI_CLOCK(mclk, TEST_SSP_MCLK, slave), DAI_CLOCK(bclk, TEST_SSP_BCLK, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/test/test-ssp.m4 b/topology/test/test-ssp.m4 index fa5fd29..676e19b 100644 --- a/topology/test/test-ssp.m4 +++ b/topology/test/test-ssp.m4 @@ -28,6 +28,7 @@ include(`dsps/byt.m4') # TEST_SSP_BCLK - SSP BCLK in Hz # TEST_SSP_PHY_BITS - SSP physical slot size # TEST_SSP_DATA_BITS - SSP data slot size +# TEST_SSP_MODE - SSP mode e.g. I2S, LEFT_J, DSP_A and DSP_B # # @@ -85,7 +86,7 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # -DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS, +DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, DAI_CLOCK(mclk, TEST_SSP_MCLK, slave), DAI_CLOCK(bclk, TEST_SSP_BCLK, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 5a6a8f5..96f3f9f 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -28,11 +28,13 @@ TONE_TEST=test-tone-playback-ssp # 8) dai_data_bits - SSP number of valid data bits per slot/channel # 9) dai_bclk - SSP BCLK in HZ # 10) dai_mclk - SSP MCLK in HZ +# 11) SSP mode - SSP mode e.g. I2S, LEFT_J, DSP_A and DSP_B # + function simple_test { for i in ${SIMPLE_TESTS[@]} do - TFILE="$i$5-$2-$4-$6-48k-$1" + TFILE="$i$5-${11}-$2-$4-$6-48k-$1" echo "M4 pre-processing test $i -> ${TFILE}" m4 ${M4_FLAGS} \ -DTEST_PIPE_NAME="$2" \ @@ -44,6 +46,7 @@ function simple_test { -DTEST_SSP_MCLK=${10} \ -DTEST_SSP_PHY_BITS=$7 \ -DTEST_SSP_DATA_BITS=$8 \ + -DTEST_SSP_MODE=${11} \ $i.m4 > ${TFILE}.conf echo "Compiling test $i -> ${TFILE}.tplg" alsatplg -v 1 -c ${TFILE}.conf -o ${TFILE}.tplg @@ -82,43 +85,43 @@ function tone_test { } # Pre-process the simple tests -simple_test nocodec passthrough "NoCodec" s16le 2 s16le 20 16 1920000 19200000 -simple_test nocodec passthrough "NoCodec" s24le 2 s24le 25 24 2400000 19200000 -simple_test nocodec volume "NoCodec" s16le 2 s16le 20 16 1920000 19200000 -simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 19200000 -simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 19200000 -simple_test nocodec src "NoCodec" s24le 2 s24le 25 24 2400000 19200000 +simple_test nocodec passthrough "NoCodec" s16le 2 s16le 20 16 1920000 19200000 I2S +simple_test nocodec passthrough "NoCodec" s24le 2 s24le 25 24 2400000 19200000 I2S +simple_test nocodec volume "NoCodec" s16le 2 s16le 20 16 1920000 19200000 I2S +simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 19200000 I2S +simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 19200000 I2S +simple_test nocodec src "NoCodec" s24le 2 s24le 25 24 2400000 19200000 I2S -simple_test codec passthrough "SSP2-Codec" s16le 2 s16le 20 16 1920000 19200000 -simple_test codec passthrough "SSP2-Codec" s24le 2 s16le 20 16 1920000 19200000 -simple_test codec passthrough "SSP2-Codec" s16le 2 s24le 25 24 2400000 19200000 -simple_test codec passthrough "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 -simple_test codec volume "SSP2-Codec" s16le 2 s16le 20 16 1920000 19200000 -simple_test codec volume "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 -simple_test codec volume "SSP2-Codec" s24le 2 s16le 20 16 1920000 19200000 -simple_test codec volume "SSP2-Codec" s16le 2 s24le 25 24 2400000 19200000 -simple_test codec src "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 +simple_test codec passthrough "SSP2-Codec" s16le 2 s16le 20 16 1920000 19200000 I2S +simple_test codec passthrough "SSP2-Codec" s24le 2 s16le 20 16 1920000 19200000 I2S +simple_test codec passthrough "SSP2-Codec" s16le 2 s24le 25 24 2400000 19200000 I2S +simple_test codec passthrough "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 I2S +simple_test codec volume "SSP2-Codec" s16le 2 s16le 20 16 1920000 19200000 I2S +simple_test codec volume "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 I2S +simple_test codec volume "SSP2-Codec" s24le 2 s16le 20 16 1920000 19200000 I2S +simple_test codec volume "SSP2-Codec" s16le 2 s24le 25 24 2400000 19200000 I2S +simple_test codec src "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 I2S # for APL -simple_test nocodec volume "NoCodec" s16le 4 s16le 16 16 1536000 24576000 -simple_test nocodec volume "NoCodec" s24le 4 s16le 16 16 1536000 24576000 -simple_test nocodec volume "NoCodec" s32le 4 s16le 16 16 1536000 24576000 -simple_test nocodec volume "NoCodec" s16le 4 s24le 32 24 3072000 24576000 -simple_test nocodec volume "NoCodec" s24le 4 s24le 32 24 3072000 24576000 -simple_test nocodec volume "NoCodec" s32le 4 s24le 32 24 3072000 24576000 -simple_test nocodec volume "NoCodec" s16le 4 s32le 32 32 3072000 24576000 -simple_test nocodec volume "NoCodec" s24le 4 s32le 32 32 3072000 24576000 -simple_test nocodec volume "NoCodec" s32le 4 s32le 32 32 3072000 24576000 -simple_test codec volume "SSP4-Codec" s16le 4 s16le 16 16 1536000 24576000 -simple_test nocodec volume "NoCodec" s16le 5 s16le 16 16 1536000 24576000 -simple_test nocodec src "NoCodec" s24le 4 s24le 32 24 3072000 24576000 +simple_test nocodec volume "NoCodec" s16le 4 s16le 16 16 1536000 24576000 I2S +simple_test nocodec volume "NoCodec" s24le 4 s16le 16 16 1536000 24576000 I2S +simple_test nocodec volume "NoCodec" s32le 4 s16le 16 16 1536000 24576000 I2S +simple_test nocodec volume "NoCodec" s16le 4 s24le 32 24 3072000 24576000 I2S +simple_test nocodec volume "NoCodec" s24le 4 s24le 32 24 3072000 24576000 I2S +simple_test nocodec volume "NoCodec" s32le 4 s24le 32 24 3072000 24576000 I2S +simple_test nocodec volume "NoCodec" s16le 4 s32le 32 32 3072000 24576000 I2S +simple_test nocodec volume "NoCodec" s24le 4 s32le 32 32 3072000 24576000 I2S +simple_test nocodec volume "NoCodec" s32le 4 s32le 32 32 3072000 24576000 I2S +simple_test codec volume "SSP4-Codec" s16le 4 s16le 16 16 1536000 24576000 I2S +simple_test nocodec volume "NoCodec" s16le 5 s16le 16 16 1536000 24576000 I2S +simple_test nocodec src "NoCodec" s24le 4 s24le 32 24 3072000 24576000 I2S # for CNL -simple_test nocodec volume "NoCodec" s16le 2 s16le 25 16 2400000 24000000 -simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 24000000 -simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 24000000 -simple_test nocodec volume "NoCodec" s24le 2 s16le 25 16 2400000 24000000 -simple_test nocodec src "NoCodec" s24le 4 s24le 25 24 2400000 24000000 +simple_test nocodec volume "NoCodec" s16le 2 s16le 25 16 2400000 24000000 I2S +simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 24000000 I2S +simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 24000000 I2S +simple_test nocodec volume "NoCodec" s24le 2 s16le 25 16 2400000 24000000 I2S +simple_test nocodec src "NoCodec" s24le 4 s24le 25 24 2400000 24000000 I2S # Tone test: Tone component only supports s32le currently tone_test codec tone "SSP2-Codec" s32le 2 s16le 20 16 1920000 19200000 -- 2.11.0

2 1

[Sound-open-firmware] [PATCH] topology: specify SSP port for NoCodec
by Keyon Jie 29 Mar '18

29 Mar '18

Add prefix 'SSPx-' for stream name 'NoCodec' to match with SOF nocodec driver. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- This shoule be merged together with driver patch: [PATCH] ASoC: SOF: nocodec: add more BE dailinks. Tested on GPMRB with: Kernel https://github.com/plbossart/sound/ #topic/sof-v4.14 c2fdacbcda40ecd23944d960d1b1c34529fd284d SOF: git://git.alsa-project.org/sound-open-firmware.git #1.1-stable eba34c566d660c227d5691dcfc010594bd5ddf3d SOFT: git://git.alsa-project.org/sound-open-firmware-tools.git #1.1-stable 739acd1e5e542b09f7b204f44350d676dacf0000 topology/reef-bxt-nocodec.m4 | 6 +++--- topology/reef-byt-nocodec.m4 | 6 +++--- topology/reef-cht-nocodec.m4 | 6 +++--- topology/test/tplg-build.sh | 44 ++++++++++++++++++++++---------------------- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4 index 7e2b624..3ae2401 100644 --- a/topology/reef-bxt-nocodec.m4 +++ b/topology/reef-bxt-nocodec.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-bxt-nocodec" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, NoCodec, + 1, SSP, 2, SSP2-NoCodec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, NoCodec, + 2, SSP, 2, SSP2-NoCodec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, +DAI_CONFIG(SSP, 2, SSP2-NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4 index 3be5d00..9748f21 100644 --- a/topology/reef-byt-nocodec.m4 +++ b/topology/reef-byt-nocodec.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-nocodec" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, NoCodec, + 1, SSP, 2, SSP2-NoCodec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, NoCodec, + 2, SSP, 2, SSP2-NoCodec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, +DAI_CONFIG(SSP, 2, SSP2-NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4 index 3f61e44..260af57 100644 --- a/topology/reef-cht-nocodec.m4 +++ b/topology/reef-cht-nocodec.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-cht-nocodec" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, NoCodec, + 1, SSP, 2, SSP2-NoCodec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, NoCodec, + 2, SSP, 2, SSP2-NoCodec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, +DAI_CONFIG(SSP, 2, SSP2-NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 5a6a8f5..d8d5ad0 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -82,12 +82,12 @@ function tone_test { } # Pre-process the simple tests -simple_test nocodec passthrough "NoCodec" s16le 2 s16le 20 16 1920000 19200000 -simple_test nocodec passthrough "NoCodec" s24le 2 s24le 25 24 2400000 19200000 -simple_test nocodec volume "NoCodec" s16le 2 s16le 20 16 1920000 19200000 -simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 19200000 -simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 19200000 -simple_test nocodec src "NoCodec" s24le 2 s24le 25 24 2400000 19200000 +simple_test nocodec passthrough "SSP2-NoCodec" s16le 2 s16le 20 16 1920000 19200000 +simple_test nocodec passthrough "SSP2-NoCodec" s24le 2 s24le 25 24 2400000 19200000 +simple_test nocodec volume "SSP2-NoCodec" s16le 2 s16le 20 16 1920000 19200000 +simple_test nocodec volume "SSP2-NoCodec" s24le 2 s24le 25 24 2400000 19200000 +simple_test nocodec volume "SSP2-NoCodec" s16le 2 s24le 25 24 2400000 19200000 +simple_test nocodec src "SSP2-NoCodec" s24le 2 s24le 25 24 2400000 19200000 simple_test codec passthrough "SSP2-Codec" s16le 2 s16le 20 16 1920000 19200000 simple_test codec passthrough "SSP2-Codec" s24le 2 s16le 20 16 1920000 19200000 @@ -100,25 +100,25 @@ simple_test codec volume "SSP2-Codec" s16le 2 s24le 25 24 2400000 19200000 simple_test codec src "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 # for APL -simple_test nocodec volume "NoCodec" s16le 4 s16le 16 16 1536000 24576000 -simple_test nocodec volume "NoCodec" s24le 4 s16le 16 16 1536000 24576000 -simple_test nocodec volume "NoCodec" s32le 4 s16le 16 16 1536000 24576000 -simple_test nocodec volume "NoCodec" s16le 4 s24le 32 24 3072000 24576000 -simple_test nocodec volume "NoCodec" s24le 4 s24le 32 24 3072000 24576000 -simple_test nocodec volume "NoCodec" s32le 4 s24le 32 24 3072000 24576000 -simple_test nocodec volume "NoCodec" s16le 4 s32le 32 32 3072000 24576000 -simple_test nocodec volume "NoCodec" s24le 4 s32le 32 32 3072000 24576000 -simple_test nocodec volume "NoCodec" s32le 4 s32le 32 32 3072000 24576000 +simple_test nocodec volume "SSP4-NoCodec" s16le 4 s16le 16 16 1536000 24576000 +simple_test nocodec volume "SSP4-NoCodec" s24le 4 s16le 16 16 1536000 24576000 +simple_test nocodec volume "SSP4-NoCodec" s32le 4 s16le 16 16 1536000 24576000 +simple_test nocodec volume "SSP4-NoCodec" s16le 4 s24le 32 24 3072000 24576000 +simple_test nocodec volume "SSP4-NoCodec" s24le 4 s24le 32 24 3072000 24576000 +simple_test nocodec volume "SSP4-NoCodec" s32le 4 s24le 32 24 3072000 24576000 +simple_test nocodec volume "SSP4-NoCodec" s16le 4 s32le 32 32 3072000 24576000 +simple_test nocodec volume "SSP4-NoCodec" s24le 4 s32le 32 32 3072000 24576000 +simple_test nocodec volume "SSP4-NoCodec" s32le 4 s32le 32 32 3072000 24576000 simple_test codec volume "SSP4-Codec" s16le 4 s16le 16 16 1536000 24576000 -simple_test nocodec volume "NoCodec" s16le 5 s16le 16 16 1536000 24576000 -simple_test nocodec src "NoCodec" s24le 4 s24le 32 24 3072000 24576000 +simple_test nocodec volume "SSP5-NoCodec" s16le 5 s16le 16 16 1536000 24576000 +simple_test nocodec src "SSP4-NoCodec" s24le 4 s24le 32 24 3072000 24576000 # for CNL -simple_test nocodec volume "NoCodec" s16le 2 s16le 25 16 2400000 24000000 -simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 24000000 -simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 24000000 -simple_test nocodec volume "NoCodec" s24le 2 s16le 25 16 2400000 24000000 -simple_test nocodec src "NoCodec" s24le 4 s24le 25 24 2400000 24000000 +simple_test nocodec volume "SSP2-NoCodec" s16le 2 s16le 25 16 2400000 24000000 +simple_test nocodec volume "SSP2-NoCodec" s16le 2 s24le 25 24 2400000 24000000 +simple_test nocodec volume "SSP2-NoCodec" s24le 2 s24le 25 24 2400000 24000000 +simple_test nocodec volume "SSP2-NoCodec" s24le 2 s16le 25 16 2400000 24000000 +simple_test nocodec src "SSP2-NoCodec" s24le 4 s24le 25 24 2400000 24000000 # Tone test: Tone component only supports s32le currently tone_test codec tone "SSP2-Codec" s32le 2 s16le 20 16 1920000 19200000 -- 2.14.1

2 2

[Sound-open-firmware] [PATCH] host-gw: fix hda-dma not start at pause release issue.
by Keyon Jie 29 Mar '18

29 Mar '18

We don't need stop host dma at pause, which is aligned with baytrail GPDMA. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/audio/host.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/audio/host.c b/src/audio/host.c index 9177d99..ac79d36 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -465,9 +465,6 @@ static int host_cmd(struct comp_dev *dev, int cmd, void *data) return ret; switch (cmd) { - case COMP_CMD_PAUSE: - dma_stop(hd->dma, hd->chan); - break; case COMP_CMD_STOP: ret = host_stop(dev); break; -- 2.14.1

4 3

[Sound-open-firmware] [PATCH] rmbox: Close opened files
by Liam Girdwood 29 Mar '18

29 Mar '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> Input and output files in trace_read function should be closed after using. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- rmbox/rmbox.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rmbox/rmbox.c b/rmbox/rmbox.c index 115be83..4df2ee1 100644 --- a/rmbox/rmbox.c +++ b/rmbox/rmbox.c @@ -232,6 +232,10 @@ trace: addr += TRACE_BLOCK_SIZE; } + fclose(in_fd); + if (out_fd) + fclose(out_fd); + return 0; } -- 2.14.1

1 0

[Sound-open-firmware] [PATCH 1/2] core: Limit children irq mask
by Liam Girdwood 29 Mar '18

29 Mar '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> Currently we support maximum of 32 children irqs, so limit the irq mask to not overflow the children irq array. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/include/reef/interrupt-map.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/reef/interrupt-map.h b/src/include/reef/interrupt-map.h index b9682587..a29f85e7 100644 --- a/src/include/reef/interrupt-map.h +++ b/src/include/reef/interrupt-map.h @@ -39,7 +39,7 @@ #define REEF_IRQ_NUM_SHIFT 0 #define REEF_IRQ_NUM_MASK 0xff #define REEF_IRQ_LEVEL_MASK 0xff -#define REEF_IRQ_BIT_MASK 0xff +#define REEF_IRQ_BIT_MASK 0x1f #define REEF_IRQ_CPU_MASK 0xff #define REEF_IRQ(_bit, _level, _cpu, _number) \ -- 2.14.1

1 1

[Sound-open-firmware] [PATCH] APL/CNL: Fix: Change DMA trace position update calling.
by yan.wang＠linux.intel.com 29 Mar '18

29 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> When DMA host buffer is wrapped, host DMA copy need more time to finish copying. So previous implementation will output old trace when DMA host buffer is wrapped because positions update is sent before DMA copying finished. Now trace_work() will always update previous position and avoid this. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- Test with: Mininow max rt5651 and APL UP^2 nocodec and CNL nocodec SOF 1.1-stable: 1c417f9f3d0a01f2a5c997636c2c89227a949db0 SOF-Tool 1.1-stable: 739acd1e5e542b09f7b204f44350d676dacf0000 https://github.com/plbossart/sound/tree/topic/sof-v4.14: c33cfed51fff5eb156dcf70ba849e6ffb3008377 --- src/lib/dma-trace.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index 5046a09..21d1a39 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -53,6 +53,20 @@ static uint64_t trace_work(void *data, uint64_t delay) uint32_t hsize; uint32_t lsize; + if (d->host_offset == d->host_size) + d->host_offset = 0; + +#if defined CONFIG_DMA_GW + /* + * there isn't DMA completion callback in GW DMA copying. + * so we send previous position always before the next copying + * for guaranteeing previous DMA copying is finished. + * This function will be called once every 500ms at least even + * if no new trace is filled. + */ + ipc_dma_trace_send_position(); +#endif + /* any data to copy ? */ if (avail == 0) return DMA_TRACE_PERIOD; @@ -98,8 +112,6 @@ static uint64_t trace_work(void *data, uint64_t delay) /* update host pointer and check for wrap */ d->host_offset += size; - if (d->host_offset == d->host_size) - d->host_offset = 0; /* update local pointer and check for wrap */ buffer->r_ptr += size; @@ -121,14 +133,6 @@ out: spin_unlock_irq(&d->lock, flags); -#if defined CONFIG_DMA_GW - /* - * there isn't DMA completion callback in GW DMA copying - * so we send position IPC message after DMA copying API calling - */ - ipc_dma_trace_send_position(); -#endif - /* reschedule the trace copying work */ return DMA_TRACE_PERIOD; } -- 2.14.3

2 1

[Sound-open-firmware] [PATCH] core: comp: Add component trigger API call.
by Liam Girdwood 29 Mar '18

29 Mar '18

Add a new component API for performing atomic stream state change operations. This leave the cmd API for non atomic usage. This patch also does some renaming to use _trigger() instead of _cmd(). Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Tested-By: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/component.c | 14 ++++++------ src/audio/dai.c | 28 +++++++++++------------- src/audio/eq_fir.c | 20 ++++++++++------- src/audio/eq_iir.c | 20 ++++++++++------- src/audio/host.c | 22 +++++++++---------- src/audio/mixer.c | 18 ++++++++-------- src/audio/pipeline.c | 44 ++++++++++++++++++-------------------- src/audio/src.c | 16 ++++++++------ src/audio/tone.c | 18 ++++++++++------ src/audio/volume.c | 21 ++++++++++-------- src/drivers/apl-ssp.c | 12 +++++------ src/drivers/ssp.c | 12 +++++------ src/include/reef/audio/component.h | 32 +++++++++++++++++---------- src/include/reef/audio/pipeline.h | 5 ++--- src/ipc/intel-ipc.c | 13 ++++++----- 15 files changed, 159 insertions(+), 136 deletions(-) diff --git a/src/audio/component.c b/src/audio/component.c index 1802278e..605652a2 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -121,7 +121,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) int ret = 0; switch (cmd) { - case COMP_CMD_START: + case COMP_TRIGGER_START: if (dev->state == COMP_STATE_PREPARE || dev->state == COMP_STATE_PAUSED) { dev->state = COMP_STATE_ACTIVE; @@ -131,7 +131,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) ret = -EINVAL; } break; - case COMP_CMD_RELEASE: + case COMP_TRIGGER_RELEASE: if (dev->state == COMP_STATE_PAUSED) { dev->state = COMP_STATE_ACTIVE; } else { @@ -140,8 +140,8 @@ int comp_set_state(struct comp_dev *dev, int cmd) ret = -EINVAL; } break; - case COMP_CMD_STOP: - case COMP_CMD_XRUN: + case COMP_TRIGGER_STOP: + case COMP_TRIGGER_XRUN: if (dev->state == COMP_STATE_ACTIVE) { dev->state = COMP_STATE_PREPARE; } else { @@ -150,7 +150,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) ret = -EINVAL; } break; - case COMP_CMD_PAUSE: + case COMP_TRIGGER_PAUSE: /* only support pausing for running */ if (dev->state == COMP_STATE_ACTIVE) dev->state = COMP_STATE_PAUSED; @@ -160,7 +160,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) ret = -EINVAL; } break; - case COMP_CMD_RESET: + case COMP_TRIGGER_RESET: /* reset always succeeds */ dev->state = COMP_STATE_READY; if (dev->state == COMP_STATE_ACTIVE || @@ -170,7 +170,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) ret = 0; } break; - case COMP_CMD_PREPARE: + case COMP_TRIGGER_PREPARE: if (dev->state == COMP_STATE_PREPARE || dev->state == COMP_STATE_READY) { dev->state = COMP_STATE_PREPARE; diff --git a/src/audio/dai.c b/src/audio/dai.c index 53536ed3..5691aca7 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -72,8 +72,6 @@ struct dai_data { uint64_t wallclock; /* wall clock at stream start */ }; -static int dai_cmd(struct comp_dev *dev, int cmd, void *data); - /* this is called by DMA driver every time descriptor has completed */ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) { @@ -88,7 +86,7 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) if (dev->state != COMP_STATE_ACTIVE && dd->xrun == 0) { /* stop the DAI */ - dai_trigger(dd->dai, COMP_CMD_STOP, dev->params.direction); + dai_trigger(dd->dai, COMP_TRIGGER_STOP, dev->params.direction); /* tell DMA not to reload */ next->size = DMA_RELOAD_END; @@ -435,7 +433,7 @@ static int dai_prepare(struct comp_dev *dev) trace_dai("pre"); - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; @@ -443,7 +441,7 @@ static int dai_prepare(struct comp_dev *dev) if (list_is_empty(&dd->config.elem_list)) { trace_dai_error("wdm"); - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return -EINVAL; } @@ -463,7 +461,7 @@ static int dai_prepare(struct comp_dev *dev) ret = dma_set_config(dd->dma, dd->chan, &dd->config); if (ret < 0) - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return ret; } @@ -492,7 +490,7 @@ static int dai_reset(struct comp_dev *dev) dd->wallclock = 0; dev->position = 0; dd->xrun = 0; - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -529,12 +527,12 @@ static void dai_pointer_init(struct comp_dev *dev) } /* used to pass standard and bespoke command (with data) to component */ -static int dai_cmd(struct comp_dev *dev, int cmd, void *data) +static int dai_comp_trigger(struct comp_dev *dev, int cmd) { struct dai_data *dd = comp_get_drvdata(dev); int ret; - trace_dai("cmd"); + trace_dai("trg"); tracev_value(cmd); wait_init(&dd->complete); @@ -544,10 +542,10 @@ static int dai_cmd(struct comp_dev *dev, int cmd, void *data) return ret; switch (cmd) { - case COMP_CMD_START: + case COMP_TRIGGER_START: dai_pointer_init(dev); /* fall through */ - case COMP_CMD_RELEASE: + case COMP_TRIGGER_RELEASE: /* only start the DAI if we are not XRUN handling */ if (dd->xrun == 0) { @@ -564,11 +562,11 @@ static int dai_cmd(struct comp_dev *dev, int cmd, void *data) /* update starting wallclock */ platform_dai_wallclock(dev, &dd->wallclock); break; - case COMP_CMD_XRUN: + case COMP_TRIGGER_XRUN: dd->xrun = 1; /* fall through */ - case COMP_CMD_PAUSE: - case COMP_CMD_STOP: + case COMP_TRIGGER_PAUSE: + case COMP_TRIGGER_STOP: wait_init(&dd->complete); /* wait for DMA to complete */ @@ -638,7 +636,7 @@ static struct comp_driver comp_dai = { .new = dai_new, .free = dai_free, .params = dai_params, - .cmd = dai_cmd, + .trigger = dai_comp_trigger, .copy = dai_copy, .prepare = dai_prepare, .reset = dai_reset, diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index 52988cdf..72cfe938 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -425,10 +425,6 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) trace_eq("cmd"); - ret = comp_set_state(dev, cmd); - if (ret < 0) - return ret; - switch (cmd) { case COMP_CMD_SET_VALUE: ret = fir_cmd_set_value(dev, cdata); @@ -441,6 +437,13 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) return ret; } +static int eq_fir_trigger(struct comp_dev *dev, int cmd) +{ + trace_eq("trg"); + + return comp_set_state(dev, cmd); +} + /* copy and process stream data from source to sink buffers */ static int eq_fir_copy(struct comp_dev *dev) { @@ -482,7 +485,7 @@ static int eq_fir_prepare(struct comp_dev *dev) trace_eq("EPp"); - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; @@ -490,13 +493,13 @@ static int eq_fir_prepare(struct comp_dev *dev) /* Initialize EQ */ if (cd->config == NULL) { - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return -EINVAL; } ret = eq_fir_setup(cd->fir, cd->config, dev->params.channels); if (ret < 0) { - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return ret; } @@ -517,7 +520,7 @@ static int eq_fir_reset(struct comp_dev *dev) for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) fir_reset(&cd->fir[i]); - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -528,6 +531,7 @@ struct comp_driver comp_eq_fir = { .free = eq_fir_free, .params = eq_fir_params, .cmd = eq_fir_cmd, + .trigger = eq_fir_trigger, .copy = eq_fir_copy, .prepare = eq_fir_prepare, .reset = eq_fir_reset, diff --git a/src/audio/eq_iir.c b/src/audio/eq_iir.c index bbcd66b8..239eead3 100644 --- a/src/audio/eq_iir.c +++ b/src/audio/eq_iir.c @@ -424,10 +424,6 @@ static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) trace_eq_iir("cmd"); - ret = comp_set_state(dev, cmd); - if (ret < 0) - return ret; - switch (cmd) { case COMP_CMD_SET_VALUE: ret = iir_cmd_set_value(dev, cdata); @@ -440,6 +436,13 @@ static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) return ret; } +static int eq_iir_trigger(struct comp_dev *dev, int cmd) +{ + trace_eq_iir("trg"); + + return comp_set_state(dev, cmd); +} + /* copy and process stream data from source to sink buffers */ static int eq_iir_copy(struct comp_dev *dev) { @@ -481,7 +484,7 @@ static int eq_iir_prepare(struct comp_dev *dev) trace_eq_iir("EPp"); - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; @@ -492,13 +495,13 @@ static int eq_iir_prepare(struct comp_dev *dev) * interrupts pipeline prepare for downstream. */ if (cd->config == NULL) { - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return -EINVAL; } ret = eq_iir_setup(cd->iir, cd->config, dev->params.channels); if (ret < 0) { - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return ret; } @@ -519,7 +522,7 @@ static int eq_iir_reset(struct comp_dev *dev) for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) iir_reset_df2t(&cd->iir[i]); - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -530,6 +533,7 @@ struct comp_driver comp_eq_iir = { .free = eq_iir_free, .params = eq_iir_params, .cmd = eq_iir_cmd, + .trigger = eq_iir_trigger, .copy = eq_iir_copy, .prepare = eq_iir_prepare, .reset = eq_iir_reset, diff --git a/src/audio/host.c b/src/audio/host.c index 9177d994..3ca67b5e 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -274,7 +274,7 @@ unwind: } /* used to pass standard and bespoke commands (with data) to component */ -static int host_cmd(struct comp_dev *dev, int cmd, void *data) +static int host_trigger(struct comp_dev *dev, int cmd) { int ret = 0; @@ -285,10 +285,10 @@ static int host_cmd(struct comp_dev *dev, int cmd, void *data) return ret; switch (cmd) { - case COMP_CMD_STOP: + case COMP_TRIGGER_STOP: ret = host_stop(dev); break; - case COMP_CMD_START: + case COMP_TRIGGER_START: /* preload first playback period for preloader task */ if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK) { ret = host_copy(dev); @@ -453,25 +453,25 @@ unwind: } /* used to pass standard and bespoke commands (with data) to component */ -static int host_cmd(struct comp_dev *dev, int cmd, void *data) +static int host_trigger(struct comp_dev *dev, int cmd) { struct host_data *hd = comp_get_drvdata(dev); int ret = 0; - trace_host("cmd"); + trace_host("trg"); ret = comp_set_state(dev, cmd); if (ret < 0) return ret; switch (cmd) { - case COMP_CMD_PAUSE: + case COMP_TRIGGER_PAUSE: dma_stop(hd->dma, hd->chan); break; - case COMP_CMD_STOP: + case COMP_TRIGGER_STOP: ret = host_stop(dev); break; - case COMP_CMD_START: + case COMP_TRIGGER_START: dma_start(hd->dma, hd->chan); /* preload first playback period for preloader task */ @@ -716,7 +716,7 @@ static int host_prepare(struct comp_dev *dev) trace_host("pre"); - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; @@ -744,7 +744,7 @@ static int host_pointer_reset(struct comp_dev *dev) hd->local_pos = 0; hd->report_pos = 0; dev->position = 0; - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -907,7 +907,7 @@ struct comp_driver comp_host = { .free = host_free, .params = host_params, .reset = host_reset, - .cmd = host_cmd, + .trigger = host_trigger, .copy = host_copy, .prepare = host_prepare, .host_buffer = host_buffer, diff --git a/src/audio/mixer.c b/src/audio/mixer.c index abc8881b..d05a40c3 100644 --- a/src/audio/mixer.c +++ b/src/audio/mixer.c @@ -178,24 +178,24 @@ static inline int mixer_sink_status(struct comp_dev *mixer) } /* used to pass standard and bespoke commands (with data) to component */ -static int mixer_cmd(struct comp_dev *dev, int cmd, void *data) +static int mixer_trigger(struct comp_dev *dev, int cmd) { int ret; - trace_mixer("cmd"); + trace_mixer("trg"); ret = comp_set_state(dev, cmd); if (ret < 0) return ret; switch(cmd) { - case COMP_CMD_START: - case COMP_CMD_RELEASE: + case COMP_TRIGGER_START: + case COMP_TRIGGER_RELEASE: if (mixer_sink_status(dev) == COMP_STATE_ACTIVE) return 1; /* no need to go downstream */ break; - case COMP_CMD_PAUSE: - case COMP_CMD_STOP: + case COMP_TRIGGER_PAUSE: + case COMP_TRIGGER_STOP: if (mixer_source_status_count(dev, COMP_STATE_ACTIVE) > 0) { dev->state = COMP_STATE_ACTIVE; return 1; /* no need to go downstream */ @@ -289,7 +289,7 @@ static int mixer_reset(struct comp_dev *dev) return 1; /* should not reset the downstream components */ } - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -318,7 +318,7 @@ static int mixer_prepare(struct comp_dev *dev) md->mix_func = mix_n; dev->state = COMP_STATE_PREPARE; - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; } @@ -345,7 +345,7 @@ struct comp_driver comp_mixer = { .free = mixer_free, .params = mixer_params, .prepare = mixer_prepare, - .cmd = mixer_cmd, + .trigger = mixer_trigger, .copy = mixer_copy, .reset = mixer_reset, }, diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 23be5031..31ade4eb 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -193,20 +193,20 @@ static void disconnect_downstream(struct pipeline *p, struct comp_dev *start, } /* update pipeline state based on cmd */ -static void pipeline_cmd_update(struct pipeline *p, struct comp_dev *comp, - int cmd) +static void pipeline_trigger_sched_comp(struct pipeline *p, + struct comp_dev *comp, int cmd) { /* only required by the scheduling component */ if (p->sched_comp != comp) return; switch (cmd) { - case COMP_CMD_PAUSE: - case COMP_CMD_STOP: + case COMP_TRIGGER_PAUSE: + case COMP_TRIGGER_STOP: pipeline_schedule_cancel(p); break; - case COMP_CMD_START: - case COMP_CMD_RELEASE: + case COMP_TRIGGER_START: + case COMP_TRIGGER_RELEASE: p->xrun_bytes = 0; /* playback pipelines need scheduled now, capture pipelines are @@ -223,9 +223,9 @@ static void pipeline_cmd_update(struct pipeline *p, struct comp_dev *comp, } } break; - case COMP_CMD_SUSPEND: - case COMP_CMD_RESUME: - case COMP_CMD_XRUN: + case COMP_TRIGGER_SUSPEND: + case COMP_TRIGGER_RESUME: + case COMP_TRIGGER_XRUN: default: break; } @@ -374,12 +374,12 @@ static int component_op_downstream(struct op_data *op_data, comp_install_params(current, previous); err = comp_params(current); break; - case COMP_OPS_CMD: + case COMP_OPS_TRIGGER: /* send command to the component and update pipeline state */ - err = comp_cmd(current, op_data->cmd, op_data->cmd_data); + err = comp_trigger(current, op_data->cmd); if (err == 0) - pipeline_cmd_update(current->pipeline, current, - op_data->cmd); + pipeline_trigger_sched_comp(current->pipeline, current, + op_data->cmd); break; case COMP_OPS_PREPARE: /* prepare the component */ @@ -455,12 +455,12 @@ static int component_op_upstream(struct op_data *op_data, comp_install_params(current, previous); err = comp_params(current); break; - case COMP_OPS_CMD: + case COMP_OPS_TRIGGER: /* send command to the component and update pipeline state */ - err = comp_cmd(current, op_data->cmd, op_data->cmd_data); + err = comp_trigger(current, op_data->cmd); if (err == 0) - pipeline_cmd_update(current->pipeline, current, - op_data->cmd); + pipeline_trigger_sched_comp(current->pipeline, current, + op_data->cmd); break; case COMP_OPS_PREPARE: /* prepare the component */ @@ -622,8 +622,7 @@ out: } /* send pipeline component/endpoint a command */ -int pipeline_cmd(struct pipeline *p, struct comp_dev *host, int cmd, - void *data) +int pipeline_trigger(struct pipeline *p, struct comp_dev *host, int cmd) { struct op_data op_data; int ret; @@ -632,9 +631,8 @@ int pipeline_cmd(struct pipeline *p, struct comp_dev *host, int cmd, trace_pipe("cmd"); op_data.p = p; - op_data.op = COMP_OPS_CMD; + op_data.op = COMP_OPS_TRIGGER; op_data.cmd = cmd; - op_data.cmd_data = data; spin_lock_irq(&p->lock, flags); @@ -1056,7 +1054,7 @@ static int pipeline_xrun_recover(struct pipeline *p) trace_pipe_error("pxr"); /* notify all pipeline comps we are in XRUN */ - ret = pipeline_cmd(p, p->source_comp, COMP_CMD_XRUN, NULL); + ret = pipeline_trigger(p, p->source_comp, COMP_TRIGGER_XRUN); if (ret < 0) { trace_pipe_error("px0"); return ret; @@ -1071,7 +1069,7 @@ static int pipeline_xrun_recover(struct pipeline *p) } /* restart pipeline comps */ - ret = pipeline_cmd(p, p->source_comp, COMP_CMD_START, NULL); + ret = pipeline_trigger(p, p->source_comp, COMP_TRIGGER_START); if (ret < 0) { trace_pipe_error("px2"); return ret; diff --git a/src/audio/src.c b/src/audio/src.c index a579fa91..1045bdf4 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -751,16 +751,19 @@ static int src_cmd(struct comp_dev *dev, int cmd, void *data) trace_src("cmd"); - ret = comp_set_state(dev, cmd); - if (ret < 0) - return ret; - if (cmd == COMP_CMD_SET_VALUE) ret = src_ctrl_cmd(dev, cdata); return ret; } +static int src_trigger(struct comp_dev *dev, int cmd) +{ + trace_src("trg"); + + return comp_set_state(dev, cmd); +} + /* copy and process stream data from source to sink buffers */ static int src_copy(struct comp_dev *dev) { @@ -827,7 +830,7 @@ static int src_prepare(struct comp_dev *dev) { trace_src("pre"); - return comp_set_state(dev, COMP_CMD_PREPARE); + return comp_set_state(dev, COMP_TRIGGER_PREPARE); } static int src_reset(struct comp_dev *dev) @@ -839,7 +842,7 @@ static int src_reset(struct comp_dev *dev) cd->src_func = src_2s_s32_default; src_polyphase_reset(&cd->src); - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -850,6 +853,7 @@ struct comp_driver comp_src = { .free = src_free, .params = src_params, .cmd = src_cmd, + .trigger = src_trigger, .copy = src_copy, .prepare = src_prepare, .reset = src_reset, diff --git a/src/audio/tone.c b/src/audio/tone.c index e4e98927..af23cc4b 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -576,10 +576,6 @@ static int tone_cmd(struct comp_dev *dev, int cmd, void *data) trace_tone("cmd"); - ret = comp_set_state(dev, cmd); - if (ret < 0) - return ret; - switch (cmd) { case COMP_CMD_SET_DATA: ret = tone_cmd_set_data(dev, cdata); @@ -592,6 +588,13 @@ static int tone_cmd(struct comp_dev *dev, int cmd, void *data) return ret; } +static int tone_trigger(struct comp_dev *dev, int cmd) +{ + trace_tone("trg"); + + return comp_set_state(dev, cmd); +} + /* copy and process stream data from source to sink buffers */ static int tone_copy(struct comp_dev * dev) { @@ -633,7 +636,7 @@ static int tone_prepare(struct comp_dev * dev) trace_tone("TPp"); - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; @@ -646,7 +649,7 @@ static int tone_prepare(struct comp_dev * dev) f = tonegen_get_f(&cd->sg[i]); a = tonegen_get_a(&cd->sg[i]); if (tonegen_init(&cd->sg[i], cd->rate, f, a) < 0) { - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return -EINVAL; } } @@ -666,7 +669,7 @@ static int tone_reset(struct comp_dev * dev) for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) tonegen_reset(&cd->sg[i]); - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -678,6 +681,7 @@ struct comp_driver comp_tone = { .free = tone_free, .params = tone_params, .cmd = tone_cmd, + .trigger = tone_trigger, .copy = tone_copy, .prepare = tone_prepare, .reset = tone_reset, diff --git a/src/audio/volume.c b/src/audio/volume.c index 1a3f4369..cff09a34 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -809,24 +809,26 @@ static int volume_ctrl_get_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *c static int volume_cmd(struct comp_dev *dev, int cmd, void *data) { struct sof_ipc_ctrl_data *cdata = data; - int ret; trace_volume("cmd"); - ret = comp_set_state(dev, cmd); - if (ret < 0) - return ret; - switch (cmd) { case COMP_CMD_SET_VALUE: return volume_ctrl_set_cmd(dev, cdata); case COMP_CMD_GET_VALUE: return volume_ctrl_get_cmd(dev, cdata); default: - return ret; + return -EINVAL; } } +static int volume_trigger(struct comp_dev *dev, int cmd) +{ + trace_volume("trg"); + + return comp_set_state(dev, cmd); +} + /* copy and process stream data from source to sink buffers */ static int volume_copy(struct comp_dev *dev) { @@ -880,7 +882,7 @@ static int volume_prepare(struct comp_dev *dev) trace_volume("pre"); - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; @@ -975,7 +977,7 @@ static int volume_prepare(struct comp_dev *dev) trace_error_value(dev->params.channels); err: - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return ret; found: @@ -989,7 +991,7 @@ static int volume_reset(struct comp_dev *dev) { trace_volume("res"); - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -1000,6 +1002,7 @@ struct comp_driver comp_volume = { .free = volume_free, .params = volume_params, .cmd = volume_cmd, + .trigger = volume_trigger, .copy = volume_copy, .prepare = volume_prepare, .reset = volume_reset, diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 6424b7d8..9af28a89 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -575,25 +575,25 @@ static int ssp_trigger(struct dai *dai, int cmd, int direction) trace_ssp("tri"); switch (cmd) { - case COMP_CMD_START: + case COMP_TRIGGER_START: if (ssp->state[direction] == COMP_STATE_PREPARE || ssp->state[direction] == COMP_STATE_PAUSED) ssp_start(dai, direction); break; - case COMP_CMD_RELEASE: + case COMP_TRIGGER_RELEASE: if (ssp->state[direction] == COMP_STATE_PAUSED || ssp->state[direction] == COMP_STATE_PREPARE) ssp_start(dai, direction); break; - case COMP_CMD_STOP: - case COMP_CMD_PAUSE: + case COMP_TRIGGER_STOP: + case COMP_TRIGGER_PAUSE: ssp->state[direction] = COMP_STATE_PAUSED; ssp_stop(dai); break; - case COMP_CMD_RESUME: + case COMP_TRIGGER_RESUME: ssp_context_restore(dai); break; - case COMP_CMD_SUSPEND: + case COMP_TRIGGER_SUSPEND: ssp_context_store(dai); break; default: diff --git a/src/drivers/ssp.c b/src/drivers/ssp.c index 827a4d81..ae9c58ce 100644 --- a/src/drivers/ssp.c +++ b/src/drivers/ssp.c @@ -540,25 +540,25 @@ static int ssp_trigger(struct dai *dai, int cmd, int direction) trace_ssp("tri"); switch (cmd) { - case COMP_CMD_START: + case COMP_TRIGGER_START: if (ssp->state[direction] == COMP_STATE_PREPARE || ssp->state[direction] == COMP_STATE_PAUSED) ssp_start(dai, direction); break; - case COMP_CMD_RELEASE: + case COMP_TRIGGER_RELEASE: if (ssp->state[direction] == COMP_STATE_PAUSED || ssp->state[direction] == COMP_STATE_PREPARE) ssp_start(dai, direction); break; - case COMP_CMD_STOP: - case COMP_CMD_PAUSE: + case COMP_TRIGGER_STOP: + case COMP_TRIGGER_PAUSE: ssp->state[direction] = COMP_STATE_PAUSED; ssp_stop(dai); break; - case COMP_CMD_RESUME: + case COMP_TRIGGER_RESUME: ssp_context_restore(dai); break; - case COMP_CMD_SUSPEND: + case COMP_TRIGGER_SUSPEND: ssp_context_store(dai); break; default: diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index 538d4761..2e58170a 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -70,17 +70,18 @@ /* * standard component stream commands + * TODO: use IPC versions after 1.1 */ -#define COMP_CMD_STOP 0 /* stop component stream */ -#define COMP_CMD_START 1 /* start component stream */ -#define COMP_CMD_PAUSE 2 /* immediately pause the component stream */ -#define COMP_CMD_RELEASE 3 /* release paused component stream */ -#define COMP_CMD_SUSPEND 5 /* suspend component */ -#define COMP_CMD_RESUME 6 /* resume component */ -#define COMP_CMD_RESET 6 /* reset component */ -#define COMP_CMD_PREPARE 7 /* prepare component */ -#define COMP_CMD_XRUN 8 /* XRUN component */ +#define COMP_TRIGGER_STOP 0 /* stop component stream */ +#define COMP_TRIGGER_START 1 /* start component stream */ +#define COMP_TRIGGER_PAUSE 2 /* pause the component stream */ +#define COMP_TRIGGER_RELEASE 3 /* release paused component stream */ +#define COMP_TRIGGER_SUSPEND 5 /* suspend component */ +#define COMP_TRIGGER_RESUME 6 /* resume component */ +#define COMP_TRIGGER_RESET 6 /* reset component */ +#define COMP_TRIGGER_PREPARE 7 /* prepare component */ +#define COMP_TRIGGER_XRUN 8 /* XRUN component */ /* * standard component control commands @@ -100,7 +101,7 @@ /* component operations */ #define COMP_OPS_PARAMS 0 -#define COMP_OPS_CMD 1 +#define COMP_OPS_TRIGGER 1 #define COMP_OPS_PREPARE 2 #define COMP_OPS_COPY 3 #define COMP_OPS_BUFFER 4 @@ -133,9 +134,12 @@ struct comp_ops { int (*dai_config)(struct comp_dev *dev, struct sof_ipc_dai_config *dai_config); - /* used to pass standard and bespoke commands (with data) to component */ + /* used to pass standard and bespoke commands (with optional data) */ int (*cmd)(struct comp_dev *dev, int cmd, void *data); + /* atomic - used to start/stop/pause stream operations */ + int (*trigger)(struct comp_dev *dev, int cmd); + /* prepare component after params are set */ int (*prepare)(struct comp_dev *dev); @@ -258,6 +262,12 @@ static inline int comp_cmd(struct comp_dev *dev, int cmd, void *data) return dev->drv->ops.cmd(dev, cmd, data); } +/* trigger component - mandatory and atomic */ +static inline int comp_trigger(struct comp_dev *dev, int cmd) +{ + return dev->drv->ops.trigger(dev, cmd); +} + /* prepare component - mandatory */ static inline int comp_prepare(struct comp_dev *dev) { diff --git a/src/include/reef/audio/pipeline.h b/src/include/reef/audio/pipeline.h index dca9413b..8e5dae34 100644 --- a/src/include/reef/audio/pipeline.h +++ b/src/include/reef/audio/pipeline.h @@ -103,9 +103,8 @@ int pipeline_prepare(struct pipeline *p, struct comp_dev *cd); /* reset the pipeline and free resources */ int pipeline_reset(struct pipeline *p, struct comp_dev *host_cd); -/* send pipeline a command */ -int pipeline_cmd(struct pipeline *p, struct comp_dev *host_cd, int cmd, - void *data); +/* trigger pipeline - atomic */ +int pipeline_trigger(struct pipeline *p, struct comp_dev *host_cd, int cmd); /* initialise pipeline subsys */ int pipeline_init(void); diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 5c062bed..8dbe7253 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -433,7 +433,7 @@ int ipc_stream_send_xrun(struct comp_dev *cdev, static int ipc_stream_trigger(uint32_t header) { struct ipc_comp_dev *pcm_dev; - uint32_t cmd = COMP_CMD_RELEASE; + uint32_t cmd = COMP_TRIGGER_RELEASE; struct sof_ipc_stream *stream = _ipc->comp_data; uint32_t ipc_cmd = (header & SOF_CMD_TYPE_MASK) >> SOF_CMD_TYPE_SHIFT; int ret; @@ -449,16 +449,16 @@ static int ipc_stream_trigger(uint32_t header) switch (ipc_cmd) { case iCS(SOF_IPC_STREAM_TRIG_START): - cmd = COMP_CMD_START; + cmd = COMP_TRIGGER_START; break; case iCS(SOF_IPC_STREAM_TRIG_STOP): - cmd = COMP_CMD_STOP; + cmd = COMP_TRIGGER_STOP; break; case iCS(SOF_IPC_STREAM_TRIG_PAUSE): - cmd = COMP_CMD_PAUSE; + cmd = COMP_TRIGGER_PAUSE; break; case iCS(SOF_IPC_STREAM_TRIG_RELEASE): - cmd = COMP_CMD_RELEASE; + cmd = COMP_TRIGGER_RELEASE; break; /* XRUN is special case- TODO */ case iCS(SOF_IPC_STREAM_TRIG_XRUN): @@ -466,8 +466,7 @@ static int ipc_stream_trigger(uint32_t header) } /* trigger the component */ - ret = pipeline_cmd(pcm_dev->cd->pipeline, pcm_dev->cd, - cmd, NULL); + ret = pipeline_trigger(pcm_dev->cd->pipeline, pcm_dev->cd, cmd); if (ret < 0) { trace_ipc_error("eRc"); trace_error_value(ipc_cmd); -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] core: comp: Add component trigger API call.
by Liam Girdwood 29 Mar '18

29 Mar '18

Add a new component API for performing atomic stream state change operations. This leave the cmd API for non atomic usage. This patch also does some renaming to use _trigger() instead of _cmd(). Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- If no objections, I'll push to a topic branch for full testing prior to merge with 1.1-stable. src/audio/component.c | 14 ++++++------ src/audio/dai.c | 30 +++++++++++++------------- src/audio/eq_fir.c | 20 ++++++++++------- src/audio/eq_iir.c | 20 ++++++++++------- src/audio/host.c | 22 +++++++++---------- src/audio/mixer.c | 18 ++++++++-------- src/audio/pipeline.c | 44 ++++++++++++++++++-------------------- src/audio/src.c | 16 ++++++++------ src/audio/tone.c | 18 ++++++++++------ src/audio/volume.c | 21 ++++++++++-------- src/drivers/apl-ssp.c | 12 +++++------ src/drivers/ssp.c | 12 +++++------ src/include/reef/audio/component.h | 32 +++++++++++++++++---------- src/include/reef/audio/pipeline.h | 5 ++--- src/ipc/intel-ipc.c | 13 ++++++----- 15 files changed, 161 insertions(+), 136 deletions(-) diff --git a/src/audio/component.c b/src/audio/component.c index 1802278e..605652a2 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -121,7 +121,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) int ret = 0; switch (cmd) { - case COMP_CMD_START: + case COMP_TRIGGER_START: if (dev->state == COMP_STATE_PREPARE || dev->state == COMP_STATE_PAUSED) { dev->state = COMP_STATE_ACTIVE; @@ -131,7 +131,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) ret = -EINVAL; } break; - case COMP_CMD_RELEASE: + case COMP_TRIGGER_RELEASE: if (dev->state == COMP_STATE_PAUSED) { dev->state = COMP_STATE_ACTIVE; } else { @@ -140,8 +140,8 @@ int comp_set_state(struct comp_dev *dev, int cmd) ret = -EINVAL; } break; - case COMP_CMD_STOP: - case COMP_CMD_XRUN: + case COMP_TRIGGER_STOP: + case COMP_TRIGGER_XRUN: if (dev->state == COMP_STATE_ACTIVE) { dev->state = COMP_STATE_PREPARE; } else { @@ -150,7 +150,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) ret = -EINVAL; } break; - case COMP_CMD_PAUSE: + case COMP_TRIGGER_PAUSE: /* only support pausing for running */ if (dev->state == COMP_STATE_ACTIVE) dev->state = COMP_STATE_PAUSED; @@ -160,7 +160,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) ret = -EINVAL; } break; - case COMP_CMD_RESET: + case COMP_TRIGGER_RESET: /* reset always succeeds */ dev->state = COMP_STATE_READY; if (dev->state == COMP_STATE_ACTIVE || @@ -170,7 +170,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) ret = 0; } break; - case COMP_CMD_PREPARE: + case COMP_TRIGGER_PREPARE: if (dev->state == COMP_STATE_PREPARE || dev->state == COMP_STATE_READY) { dev->state = COMP_STATE_PREPARE; diff --git a/src/audio/dai.c b/src/audio/dai.c index 53536ed3..e20283dd 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -72,8 +72,6 @@ struct dai_data { uint64_t wallclock; /* wall clock at stream start */ }; -static int dai_cmd(struct comp_dev *dev, int cmd, void *data); - /* this is called by DMA driver every time descriptor has completed */ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) { @@ -88,13 +86,15 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) if (dev->state != COMP_STATE_ACTIVE && dd->xrun == 0) { /* stop the DAI */ - dai_trigger(dd->dai, COMP_CMD_STOP, dev->params.direction); + dai_trigger(dd->dai, COMP_TRIGGER_STOP, dev->params.direction); /* tell DMA not to reload */ next->size = DMA_RELOAD_END; /* inform waiters */ wait_completed(&dd->complete); + + return; } /* is our pipeline handling an XRUN ? */ @@ -435,7 +435,7 @@ static int dai_prepare(struct comp_dev *dev) trace_dai("pre"); - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; @@ -443,7 +443,7 @@ static int dai_prepare(struct comp_dev *dev) if (list_is_empty(&dd->config.elem_list)) { trace_dai_error("wdm"); - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return -EINVAL; } @@ -463,7 +463,7 @@ static int dai_prepare(struct comp_dev *dev) ret = dma_set_config(dd->dma, dd->chan, &dd->config); if (ret < 0) - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return ret; } @@ -492,7 +492,7 @@ static int dai_reset(struct comp_dev *dev) dd->wallclock = 0; dev->position = 0; dd->xrun = 0; - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -529,12 +529,12 @@ static void dai_pointer_init(struct comp_dev *dev) } /* used to pass standard and bespoke command (with data) to component */ -static int dai_cmd(struct comp_dev *dev, int cmd, void *data) +static int dai_comp_trigger(struct comp_dev *dev, int cmd) { struct dai_data *dd = comp_get_drvdata(dev); int ret; - trace_dai("cmd"); + trace_dai("trg"); tracev_value(cmd); wait_init(&dd->complete); @@ -544,10 +544,10 @@ static int dai_cmd(struct comp_dev *dev, int cmd, void *data) return ret; switch (cmd) { - case COMP_CMD_START: + case COMP_TRIGGER_START: dai_pointer_init(dev); /* fall through */ - case COMP_CMD_RELEASE: + case COMP_TRIGGER_RELEASE: /* only start the DAI if we are not XRUN handling */ if (dd->xrun == 0) { @@ -564,11 +564,11 @@ static int dai_cmd(struct comp_dev *dev, int cmd, void *data) /* update starting wallclock */ platform_dai_wallclock(dev, &dd->wallclock); break; - case COMP_CMD_XRUN: + case COMP_TRIGGER_XRUN: dd->xrun = 1; /* fall through */ - case COMP_CMD_PAUSE: - case COMP_CMD_STOP: + case COMP_TRIGGER_PAUSE: + case COMP_TRIGGER_STOP: wait_init(&dd->complete); /* wait for DMA to complete */ @@ -638,7 +638,7 @@ static struct comp_driver comp_dai = { .new = dai_new, .free = dai_free, .params = dai_params, - .cmd = dai_cmd, + .trigger = dai_comp_trigger, .copy = dai_copy, .prepare = dai_prepare, .reset = dai_reset, diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index 52988cdf..72cfe938 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -425,10 +425,6 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) trace_eq("cmd"); - ret = comp_set_state(dev, cmd); - if (ret < 0) - return ret; - switch (cmd) { case COMP_CMD_SET_VALUE: ret = fir_cmd_set_value(dev, cdata); @@ -441,6 +437,13 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) return ret; } +static int eq_fir_trigger(struct comp_dev *dev, int cmd) +{ + trace_eq("trg"); + + return comp_set_state(dev, cmd); +} + /* copy and process stream data from source to sink buffers */ static int eq_fir_copy(struct comp_dev *dev) { @@ -482,7 +485,7 @@ static int eq_fir_prepare(struct comp_dev *dev) trace_eq("EPp"); - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; @@ -490,13 +493,13 @@ static int eq_fir_prepare(struct comp_dev *dev) /* Initialize EQ */ if (cd->config == NULL) { - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return -EINVAL; } ret = eq_fir_setup(cd->fir, cd->config, dev->params.channels); if (ret < 0) { - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return ret; } @@ -517,7 +520,7 @@ static int eq_fir_reset(struct comp_dev *dev) for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) fir_reset(&cd->fir[i]); - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -528,6 +531,7 @@ struct comp_driver comp_eq_fir = { .free = eq_fir_free, .params = eq_fir_params, .cmd = eq_fir_cmd, + .trigger = eq_fir_trigger, .copy = eq_fir_copy, .prepare = eq_fir_prepare, .reset = eq_fir_reset, diff --git a/src/audio/eq_iir.c b/src/audio/eq_iir.c index bbcd66b8..239eead3 100644 --- a/src/audio/eq_iir.c +++ b/src/audio/eq_iir.c @@ -424,10 +424,6 @@ static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) trace_eq_iir("cmd"); - ret = comp_set_state(dev, cmd); - if (ret < 0) - return ret; - switch (cmd) { case COMP_CMD_SET_VALUE: ret = iir_cmd_set_value(dev, cdata); @@ -440,6 +436,13 @@ static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) return ret; } +static int eq_iir_trigger(struct comp_dev *dev, int cmd) +{ + trace_eq_iir("trg"); + + return comp_set_state(dev, cmd); +} + /* copy and process stream data from source to sink buffers */ static int eq_iir_copy(struct comp_dev *dev) { @@ -481,7 +484,7 @@ static int eq_iir_prepare(struct comp_dev *dev) trace_eq_iir("EPp"); - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; @@ -492,13 +495,13 @@ static int eq_iir_prepare(struct comp_dev *dev) * interrupts pipeline prepare for downstream. */ if (cd->config == NULL) { - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return -EINVAL; } ret = eq_iir_setup(cd->iir, cd->config, dev->params.channels); if (ret < 0) { - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return ret; } @@ -519,7 +522,7 @@ static int eq_iir_reset(struct comp_dev *dev) for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) iir_reset_df2t(&cd->iir[i]); - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -530,6 +533,7 @@ struct comp_driver comp_eq_iir = { .free = eq_iir_free, .params = eq_iir_params, .cmd = eq_iir_cmd, + .trigger = eq_iir_trigger, .copy = eq_iir_copy, .prepare = eq_iir_prepare, .reset = eq_iir_reset, diff --git a/src/audio/host.c b/src/audio/host.c index 9177d994..3ca67b5e 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -274,7 +274,7 @@ unwind: } /* used to pass standard and bespoke commands (with data) to component */ -static int host_cmd(struct comp_dev *dev, int cmd, void *data) +static int host_trigger(struct comp_dev *dev, int cmd) { int ret = 0; @@ -285,10 +285,10 @@ static int host_cmd(struct comp_dev *dev, int cmd, void *data) return ret; switch (cmd) { - case COMP_CMD_STOP: + case COMP_TRIGGER_STOP: ret = host_stop(dev); break; - case COMP_CMD_START: + case COMP_TRIGGER_START: /* preload first playback period for preloader task */ if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK) { ret = host_copy(dev); @@ -453,25 +453,25 @@ unwind: } /* used to pass standard and bespoke commands (with data) to component */ -static int host_cmd(struct comp_dev *dev, int cmd, void *data) +static int host_trigger(struct comp_dev *dev, int cmd) { struct host_data *hd = comp_get_drvdata(dev); int ret = 0; - trace_host("cmd"); + trace_host("trg"); ret = comp_set_state(dev, cmd); if (ret < 0) return ret; switch (cmd) { - case COMP_CMD_PAUSE: + case COMP_TRIGGER_PAUSE: dma_stop(hd->dma, hd->chan); break; - case COMP_CMD_STOP: + case COMP_TRIGGER_STOP: ret = host_stop(dev); break; - case COMP_CMD_START: + case COMP_TRIGGER_START: dma_start(hd->dma, hd->chan); /* preload first playback period for preloader task */ @@ -716,7 +716,7 @@ static int host_prepare(struct comp_dev *dev) trace_host("pre"); - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; @@ -744,7 +744,7 @@ static int host_pointer_reset(struct comp_dev *dev) hd->local_pos = 0; hd->report_pos = 0; dev->position = 0; - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -907,7 +907,7 @@ struct comp_driver comp_host = { .free = host_free, .params = host_params, .reset = host_reset, - .cmd = host_cmd, + .trigger = host_trigger, .copy = host_copy, .prepare = host_prepare, .host_buffer = host_buffer, diff --git a/src/audio/mixer.c b/src/audio/mixer.c index abc8881b..d05a40c3 100644 --- a/src/audio/mixer.c +++ b/src/audio/mixer.c @@ -178,24 +178,24 @@ static inline int mixer_sink_status(struct comp_dev *mixer) } /* used to pass standard and bespoke commands (with data) to component */ -static int mixer_cmd(struct comp_dev *dev, int cmd, void *data) +static int mixer_trigger(struct comp_dev *dev, int cmd) { int ret; - trace_mixer("cmd"); + trace_mixer("trg"); ret = comp_set_state(dev, cmd); if (ret < 0) return ret; switch(cmd) { - case COMP_CMD_START: - case COMP_CMD_RELEASE: + case COMP_TRIGGER_START: + case COMP_TRIGGER_RELEASE: if (mixer_sink_status(dev) == COMP_STATE_ACTIVE) return 1; /* no need to go downstream */ break; - case COMP_CMD_PAUSE: - case COMP_CMD_STOP: + case COMP_TRIGGER_PAUSE: + case COMP_TRIGGER_STOP: if (mixer_source_status_count(dev, COMP_STATE_ACTIVE) > 0) { dev->state = COMP_STATE_ACTIVE; return 1; /* no need to go downstream */ @@ -289,7 +289,7 @@ static int mixer_reset(struct comp_dev *dev) return 1; /* should not reset the downstream components */ } - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -318,7 +318,7 @@ static int mixer_prepare(struct comp_dev *dev) md->mix_func = mix_n; dev->state = COMP_STATE_PREPARE; - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; } @@ -345,7 +345,7 @@ struct comp_driver comp_mixer = { .free = mixer_free, .params = mixer_params, .prepare = mixer_prepare, - .cmd = mixer_cmd, + .trigger = mixer_trigger, .copy = mixer_copy, .reset = mixer_reset, }, diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 23be5031..31ade4eb 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -193,20 +193,20 @@ static void disconnect_downstream(struct pipeline *p, struct comp_dev *start, } /* update pipeline state based on cmd */ -static void pipeline_cmd_update(struct pipeline *p, struct comp_dev *comp, - int cmd) +static void pipeline_trigger_sched_comp(struct pipeline *p, + struct comp_dev *comp, int cmd) { /* only required by the scheduling component */ if (p->sched_comp != comp) return; switch (cmd) { - case COMP_CMD_PAUSE: - case COMP_CMD_STOP: + case COMP_TRIGGER_PAUSE: + case COMP_TRIGGER_STOP: pipeline_schedule_cancel(p); break; - case COMP_CMD_START: - case COMP_CMD_RELEASE: + case COMP_TRIGGER_START: + case COMP_TRIGGER_RELEASE: p->xrun_bytes = 0; /* playback pipelines need scheduled now, capture pipelines are @@ -223,9 +223,9 @@ static void pipeline_cmd_update(struct pipeline *p, struct comp_dev *comp, } } break; - case COMP_CMD_SUSPEND: - case COMP_CMD_RESUME: - case COMP_CMD_XRUN: + case COMP_TRIGGER_SUSPEND: + case COMP_TRIGGER_RESUME: + case COMP_TRIGGER_XRUN: default: break; } @@ -374,12 +374,12 @@ static int component_op_downstream(struct op_data *op_data, comp_install_params(current, previous); err = comp_params(current); break; - case COMP_OPS_CMD: + case COMP_OPS_TRIGGER: /* send command to the component and update pipeline state */ - err = comp_cmd(current, op_data->cmd, op_data->cmd_data); + err = comp_trigger(current, op_data->cmd); if (err == 0) - pipeline_cmd_update(current->pipeline, current, - op_data->cmd); + pipeline_trigger_sched_comp(current->pipeline, current, + op_data->cmd); break; case COMP_OPS_PREPARE: /* prepare the component */ @@ -455,12 +455,12 @@ static int component_op_upstream(struct op_data *op_data, comp_install_params(current, previous); err = comp_params(current); break; - case COMP_OPS_CMD: + case COMP_OPS_TRIGGER: /* send command to the component and update pipeline state */ - err = comp_cmd(current, op_data->cmd, op_data->cmd_data); + err = comp_trigger(current, op_data->cmd); if (err == 0) - pipeline_cmd_update(current->pipeline, current, - op_data->cmd); + pipeline_trigger_sched_comp(current->pipeline, current, + op_data->cmd); break; case COMP_OPS_PREPARE: /* prepare the component */ @@ -622,8 +622,7 @@ out: } /* send pipeline component/endpoint a command */ -int pipeline_cmd(struct pipeline *p, struct comp_dev *host, int cmd, - void *data) +int pipeline_trigger(struct pipeline *p, struct comp_dev *host, int cmd) { struct op_data op_data; int ret; @@ -632,9 +631,8 @@ int pipeline_cmd(struct pipeline *p, struct comp_dev *host, int cmd, trace_pipe("cmd"); op_data.p = p; - op_data.op = COMP_OPS_CMD; + op_data.op = COMP_OPS_TRIGGER; op_data.cmd = cmd; - op_data.cmd_data = data; spin_lock_irq(&p->lock, flags); @@ -1056,7 +1054,7 @@ static int pipeline_xrun_recover(struct pipeline *p) trace_pipe_error("pxr"); /* notify all pipeline comps we are in XRUN */ - ret = pipeline_cmd(p, p->source_comp, COMP_CMD_XRUN, NULL); + ret = pipeline_trigger(p, p->source_comp, COMP_TRIGGER_XRUN); if (ret < 0) { trace_pipe_error("px0"); return ret; @@ -1071,7 +1069,7 @@ static int pipeline_xrun_recover(struct pipeline *p) } /* restart pipeline comps */ - ret = pipeline_cmd(p, p->source_comp, COMP_CMD_START, NULL); + ret = pipeline_trigger(p, p->source_comp, COMP_TRIGGER_START); if (ret < 0) { trace_pipe_error("px2"); return ret; diff --git a/src/audio/src.c b/src/audio/src.c index a579fa91..1045bdf4 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -751,16 +751,19 @@ static int src_cmd(struct comp_dev *dev, int cmd, void *data) trace_src("cmd"); - ret = comp_set_state(dev, cmd); - if (ret < 0) - return ret; - if (cmd == COMP_CMD_SET_VALUE) ret = src_ctrl_cmd(dev, cdata); return ret; } +static int src_trigger(struct comp_dev *dev, int cmd) +{ + trace_src("trg"); + + return comp_set_state(dev, cmd); +} + /* copy and process stream data from source to sink buffers */ static int src_copy(struct comp_dev *dev) { @@ -827,7 +830,7 @@ static int src_prepare(struct comp_dev *dev) { trace_src("pre"); - return comp_set_state(dev, COMP_CMD_PREPARE); + return comp_set_state(dev, COMP_TRIGGER_PREPARE); } static int src_reset(struct comp_dev *dev) @@ -839,7 +842,7 @@ static int src_reset(struct comp_dev *dev) cd->src_func = src_2s_s32_default; src_polyphase_reset(&cd->src); - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -850,6 +853,7 @@ struct comp_driver comp_src = { .free = src_free, .params = src_params, .cmd = src_cmd, + .trigger = src_trigger, .copy = src_copy, .prepare = src_prepare, .reset = src_reset, diff --git a/src/audio/tone.c b/src/audio/tone.c index e4e98927..af23cc4b 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -576,10 +576,6 @@ static int tone_cmd(struct comp_dev *dev, int cmd, void *data) trace_tone("cmd"); - ret = comp_set_state(dev, cmd); - if (ret < 0) - return ret; - switch (cmd) { case COMP_CMD_SET_DATA: ret = tone_cmd_set_data(dev, cdata); @@ -592,6 +588,13 @@ static int tone_cmd(struct comp_dev *dev, int cmd, void *data) return ret; } +static int tone_trigger(struct comp_dev *dev, int cmd) +{ + trace_tone("trg"); + + return comp_set_state(dev, cmd); +} + /* copy and process stream data from source to sink buffers */ static int tone_copy(struct comp_dev * dev) { @@ -633,7 +636,7 @@ static int tone_prepare(struct comp_dev * dev) trace_tone("TPp"); - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; @@ -646,7 +649,7 @@ static int tone_prepare(struct comp_dev * dev) f = tonegen_get_f(&cd->sg[i]); a = tonegen_get_a(&cd->sg[i]); if (tonegen_init(&cd->sg[i], cd->rate, f, a) < 0) { - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return -EINVAL; } } @@ -666,7 +669,7 @@ static int tone_reset(struct comp_dev * dev) for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) tonegen_reset(&cd->sg[i]); - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -678,6 +681,7 @@ struct comp_driver comp_tone = { .free = tone_free, .params = tone_params, .cmd = tone_cmd, + .trigger = tone_trigger, .copy = tone_copy, .prepare = tone_prepare, .reset = tone_reset, diff --git a/src/audio/volume.c b/src/audio/volume.c index 1a3f4369..cff09a34 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -809,24 +809,26 @@ static int volume_ctrl_get_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *c static int volume_cmd(struct comp_dev *dev, int cmd, void *data) { struct sof_ipc_ctrl_data *cdata = data; - int ret; trace_volume("cmd"); - ret = comp_set_state(dev, cmd); - if (ret < 0) - return ret; - switch (cmd) { case COMP_CMD_SET_VALUE: return volume_ctrl_set_cmd(dev, cdata); case COMP_CMD_GET_VALUE: return volume_ctrl_get_cmd(dev, cdata); default: - return ret; + return -EINVAL; } } +static int volume_trigger(struct comp_dev *dev, int cmd) +{ + trace_volume("trg"); + + return comp_set_state(dev, cmd); +} + /* copy and process stream data from source to sink buffers */ static int volume_copy(struct comp_dev *dev) { @@ -880,7 +882,7 @@ static int volume_prepare(struct comp_dev *dev) trace_volume("pre"); - ret = comp_set_state(dev, COMP_CMD_PREPARE); + ret = comp_set_state(dev, COMP_TRIGGER_PREPARE); if (ret < 0) return ret; @@ -975,7 +977,7 @@ static int volume_prepare(struct comp_dev *dev) trace_error_value(dev->params.channels); err: - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return ret; found: @@ -989,7 +991,7 @@ static int volume_reset(struct comp_dev *dev) { trace_volume("res"); - comp_set_state(dev, COMP_CMD_RESET); + comp_set_state(dev, COMP_TRIGGER_RESET); return 0; } @@ -1000,6 +1002,7 @@ struct comp_driver comp_volume = { .free = volume_free, .params = volume_params, .cmd = volume_cmd, + .trigger = volume_trigger, .copy = volume_copy, .prepare = volume_prepare, .reset = volume_reset, diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 6424b7d8..9af28a89 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -575,25 +575,25 @@ static int ssp_trigger(struct dai *dai, int cmd, int direction) trace_ssp("tri"); switch (cmd) { - case COMP_CMD_START: + case COMP_TRIGGER_START: if (ssp->state[direction] == COMP_STATE_PREPARE || ssp->state[direction] == COMP_STATE_PAUSED) ssp_start(dai, direction); break; - case COMP_CMD_RELEASE: + case COMP_TRIGGER_RELEASE: if (ssp->state[direction] == COMP_STATE_PAUSED || ssp->state[direction] == COMP_STATE_PREPARE) ssp_start(dai, direction); break; - case COMP_CMD_STOP: - case COMP_CMD_PAUSE: + case COMP_TRIGGER_STOP: + case COMP_TRIGGER_PAUSE: ssp->state[direction] = COMP_STATE_PAUSED; ssp_stop(dai); break; - case COMP_CMD_RESUME: + case COMP_TRIGGER_RESUME: ssp_context_restore(dai); break; - case COMP_CMD_SUSPEND: + case COMP_TRIGGER_SUSPEND: ssp_context_store(dai); break; default: diff --git a/src/drivers/ssp.c b/src/drivers/ssp.c index 827a4d81..ae9c58ce 100644 --- a/src/drivers/ssp.c +++ b/src/drivers/ssp.c @@ -540,25 +540,25 @@ static int ssp_trigger(struct dai *dai, int cmd, int direction) trace_ssp("tri"); switch (cmd) { - case COMP_CMD_START: + case COMP_TRIGGER_START: if (ssp->state[direction] == COMP_STATE_PREPARE || ssp->state[direction] == COMP_STATE_PAUSED) ssp_start(dai, direction); break; - case COMP_CMD_RELEASE: + case COMP_TRIGGER_RELEASE: if (ssp->state[direction] == COMP_STATE_PAUSED || ssp->state[direction] == COMP_STATE_PREPARE) ssp_start(dai, direction); break; - case COMP_CMD_STOP: - case COMP_CMD_PAUSE: + case COMP_TRIGGER_STOP: + case COMP_TRIGGER_PAUSE: ssp->state[direction] = COMP_STATE_PAUSED; ssp_stop(dai); break; - case COMP_CMD_RESUME: + case COMP_TRIGGER_RESUME: ssp_context_restore(dai); break; - case COMP_CMD_SUSPEND: + case COMP_TRIGGER_SUSPEND: ssp_context_store(dai); break; default: diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index 538d4761..2e58170a 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -70,17 +70,18 @@ /* * standard component stream commands + * TODO: use IPC versions after 1.1 */ -#define COMP_CMD_STOP 0 /* stop component stream */ -#define COMP_CMD_START 1 /* start component stream */ -#define COMP_CMD_PAUSE 2 /* immediately pause the component stream */ -#define COMP_CMD_RELEASE 3 /* release paused component stream */ -#define COMP_CMD_SUSPEND 5 /* suspend component */ -#define COMP_CMD_RESUME 6 /* resume component */ -#define COMP_CMD_RESET 6 /* reset component */ -#define COMP_CMD_PREPARE 7 /* prepare component */ -#define COMP_CMD_XRUN 8 /* XRUN component */ +#define COMP_TRIGGER_STOP 0 /* stop component stream */ +#define COMP_TRIGGER_START 1 /* start component stream */ +#define COMP_TRIGGER_PAUSE 2 /* pause the component stream */ +#define COMP_TRIGGER_RELEASE 3 /* release paused component stream */ +#define COMP_TRIGGER_SUSPEND 5 /* suspend component */ +#define COMP_TRIGGER_RESUME 6 /* resume component */ +#define COMP_TRIGGER_RESET 6 /* reset component */ +#define COMP_TRIGGER_PREPARE 7 /* prepare component */ +#define COMP_TRIGGER_XRUN 8 /* XRUN component */ /* * standard component control commands @@ -100,7 +101,7 @@ /* component operations */ #define COMP_OPS_PARAMS 0 -#define COMP_OPS_CMD 1 +#define COMP_OPS_TRIGGER 1 #define COMP_OPS_PREPARE 2 #define COMP_OPS_COPY 3 #define COMP_OPS_BUFFER 4 @@ -133,9 +134,12 @@ struct comp_ops { int (*dai_config)(struct comp_dev *dev, struct sof_ipc_dai_config *dai_config); - /* used to pass standard and bespoke commands (with data) to component */ + /* used to pass standard and bespoke commands (with optional data) */ int (*cmd)(struct comp_dev *dev, int cmd, void *data); + /* atomic - used to start/stop/pause stream operations */ + int (*trigger)(struct comp_dev *dev, int cmd); + /* prepare component after params are set */ int (*prepare)(struct comp_dev *dev); @@ -258,6 +262,12 @@ static inline int comp_cmd(struct comp_dev *dev, int cmd, void *data) return dev->drv->ops.cmd(dev, cmd, data); } +/* trigger component - mandatory and atomic */ +static inline int comp_trigger(struct comp_dev *dev, int cmd) +{ + return dev->drv->ops.trigger(dev, cmd); +} + /* prepare component - mandatory */ static inline int comp_prepare(struct comp_dev *dev) { diff --git a/src/include/reef/audio/pipeline.h b/src/include/reef/audio/pipeline.h index dca9413b..8e5dae34 100644 --- a/src/include/reef/audio/pipeline.h +++ b/src/include/reef/audio/pipeline.h @@ -103,9 +103,8 @@ int pipeline_prepare(struct pipeline *p, struct comp_dev *cd); /* reset the pipeline and free resources */ int pipeline_reset(struct pipeline *p, struct comp_dev *host_cd); -/* send pipeline a command */ -int pipeline_cmd(struct pipeline *p, struct comp_dev *host_cd, int cmd, - void *data); +/* trigger pipeline - atomic */ +int pipeline_trigger(struct pipeline *p, struct comp_dev *host_cd, int cmd); /* initialise pipeline subsys */ int pipeline_init(void); diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 5c062bed..8dbe7253 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -433,7 +433,7 @@ int ipc_stream_send_xrun(struct comp_dev *cdev, static int ipc_stream_trigger(uint32_t header) { struct ipc_comp_dev *pcm_dev; - uint32_t cmd = COMP_CMD_RELEASE; + uint32_t cmd = COMP_TRIGGER_RELEASE; struct sof_ipc_stream *stream = _ipc->comp_data; uint32_t ipc_cmd = (header & SOF_CMD_TYPE_MASK) >> SOF_CMD_TYPE_SHIFT; int ret; @@ -449,16 +449,16 @@ static int ipc_stream_trigger(uint32_t header) switch (ipc_cmd) { case iCS(SOF_IPC_STREAM_TRIG_START): - cmd = COMP_CMD_START; + cmd = COMP_TRIGGER_START; break; case iCS(SOF_IPC_STREAM_TRIG_STOP): - cmd = COMP_CMD_STOP; + cmd = COMP_TRIGGER_STOP; break; case iCS(SOF_IPC_STREAM_TRIG_PAUSE): - cmd = COMP_CMD_PAUSE; + cmd = COMP_TRIGGER_PAUSE; break; case iCS(SOF_IPC_STREAM_TRIG_RELEASE): - cmd = COMP_CMD_RELEASE; + cmd = COMP_TRIGGER_RELEASE; break; /* XRUN is special case- TODO */ case iCS(SOF_IPC_STREAM_TRIG_XRUN): @@ -466,8 +466,7 @@ static int ipc_stream_trigger(uint32_t header) } /* trigger the component */ - ret = pipeline_cmd(pcm_dev->cd->pipeline, pcm_dev->cd, - cmd, NULL); + ret = pipeline_trigger(pcm_dev->cd->pipeline, pcm_dev->cd, cmd); if (ret < 0) { trace_ipc_error("eRc"); trace_error_value(ipc_cmd); -- 2.14.1

3 3

[Sound-open-firmware] [PATCH] topology: apl-tdf8532: add support for SSP2-Codec
by Keyon Jie 28 Mar '18

28 Mar '18

Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- topology/reef-apl-tdf8532.m4 | 48 ++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/topology/reef-apl-tdf8532.m4 b/topology/reef-apl-tdf8532.m4 index eaddac9..50023f0 100644 --- a/topology/reef-apl-tdf8532.m4 +++ b/topology/reef-apl-tdf8532.m4 @@ -20,8 +20,8 @@ include(`dsps/bxt.m4') # Define the pipelines # # PCM0 ----> volume -----> SSP4 -# -# PCM1 <---- Volume <----- SSP4 +# PCM1 ----> volume -----> SSP2 +# PCM2 <---- Volume <----- SSP2 # # Low Latency playback pipeline 1 on PCM 0 using max 4 channels of s32le. @@ -31,18 +31,22 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4, 1, 0, 4, s32le, 48, 1000, 0, 0, 0, 1, SSP, 4, s32le, 2) -# Low Latency capture pipeline 2 on PCM 0 using max 4 channels of s32le. +# Low Latency playback pipeline 3 on PCM 1 using max 4 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 -# Use DMAC 0 channel 2 for PCM audio capture data -PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4, - 2, 0, 4, s32le, - 48, 1000, 0, 0, 0, 1, SSP, 4, s32le, 2) +# Use DMAC 0 channel 1 for PCM audio playback data +PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4, + 2, 1, 2, s16le, + 48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2) +# Low Latency playback pipeline 1 on PCM 0 using max 4 channels of s32le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +# Use DMAC 0 channel 1 for PCM audio playback data +PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4, + 3, 1, 2, s16le, + 48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2) # # DAI configuration # -# SSP port 4 is our only pipeline DAI -# # playback DAI is SSP4 using 2 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 @@ -51,15 +55,23 @@ DAI_ADD(sof/pipe-dai-playback.m4, PIPELINE_SOURCE_1, 2, s32le, 48, 1000, 0, 0) -# capture DAI is SSP4 using 2 periods -# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +# playback DAI is SSP2 using 2 periods +# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 2, SSP, 2, SSP2-Codec, + PIPELINE_SOURCE_2, 2, s16le, + 48, 1000, 0, 0) + +# capture DAI is SSP2 using 2 periods +# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 4, SSP4-Codec, - PIPELINE_SINK_2, 2, s32le, + 3, SSP, 2, SSP2-Codec, + PIPELINE_SINK_3, 2, s16le, 48, 1000, 0, 0) -# PCM Low Latency -PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) +# PCM Low Latency, id 0 +PCM_PLAYBACK_ADD(Port4, 1, 0, 0, PIPELINE_PCM_1) +PCM_DUPLEX_ADD(Port2, 4, 1, 1, PIPELINE_PCM_2, PIPELINE_PCM_3) # # BE configurations - overrides config in ACPI if present @@ -69,3 +81,9 @@ DAI_CONFIG(SSP, 4, SSP4-Codec, DSP_B, 32, DAI_CLOCK(bclk, 12288000, slave), DAI_CLOCK(fsync, 48000, slave), DAI_TDM(8, 32, 15, 15)) + +DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 16, + DAI_CLOCK(mclk, 24576000, slave), + DAI_CLOCK(bclk, 1536000, slave), + DAI_CLOCK(fsync, 48000, slave), + DAI_TDM(2, 16, 3, 3)) -- 2.14.1

2 1

[Sound-open-firmware] [PATCH 1/3] topology: append pipeline id to PGA and control mixer
by Keyon Jie 28 Mar '18

28 Mar '18

Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- topology/m4/mixercontrol.m4 | 2 +- topology/sof/pipe-low-latency-capture.m4 | 2 +- topology/sof/pipe-low-latency-playback.m4 | 4 ++-- topology/sof/pipe-pcm-media.m4 | 2 +- topology/sof/pipe-tone.m4 | 4 ++-- topology/sof/pipe-volume-capture.m4 | 2 +- topology/sof/pipe-volume-playback.m4 | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/topology/m4/mixercontrol.m4 b/topology/m4/mixercontrol.m4 index 77a3784..a3423c3 100644 --- a/topology/m4/mixercontrol.m4 +++ b/topology/m4/mixercontrol.m4 @@ -30,7 +30,7 @@ define(`CONTROLMIXER_OPS', dnl C_CONTROLMIXER(name, index, ops, max, invert, tlv, KCONTROL_CHANNELS) define(`C_CONTROLMIXER', -`SectionControlMixer.STR($1) {' +`SectionControlMixer."$1 PIPELINE_ID" {' `' ` # control belongs to this index group' ` index STR($2)' diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index 96fa3cc..39be2bc 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -32,7 +32,7 @@ C_CONTROLMIXER(PCM PCM_ID Capture Volume, PIPELINE_ID, W_PCM_CAPTURE(PCM_ID, Low Latency Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 0) # "Capture Volume" has 2 sink and source periods for host and DAI ping-pong -W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, LIST(` ', "PCM PCM_ID Capture Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, LIST(` ', "PCM PCM_ID Capture Volume PIPELINE_ID")) # Capture Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index b7f2d11..b40b793 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -57,10 +57,10 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, W_PCM_PLAYBACK(PCM_ID, Low Latency Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # "Playback Volume" has 1 sink period and 2 source periods for host ping-pong -W_PGA(0, PIPELINE_FORMAT, 1, 2, 1, LIST(` ', "PCM PCM_ID Playback Volume")) +W_PGA(0, PIPELINE_FORMAT, 1, 2, 1, LIST(` ', "PCM PCM_ID Playback Volume PIPELINE_ID")) # "Master Playback Volume" has 1 source and 2 sink periods for DAI ping-pong -W_PGA(1, PIPELINE_FORMAT, 2, 1, 1, LIST(` ', "Master Playback Volume")) +W_PGA(1, PIPELINE_FORMAT, 2, 1, 1, LIST(` ', "Master Playback Volume PIPELINE_ID")) # Mixer 0 has 1 sink and source periods. W_MIXER(0, PIPELINE_FORMAT, 1, 1, 1) diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index 9eaa187..7f68977 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -45,7 +45,7 @@ W_DATA(media_src_conf, media_src_tokens) W_PCM_PLAYBACK(PCM_ID, Media Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # "Playback Volume" has 2 sink period and 2 source periods for host ping-pong -W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "PCM PCM_ID Playback Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "PCM PCM_ID Playback Volume PIPELINE_ID")) # "SRC 0" has 2 sink and source periods. W_SRC(0, PIPELINE_FORMAT, 2, 2, media_src_conf, 2) diff --git a/topology/sof/pipe-tone.m4 b/topology/sof/pipe-tone.m4 index 09ed32c..3cdd408 100644 --- a/topology/sof/pipe-tone.m4 +++ b/topology/sof/pipe-tone.m4 @@ -20,7 +20,7 @@ include(`pipeline.m4') # # Volume Mixer control with max value of 32 -C_CONTROLMIXER(Tone Volume PIPELINE_ID, PIPELINE_ID, +C_CONTROLMIXER(Tone Volume, PIPELINE_ID, CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), CONTROLMIXER_MAX(, 32), false, @@ -29,7 +29,7 @@ C_CONTROLMIXER(Tone Volume PIPELINE_ID, PIPELINE_ID, LIST(` ', KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) # Switch type Mixer Control with max value of 1 -C_CONTROLMIXER(Tone Switch PIPELINE_ID, PIPELINE_ID, +C_CONTROLMIXER(Tone Switch, PIPELINE_ID, CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), CONTROLMIXER_MAX(max 1 indicates switch type control, 1), false, diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 5d1c24f..b3d3206 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -34,7 +34,7 @@ C_CONTROLMIXER(Master Capture Volume, PIPELINE_ID, W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) # "Volume" has 2 source and 2 sink periods -W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Capture Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Capture Volume PIPELINE_ID")) # Capture Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 727490d..4b12d2a 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -34,7 +34,7 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # "Volume" has 2 source and 2 sink periods -W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Playback Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Playback Volume PIPELINE_ID")) # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, -- 2.14.1

2 3

[Sound-open-firmware] [PATCH v3 1/3] trace: core: add trace_flush()
by Ranjani Sridharan 28 Mar '18

28 Mar '18

This patch adds a new trace_flush() feature to flush the last remaining trace messages during panic. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- Tested with Minnowboard Turbot with RT5651 Kernel: https://github.com/plbossart/sound.git branch: topic/sof-v4.14 SOF: https://github.com/ranj063/sof.git branch: debug/trace_test SOFT: 1.1-stable --- --- src/include/reef/dma-trace.h | 1 + src/include/reef/panic.h | 8 ++++- src/include/reef/trace.h | 1 + src/lib/dma-trace.c | 35 ++++++++++++++++++++++ src/lib/trace.c | 11 +++++++ .../apollolake/include/platform/platform.h | 3 ++ src/platform/baytrail/include/platform/platform.h | 3 ++ .../cannonlake/include/platform/platform.h | 3 ++ src/platform/haswell/include/platform/platform.h | 3 ++ 9 files changed, 67 insertions(+), 1 deletion(-) diff --git a/src/include/reef/dma-trace.h b/src/include/reef/dma-trace.h index f17ffe5..bf6e3f3 100644 --- a/src/include/reef/dma-trace.h +++ b/src/include/reef/dma-trace.h @@ -72,6 +72,7 @@ int dma_trace_init_complete(struct dma_trace_data *d); int dma_trace_host_buffer(struct dma_trace_data *d, struct dma_sg_elem *elem, uint32_t host_size); int dma_trace_enable(struct dma_trace_data *d); +void dma_trace_flush(void *t); void dtrace_event(const char *e, uint32_t size); void dtrace_event_atomic(const char *e, uint32_t length); diff --git a/src/include/reef/panic.h b/src/include/reef/panic.h index e8b4ae2..71df1b8 100644 --- a/src/include/reef/panic.h +++ b/src/include/reef/panic.h @@ -34,6 +34,7 @@ #include <reef/reef.h> #include <reef/mailbox.h> #include <reef/interrupt.h> +#include <reef/trace.h> #include <platform/platform.h> #include <uapi/ipc.h> #include <stdint.h> @@ -59,8 +60,13 @@ static inline void panic_rewind(uint32_t p, uint32_t stack_rewind_frames) /* TODO: send IPC oops message to host */ - /* panic and loop forever */ + /* panic */ platform_panic(p); + + /* flush last trace messages */ + trace_flush(); + + /* and loop forever */ while (1) {}; } diff --git a/src/include/reef/trace.h b/src/include/reef/trace.h index 7afbd23..44824b9 100644 --- a/src/include/reef/trace.h +++ b/src/include/reef/trace.h @@ -106,6 +106,7 @@ void _trace_error(uint32_t event); void _trace_error_value(uint32_t event); void _trace_event_atomic(uint32_t event); void _trace_error_atomic(uint32_t event); +void trace_flush(void); void trace_off(void); void trace_init(struct reef * reef); diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index 10e6102..5046a09 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -36,6 +36,7 @@ #include <arch/cache.h> #include <platform/timer.h> #include <platform/dma.h> +#include <platform/platform.h> #include <reef/lock.h> #include <stdint.h> @@ -285,6 +286,40 @@ int dma_trace_enable(struct dma_trace_data *d) return 0; } +void dma_trace_flush(void *t) +{ + struct dma_trace_buf *buffer = &trace_data->dmatb; + uint32_t avail = buffer->avail; + int32_t size; + int32_t wrap_count; + + /* number of bytes to flush */ + if (avail > DMA_FLUSH_TRACE_SIZE) { + size = DMA_FLUSH_TRACE_SIZE; + } else { + /* check for buffer wrap */ + if (buffer->w_ptr > buffer->r_ptr) + size = buffer->w_ptr - buffer->r_ptr; + else + size = buffer->end_addr - buffer->r_ptr + + buffer->w_ptr - buffer->addr; + } + + /* check for buffer wrap */ + if (buffer->w_ptr - size < buffer->addr) { + wrap_count = buffer->w_ptr - buffer->addr; + memcpy(t, buffer->end_addr - (size - wrap_count), + size - wrap_count); + memcpy(t + (size - wrap_count), buffer->addr, + wrap_count); + } else { + memcpy(t, buffer->w_ptr - size, size); + } + + /* writeback trace data */ + dcache_writeback_region(t, size); +} + static void dtrace_add_event(const char *e, uint32_t length) { struct dma_trace_buf *buffer = &trace_data->dmatb; diff --git a/src/lib/trace.c b/src/lib/trace.c index de99a4e..8d53b97 100644 --- a/src/lib/trace.c +++ b/src/lib/trace.c @@ -136,6 +136,17 @@ void _trace_event_atomic(uint32_t event) dtrace_event_atomic((const char*)dt, sizeof(uint64_t) * 2); } +void trace_flush(void) +{ + volatile uint64_t *t; + + /* get mailbox position */ + t = (volatile uint64_t *)(MAILBOX_TRACE_BASE + trace.pos); + + /* flush dma trace messages */ + dma_trace_flush((void *)t); +} + void trace_off(void) { trace.enable = 0; diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index a1dfba2..86172bf 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -88,6 +88,9 @@ struct reef; /* local buffer size of DMA tracing */ #define DMA_TRACE_LOCAL_SIZE HOST_PAGE_SIZE +/* trace bytes flushed during panic */ +#define DMA_FLUSH_TRACE_SIZE (MAILBOX_TRACE_SIZE >> 2) + /* the interval of DMA trace copying */ #define DMA_TRACE_PERIOD 500000 diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 9a6967b..f3464f5 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -82,6 +82,9 @@ struct reef; /* local buffer size of DMA tracing */ #define DMA_TRACE_LOCAL_SIZE HOST_PAGE_SIZE +/* trace bytes flushed during panic */ +#define DMA_FLUSH_TRACE_SIZE (MAILBOX_TRACE_SIZE >> 2) + /* the interval of DMA trace copying */ #define DMA_TRACE_PERIOD 500000 diff --git a/src/platform/cannonlake/include/platform/platform.h b/src/platform/cannonlake/include/platform/platform.h index b007e8a..764ef76 100644 --- a/src/platform/cannonlake/include/platform/platform.h +++ b/src/platform/cannonlake/include/platform/platform.h @@ -92,6 +92,9 @@ struct reef; /* local buffer size of DMA tracing */ #define DMA_TRACE_LOCAL_SIZE HOST_PAGE_SIZE +/* trace bytes flushed during panic */ +#define DMA_FLUSH_TRACE_SIZE (MAILBOX_TRACE_SIZE >> 2) + /* the interval of DMA trace copying */ #define DMA_TRACE_PERIOD 500000 diff --git a/src/platform/haswell/include/platform/platform.h b/src/platform/haswell/include/platform/platform.h index a9efe8a..9ffab90 100644 --- a/src/platform/haswell/include/platform/platform.h +++ b/src/platform/haswell/include/platform/platform.h @@ -81,6 +81,9 @@ struct reef; /* local buffer size of DMA tracing */ #define DMA_TRACE_LOCAL_SIZE HOST_PAGE_SIZE +/* trace bytes flushed during panic */ +#define DMA_FLUSH_TRACE_SIZE (MAILBOX_TRACE_SIZE >> 2) + /* the interval of DMA trace copying */ #define DMA_TRACE_PERIOD 500000 -- 2.14.1

2 3

[Sound-open-firmware] [PATCH V2] dma-trace: Fix reschedule bug to avoid dma buffer overflow
by Xiuli Pan 28 Mar '18

28 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> We have wrong logic in reschedule, we always reschedule the trace_work once the buffer is half full and new trace coming. We will delay the old schedule before the old scheduled trace_work is finally run. Thus the trace_work will like the carrot in front of the DSP as the donkey, the DSP will never run the trace_work that scheduled in the furture while we are in busy state and lots of trace are coming continuously. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> Reviewed-by: Zhigang Wu <zhigang.wu(a)linux.intel.com> Reviewed-by: Yan Wang <yan.wang(a)linux.intel.com> Tested-by: Zhigang Wu <zhigang.wu(a)linux.intel.com> --- V2: reuse copy in progress as Yan suggest. Test with: Mininow max rt5651 and GP-MRB nocodec and CNL nocodec SOF 1.1-stable: 210989dffeea811de2370fccb7cf5d53106b1e6e SOF-Tool 1.1-stable: 49c1b450e635ac0c893d67ff0ddfd34e03a85b46 https://github.com/plbossart/sound/tree/topic/sof-v4.14: 8d8c1bb32537800726b14d00d13f324b7f536386 --- src/lib/dma-trace.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index 1ff2bd4..733435e 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -115,7 +115,7 @@ out: buffer->avail -= size; } - /* DMA trace copying is done */ + /* DMA trace copying is done, allow reschedule */ d->copy_in_progress = 0; spin_unlock_irq(&d->lock, flags); @@ -137,6 +137,7 @@ int dma_trace_init_early(struct reef *reef) struct dma_trace_buf *buffer; trace_data = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*trace_data)); + trace_data->rescheduled = 0; buffer = &trace_data->dmatb; /* allocate new buffer */ @@ -335,9 +336,15 @@ void dtrace_event(const char *e, uint32_t length) spin_unlock_irq(&trace_data->lock, flags); /* schedule copy now if buffer > 50% full */ - if (trace_data->enabled && buffer->avail >= (DMA_TRACE_LOCAL_SIZE / 2)) + if (trace_data->enabled && + buffer->avail >= (DMA_TRACE_LOCAL_SIZE / 2)) { work_reschedule_default(&trace_data->dmat_work, DMA_TRACE_RESCHEDULE_TIME); + /* reschedule should not be intrrupted */ + /* just like we are in copy progress */ + trace_data->copy_in_progress = 1; + } + } void dtrace_event_atomic(const char *e, uint32_t length) -- 2.7.4

3 3

[Sound-open-firmware] [PATCH] sof: Turn IRQs off globally when send command to pipeline component
by Wu Zhigang 28 Mar '18

28 Mar '18

When pipeline processing the command, we have to turn off the IRQs. If not, the DMA IRQ will interrupt the pipeline state set process, when pipeline is scheduled, the states inconsistence will cause xrun. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> --- Tested with apl-gpmrb board kernel: https://github.com/plbossart/sound.git branch: topic/sof-v4.14 95d77adbaadc44b28c8975a3714f70824d1a8529 firmware: git://git.alsa-project.org/sound-open-firmware.git branch: 1.1-stable 210989dffeea811de2370fccb7cf5d53106b1e6e tools: branch: 1.1-stable cc91c73aa3e91eea35abdeb76d578b97f718feff --- src/audio/pipeline.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 1b7f248..23be503 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -627,6 +627,7 @@ int pipeline_cmd(struct pipeline *p, struct comp_dev *host, int cmd, { struct op_data op_data; int ret; + uint32_t flags; trace_pipe("cmd"); @@ -635,7 +636,7 @@ int pipeline_cmd(struct pipeline *p, struct comp_dev *host, int cmd, op_data.cmd = cmd; op_data.cmd_data = data; - spin_lock(&p->lock); + spin_lock_irq(&p->lock, flags); if (host->params.direction == SOF_IPC_STREAM_PLAYBACK) { /* send cmd downstream from host to DAI */ @@ -651,7 +652,7 @@ int pipeline_cmd(struct pipeline *p, struct comp_dev *host, int cmd, trace_error_value(cmd); } - spin_unlock(&p->lock); + spin_unlock_irq(&p->lock, flags); return ret; } -- 2.11.0

4 6

[Sound-open-firmware] [PATCH v2] trace: core: add trace_flush()
by Ranjani Sridharan 27 Mar '18

27 Mar '18

This patch adds a new trace_flush() feature to flush the last remaining trace messages during panic. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Tested with Minnowboard Turbot with RT5651 Kernel: https://github.com/plbossart/sound.git branch: topic/sof-v4.14 SOF: https://github.com/ranj063/sof.git branch: debug/trace_test SOFT: 1.1-stable --- --- src/include/reef/dma-trace.h | 1 + src/include/reef/panic.h | 8 +++++- src/include/reef/trace.h | 1 + src/lib/dma-trace.c | 29 ++++++++++++++++++++++ src/lib/trace.c | 11 ++++++++ .../apollolake/include/platform/platform.h | 3 +++ src/platform/baytrail/include/platform/platform.h | 3 +++ .../cannonlake/include/platform/platform.h | 3 +++ src/platform/haswell/include/platform/platform.h | 3 +++ 9 files changed, 61 insertions(+), 1 deletion(-) diff --git a/src/include/reef/dma-trace.h b/src/include/reef/dma-trace.h index f17ffe5..bf6e3f3 100644 --- a/src/include/reef/dma-trace.h +++ b/src/include/reef/dma-trace.h @@ -72,6 +72,7 @@ int dma_trace_init_complete(struct dma_trace_data *d); int dma_trace_host_buffer(struct dma_trace_data *d, struct dma_sg_elem *elem, uint32_t host_size); int dma_trace_enable(struct dma_trace_data *d); +void dma_trace_flush(void *t); void dtrace_event(const char *e, uint32_t size); void dtrace_event_atomic(const char *e, uint32_t length); diff --git a/src/include/reef/panic.h b/src/include/reef/panic.h index e8b4ae2..71df1b8 100644 --- a/src/include/reef/panic.h +++ b/src/include/reef/panic.h @@ -34,6 +34,7 @@ #include <reef/reef.h> #include <reef/mailbox.h> #include <reef/interrupt.h> +#include <reef/trace.h> #include <platform/platform.h> #include <uapi/ipc.h> #include <stdint.h> @@ -59,8 +60,13 @@ static inline void panic_rewind(uint32_t p, uint32_t stack_rewind_frames) /* TODO: send IPC oops message to host */ - /* panic and loop forever */ + /* panic */ platform_panic(p); + + /* flush last trace messages */ + trace_flush(); + + /* and loop forever */ while (1) {}; } diff --git a/src/include/reef/trace.h b/src/include/reef/trace.h index 7afbd23..44824b9 100644 --- a/src/include/reef/trace.h +++ b/src/include/reef/trace.h @@ -106,6 +106,7 @@ void _trace_error(uint32_t event); void _trace_error_value(uint32_t event); void _trace_event_atomic(uint32_t event); void _trace_error_atomic(uint32_t event); +void trace_flush(void); void trace_off(void); void trace_init(struct reef * reef); diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index 1ff2bd4..fb30989 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -36,6 +36,7 @@ #include <arch/cache.h> #include <platform/timer.h> #include <platform/dma.h> +#include <platform/platform.h> #include <reef/lock.h> #include <stdint.h> @@ -285,6 +286,34 @@ int dma_trace_enable(struct dma_trace_data *d) return 0; } +void dma_trace_flush(void *t) +{ + struct dma_trace_buf *buffer = &trace_data->dmatb; + uint32_t avail = buffer->avail; + int32_t size; + int32_t wrap_count; + + /* number of bytes to flush */ + if (avail > DMA_FLUSH_TRACE_SIZE) + size = DMA_FLUSH_TRACE_SIZE; + else + size = buffer->w_ptr - buffer->r_ptr; + + /* check for buffer wrap */ + if (buffer->w_ptr - size < buffer->addr) { + wrap_count = buffer->w_ptr - buffer->addr; + memcpy(t, buffer->end_addr - (size - wrap_count), + size - wrap_count); + memcpy(t + (size - wrap_count), buffer->addr, + wrap_count); + } else { + memcpy(t, buffer->w_ptr - size, size); + } + + /* writeback trace data */ + dcache_writeback_region(t, size); +} + static void dtrace_add_event(const char *e, uint32_t length) { struct dma_trace_buf *buffer = &trace_data->dmatb; diff --git a/src/lib/trace.c b/src/lib/trace.c index de99a4e..8d53b97 100644 --- a/src/lib/trace.c +++ b/src/lib/trace.c @@ -136,6 +136,17 @@ void _trace_event_atomic(uint32_t event) dtrace_event_atomic((const char*)dt, sizeof(uint64_t) * 2); } +void trace_flush(void) +{ + volatile uint64_t *t; + + /* get mailbox position */ + t = (volatile uint64_t *)(MAILBOX_TRACE_BASE + trace.pos); + + /* flush dma trace messages */ + dma_trace_flush((void *)t); +} + void trace_off(void) { trace.enable = 0; diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index a1dfba2..86172bf 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -88,6 +88,9 @@ struct reef; /* local buffer size of DMA tracing */ #define DMA_TRACE_LOCAL_SIZE HOST_PAGE_SIZE +/* trace bytes flushed during panic */ +#define DMA_FLUSH_TRACE_SIZE (MAILBOX_TRACE_SIZE >> 2) + /* the interval of DMA trace copying */ #define DMA_TRACE_PERIOD 500000 diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 9a6967b..f3464f5 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -82,6 +82,9 @@ struct reef; /* local buffer size of DMA tracing */ #define DMA_TRACE_LOCAL_SIZE HOST_PAGE_SIZE +/* trace bytes flushed during panic */ +#define DMA_FLUSH_TRACE_SIZE (MAILBOX_TRACE_SIZE >> 2) + /* the interval of DMA trace copying */ #define DMA_TRACE_PERIOD 500000 diff --git a/src/platform/cannonlake/include/platform/platform.h b/src/platform/cannonlake/include/platform/platform.h index b007e8a..764ef76 100644 --- a/src/platform/cannonlake/include/platform/platform.h +++ b/src/platform/cannonlake/include/platform/platform.h @@ -92,6 +92,9 @@ struct reef; /* local buffer size of DMA tracing */ #define DMA_TRACE_LOCAL_SIZE HOST_PAGE_SIZE +/* trace bytes flushed during panic */ +#define DMA_FLUSH_TRACE_SIZE (MAILBOX_TRACE_SIZE >> 2) + /* the interval of DMA trace copying */ #define DMA_TRACE_PERIOD 500000 diff --git a/src/platform/haswell/include/platform/platform.h b/src/platform/haswell/include/platform/platform.h index a9efe8a..9ffab90 100644 --- a/src/platform/haswell/include/platform/platform.h +++ b/src/platform/haswell/include/platform/platform.h @@ -81,6 +81,9 @@ struct reef; /* local buffer size of DMA tracing */ #define DMA_TRACE_LOCAL_SIZE HOST_PAGE_SIZE +/* trace bytes flushed during panic */ +#define DMA_FLUSH_TRACE_SIZE (MAILBOX_TRACE_SIZE >> 2) + /* the interval of DMA trace copying */ #define DMA_TRACE_PERIOD 500000 -- 2.14.1

2 2

[Sound-open-firmware] [PATCH V3] dma-trace: Fix reschedule bug to avoid dma buffer overflow
by Xiuli Pan 27 Mar '18

27 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> We have wrong logic in reschedule, we always reschedule the trace_work once the buffer is half full and new trace coming. We will delay the old schedule before the old scheduled trace_work is finally run. Thus the trace_work will like the carrot in front of the DSP as the donkey, the DSP will never run the trace_work that scheduled in the furture while we are in busy state and lots of trace are coming continuously. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> Reviewed-by: Zhigang Wu <zhigang.wu(a)linux.intel.com> Reviewed-by: Yan Wang <yan.wang(a)linux.intel.com> Tested-by: Zhigang Wu <zhigang.wu(a)linux.intel.com> --- V2: reuse copy in progress as Yan suggest. V3: Fix a typo in refine Test with: Mininow max rt5651 and GP-MRB nocodec and CNL nocodec SOF 1.1-stable: 210989dffeea811de2370fccb7cf5d53106b1e6e SOF-Tool 1.1-stable: 49c1b450e635ac0c893d67ff0ddfd34e03a85b46 https://github.com/plbossart/sound/tree/topic/sof-v4.14: 8d8c1bb32537800726b14d00d13f324b7f536386 --- src/lib/dma-trace.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index 1ff2bd4..10e6102 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -115,7 +115,7 @@ out: buffer->avail -= size; } - /* DMA trace copying is done */ + /* DMA trace copying is done, allow reschedule */ d->copy_in_progress = 0; spin_unlock_irq(&d->lock, flags); @@ -335,9 +335,15 @@ void dtrace_event(const char *e, uint32_t length) spin_unlock_irq(&trace_data->lock, flags); /* schedule copy now if buffer > 50% full */ - if (trace_data->enabled && buffer->avail >= (DMA_TRACE_LOCAL_SIZE / 2)) + if (trace_data->enabled && + buffer->avail >= (DMA_TRACE_LOCAL_SIZE / 2)) { work_reschedule_default(&trace_data->dmat_work, DMA_TRACE_RESCHEDULE_TIME); + /* reschedule should not be intrrupted */ + /* just like we are in copy progress */ + trace_data->copy_in_progress = 1; + } + } void dtrace_event_atomic(const char *e, uint32_t length) -- 2.7.4

2 1