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

[Sound-open-firmware] [PATCH] 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> Tested-by: Zhigang Wu <zhigang.wu(a)linux.intel.com> --- 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/include/reef/dma-trace.h | 1 + src/lib/dma-trace.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/include/reef/dma-trace.h b/src/include/reef/dma-trace.h index f17ffe5..5ef5eb2 100644 --- a/src/include/reef/dma-trace.h +++ b/src/include/reef/dma-trace.h @@ -63,6 +63,7 @@ struct dma_trace_data { struct work dmat_work; uint32_t enabled; uint32_t copy_in_progress; + uint32_t rescheduled; uint32_t stream_tag; spinlock_t lock; }; diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index 1ff2bd4..ef29026 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -128,6 +128,9 @@ out: ipc_dma_trace_send_position(); #endif + /* enable reschedule after one copy is done */ + if (d->rescheduled) + d->rescheduled = 0; /* reschedule the trace copying work */ return DMA_TRACE_PERIOD; } @@ -137,6 +140,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 +339,12 @@ 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 && !trace_data->rescheduled && + buffer->avail >= (DMA_TRACE_LOCAL_SIZE / 2)) { work_reschedule_default(&trace_data->dmat_work, DMA_TRACE_RESCHEDULE_TIME); + trace_data->rescheduled = 1; + } } void dtrace_event_atomic(const char *e, uint32_t length) -- 2.7.4

3 2

[Sound-open-firmware] [PATCH] sof: Add volume component state check
by Wu Zhigang 27 Mar '18

27 Mar '18

Add the state check in volume_copy function, this can low down the xrun error possibility: For example: when firmware receive the PAUSE command, the HOST and VOLUME component are set to PAUSE state. at this time DMA IRQ happen, the pipeline is scheduled. host_copy() function will be called, but jump out immediately because of PAUSE state. but volume_copy() did not have this state check, the xrun will happen. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> Reviewed-by: Keyon Jie <yang.jie(a)linux.intel.com> --- Tested with apl-gpmrb board kernel: https://github.com/plbossart/sound.git branch: topic/sof-v4.14 4881a4bd906f8b52bebd209b88ff920005550d53 firmware: git://git.alsa-project.org/sound-open-firmware.git branch: 1.1-stable 1f8c6c4d2018aac6994c75f60cee54765435d424 tools: branch: 1.1-stable cc91c73aa3e91eea35abdeb76d578b97f718feff --- src/audio/volume.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/audio/volume.c b/src/audio/volume.c index df926c5..2652765 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -836,6 +836,9 @@ static int volume_copy(struct comp_dev *dev) tracev_volume("cpy"); + if (dev->state != COMP_STATE_ACTIVE) + return 0; + /* volume components will only ever have 1 source and 1 sink buffer */ source = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list); sink = list_first_item(&dev->bsink_list, struct comp_buffer, source_list); -- 2.11.0

5 7

[Sound-open-firmware] [PATCH] dai: use verbose trace call to prevent trace buffer overflow
by Ranjani Sridharan 27 Mar '18

27 Mar '18

This patch changes the trace message to use the verbose option to prevent trace buffer overflow. 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: 1.1-stable SOFT: 1.1-stable --- --- src/audio/dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 53536ed..f1b4a8e 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -82,7 +82,7 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) struct comp_buffer *dma_buffer; uint32_t copied_size; - trace_dai("irq"); + tracev_dai("irq"); /* is stream stopped or paused and we are not handling XRUN ? */ if (dev->state != COMP_STATE_ACTIVE && dd->xrun == 0) { -- 2.14.1

3 3

[Sound-open-firmware] [PATCH 1/2] trace: core: replace _trace_error() with generic _trace_event_mbox()
by Ranjani Sridharan 26 Mar '18

26 Mar '18

This patch modifies the _trace_error function names to a more generic name _trace_event_mbox() and updates users. 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/trace.h | 16 +++++------ src/lib/trace.c | 72 ++++++++++++++++++++++++------------------------ 2 files changed, 43 insertions(+), 45 deletions(-) diff --git a/src/include/reef/trace.h b/src/include/reef/trace.h index 44824b9..d6a68a6 100644 --- a/src/include/reef/trace.h +++ b/src/include/reef/trace.h @@ -102,10 +102,9 @@ #define TRACEE 1 void _trace_event(uint32_t event); -void _trace_error(uint32_t event); -void _trace_error_value(uint32_t event); +void _trace_event_mbox(uint32_t event); void _trace_event_atomic(uint32_t event); -void _trace_error_atomic(uint32_t event); +void _trace_event_mbox_atomic(uint32_t event); void trace_flush(void); void trace_off(void); void trace_init(struct reef * reef); @@ -116,7 +115,6 @@ void trace_init(struct reef * reef); _trace_event(__c | (__e[0] << 16) | (__e[1] <<8) | __e[2]) #define trace_event_atomic(__c, __e) \ _trace_event_atomic(__c | (__e[0] << 16) | (__e[1] <<8) | __e[2]) - #define trace_value(x) _trace_event(x) #define trace_value_atomic(x) _trace_event_atomic(x) @@ -138,12 +136,12 @@ void trace_init(struct reef * reef); /* error tracing */ #if TRACEE #define trace_error(__c, __e) \ - _trace_error_atomic(__c | (__e[0] << 16) | (__e[1] <<8) | __e[2]) + _trace_event_mbox_atomic(__c | (__e[0] << 16) | (__e[1] << 8) | __e[2]) #define trace_error_atomic(__c, __e) \ - _trace_error_atomic(__c | (__e[0] << 16) | (__e[1] <<8) | __e[2]) -/* write back error value to mbox*/ -#define trace_error_value(x) _trace_error_atomic(x) -#define trace_error_value_atomic(x) _trace_error_atomic(x) + _trace_event_mbox_atomic(__c | (__e[0] << 16) | (__e[1] << 8) | __e[2]) +/* write back error value to mbox */ +#define trace_error_value(x) _trace_event_mbox_atomic(x) +#define trace_error_value_atomic(x) _trace_event_mbox_atomic(x) #else #define trace_error(__c, __e) #define trace_error_atomic(__c, __e) diff --git a/src/lib/trace.c b/src/lib/trace.c index 8d53b97..5f3ba8a 100644 --- a/src/lib/trace.c +++ b/src/lib/trace.c @@ -45,28 +45,54 @@ struct trace { static struct trace trace; -void _trace_error(uint32_t event) +/* send trace events only to the local trace buffer */ +void _trace_event(uint32_t event) +{ + uint64_t dt[2]; + + if (!trace.enable) + return; + + dt[0] = platform_timer_get(platform_timer); + dt[1] = event; + dtrace_event((const char *)dt, sizeof(uint64_t) * 2); +} + +void _trace_event_atomic(uint32_t event) +{ + uint64_t dt[2]; + + if (!trace.enable) + return; + + dt[0] = platform_timer_get(platform_timer); + dt[1] = event; + dtrace_event_atomic((const char *)dt, sizeof(uint64_t) * 2); +} + +/* send trace events to the local trace buffer and the mailbox */ +void _trace_event_mbox(uint32_t event) { unsigned long flags; - volatile uint64_t *t; uint64_t dt[2]; uint64_t time; + volatile uint64_t *t; + if (!trace.enable) return; time = platform_timer_get(platform_timer); - /* save event to DMA tracing buffer */ dt[0] = time; dt[1] = event; - dtrace_event((const char*)dt, sizeof(uint64_t) * 2); + dtrace_event((const char *)dt, sizeof(uint64_t) * 2); /* send event by mail box too. */ spin_lock_irq(&trace.lock, flags); /* write timestamp and event to trace buffer */ - t = (volatile uint64_t*)(MAILBOX_TRACE_BASE + trace.pos); + t = (volatile uint64_t *)(MAILBOX_TRACE_BASE + trace.pos); trace.pos += (sizeof(uint64_t) << 1); if (trace.pos > MAILBOX_TRACE_SIZE - sizeof(uint64_t) * 2) @@ -78,14 +104,13 @@ void _trace_error(uint32_t event) t[1] = event; /* writeback trace data */ - dcache_writeback_region((void*)t, sizeof(uint64_t) * 2); + dcache_writeback_region((void *)t, sizeof(uint64_t) * 2); } -void _trace_error_atomic(uint32_t event) +void _trace_event_mbox_atomic(uint32_t event) { volatile uint64_t *t; uint64_t dt[2]; - uint64_t time; if (!trace.enable) @@ -93,13 +118,12 @@ void _trace_error_atomic(uint32_t event) time = platform_timer_get(platform_timer); - /* save event to DMA tracing buffer */ dt[0] = time; dt[1] = event; - dtrace_event_atomic((const char*)dt, sizeof(uint64_t) * 2); + dtrace_event_atomic((const char *)dt, sizeof(uint64_t) * 2); /* write timestamp and event to trace buffer */ - t = (volatile uint64_t*)(MAILBOX_TRACE_BASE + trace.pos); + t = (volatile uint64_t *)(MAILBOX_TRACE_BASE + trace.pos); trace.pos += (sizeof(uint64_t) << 1); if (trace.pos > MAILBOX_TRACE_SIZE - sizeof(uint64_t) * 2) @@ -109,31 +133,7 @@ void _trace_error_atomic(uint32_t event) t[1] = event; /* writeback trace data */ - dcache_writeback_region((void*)t, sizeof(uint64_t) * 2); -} - -void _trace_event(uint32_t event) -{ - uint64_t dt[2]; - - if (!trace.enable) - return; - - dt[0] = platform_timer_get(platform_timer); - dt[1] = event; - dtrace_event((const char*)dt, sizeof(uint64_t) * 2); -} - -void _trace_event_atomic(uint32_t event) -{ - uint64_t dt[2]; - - if (!trace.enable) - return; - - dt[0] = platform_timer_get(platform_timer); - dt[1] = event; - dtrace_event_atomic((const char*)dt, sizeof(uint64_t) * 2); + dcache_writeback_region((void *)t, sizeof(uint64_t) * 2); } void trace_flush(void) -- 2.14.1

1 1

[Sound-open-firmware] [PATCH 1/3] trace: core: add trace_error_value() and update users
by Ranjani Sridharan 26 Mar '18

26 Mar '18

This patch adds a new trace feature to send any error states/values after the trace messages to mbox and modifes users of trace_value() to use trace_error_value(). 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/audio/buffer.c | 2 +- src/audio/component.c | 14 +++++++------- src/audio/dai.c | 18 +++++++++--------- src/audio/eq_fir.c | 2 +- src/audio/eq_iir.c | 2 +- src/audio/host.c | 6 +++--- src/audio/pipeline.c | 16 ++++++++-------- src/audio/src.c | 14 +++++++------- src/audio/volume.c | 14 +++++++------- src/drivers/dw-dma.c | 12 ++++++------ src/drivers/hda-dma.c | 4 ++-- src/include/reef/audio/component.h | 4 ++-- src/include/reef/trace.h | 6 ++++++ src/include/reef/wait.h | 4 ++-- src/ipc/intel-ipc.c | 24 ++++++++++++------------ src/ipc/ipc.c | 16 ++++++++-------- src/lib/alloc.c | 4 ++-- 17 files changed, 84 insertions(+), 78 deletions(-) diff --git a/src/audio/buffer.c b/src/audio/buffer.c index 360ad6b..a5d92b2 100644 --- a/src/audio/buffer.c +++ b/src/audio/buffer.c @@ -55,7 +55,7 @@ struct comp_buffer *buffer_new(struct sof_ipc_buffer *desc) /* validate request */ if (desc->size == 0 || desc->size > HEAP_BUFFER_SIZE) { trace_buffer_error("ebg"); - trace_value(desc->size); + trace_error_value(desc->size); return NULL; } diff --git a/src/audio/component.c b/src/audio/component.c index f27f350..1802278 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -79,7 +79,7 @@ struct comp_dev *comp_new(struct sof_ipc_comp *comp) drv = get_drv(comp->type); if (drv == NULL) { trace_comp_error("eCD"); - trace_value(comp->type); + trace_error_value(comp->type); return NULL; } @@ -127,7 +127,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) dev->state = COMP_STATE_ACTIVE; } else { trace_comp_error("CES"); - trace_value(dev->state); + trace_error_value(dev->state); ret = -EINVAL; } break; @@ -136,7 +136,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) dev->state = COMP_STATE_ACTIVE; } else { trace_comp_error("CEr"); - trace_value(dev->state); + trace_error_value(dev->state); ret = -EINVAL; } break; @@ -146,7 +146,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) dev->state = COMP_STATE_PREPARE; } else { trace_comp_error("CEs"); - trace_value(dev->state); + trace_error_value(dev->state); ret = -EINVAL; } break; @@ -156,7 +156,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) dev->state = COMP_STATE_PAUSED; else { trace_comp_error("CEp"); - trace_value(dev->state); + trace_error_value(dev->state); ret = -EINVAL; } break; @@ -166,7 +166,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) if (dev->state == COMP_STATE_ACTIVE || dev->state == COMP_STATE_PAUSED) { trace_comp_error("CER"); - trace_value(dev->state); + trace_error_value(dev->state); ret = 0; } break; @@ -176,7 +176,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) dev->state = COMP_STATE_PREPARE; } else { trace_comp_error("CEP"); - trace_value(dev->state); + trace_error_value(dev->state); ret = -EINVAL; } break; diff --git a/src/audio/dai.c b/src/audio/dai.c index 061af5e..f1b4a8e 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -278,10 +278,10 @@ static int dai_playback_params(struct comp_dev *dev) err = buffer_set_size(dma_buffer, buffer_size); if (err < 0) { trace_dai_error("ep1"); - trace_value(source_config->periods_sink); - trace_value(dd->period_bytes); - trace_value(buffer_size); - trace_value(dma_buffer->alloc_size); + trace_error_value(source_config->periods_sink); + trace_error_value(dd->period_bytes); + trace_error_value(buffer_size); + trace_error_value(dma_buffer->alloc_size); return err; } @@ -346,10 +346,10 @@ static int dai_capture_params(struct comp_dev *dev) err = buffer_set_size(dma_buffer, buffer_size); if (err < 0) { trace_dai_error("ec1"); - trace_value(sink_config->periods_sink); - trace_value(dd->period_bytes); - trace_value(buffer_size); - trace_value(dma_buffer->alloc_size); + trace_error_value(sink_config->periods_sink); + trace_error_value(dd->period_bytes); + trace_error_value(buffer_size); + trace_error_value(dma_buffer->alloc_size); return err; } @@ -576,7 +576,7 @@ static int dai_cmd(struct comp_dev *dev, int cmd, void *data) ret = wait_for_completion_timeout(&dd->complete); if (ret < 0) { trace_dai_error("ed0"); - trace_value(cmd); + trace_error_value(cmd); } break; default: diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index b6ec58f..52988cd 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -386,7 +386,7 @@ static int fir_cmd_set_data(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdat } } else { trace_eq_error("une"); - trace_value(cdata->index); + trace_error_value(cdata->index); return -EINVAL; } break; diff --git a/src/audio/eq_iir.c b/src/audio/eq_iir.c index 2a1dd59..bbcd66b 100644 --- a/src/audio/eq_iir.c +++ b/src/audio/eq_iir.c @@ -382,7 +382,7 @@ static int iir_cmd_set_data(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdat } } else { trace_eq_iir_error("une"); - trace_value(cdata->index); + trace_error_value(cdata->index); return -EINVAL; } break; diff --git a/src/audio/host.c b/src/audio/host.c index 744ca02..9177d99 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -671,15 +671,15 @@ static int host_params(struct comp_dev *dev) err = buffer_set_size(hd->dma_buffer, buffer_size); if (err < 0) { trace_host_error("eSz"); - trace_value(buffer_size); + trace_error_value(buffer_size); return err; } /* component buffer size must be divisor of host buffer size */ if (hd->host_size % hd->period_bytes) { trace_comp_error("eHB"); - trace_value(hd->host_size); - trace_value(hd->period_bytes); + trace_error_value(hd->host_size); + trace_error_value(hd->period_bytes); return -EINVAL; } diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index c7f8aed..1b7f248 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -392,7 +392,7 @@ static int component_op_downstream(struct op_data *op_data, case COMP_OPS_BUFFER: /* handled by other API call */ default: trace_pipe_error("eOi"); - trace_value(op_data->op); + trace_error_value(op_data->op); return -EINVAL; } @@ -473,7 +473,7 @@ static int component_op_upstream(struct op_data *op_data, case COMP_OPS_BUFFER: /* handled by other API call */ default: trace_pipe_error("eOi"); - trace_value(op_data->op); + trace_error_value(op_data->op); return -EINVAL; } @@ -647,8 +647,8 @@ int pipeline_cmd(struct pipeline *p, struct comp_dev *host, int cmd, if (ret < 0) { trace_ipc_error("pc0"); - trace_value(host->comp.id); - trace_value(cmd); + trace_error_value(host->comp.id); + trace_error_value(cmd); } spin_unlock(&p->lock); @@ -693,7 +693,7 @@ int pipeline_params(struct pipeline *p, struct comp_dev *host, if (ret < 0) { trace_ipc_error("pp0"); - trace_value(host->comp.id); + trace_error_value(host->comp.id); } spin_unlock(&p->lock); @@ -723,7 +723,7 @@ int pipeline_reset(struct pipeline *p, struct comp_dev *host) if (ret < 0) { trace_ipc_error("pr0"); - trace_value(host->comp.id); + trace_error_value(host->comp.id); } spin_unlock(&p->lock); @@ -774,7 +774,7 @@ static int pipeline_copy_from_upstream(struct comp_dev *start, err = pipeline_copy_from_upstream(start, buffer->source); if (err < 0) { trace_pipe_error("ePU"); - trace_value(current->comp.id); + trace_error_value(current->comp.id); return err; } } @@ -837,7 +837,7 @@ static int pipeline_copy_to_downstream(struct comp_dev *start, err = pipeline_copy_to_downstream(start, buffer->sink); if (err < 0) { trace_pipe_error("ePD"); - trace_value(current->comp.id); + trace_error_value(current->comp.id); return err; } } diff --git a/src/audio/src.c b/src/audio/src.c index cca0cbc..a579fa9 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -645,10 +645,10 @@ static int src_params(struct comp_dev *dev) params->channels, dev->frames, frames_is_for_source); if (err < 0) { trace_src_error("sr1"); - trace_value(source_rate); - trace_value(sink_rate); - trace_value(params->channels); - trace_value(dev->frames); + trace_error_value(source_rate); + trace_error_value(sink_rate); + trace_error_value(params->channels); + trace_error_value(dev->frames); return err; } @@ -666,7 +666,7 @@ static int src_params(struct comp_dev *dev) delay_lines_size); if (!cd->delay_lines) { trace_src_error("sr3"); - trace_value(delay_lines_size); + trace_error_value(delay_lines_size); return -EINVAL; } @@ -721,8 +721,8 @@ static int src_params(struct comp_dev *dev) err = buffer_set_size(sink, q * dev->frames * dev->frame_bytes); if (err < 0) { trace_src_error("eSz"); - trace_value(sink->alloc_size); - trace_value(q * dev->frames * dev->frame_bytes); + trace_error_value(sink->alloc_size); + trace_error_value(q * dev->frames * dev->frame_bytes); return err; } diff --git a/src/audio/volume.c b/src/audio/volume.c index df926c5..1a3f436 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -943,15 +943,15 @@ static int volume_prepare(struct comp_dev *dev) /* validate */ if (cd->sink_period_bytes == 0) { trace_volume_error("vp1"); - trace_value(dev->frames); - trace_value(sinkb->sink->frame_bytes); + trace_error_value(dev->frames); + trace_error_value(sinkb->sink->frame_bytes); ret = -EINVAL; goto err; } if (cd->source_period_bytes == 0) { trace_volume_error("vp2"); - trace_value(dev->frames); - trace_value(sourceb->source->frame_bytes); + trace_error_value(dev->frames); + trace_error_value(sourceb->source->frame_bytes); ret = -EINVAL; goto err; } @@ -970,9 +970,9 @@ static int volume_prepare(struct comp_dev *dev) goto found; } trace_volume_error("vp3"); - trace_value(cd->source_format); - trace_value(cd->sink_format); - trace_value(dev->params.channels); + trace_error_value(cd->source_format); + trace_error_value(cd->sink_format); + trace_error_value(dev->params.channels); err: comp_set_state(dev, COMP_CMD_RESET); diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index 8cb8e31..1a3c7a9 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -374,9 +374,9 @@ static int dw_dma_start(struct dma *dma, int channel) (dw_read(dma, DW_DMA_CHAN_EN) & (0x1 << channel))) { ret = -EBUSY; trace_dma_error("eS0"); - trace_value(dw_read(dma, DW_DMA_CHAN_EN)); - trace_value(dw_read(dma, DW_CFG_LOW(channel))); - trace_value(p->chan[channel].status); + trace_error_value(dw_read(dma, DW_DMA_CHAN_EN)); + trace_error_value(dw_read(dma, DW_CFG_LOW(channel))); + trace_error_value(p->chan[channel].status); goto out; } @@ -480,7 +480,7 @@ static int dw_dma_stop(struct dma *dma, int channel) /* is channel stii active ? */ if ((dw_read(dma, DW_DMA_CHAN_EN) & (0x1 << channel))) { trace_dma_error("ea0"); - trace_value(channel); + trace_error_value(channel); } p->chan[channel].status = COMP_STATE_PREPARE; @@ -912,7 +912,7 @@ static void dw_dma_irq_handler(void *data) status_intr = dw_read(dma, DW_INTR_STATUS); if (!status_intr) { trace_dma_error("eDI"); - trace_value(status_intr); + trace_error_value(status_intr); } tracev_dma("irq"); @@ -1078,7 +1078,7 @@ static void dw_dma_irq_handler(void *data) status_block_new = dw_read(dma, DW_STATUS_BLOCK); if (status_block_new) { trace_dma_error("eI2"); - trace_value(status_block_new); + trace_error_value(status_block_new); } for (i = 0; i < DW_MAX_CHAN; i++) { diff --git a/src/drivers/hda-dma.c b/src/drivers/hda-dma.c index caea70e..c00fb2e 100644 --- a/src/drivers/hda-dma.c +++ b/src/drivers/hda-dma.c @@ -192,8 +192,8 @@ static int hda_dma_start(struct dma *dma, int channel) (dgcs & DGCS_GEN)) { ret = -EBUSY; trace_host_error("eS0"); - trace_value(dgcs); - trace_value(p->chan[channel].status); + trace_error_value(dgcs); + trace_error_value(p->chan[channel].status); goto out; } diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index f25ad3d..538d476 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -250,8 +250,8 @@ static inline int comp_cmd(struct comp_dev *dev, int cmd, void *data) && ((cdata->data->magic != SOF_ABI_MAGIC) || (cdata->data->abi != SOF_ABI_VERSION))) { trace_comp_error("abi"); - trace_value(cdata->data->magic); - trace_value(cdata->data->abi); + trace_error_value(cdata->data->magic); + trace_error_value(cdata->data->abi); return -EINVAL; } diff --git a/src/include/reef/trace.h b/src/include/reef/trace.h index 2e22b16..7afbd23 100644 --- a/src/include/reef/trace.h +++ b/src/include/reef/trace.h @@ -103,6 +103,7 @@ void _trace_event(uint32_t event); 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_off(void); @@ -139,9 +140,14 @@ void trace_init(struct reef * reef); _trace_error_atomic(__c | (__e[0] << 16) | (__e[1] <<8) | __e[2]) #define trace_error_atomic(__c, __e) \ _trace_error_atomic(__c | (__e[0] << 16) | (__e[1] <<8) | __e[2]) +/* write back error value to mbox*/ +#define trace_error_value(x) _trace_error_atomic(x) +#define trace_error_value_atomic(x) _trace_error_atomic(x) #else #define trace_error(__c, __e) #define trace_error_atomic(__c, __e) +#define trace_error_value(x) +#define trace_error_value_atomic(x) #endif #else diff --git a/src/include/reef/wait.h b/src/include/reef/wait.h index a598d48..e9737ec 100644 --- a/src/include/reef/wait.h +++ b/src/include/reef/wait.h @@ -139,8 +139,8 @@ static inline int wait_for_completion_timeout(completion_t *comp) return 0; } else { /* timeout */ - trace_value(c->timeout); - trace_value(c->complete); + trace_error_value(c->timeout); + trace_error_value(c->complete); return -ETIME; } } diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index fbe0b6e..5c062be 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -238,14 +238,14 @@ static int ipc_stream_pcm_params(uint32_t stream) pcm_dev = ipc_get_comp(_ipc, pcm_params->comp_id); if (pcm_dev == NULL) { trace_ipc_error("eAC"); - trace_value(pcm_params->comp_id); + trace_error_value(pcm_params->comp_id); return -EINVAL; } /* sanity check comp */ if (pcm_dev->cd->pipeline == NULL) { trace_ipc_error("eA1"); - trace_value(pcm_params->comp_id); + trace_error_value(pcm_params->comp_id); return -EINVAL; } @@ -350,7 +350,7 @@ static int ipc_stream_pcm_free(uint32_t header) /* sanity check comp */ if (pcm_dev->cd->pipeline == NULL) { trace_ipc_error("eF1"); - trace_value(free_req->comp_id); + trace_error_value(free_req->comp_id); return -EINVAL; } @@ -470,7 +470,7 @@ static int ipc_stream_trigger(uint32_t header) cmd, NULL); if (ret < 0) { trace_ipc_error("eRc"); - trace_value(ipc_cmd); + trace_error_value(ipc_cmd); } return ret; @@ -516,8 +516,8 @@ static int ipc_dai_config(uint32_t header) dai = dai_get(config->type, config->id); if (dai == NULL) { trace_ipc_error("eDi"); - trace_value(config->type); - trace_value(config->id); + trace_error_value(config->type); + trace_error_value(config->id); return -ENODEV; } @@ -543,7 +543,7 @@ static int ipc_glb_dai_message(uint32_t header) //return ipc_comp_set_value(header, COMP_CMD_LOOPBACK); default: trace_ipc_error("eDc"); - trace_value(header); + trace_error_value(header); return -EINVAL; } } @@ -747,7 +747,7 @@ static int ipc_glb_debug_message(uint32_t header) return ipc_dma_trace_config(header); default: trace_ipc_error("eDc"); - trace_value(header); + trace_error_value(header); return -EINVAL; } } @@ -769,7 +769,7 @@ static int ipc_comp_value(uint32_t header, uint32_t cmd) comp_dev = ipc_get_comp(_ipc, data->comp_id); if (comp_dev == NULL){ trace_ipc_error("eVg"); - trace_value(data->comp_id); + trace_error_value(data->comp_id); return -ENODEV; } @@ -800,7 +800,7 @@ static int ipc_glb_comp_message(uint32_t header) return ipc_comp_value(header, COMP_CMD_GET_DATA); default: trace_ipc_error("eCc"); - trace_value(header); + trace_error_value(header); return -EINVAL; } } @@ -929,7 +929,7 @@ static int ipc_glb_tplg_message(uint32_t header) return ipc_glb_tplg_free(header, ipc_buffer_free); default: trace_ipc_error("eTc"); - trace_value(header); + trace_error_value(header); return -EINVAL; } } @@ -970,7 +970,7 @@ int ipc_cmd(void) return ipc_glb_debug_message(hdr->cmd); default: trace_ipc_error("eGc"); - trace_value(type); + trace_error_value(type); return -EINVAL; } } diff --git a/src/ipc/ipc.c b/src/ipc/ipc.c index 762bbf5..0b52cb2 100644 --- a/src/ipc/ipc.c +++ b/src/ipc/ipc.c @@ -108,7 +108,7 @@ int ipc_comp_new(struct ipc *ipc, struct sof_ipc_comp *comp) icd = ipc_get_comp(ipc, comp->id); if (icd != NULL) { trace_ipc_error("eCe"); - trace_value(comp->id); + trace_error_value(comp->id); return -EINVAL; } @@ -162,7 +162,7 @@ int ipc_buffer_new(struct ipc *ipc, struct sof_ipc_buffer *desc) ibd = ipc_get_comp(ipc, desc->comp.id); if (ibd != NULL) { trace_ipc_error("eBe"); - trace_value(desc->comp.id); + trace_error_value(desc->comp.id); return -EINVAL; } @@ -215,14 +215,14 @@ int ipc_comp_connect(struct ipc *ipc, icd_source = ipc_get_comp(ipc, connect->source_id); if (icd_source == NULL) { trace_ipc_error("eCr"); - trace_value(connect->source_id); + trace_error_value(connect->source_id); return -EINVAL; } icd_sink = ipc_get_comp(ipc, connect->sink_id); if (icd_sink == NULL) { trace_ipc_error("eCn"); - trace_value(connect->sink_id); + trace_error_value(connect->sink_id); return -EINVAL; } @@ -237,8 +237,8 @@ int ipc_comp_connect(struct ipc *ipc, icd_source->cd, icd_sink->cb); else { trace_ipc_error("eCt"); - trace_value(connect->source_id); - trace_value(connect->sink_id); + trace_error_value(connect->source_id); + trace_error_value(connect->sink_id); return -EINVAL; } } @@ -255,7 +255,7 @@ int ipc_pipeline_new(struct ipc *ipc, ipc_pipe = ipc_get_comp(ipc, pipe_desc->comp_id); if (ipc_pipe != NULL) { trace_ipc_error("ePi"); - trace_value(pipe_desc->comp_id); + trace_error_value(pipe_desc->comp_id); return -EINVAL; } @@ -263,7 +263,7 @@ int ipc_pipeline_new(struct ipc *ipc, icd = ipc_get_comp(ipc, pipe_desc->sched_id); if (icd == NULL) { trace_ipc_error("ePs"); - trace_value(pipe_desc->sched_id); + trace_error_value(pipe_desc->sched_id); return -EINVAL; } if (icd->type != COMP_TYPE_COMPONENT) { diff --git a/src/lib/alloc.c b/src/lib/alloc.c index 27916e3..4803456 100644 --- a/src/lib/alloc.c +++ b/src/lib/alloc.c @@ -378,8 +378,8 @@ find: error: trace_mem_error("eMm"); - trace_value(bytes); - trace_value(caps); + trace_error_value(bytes); + trace_error_value(caps); return NULL; } -- 2.14.1

4 12

[Sound-open-firmware] [PATCH] topology: hsw/bdw: Use DMAC1 for host DMA
by Liam Girdwood 23 Mar '18

23 Mar '18

DMAC0 missing some configuration so use DMAC1 Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/reef-bdw-rt286.m4 | 6 +++--- topology/reef-bdw-rt5640.m4 | 6 +++--- topology/reef-hsw-rt5640.m4 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/topology/reef-bdw-rt286.m4 b/topology/reef-bdw-rt286.m4 index a305e7d..c7dded6 100644 --- a/topology/reef-bdw-rt286.m4 +++ b/topology/reef-bdw-rt286.m4 @@ -33,21 +33,21 @@ include(`dsps/bdw.m4') # Use DMAC 0 channel 1 for PCM audio playback data PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) + 48, 1000, 0, 0, 1, 1) # 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_ADD(sof/pipe-low-latency-capture.m4, 2, 0, 2, s32le, - 48, 1000, 0, 0, 0, 2) + 48, 1000, 0, 0, 1, 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) + 96, 2000, 1, 0, 1, 3) # Tone Playback pipeline 5 using max 2 channels of s32le. # Schedule 192 frames per 4000us deadline on core 0 with priority 2 diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4 index 3fbb844..53c9610 100644 --- a/topology/reef-bdw-rt5640.m4 +++ b/topology/reef-bdw-rt5640.m4 @@ -33,21 +33,21 @@ include(`dsps/bdw.m4') # Use DMAC 0 channel 1 for PCM audio playback data PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) + 48, 1000, 0, 0, 1, 1) # 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_ADD(sof/pipe-low-latency-capture.m4, 2, 0, 2, s32le, - 48, 1000, 0, 0, 0, 2) + 48, 1000, 0, 0, 1, 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) + 96, 2000, 1, 0, 1, 3) # Tone Playback pipeline 5 using max 2 channels of s32le. # Schedule 192 frames per 4000us deadline on core 0 with priority 2 diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4 index 5ab33ea..5516451 100644 --- a/topology/reef-hsw-rt5640.m4 +++ b/topology/reef-hsw-rt5640.m4 @@ -33,21 +33,21 @@ include(`dsps/hsw.m4') # Use DMAC 0 channel 1 for PCM audio playback data PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) + 48, 1000, 0, 0, 1, 1) # 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_ADD(sof/pipe-low-latency-capture.m4, 2, 0, 2, s32le, - 48, 1000, 0, 0, 0, 2) + 48, 1000, 0, 0, 1, 2) # PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le. # Schedule 192 frames per 4000us 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, - 192, 4000, 1, 0, 0, 3) + 192, 4000, 1, 0, 1, 3) # Tone Playback pipeline 5 using max 2 channels of s32le. # Schedule 192 frames per 4000us deadline on core 0 with priority 2 -- 2.14.1

1 0

[Sound-open-firmware] [PATCH 1/2] xtensa: arch: fix 64bit timer.
by Liam Girdwood 23 Mar '18

23 Mar '18

Timer would miss overflow condition, now logic same as BYT 64 bit timer. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/arch/xtensa/timer.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/arch/xtensa/timer.c b/src/arch/xtensa/timer.c index ee01d083..1da503fd 100644 --- a/src/arch/xtensa/timer.c +++ b/src/arch/xtensa/timer.c @@ -80,7 +80,7 @@ void timer_64_handler(void *arg) } /* get next timeout value */ - if (timer->hitimeout > 0 && timer->hitimeout == timer->hitime) { + if (timer->hitimeout == timer->hitime) { /* timeout is in this 32 bit period */ ccompare = timer->lowtimeout; } else { @@ -185,17 +185,13 @@ int arch_timer_set(struct timer *timer, uint64_t ticks) flags = arch_interrupt_global_disable(); /* same hi 64 bit context as ticks ? */ - if (hitimeout == timer->hitime) { - /* yes, then set the value for next timeout */ - time = ticks; - timer->lowtimeout = 0; - timer->hitimeout = 0; - } else if (hitimeout < timer->hitime) { + if (hitimeout < timer->hitime) { /* cant be in the past */ arch_interrupt_global_enable(flags); return -EINVAL; } else { /* set for checking at next timeout */ + time = ticks; timer->hitimeout = hitimeout; timer->lowtimeout = ticks; } -- 2.14.1

1 1

[Sound-open-firmware] [PATCH] topology: modify tlv data to match volume range supported by firmware
by Ranjani Sridharan 23 Mar '18

23 Mar '18

This patch modifies the tlv data for volume controls to match the volume range supported in the firmware. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Tested on Minnowboard Turbot w/ RT5651 SOF master:1.1-stable SOF Tool master: https://github.com/ranj063/soft.git branch: volume-tlv Kernel: https://github.com/ranj063/sound.git branch: volume-tlv --- --- topology/common/tlv.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/topology/common/tlv.m4 b/topology/common/tlv.m4 index e591fa8..f1a9eff 100644 --- a/topology/common/tlv.m4 +++ b/topology/common/tlv.m4 @@ -4,11 +4,11 @@ # SectionTLV."vtlv_m90s3" { - Comment "-90dB step 3dB" + Comment "-64dB step 2dB" scale { - min "-9000" - step "300" + min "-6400" + step "200" mute "1" } } -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] volume: Add support for 4 channel input
by Ranjani Sridharan 23 Mar '18

23 Mar '18

This patch adds support for 4 channel input in volume Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/volume.c | 311 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 284 insertions(+), 27 deletions(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index 0620e18..df926c5 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -91,9 +91,11 @@ struct comp_func_map { struct comp_buffer *source, uint32_t frames); }; +/* volume scaling functions for stereo input */ + /* copy and scale volume from 16 bit source buffer to 32 bit dest buffer */ -static void vol_s16_to_s32(struct comp_dev *dev, struct comp_buffer *sink, - struct comp_buffer *source, uint32_t frames) +static void vol_s16_to_s32_2ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) { struct comp_data *cd = comp_get_drvdata(dev); int16_t *src = (int16_t *) source->r_ptr; @@ -109,8 +111,8 @@ static void vol_s16_to_s32(struct comp_dev *dev, struct comp_buffer *sink, } /* copy and scale volume from 32 bit source buffer to 16 bit dest buffer */ -static void vol_s32_to_s16(struct comp_dev *dev, struct comp_buffer *sink, - struct comp_buffer *source, uint32_t frames) +static void vol_s32_to_s16_2ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) { struct comp_data *cd = comp_get_drvdata(dev); int32_t *src = (int32_t *) source->r_ptr; @@ -128,8 +130,8 @@ static void vol_s32_to_s16(struct comp_dev *dev, struct comp_buffer *sink, } /* copy and scale volume from 32 bit source buffer to 32 bit dest buffer */ -static void vol_s32_to_s32(struct comp_dev *dev, struct comp_buffer *sink, - struct comp_buffer *source, uint32_t frames) +static void vol_s32_to_s32_2ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) { struct comp_data *cd = comp_get_drvdata(dev); int32_t *src = (int32_t *) source->r_ptr; @@ -147,8 +149,8 @@ static void vol_s32_to_s32(struct comp_dev *dev, struct comp_buffer *sink, } /* copy and scale volume from 16 bit source buffer to 16 bit dest buffer */ -static void vol_s16_to_s16(struct comp_dev *dev, struct comp_buffer *sink, - struct comp_buffer *source, uint32_t frames) +static void vol_s16_to_s16_2ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) { struct comp_data *cd = comp_get_drvdata(dev); int16_t *src = (int16_t *) source->r_ptr; @@ -166,8 +168,8 @@ static void vol_s16_to_s16(struct comp_dev *dev, struct comp_buffer *sink, } /* copy and scale volume from 16 bit source buffer to 24 bit on 32 bit boundary dest buffer */ -static void vol_s16_to_s24(struct comp_dev *dev, struct comp_buffer *sink, - struct comp_buffer *source, uint32_t frames) +static void vol_s16_to_s24_2ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) { struct comp_data *cd = comp_get_drvdata(dev); int16_t *src = (int16_t *) source->r_ptr; @@ -185,8 +187,8 @@ static void vol_s16_to_s24(struct comp_dev *dev, struct comp_buffer *sink, } /* copy and scale volume from 16 bit source buffer to 24 bit on 32 bit boundary dest buffer */ -static void vol_s24_to_s16(struct comp_dev *dev, struct comp_buffer *sink, - struct comp_buffer *source, uint32_t frames) +static void vol_s24_to_s16_2ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) { struct comp_data *cd = comp_get_drvdata(dev); int32_t *src = (int32_t *) source->r_ptr; @@ -206,8 +208,8 @@ static void vol_s24_to_s16(struct comp_dev *dev, struct comp_buffer *sink, } /* copy and scale volume from 32 bit source buffer to 24 bit on 32 bit boundary dest buffer */ -static void vol_s32_to_s24(struct comp_dev *dev, struct comp_buffer *sink, - struct comp_buffer *source, uint32_t frames) +static void vol_s32_to_s24_2ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) { struct comp_data *cd = comp_get_drvdata(dev); int32_t *src = (int32_t *) source->r_ptr; @@ -225,8 +227,8 @@ static void vol_s32_to_s24(struct comp_dev *dev, struct comp_buffer *sink, } /* copy and scale volume from 16 bit source buffer to 24 bit on 32 bit boundary dest buffer */ -static void vol_s24_to_s32(struct comp_dev *dev, struct comp_buffer *sink, - struct comp_buffer *source, uint32_t frames) +static void vol_s24_to_s32_2ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) { struct comp_data *cd = comp_get_drvdata(dev); int32_t *src = (int32_t *) source->r_ptr; @@ -248,8 +250,8 @@ static void vol_s24_to_s32(struct comp_dev *dev, struct comp_buffer *sink, /* Copy and scale volume from 24 bit source buffer to 24 bit on 32 bit boundary * dest buffer. */ -static void vol_s24_to_s24(struct comp_dev *dev, struct comp_buffer *sink, - struct comp_buffer *source, uint32_t frames) +static void vol_s24_to_s24_2ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) { struct comp_data *cd = comp_get_drvdata(dev); int32_t i, *src = (int32_t*) source->r_ptr; @@ -267,17 +269,272 @@ static void vol_s24_to_s24(struct comp_dev *dev, struct comp_buffer *sink, } } +/* volume scaling functions for 4-channel input */ + +/* copy and scale volume from 16 bit source buffer to 32 bit dest buffer */ +static void vol_s16_to_s32_4ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int16_t *src = (int16_t *)source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.15 --> Q1.31 and volume is Q1.16 */ + for (i = 0; i < frames * 4; i += 4) { + dest[i] = (int32_t)src[i] * cd->volume[0]; + dest[i + 1] = (int32_t)src[i + 1] * cd->volume[1]; + dest[i + 2] = (int32_t)src[i + 2] * cd->volume[2]; + dest[i + 3] = (int32_t)src[i + 3] * cd->volume[3]; + } +} + +/* copy and scale volume from 32 bit source buffer to 16 bit dest buffer */ +static void vol_s32_to_s16_4ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t *src = (int32_t *)source->r_ptr; + int16_t *dest = (int16_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.31 --> Q1.15 and volume is Q1.16 */ + for (i = 0; i < frames * 4; i += 4) { + dest[i] = (int16_t)q_multsr_sat_32x32(src[i], cd->volume[0], + Q_SHIFT_BITS_64(31, 16, + 15)); + dest[i + 1] = (int16_t)q_multsr_sat_32x32(src[i + 1], + cd->volume[1], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 2] = (int16_t)q_multsr_sat_32x32(src[i + 2], + cd->volume[2], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 3] = (int16_t)q_multsr_sat_32x32(src[i + 3], + cd->volume[3], + Q_SHIFT_BITS_64(31, + 16, + 15)); + } +} + +/* copy and scale volume from 32 bit source buffer to 32 bit dest buffer */ +static void vol_s32_to_s32_4ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t *src = (int32_t *)source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.31 --> Q1.31 and volume is Q1.16 */ + for (i = 0; i < frames * 4; i += 4) { + dest[i] = q_multsr_sat_32x32(src[i], cd->volume[0], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 1] = q_multsr_sat_32x32(src[i + 1], cd->volume[1], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 2] = q_multsr_sat_32x32(src[i + 2], cd->volume[2], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 3] = q_multsr_sat_32x32(src[i + 3], cd->volume[3], + Q_SHIFT_BITS_64(31, 16, 31)); + } +} + +/* copy and scale volume from 16 bit source buffer to 16 bit dest buffer */ +static void vol_s16_to_s16_4ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int16_t *src = (int16_t *)source->r_ptr; + int16_t *dest = (int16_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.15 --> Q1.15 and volume is Q1.16 */ + for (i = 0; i < frames * 4; i += 4) { + dest[i] = q_multsr_sat_16x16(src[i], cd->volume[0], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 1] = q_multsr_sat_16x16(src[i + 1], cd->volume[1], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 2] = q_multsr_sat_16x16(src[i + 2], cd->volume[2], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 3] = q_multsr_sat_16x16(src[i + 3], cd->volume[3], + Q_SHIFT_BITS_32(15, 16, 15)); + } +} + +/* copy and scale volume from 16 bit source buffer to 24 bit + * on 32 bit boundary buffer + */ +static void vol_s16_to_s24_4ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int16_t *src = (int16_t *)source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.15 and volume is Q1.16 */ + for (i = 0; i < frames * 4; i += 4) { + dest[i] = q_multsr_sat_32x32(src[i], cd->volume[0], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 1] = q_multsr_sat_32x32(src[i + 1], cd->volume[1], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 2] = q_multsr_sat_32x32(src[i + 2], cd->volume[2], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 3] = q_multsr_sat_32x32(src[i + 3], cd->volume[3], + Q_SHIFT_BITS_64(15, 16, 23)); + } +} + +/* copy and scale volume from 16 bit source buffer to 24 bit + * on 32 bit boundary dest buffer + */ +static void vol_s24_to_s16_4ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t *src = (int32_t *)source->r_ptr; + int16_t *dest = (int16_t *)sink->w_ptr; + int32_t i, sample; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.23 --> Q1.15 and volume is Q1.16 */ + for (i = 0; i < frames * 4; i += 4) { + sample = sign_extend_s24(src[i]); + dest[i] = (int16_t)q_multsr_sat_32x32(sample, cd->volume[0], + Q_SHIFT_BITS_64(23, 16, + 15)); + sample = sign_extend_s24(src[i + 1]); + dest[i + 1] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[1], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 2]); + dest[i + 2] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[2], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 3]); + dest[i + 3] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[3], + Q_SHIFT_BITS_64(23, + 16, + 15)); + } +} + +/* copy and scale volume from 32 bit source buffer to 24 bit + * on 32 bit boundary dest buffer + */ +static void vol_s32_to_s24_4ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t *src = (int32_t *)source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.31 --> Q1.23 and volume is Q1.16 */ + for (i = 0; i < frames * 4; i += 4) { + dest[i] = q_multsr_sat_32x32(src[i], cd->volume[0], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 1] = q_multsr_sat_32x32(src[i + 1], cd->volume[1], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 2] = q_multsr_sat_32x32(src[i + 2], cd->volume[2], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 3] = q_multsr_sat_32x32(src[i + 3], cd->volume[3], + Q_SHIFT_BITS_64(31, 16, 23)); + } +} + +/* copy and scale volume from 16 bit source buffer to 24 bit + * on 32 bit boundary dest buffer + */ +static void vol_s24_to_s32_4ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t *src = (int32_t *)source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.23 --> Q1.31 and volume is Q1.16 */ + for (i = 0; i < frames * 4; i += 4) { + dest[i] = q_multsr_sat_32x32(sign_extend_s24(src[i]), + cd->volume[0], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 1] = q_multsr_sat_32x32(sign_extend_s24(src[i + 1]), + cd->volume[1], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 2] = q_multsr_sat_32x32(sign_extend_s24(src[i + 2]), + cd->volume[2], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 3] = q_multsr_sat_32x32(sign_extend_s24(src[i + 3]), + cd->volume[3], + Q_SHIFT_BITS_64(23, 16, 31)); + } +} + +/* Copy and scale volume from 24 bit source buffer to 24 bit on 32 bit boundary + * dest buffer. + */ +static void vol_s24_to_s24_4ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t i, *src = (int32_t *)source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.23 --> Q1.23 and volume is Q1.16 */ + for (i = 0; i < frames * 4; i += 4) { + dest[i] = q_multsr_sat_32x32(sign_extend_s24(src[i]), + cd->volume[0], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 1] = q_multsr_sat_32x32(sign_extend_s24(src[i + 1]), + cd->volume[1], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 2] = q_multsr_sat_32x32(sign_extend_s24(src[i + 2]), + cd->volume[2], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 3] = q_multsr_sat_32x32(sign_extend_s24(src[i + 3]), + cd->volume[3], + Q_SHIFT_BITS_64(23, 16, 23)); + } +} + /* map of source and sink buffer formats to volume function */ static const struct comp_func_map func_map[] = { - {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S16_LE, 2, vol_s16_to_s16}, - {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S32_LE, 2, vol_s16_to_s32}, - {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S16_LE, 2, vol_s32_to_s16}, - {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S32_LE, 2, vol_s32_to_s32}, - {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S24_4LE, 2, vol_s16_to_s24}, - {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S16_LE, 2, vol_s24_to_s16}, - {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S24_4LE, 2, vol_s32_to_s24}, - {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S32_LE, 2, vol_s24_to_s32}, - {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S24_4LE, 2, vol_s24_to_s24}, + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S16_LE, 2, vol_s16_to_s16_2ch}, + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S32_LE, 2, vol_s16_to_s32_2ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S16_LE, 2, vol_s32_to_s16_2ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S32_LE, 2, vol_s32_to_s32_2ch}, + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S24_4LE, 2, vol_s16_to_s24_2ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S16_LE, 2, vol_s24_to_s16_2ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S24_4LE, 2, vol_s32_to_s24_2ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S32_LE, 2, vol_s24_to_s32_2ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S24_4LE, 2, vol_s24_to_s24_2ch}, + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S16_LE, 4, vol_s16_to_s16_4ch}, + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S32_LE, 4, vol_s16_to_s32_4ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S16_LE, 4, vol_s32_to_s16_4ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S32_LE, 4, vol_s32_to_s32_4ch}, + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S24_4LE, 4, vol_s16_to_s24_4ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S16_LE, 4, vol_s24_to_s16_4ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S24_4LE, 4, vol_s32_to_s24_4ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S32_LE, 4, vol_s24_to_s32_4ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S24_4LE, 4, vol_s24_to_s24_4ch}, }; /* synchronise host mmap() volume with real value */ -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] hsw: ipc: ipcx/ipcd are only used for doorbell
by Liam Girdwood 22 Mar '18

22 Mar '18

IPCX and IPCD are 32bit wide and should only be used for doorbell on HSW and BDW. Payload should be in mailbox. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/ipc/hsw-ipc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/ipc/hsw-ipc.c b/src/ipc/hsw-ipc.c index 5bfdf93a..489d6ef9 100644 --- a/src/ipc/hsw-ipc.c +++ b/src/ipc/hsw-ipc.c @@ -80,7 +80,7 @@ out: spin_unlock_irq(&_ipc->lock, flags); /* clear DONE bit - tell Host we have completed */ - shim_write(SHIM_IPCD, shim_read(SHIM_IPCD) & ~SHIM_IPCD_DONE); + shim_write(SHIM_IPCD, 0); /* unmask Done interrupt */ shim_write(SHIM_IMRD, shim_read(SHIM_IMRD) & ~SHIM_IMRD_DONE); @@ -123,7 +123,6 @@ void ipc_platform_do_cmd(struct ipc *ipc) { struct intel_ipc_data *iipc = ipc_get_drvdata(ipc); struct sof_ipc_reply reply; - uint32_t ipcx; int32_t err; tracev_ipc("Cmd"); @@ -146,10 +145,7 @@ done: ipc->host_pending = 0; /* clear BUSY bit and set DONE bit - accept new messages */ - ipcx = shim_read(SHIM_IPCX); - ipcx &= ~SHIM_IPCX_BUSY; - ipcx |= SHIM_IPCX_DONE; - shim_write(SHIM_IPCX, ipcx); + shim_write(SHIM_IPCX, SHIM_IPCX_DONE); /* unmask busy interrupt */ shim_write(SHIM_IMRD, shim_read(SHIM_IMRD) & ~SHIM_IMRD_BUSY); @@ -191,7 +187,7 @@ void ipc_platform_send_msg(struct ipc *ipc) tracev_ipc("Msg"); /* now interrupt host to tell it we have message sent */ - shim_write(SHIM_IPCD, msg->header | SHIM_IPCD_BUSY); + shim_write(SHIM_IPCD, SHIM_IPCD_BUSY); list_item_append(&msg->list, &ipc->empty_list); -- 2.14.1

1 0

[Sound-open-firmware] [PATCH 1/2] topology: utils: add get format name helper function
by Xiuli Pan 22 Mar '18

22 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> We may need to get format name from some format short name. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 and GP-MRB nocodec and CNL nocodec SOF 1.1-stable: 480407f4745a2edf9c51e3a14be7533970122f23 SOF-Tool 1.1-stable: 105c88febf1b974b9f03b02712dbc154eff5eb4d https://github.com/plbossart/sound/tree/topic/sof-v4.14: 95d77adbaadc44b28c8975a3714f70824d1a8529 --- topology/m4/utils.m4 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/topology/m4/utils.m4 b/topology/m4/utils.m4 index e929244..ba87c8d 100644 --- a/topology/m4/utils.m4 +++ b/topology/m4/utils.m4 @@ -35,6 +35,15 @@ define(`COMP_SAMPLE_SIZE', $1, `float', `4', `4')') +dnl COMP_FORMAT_NAME(FMT) +define(`COMP_FORMAT_NAME', +`ifelse( + $1, `s16le', `S16_LE', + $1, `s24le', `S24_LE', + $1, `s32le', `S32_LE', + $1, `float', `FLOAT_LE', + )') + dnl P_GRAPH(name, CONNECTIONS) define(`P_GRAPH', `SectionGraph.STR($1) {' -- 2.7.4

3 4

[Sound-open-firmware] [PATCH] topology: test: add more topologies for test
by Keqiao.Zhang 22 Mar '18

22 Mar '18

Signed-off-by: Keqiao.Zhang <keqiao.zhang(a)linux.intel.com> --- topology/test/tplg-build.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index b042909..5a6a8f5 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -90,16 +90,35 @@ 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 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 # 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 + +# 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 # 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] cnl: scheduler: Add list of tasks per irq level
by Liam Girdwood 22 Mar '18

22 Mar '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> This patch adds list of tasks per each irq level and fixes the problem, where scheduler tried to schedule the same task two times. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/arch/xtensa/include/arch/task.h | 4 +- src/arch/xtensa/init.c | 2 +- src/arch/xtensa/task.c | 147 ++++++++++++++++++++++++++++-------- src/include/reef/schedule.h | 3 + src/lib/schedule.c | 26 +++---- 5 files changed, 136 insertions(+), 46 deletions(-) diff --git a/src/arch/xtensa/include/arch/task.h b/src/arch/xtensa/include/arch/task.h index 1547751b..2ec5f25e 100644 --- a/src/arch/xtensa/include/arch/task.h +++ b/src/arch/xtensa/include/arch/task.h @@ -36,6 +36,8 @@ struct task; void arch_run_task(struct task *task); -int arch_init_tasks(void); +void arch_allocate_tasks(void); + +int arch_assign_tasks(void); #endif diff --git a/src/arch/xtensa/init.c b/src/arch/xtensa/init.c index 04338540..24c99369 100644 --- a/src/arch/xtensa/init.c +++ b/src/arch/xtensa/init.c @@ -78,7 +78,7 @@ static void register_exceptions(void) int arch_init(struct reef *reef) { register_exceptions(); - arch_init_tasks(); + arch_assign_tasks(); return 0; } diff --git a/src/arch/xtensa/task.c b/src/arch/xtensa/task.c index 349f8abb..0ffedeb9 100644 --- a/src/arch/xtensa/task.c +++ b/src/arch/xtensa/task.c @@ -34,12 +34,19 @@ #include <platform/platform.h> #include <reef/debug.h> #include <arch/task.h> +#include <reef/alloc.h> #include <stdint.h> #include <errno.h> -static struct task *_irq_low_task = NULL; -static struct task *_irq_med_task = NULL; -static struct task *_irq_high_task = NULL; +struct irq_task { + spinlock_t lock; + struct list_item list; /* list of tasks per irq */ + uint32_t irq; +}; + +static struct irq_task *irq_low_task; +static struct irq_task *irq_med_task; +static struct irq_task *irq_high_task; static inline uint32_t task_get_irq(struct task *task) { @@ -65,55 +72,106 @@ static inline void task_set_data(struct task *task) { switch (task->priority) { case TASK_PRI_MED + 1 ... TASK_PRI_LOW: - _irq_low_task = task; + list_item_append(&task->irq_low_list, &irq_low_task->list); break; case TASK_PRI_HIGH ... TASK_PRI_MED - 1: - _irq_high_task = task; + list_item_append(&task->irq_high_list, &irq_high_task->list); break; case TASK_PRI_MED: default: - _irq_med_task = task; + list_item_append(&task->irq_med_list, &irq_med_task->list); break; } } static void _irq_low(void *arg) { - struct task *task = *(struct task **)arg; - uint32_t irq; + struct irq_task *irq_task = *(struct irq_task **)arg; + struct list_item *tlist; + struct list_item *clist; + struct task *task; + uint32_t flags; - if (task->func) - task->func(task->data); + /* intentionally don't lock list to have task added from schedule irq */ + list_for_item(tlist, &irq_task->list) { + task = container_of(tlist, struct task, irq_low_list); - schedule_task_complete(task); - irq = task_get_irq(task); - interrupt_clear(irq); + if (task->func) + task->func(task->data); + + schedule_task_complete(task); + } + + spin_lock_irq(&irq_task->lock, flags); + + list_for_item_safe(clist, tlist, &irq_task->list) { + task = container_of(clist, struct task, irq_low_list); + list_item_del(&task->irq_low_list); + } + + interrupt_clear(irq_task->irq); + + spin_unlock_irq(&irq_task->lock, flags); } static void _irq_med(void *arg) { - struct task *task = *(struct task **)arg; - uint32_t irq; + struct irq_task *irq_task = *(struct irq_task **)arg; + struct list_item *tlist; + struct list_item *clist; + struct task *task; + uint32_t flags; - if (task->func) - task->func(task->data); + /* intentionally don't lock list to have task added from schedule irq */ + list_for_item(tlist, &irq_task->list) { + task = container_of(tlist, struct task, irq_med_list); - schedule_task_complete(task); - irq = task_get_irq(task); - interrupt_clear(irq); + if (task->func) + task->func(task->data); + + schedule_task_complete(task); + } + + spin_lock_irq(&irq_task->lock, flags); + + list_for_item_safe(clist, tlist, &irq_task->list) { + task = container_of(clist, struct task, irq_med_list); + list_item_del(&task->irq_med_list); + } + + interrupt_clear(irq_task->irq); + + spin_unlock_irq(&irq_task->lock, flags); } static void _irq_high(void *arg) { - struct task *task = *(struct task **)arg; - uint32_t irq; + struct irq_task *irq_task = *(struct irq_task **)arg; + struct list_item *tlist; + struct list_item *clist; + struct task *task; + uint32_t flags; - if (task->func) - task->func(task->data); + /* intentionally don't lock list to have task added from schedule irq */ + list_for_item(tlist, &irq_task->list) { + task = container_of(tlist, struct task, irq_high_list); - schedule_task_complete(task); - irq = task_get_irq(task); - interrupt_clear(irq); + if (task->func) + task->func(task->data); + + schedule_task_complete(task); + } + + spin_lock_irq(&irq_task->lock, flags); + + list_for_item_safe(clist, tlist, &irq_task->list) { + task = container_of(clist, struct task, irq_high_list); + list_item_del(&task->irq_high_list); + } + + interrupt_clear(irq_task->irq); + + spin_unlock_irq(&irq_task->lock, flags); } /* architecture specific method of running task */ @@ -126,15 +184,42 @@ void arch_run_task(struct task *task) interrupt_set(irq); } -int arch_init_tasks(void) +void arch_allocate_tasks(void) +{ + /* irq low */ + irq_low_task = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + sizeof(*irq_low_task)); + list_init(&irq_low_task->list); + spinlock_init(&irq_low_task->lock); + irq_low_task->irq = PLATFORM_IRQ_TASK_LOW; + + /* irq medium */ + irq_med_task = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + sizeof(*irq_med_task)); + list_init(&irq_med_task->list); + spinlock_init(&irq_med_task->lock); + irq_med_task->irq = PLATFORM_IRQ_TASK_MED; + + /* irq high */ + irq_high_task = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + sizeof(*irq_high_task)); + list_init(&irq_high_task->list); + spinlock_init(&irq_high_task->lock); + irq_high_task->irq = PLATFORM_IRQ_TASK_HIGH; +} + +int arch_assign_tasks(void) { - interrupt_register(PLATFORM_IRQ_TASK_LOW, _irq_low, &_irq_low_task); + /* irq low */ + interrupt_register(PLATFORM_IRQ_TASK_LOW, _irq_low, &irq_low_task); interrupt_enable(PLATFORM_IRQ_TASK_LOW); - interrupt_register(PLATFORM_IRQ_TASK_MED, _irq_med, &_irq_med_task); + /* irq medium */ + interrupt_register(PLATFORM_IRQ_TASK_MED, _irq_med, &irq_med_task); interrupt_enable(PLATFORM_IRQ_TASK_MED); - interrupt_register(PLATFORM_IRQ_TASK_HIGH, _irq_high, &_irq_high_task); + /* irq high */ + interrupt_register(PLATFORM_IRQ_TASK_HIGH, _irq_high, &irq_high_task); interrupt_enable(PLATFORM_IRQ_TASK_HIGH); return 0; diff --git a/src/include/reef/schedule.h b/src/include/reef/schedule.h index 68aa0adf..26b3a935 100644 --- a/src/include/reef/schedule.h +++ b/src/include/reef/schedule.h @@ -64,6 +64,9 @@ struct task { uint64_t deadline; /* scheduling deadline */ uint32_t state; /* TASK_STATE_ */ struct list_item list; /* list in scheduler */ + struct list_item irq_low_list; /* list for low irq level */ + struct list_item irq_med_list; /* list for medium irq level */ + struct list_item irq_high_list; /* list for high irq level */ /* task function and private data */ void *data; diff --git a/src/lib/schedule.c b/src/lib/schedule.c index 77284196..c21d222b 100644 --- a/src/lib/schedule.c +++ b/src/lib/schedule.c @@ -172,7 +172,7 @@ static uint64_t sch_work(void *data, uint64_t delay) static struct task *schedule_edf(void) { struct task *task; - struct task *next_plus1_task = NULL; + struct task *future_task = NULL; uint64_t current; tracev_pipe("edf"); @@ -192,18 +192,16 @@ static struct task *schedule_edf(void) /* can task be started now ? */ if (task->start > current) { /* no, then schedule wake up */ - next_plus1_task = task; + future_task = task; } else { - /* yes, get next task and run this one now */ - next_plus1_task = edf_get_next(current, task); - - /* run current task */ + /* yes, run current task */ task->start = current; + task->state = TASK_STATE_RUNNING; arch_run_task(task); } - /* teall caller about next task (after current) */ - return next_plus1_task; + /* tell caller about future task */ + return future_task; } #if 0 /* FIXME: is this needed ? */ @@ -319,15 +317,14 @@ void schedule_task_complete(struct task *task) static void scheduler_run(void *unused) { - struct task *next_task; + struct task *future_task; tracev_pipe("run"); /* EDF is only scheduler supported atm */ - next_task = schedule_edf(); - if (next_task) { - work_reschedule_default_at(&sch->work, next_task->start); - } + future_task = schedule_edf(); + if (future_task) + work_reschedule_default_at(&sch->work, future_task->start); } /* run the scheduler */ @@ -382,5 +379,8 @@ int scheduler_init(struct reef *reef) interrupt_register(PLATFORM_SCHEDULE_IRQ, scheduler_run, NULL); interrupt_enable(PLATFORM_SCHEDULE_IRQ); + /* allocate arch tasks */ + arch_allocate_tasks(); + return 0; } -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] CNL: DMA: Add chan_size setting for host/link DMA IN/OUT on CNL.
by yan.wang＠linux.intel.com 22 Mar '18

22 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> "chan_size" is used for calculation of DMA register offset. It must be set otherwise only the first channel is available. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/platform/cannonlake/dma.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/platform/cannonlake/dma.c b/src/platform/cannonlake/dma.c index 59e0fc7..b77f1d2 100644 --- a/src/platform/cannonlake/dma.c +++ b/src/platform/cannonlake/dma.c @@ -136,6 +136,7 @@ static struct dma dma[] = { .base = GTW_HOST_IN_STREAM_BASE(0), .channels = 7, .irq = IRQ_EXT_HOST_DMA_IN_LVL3(0, 0), + .chan_size = GTW_HOST_IN_STREAM_SIZE, }, .ops = &hda_host_dma_ops, }, @@ -145,6 +146,7 @@ static struct dma dma[] = { .base = GTW_HOST_OUT_STREAM_BASE(0), .channels = 9, .irq = IRQ_EXT_HOST_DMA_OUT_LVL3(0, 0), + .chan_size = GTW_HOST_OUT_STREAM_SIZE, }, .ops = &hda_host_dma_ops, }, @@ -154,6 +156,7 @@ static struct dma dma[] = { .base = GTW_LINK_IN_STREAM_BASE(0), .channels = 9, .irq = IRQ_EXT_LINK_DMA_IN_LVL4(0, 0), + .chan_size = GTW_LINK_IN_STREAM_SIZE, }, .ops = &hda_link_dma_ops, }, @@ -163,6 +166,7 @@ static struct dma dma[] = { .base = GTW_LINK_OUT_STREAM_BASE(0), .channels = 7, .irq = IRQ_EXT_LINK_DMA_OUT_LVL4(0, 0), + .chan_size = GTW_LINK_OUT_STREAM_SIZE, }, .ops = &hda_link_dma_ops, },}; -- 2.14.3

2 1

[Sound-open-firmware] [PATCH] cnl & apl: ssp: fix a typo for SOF failed with pulseAudio
by Rander Wang 22 Mar '18

22 Mar '18

Refine ssp setting, set SSRSA to stop capture, set SSTSA to stop playback --- Test with: CNL-Y nocode SOF 1.1-stable:ffd9093267aa8d SOF-Tool 1.1-stable:cc91c73aa3e91eea Kernel:https://github.com/plbossart/sound.git 4881a4bd906f8b52b Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/drivers/apl-ssp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index c26f2a0..6424b7d 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -545,14 +545,14 @@ static void ssp_stop(struct dai *dai) /* stop Rx if we are not capturing */ if (ssp->state[SOF_IPC_STREAM_CAPTURE] != COMP_STATE_ACTIVE) { ssp_update_bits(dai, SSCR1, SSCR1_RSRE, 0); - ssp_update_bits(dai, SSTSA, 0x1 << 8, 0x0 << 8); + ssp_update_bits(dai, SSRSA, 0x1 << 8, 0x0 << 8); trace_ssp("Ss0"); } /* stop Tx if we are not playing */ if (ssp->state[SOF_IPC_STREAM_PLAYBACK] != COMP_STATE_ACTIVE) { ssp_update_bits(dai, SSCR1, SSCR1_TSRE, 0); - ssp_update_bits(dai, SSRSA, 0x1 << 8, 0x0 << 8); + ssp_update_bits(dai, SSTSA, 0x1 << 8, 0x0 << 8); trace_ssp("Ss1"); } -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] Add chan_size setting for host/link DMA IN/OUT on CNL.
by yan.wang＠linux.intel.com 22 Mar '18

22 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> "chan_size" is used for calculation of DMA register offset. It must be set otherwise only the first channel is available. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/platform/cannonlake/dma.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/platform/cannonlake/dma.c b/src/platform/cannonlake/dma.c index 59e0fc7..b77f1d2 100644 --- a/src/platform/cannonlake/dma.c +++ b/src/platform/cannonlake/dma.c @@ -136,6 +136,7 @@ static struct dma dma[] = { .base = GTW_HOST_IN_STREAM_BASE(0), .channels = 7, .irq = IRQ_EXT_HOST_DMA_IN_LVL3(0, 0), + .chan_size = GTW_HOST_IN_STREAM_SIZE, }, .ops = &hda_host_dma_ops, }, @@ -145,6 +146,7 @@ static struct dma dma[] = { .base = GTW_HOST_OUT_STREAM_BASE(0), .channels = 9, .irq = IRQ_EXT_HOST_DMA_OUT_LVL3(0, 0), + .chan_size = GTW_HOST_OUT_STREAM_SIZE, }, .ops = &hda_host_dma_ops, }, @@ -154,6 +156,7 @@ static struct dma dma[] = { .base = GTW_LINK_IN_STREAM_BASE(0), .channels = 9, .irq = IRQ_EXT_LINK_DMA_IN_LVL4(0, 0), + .chan_size = GTW_LINK_IN_STREAM_SIZE, }, .ops = &hda_link_dma_ops, }, @@ -163,6 +166,7 @@ static struct dma dma[] = { .base = GTW_LINK_OUT_STREAM_BASE(0), .channels = 7, .irq = IRQ_EXT_LINK_DMA_OUT_LVL4(0, 0), + .chan_size = GTW_LINK_OUT_STREAM_SIZE, }, .ops = &hda_link_dma_ops, },}; -- 2.14.3

4 3

[Sound-open-firmware] [PATCH v3] topology: apl-tdf8532: create m4 file for gpmrb platform
by Wu Zhigang 21 Mar '18

21 Mar '18

Here add topology file for apollolake GP-MRB platform, it is initial version, we only support one playback and one capture PCM pipeline at the moment, with SSP/DAI set to tdm8-32le-48kHz (active on first 4 slots for both transmit and receive). Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> Reviewed-by: Keyon Jie <yang.jie(a)linux.intel.com> --- v3: change tplg file to support output 4-slot. v2: update the topology based on latest version. v1: create the m4 file for gpmrb platform. --- Tested with apl-gpmrb board kernel: https://github.com/plbossart/sound.git branch: topic/sof-v4.14 4881a4bd906f8b52bebd209b88ff920005550d53 firmware: git://git.alsa-project.org/sound-open-firmware.git branch: 1.1-stable ffd9093267aa8d3deeffeb09b73c8b0789ad4071 tools: branch: 1.1-stable cc91c73aa3e91eea35abdeb76d578b97f718feff --- topology/Makefile.am | 6 ++-- topology/reef-apl-tdf8532.m4 | 71 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 topology/reef-apl-tdf8532.m4 diff --git a/topology/Makefile.am b/topology/Makefile.am index f161ba2..a7e86fd 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -28,7 +28,8 @@ MACHINES = \ reef-byt-rt5651.tplg \ reef-byt-da7213.tplg \ reef-cnl-rt274.tplg \ - reef-hsw-rt5640.tplg + reef-hsw-rt5640.tplg \ + reef-apl-tdf8532.tplg # Uncomment the following line if you want to debug conf files .PRECIOUS: %.conf @@ -58,4 +59,5 @@ EXTRA_DIST = \ reef-byt-rt5651.m4 \ reef-byt-da7213.m4 \ reef-cnl-rt274.m4 \ - reef-hsw-rt5640.m4 + reef-hsw-rt5640.m4 \ + reef-apl-tdf8532.m4 diff --git a/topology/reef-apl-tdf8532.m4 b/topology/reef-apl-tdf8532.m4 new file mode 100644 index 0000000..eaddac9 --- /dev/null +++ b/topology/reef-apl-tdf8532.m4 @@ -0,0 +1,71 @@ +# +# Topology for generic Apollolake board with TDF8532 +# + +# Include topology builder +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') + +# Include TLV library +include(`common/tlv.m4') + +# Include Token library +include(`sof/tokens.m4') + +# Include Apollolake DSP configuration +include(`dsps/bxt.m4') + +# +# Define the pipelines +# +# PCM0 ----> volume -----> SSP4 +# +# PCM1 <---- Volume <----- SSP4 +# + +# 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-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. +# 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) + +# +# 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 +DAI_ADD(sof/pipe-dai-playback.m4, + 1, SSP, 4, SSP4-Codec, + 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 +DAI_ADD(sof/pipe-dai-capture.m4, + 2, SSP, 4, SSP4-Codec, + PIPELINE_SINK_2, 2, s32le, + 48, 1000, 0, 0) + +# PCM Low Latency +PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) + +# +# BE configurations - overrides config in ACPI if present +# +DAI_CONFIG(SSP, 4, SSP4-Codec, DSP_B, 32, + DAI_CLOCK(mclk, 24576000, slave), + DAI_CLOCK(bclk, 12288000, slave), + DAI_CLOCK(fsync, 48000, slave), + DAI_TDM(8, 32, 15, 15)) -- 2.11.0

2 1

[Sound-open-firmware] [PATCH] cnl: core: Enable L1 cache for DSP
by Liam Girdwood 21 Mar '18

21 Mar '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> This time really enable L1 cache as we missed one more setting in boot_ldr. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/platform/cannonlake/boot_ldr.x.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/cannonlake/boot_ldr.x.in b/src/platform/cannonlake/boot_ldr.x.in index cc7a2dca..a42fd897 100644 --- a/src/platform/cannonlake/boot_ldr.x.in +++ b/src/platform/cannonlake/boot_ldr.x.in @@ -375,7 +375,7 @@ SECTIONS PROVIDE(_memmap_vecbase_reset = HP_SRAM_VECBASE_RESET); - _memmap_cacheattr_wbna_trapnull = 0x25222222; + _memmap_cacheattr_wbna_trapnull = 0xFF42FFF2; PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wbna_trapnull); .debug 0 : { *(.debug) } -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] mailbox: fix mailbox mappings to include exception space.
by Xiuli Pan 21 Mar '18

21 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Fix mailbox mapping on BYT, HSW, APL and CNL. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- This patch need to used with patch set: ASoC: SOF: export snd_sof_trace_notify_for_error ASoC: SOF: Add SOF_IPC_REGION_EXCEPTION ASoC: SOF: add dsp_oops_offset for DSP panic ASoC: SOF: Add exception memory window support for BYT ASoC: SOF: Add exception memory window support for HSW ASoC: SOF: Add exception memory window support for BDW ASoC: SOF: Add exception memory window support for APL and CNL Test with: Mininow max rt5651 and GP-MRB nocodec and CNL nocodec SOF 1.1-stable: ffd9093267aa8d3deeffeb09b73c8b0789ad4071 SOF-Tool 1.1-stable: cc91c73aa3e91eea35abdeb76d578b97f718feff https://github.com/plbossart/sound/tree/topic/sof-v4.14: 4881a4bd906f8b52bebd209b88ff920005550d53 --- src/include/uapi/ipc.h | 1 + src/platform/apollolake/include/platform/mailbox.h | 12 ++++++------ src/platform/apollolake/include/platform/memory.h | 13 ++++++++++--- src/platform/apollolake/include/platform/platform.h | 6 ++++-- src/platform/apollolake/platform.c | 13 ++++++++++--- src/platform/baytrail/include/platform/platform.h | 5 +++-- src/platform/baytrail/platform.c | 9 ++++++++- src/platform/cannonlake/include/platform/mailbox.h | 12 ++++++------ src/platform/cannonlake/include/platform/memory.h | 12 +++++++++--- src/platform/cannonlake/include/platform/platform.h | 6 ++++-- src/platform/cannonlake/platform.c | 13 ++++++++++--- src/platform/haswell/include/platform/platform.h | 2 +- src/platform/haswell/platform.c | 9 ++++++++- 13 files changed, 80 insertions(+), 33 deletions(-) diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index e44a13f..5ec9ec3 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -795,6 +795,7 @@ enum sof_ipc_region { SOF_IPC_REGION_DEBUG, SOF_IPC_REGION_STREAM, SOF_IPC_REGION_REGS, + SOF_IPC_REGION_EXCEPTION, }; struct sof_ipc_ext_data_hdr { diff --git a/src/platform/apollolake/include/platform/mailbox.h b/src/platform/apollolake/include/platform/mailbox.h index e04bdb5..92bd089 100644 --- a/src/platform/apollolake/include/platform/mailbox.h +++ b/src/platform/apollolake/include/platform/mailbox.h @@ -56,17 +56,17 @@ #define MAILBOX_TRACE_SIZE SRAM_TRACE_SIZE #define MAILBOX_TRACE_BASE SRAM_TRACE_BASE -/* window 2 debug and exception */ -#define MAILBOX_DEBUG_SIZE (SRAM_DEBUG_SIZE - MAILBOX_EXCEPTION_SIZE) +/* window 2 debug, exception and stream */ +#define MAILBOX_DEBUG_SIZE SRAM_DEBUG_SIZE #define MAILBOX_DEBUG_BASE SRAM_DEBUG_BASE -#define MAILBOX_EXCEPTION_SIZE 0x100 -#define MAILBOX_EXCEPTION_BASE \ - (MAILBOX_SW_REG_BASE + SRAM_REG_FW_END) +#define MAILBOX_EXCEPTION_SIZE SRAM_EXCEPT_SIZE +#define MAILBOX_EXCEPTION_BASE SRAM_EXCEPT_BASE +#define MAILBOX_EXCEPTION_OFFSET SRAM_DEBUG_SIZE #define MAILBOX_STREAM_SIZE SRAM_STREAM_SIZE #define MAILBOX_STREAM_BASE SRAM_STREAM_BASE -#define MAILBOX_STREAM_OFFSET SRAM_DEBUG_SIZE +#define MAILBOX_STREAM_OFFSET (SRAM_DEBUG_SIZE + SRAM_EXCEPT_SIZE) /* window 1 inbox/downlink and FW registers */ #define MAILBOX_HOSTBOX_SIZE SRAM_INBOX_SIZE diff --git a/src/platform/apollolake/include/platform/memory.h b/src/platform/apollolake/include/platform/memory.h index a0dab04..ca3f15d 100644 --- a/src/platform/apollolake/include/platform/memory.h +++ b/src/platform/apollolake/include/platform/memory.h @@ -214,6 +214,8 @@ * +---------------------+----------------+-----------------------------------+ * | SRAM_DEBUG_BASE | Debug data W2 | SRAM_DEBUG_SIZE | * +---------------------+----------------+-----------------------------------+ + * | SRAM_EXCEPT_BASE | Debug data W2 | SRAM_EXCEPT_SIZE | + * +---------------------+----------------+-----------------------------------+ * | SRAM_STREAM_BASE | Stream data W2 | SRAM_STREAM_SIZE | * +---------------------+----------------+-----------------------------------+ * | SRAM_INBOX_BASE | Inbox W1 | SRAM_INBOX_SIZE | @@ -236,9 +238,12 @@ /* window 2 */ #define SRAM_DEBUG_BASE (SRAM_TRACE_BASE + SRAM_TRACE_SIZE) -#define SRAM_DEBUG_SIZE 0x1000 +#define SRAM_DEBUG_SIZE 0x800 + +#define SRAM_EXCEPT_BASE (SRAM_DEBUG_BASE + SRAM_DEBUG_SIZE) +#define SRAM_EXCEPT_SIZE 0x800 -#define SRAM_STREAM_BASE (SRAM_DEBUG_BASE + SRAM_DEBUG_SIZE) +#define SRAM_STREAM_BASE (SRAM_EXCEPT_BASE + SRAM_EXCEPT_SIZE) #define SRAM_STREAM_SIZE 0x1000 /* window 1 */ @@ -263,7 +268,8 @@ #define HP_SRAM_WIN1_BASE SRAM_INBOX_BASE #define HP_SRAM_WIN1_SIZE SRAM_INBOX_SIZE #define HP_SRAM_WIN2_BASE SRAM_DEBUG_BASE -#define HP_SRAM_WIN2_SIZE (SRAM_DEBUG_SIZE + SRAM_STREAM_SIZE) +#define HP_SRAM_WIN2_SIZE (SRAM_DEBUG_SIZE + SRAM_EXCEPT_SIZE + \ + SRAM_STREAM_SIZE) #define HP_SRAM_WIN3_BASE SRAM_TRACE_BASE #define HP_SRAM_WIN3_SIZE SRAM_TRACE_SIZE @@ -273,6 +279,7 @@ (HP_SRAM_SIZE - \ SRAM_TRACE_SIZE - \ SRAM_DEBUG_SIZE - \ + SRAM_EXCEPT_SIZE - \ SRAM_STREAM_SIZE - \ SRAM_INBOX_SIZE - \ SRAM_OUTBOX_SIZE - \ diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index 273bb98..a1dfba2 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -113,8 +113,10 @@ struct reef; #define PLATFORM_NUM_SSP 6 /* Platform defined panic code */ -#define platform_panic(__x) \ - sw_reg_write(SRAM_REG_FW_STATUS, (0xdead000 | __x) & 0x3fffffff) +#define platform_panic(__x) { \ + sw_reg_write(SRAM_REG_FW_STATUS, (0xdead000 | __x) & 0x3fffffff); \ + ipc_write(IPC_DIPCI, 0x80000000 | ((0xdead000 | __x) & 0x3fffffff)); \ +} /* Platform defined trace code */ #define platform_trace_point(__x) \ diff --git a/src/platform/apollolake/platform.c b/src/platform/apollolake/platform.c index 84f8e71..2b41028 100644 --- a/src/platform/apollolake/platform.c +++ b/src/platform/apollolake/platform.c @@ -68,7 +68,7 @@ static const struct sof_ipc_fw_ready ready = { #define SRAM_WINDOW_HOST_OFFSET(x) (0x80000 + x * 0x20000) -#define NUM_APL_WINDOWS 6 +#define NUM_APL_WINDOWS 7 static const struct sof_ipc_window sram_window = { .ext_hdr = { @@ -103,17 +103,24 @@ static const struct sof_ipc_window sram_window = { .type = SOF_IPC_REGION_DEBUG, .id = 2, /* map to host window 2 */ .flags = 0, // TODO: set later - .size = MAILBOX_EXCEPTION_SIZE + MAILBOX_DEBUG_SIZE, + .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[5] = { + .window[6] = { .type = SOF_IPC_REGION_TRACE, .id = 3, /* map to host window 3 */ .flags = 0, // TODO: set later diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 036f549..9a6967b 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -98,9 +98,10 @@ struct reef; #define PLATFORM_IDLE_TIME 750000 /* Platform defined panic code */ -#define platform_panic(__x) \ +#define platform_panic(__x) { \ shim_write(SHIM_IPCDL, (0xdead000 | (__x & 0xfff))); \ - shim_write(SHIM_IPCDH, SHIM_IPCDH_BUSY); + shim_write(SHIM_IPCDH, SHIM_IPCDH_BUSY); \ +} /* Platform defined trace code */ #define platform_trace_point(__x) \ diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index cec8297..8fa03a7 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -70,7 +70,7 @@ static const struct sof_ipc_fw_ready ready = { /* TODO: add capabilities */ }; -#define NUM_BYT_WINDOWS 5 +#define NUM_BYT_WINDOWS 6 static const struct sof_ipc_window sram_window = { .ext_hdr = { .hdr.cmd = SOF_IPC_FW_READY, @@ -114,6 +114,13 @@ static const struct sof_ipc_window sram_window = { .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, + }, }; static struct work_queue_timesource platform_generic_queue = { diff --git a/src/platform/cannonlake/include/platform/mailbox.h b/src/platform/cannonlake/include/platform/mailbox.h index c58e310..2b68bcb 100644 --- a/src/platform/cannonlake/include/platform/mailbox.h +++ b/src/platform/cannonlake/include/platform/mailbox.h @@ -57,17 +57,17 @@ #define MAILBOX_TRACE_SIZE SRAM_TRACE_SIZE #define MAILBOX_TRACE_BASE SRAM_TRACE_BASE -/* window 2 debug and exception */ -#define MAILBOX_DEBUG_SIZE (SRAM_DEBUG_SIZE - MAILBOX_EXCEPTION_SIZE) +/* window 2 debug, exception and stream */ +#define MAILBOX_DEBUG_SIZE SRAM_DEBUG_SIZE #define MAILBOX_DEBUG_BASE SRAM_DEBUG_BASE -#define MAILBOX_EXCEPTION_SIZE 0x100 -#define MAILBOX_EXCEPTION_BASE \ - (MAILBOX_SW_REG_BASE + SRAM_REG_FW_END) +#define MAILBOX_EXCEPTION_SIZE SRAM_EXCEPT_SIZE +#define MAILBOX_EXCEPTION_BASE SRAM_EXCEPT_BASE +#define MAILBOX_EXCEPTION_OFFSET SRAM_DEBUG_SIZE #define MAILBOX_STREAM_SIZE SRAM_STREAM_SIZE #define MAILBOX_STREAM_BASE SRAM_STREAM_BASE -#define MAILBOX_STREAM_OFFSET SRAM_DEBUG_SIZE +#define MAILBOX_STREAM_OFFSET (SRAM_DEBUG_SIZE + SRAM_EXCEPT_SIZE) /* window 1 inbox/downlink and FW registers */ #define MAILBOX_HOSTBOX_SIZE SRAM_INBOX_SIZE diff --git a/src/platform/cannonlake/include/platform/memory.h b/src/platform/cannonlake/include/platform/memory.h index fba0471..64c4bbc 100644 --- a/src/platform/cannonlake/include/platform/memory.h +++ b/src/platform/cannonlake/include/platform/memory.h @@ -146,6 +146,8 @@ * +---------------------+----------------+-----------------------------------+ * | SRAM_DEBUG_BASE | Debug data W2 | SRAM_DEBUG_SIZE | * +---------------------+----------------+-----------------------------------+ + * | SRAM_EXCEPT_BASE | Debug data W2 | SRAM_EXCEPT_SIZE | + * +---------------------+----------------+-----------------------------------+ * | SRAM_STREAM_BASE | Stream data W2 | SRAM_STREAM_SIZE | * +---------------------+----------------+-----------------------------------+ * | SRAM_TRACE_BASE | Trace Buffer W3| SRAM_TRACE_SIZE | @@ -206,9 +208,12 @@ /* window 2 */ #define SRAM_DEBUG_BASE (SRAM_INBOX_BASE + SRAM_INBOX_SIZE) -#define SRAM_DEBUG_SIZE 0x1000 +#define SRAM_DEBUG_SIZE 0x800 + +#define SRAM_EXCEPT_BASE (SRAM_DEBUG_BASE + SRAM_DEBUG_SIZE) +#define SRAM_EXCEPT_SIZE 0x800 -#define SRAM_STREAM_BASE (SRAM_DEBUG_BASE + SRAM_DEBUG_SIZE) +#define SRAM_STREAM_BASE (SRAM_EXCEPT_BASE + SRAM_EXCEPT_SIZE) #define SRAM_STREAM_SIZE 0x1000 /* window 3 */ @@ -220,7 +225,8 @@ #define HP_SRAM_WIN1_BASE SRAM_INBOX_BASE #define HP_SRAM_WIN1_SIZE SRAM_INBOX_SIZE #define HP_SRAM_WIN2_BASE SRAM_DEBUG_BASE -#define HP_SRAM_WIN2_SIZE (SRAM_DEBUG_SIZE + SRAM_STREAM_SIZE) +#define HP_SRAM_WIN2_SIZE (SRAM_DEBUG_SIZE + SRAM_EXCEPT_SIZE + \ + SRAM_STREAM_SIZE) #define HP_SRAM_WIN3_BASE SRAM_TRACE_BASE #define HP_SRAM_WIN3_SIZE SRAM_TRACE_SIZE diff --git a/src/platform/cannonlake/include/platform/platform.h b/src/platform/cannonlake/include/platform/platform.h index c91c583..b007e8a 100644 --- a/src/platform/cannonlake/include/platform/platform.h +++ b/src/platform/cannonlake/include/platform/platform.h @@ -108,8 +108,10 @@ struct reef; #define PLATFORM_IDLE_TIME 750000 /* Platform defined trace code */ -#define platform_panic(__x) \ - sw_reg_write(SRAM_REG_FW_STATUS, (0xdead000 | __x) & 0x3fffffff) +#define platform_panic(__x) { \ + sw_reg_write(SRAM_REG_FW_STATUS, (0xdead000 | __x) & 0x3fffffff); \ + ipc_write(IPC_DIPCIDR, 0x80000000 | ((0xdead000 | __x) & 0x3fffffff)); \ +} /* Platform defined trace code */ #define platform_trace_point(__x) \ diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index 68ebcb3..1f1fd2f 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -70,7 +70,7 @@ static const struct sof_ipc_fw_ready ready = { #define SRAM_WINDOW_HOST_OFFSET(x) (0x80000 + x * 0x20000) -#define NUM_CNL_WINDOWS 6 +#define NUM_CNL_WINDOWS 7 static const struct sof_ipc_window sram_window = { .ext_hdr = { @@ -105,17 +105,24 @@ static const struct sof_ipc_window sram_window = { .type = SOF_IPC_REGION_DEBUG, .id = 2, /* map to host window 2 */ .flags = 0, // TODO: set later - .size = MAILBOX_EXCEPTION_SIZE + MAILBOX_DEBUG_SIZE, + .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[5] = { + .window[6] = { .type = SOF_IPC_REGION_TRACE, .id = 3, /* map to host window 3 */ .flags = 0, // TODO: set later diff --git a/src/platform/haswell/include/platform/platform.h b/src/platform/haswell/include/platform/platform.h index 94c4bc2..a9efe8a 100644 --- a/src/platform/haswell/include/platform/platform.h +++ b/src/platform/haswell/include/platform/platform.h @@ -98,7 +98,7 @@ struct reef; /* Platform defined panic code */ #define platform_panic(__x) \ - shim_write(SHIM_IPCD, (0xdead000 | __x) & 0x3fffffff) + shim_write(SHIM_IPCD, (SHIM_IPCD_BUSY | 0xdead000 | __x)) /* Platform defined trace code */ #define platform_trace_point(__x) \ diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index f84d6e3..e9270ac 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -69,7 +69,7 @@ static const struct sof_ipc_fw_ready ready = { /* TODO: add capabilities */ }; -#define NUM_HSW_WINDOWS 5 +#define NUM_HSW_WINDOWS 6 static const struct sof_ipc_window sram_window = { .ext_hdr = { .hdr.cmd = SOF_IPC_FW_READY, @@ -113,6 +113,13 @@ static const struct sof_ipc_window sram_window = { .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, + }, }; static struct work_queue_timesource platform_generic_queue = { -- 2.7.4

4 3

[Sound-open-firmware] [PATCH] ASoC: sof: Fix oops due to trace_sleep use before init
by Daniel Baluta 21 Mar '18

21 Mar '18

Access happens on the following path: 1) sof_ipc_tx_message => tx_wait_done => snd_sof_trace_notify_for_error => wake_up(&sdev->trace_sleep) where sdev->trace_sleep is not yet initialized. While at it also move initialization of sdev->host_offset before starting working with sdev struct. Signed-off-by: Daniel Baluta <daniel.baluta(a)gmail.com> --- sound/soc/sof/trace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/trace.c b/sound/soc/sof/trace.c index 744d75b..2772cbee 100644 --- a/sound/soc/sof/trace.c +++ b/sound/soc/sof/trace.c @@ -245,6 +245,9 @@ int snd_sof_init_trace(struct snd_sof_dev *sdev) params.buffer.offset = 0; params.buffer.pages = sdev->dma_trace_pages; + init_waitqueue_head(&sdev->trace_sleep); + sdev->host_offset = 0; + /* send IPC to the DSP */ ret = sof_ipc_tx_message(sdev->ipc, params.hdr.cmd, &params, sizeof(params), @@ -255,8 +258,6 @@ int snd_sof_init_trace(struct snd_sof_dev *sdev) goto table_err; } - init_waitqueue_head(&sdev->trace_sleep); - sdev->host_offset = 0; return 0; table_err: -- 2.7.4

3 3

[Sound-open-firmware] [PATCH 0/7] Fix exception support using memory window
by Xiuli Pan 21 Mar '18

21 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> This patch set need used with patch for SOF: mailbox: fix mailbox mappings to include exception space. Pan Xiuli (7): ASoC: SOF: export snd_sof_trace_notify_for_error ASoC: SOF: Add SOF_IPC_REGION_EXCEPTION ASoC: SOF: add dsp_oops_offset for DSP panic ASoC: SOF: Add exception memory window support for BYT ASoC: SOF: Add exception memory window support for HSW ASoC: SOF: Add exception memory window support for BDW ASoC: SOF: Add exception memory window support for APL and CNL include/uapi/sound/sof-ipc.h | 1 + sound/soc/sof/hw-apl.c | 33 +++++++++++++++++++++++++++++---- sound/soc/sof/hw-bdw.c | 22 +++++++++++++++++----- sound/soc/sof/hw-byt.c | 22 +++++++++++++++++----- sound/soc/sof/hw-hsw.c | 22 +++++++++++++++++----- sound/soc/sof/sof-priv.h | 1 + sound/soc/sof/trace.c | 1 + 7 files changed, 83 insertions(+), 19 deletions(-) -- 2.7.4

2 8

[Sound-open-firmware] [PATCH] topology: Remove duplicate W_DAI_IN/OUT and W_PIPELINE
by Liam Girdwood 21 Mar '18

21 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> We call PIPELINE_PCM_DAI_ADD and DAI_ADD that will duplicate call W_DAI_IN/OUT and W_PIPELINE. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- topology/sof/pipe-passthrough-capture.m4 | 10 ---------- topology/sof/pipe-passthrough-playback.m4 | 10 ---------- topology/sof/pipe-src-capture.m4 | 12 ------------ topology/sof/pipe-src-playback.m4 | 12 ------------ topology/sof/pipe-volume-capture.m4 | 12 ------------ topology/sof/pipe-volume-playback.m4 | 12 ------------ 6 files changed, 68 deletions(-) diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4 index ff7c842..203003c 100644 --- a/topology/sof/pipe-passthrough-capture.m4 +++ b/topology/sof/pipe-passthrough-capture.m4 @@ -24,16 +24,6 @@ W_BUFFER(0, COMP_BUFFER_SIZE(2, COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), PLATFORM_PASS_MEM_CAP) -# -# DAI definitions -# -W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2, dai0c_plat_conf) - -# -# DAI pipeline - always use 0 for DAIs -# -W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, SCHEDULE_CORE, 0, pipe_dai_schedule_plat) - # # Pipeline Graph # diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index 84aa126..a2a88ad 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -24,16 +24,6 @@ W_BUFFER(0, COMP_BUFFER_SIZE(2, COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), PLATFORM_PASS_MEM_CAP) -# -# DAI definitions -# -W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf) - -# -# DAI pipeline - always use 0 for DAIs -# -W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, SCHEDULE_CORE, 0, pipe_dai_schedule_plat) - # # Pipeline Graph # diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4 index 54eeea3..6211d33 100644 --- a/topology/sof/pipe-src-capture.m4 +++ b/topology/sof/pipe-src-capture.m4 @@ -39,18 +39,6 @@ W_BUFFER(1, COMP_BUFFER_SIZE(4, COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), PLATFORM_DAI_MEM_CAP) -# -# DAI definitions -# -W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS, - DAI_PERIODS, dai0c_plat_conf) - -# -# DAI pipeline -# -W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, - SCHEDULE_CORE, 0, pipe_dai_schedule_plat) - # # Pipeline Graph # diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4 index 51237ac..119ee2c 100644 --- a/topology/sof/pipe-src-playback.m4 +++ b/topology/sof/pipe-src-playback.m4 @@ -39,18 +39,6 @@ W_BUFFER(1, COMP_BUFFER_SIZE(4, COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), PLATFORM_DAI_MEM_CAP) -# -# DAI definitions -# -W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS, - DAI_PERIODS, dai0p_plat_conf) - -# -# DAI pipeline -# -W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, - SCHEDULE_CORE, 0, pipe_dai_schedule_plat) - # # Pipeline Graph # diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index c3917ca..5d1c24f 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -44,18 +44,6 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2, COMP_SAMPLE_SIZE(DAI_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), PLATFORM_DAI_MEM_CAP) -# -# DAI definitions -# -W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS, - DAI_PERIODS, dai0c_plat_conf) - -# -# DAI pipeline - always use 0 for DAIs -# -W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, - SCHEDULE_CORE, 0, pipe_dai_schedule_plat) - # # Pipeline Graph # diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 194aad9..727490d 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -44,18 +44,6 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2, COMP_SAMPLE_SIZE(DAI_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), PLATFORM_DAI_MEM_CAP) -# -# DAI definitions -# -W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS, - DAI_PERIODS, dai0p_plat_conf) - -# -# DAI pipeline - always use 0 for DAIs -# -W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, - SCHEDULE_CORE, 0, pipe_dai_schedule_plat) - # # Pipeline Graph # -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] cnl: ssp: fix ssp settings
by Liam Girdwood 21 Mar '18

21 Mar '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> We change ssp settings in order to properly transmit and receive data: 1. Use frame end padding instead of dummy stop bits. This way alignment bits will be transmitted at the end of whole frame instead of every slot. 2. Disable receive without transmit mode. 3. Do not change the source for MCLK. 4. DSP_A format shouldn't have start delay. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/drivers/apl-ssp.c | 30 +++++++++++++++++------------- src/include/reef/ssp.h | 3 ++- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index a863b448..81fe96c4 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -106,7 +106,7 @@ static inline int ssp_set_config(struct dai *dai, uint32_t i2s_n; uint32_t data_size; uint32_t start_delay; - uint32_t dummy_stop; + uint32_t frame_end_padding; uint32_t frame_len = 0; uint32_t bdiv_min; uint32_t tft; @@ -138,13 +138,13 @@ static inline int ssp_set_config(struct dai *dai, sscr0 = SSCR0_PSP | SSCR0_RIM | SSCR0_TIM; /* sscr1 dynamic settings are SFRMDIR, SCLKDIR, SCFR */ - sscr1 = SSCR1_TTE | SSCR1_TTELP | SSCR1_RWOT | SSCR1_TRAIL; + sscr1 = SSCR1_TTE | SSCR1_TTELP | SSCR1_TRAIL | SSCR1_RSRE | SSCR1_TSRE; /* sscr2 dynamic setting is LJDFD */ sscr2 = SSCR2_SDFD | SSCR2_TURM1; /* sscr3 dynamic settings are TFT, RFT */ - sscr3 = 0; + sscr3 = SSCR3_TX(8) | SSCR3_RX(8); /* sspsp dynamic settings are SCMODE, SFRMP, DMYSTRT, SFRMWDTH */ sspsp = 0; @@ -283,7 +283,7 @@ static inline int ssp_set_config(struct dai *dai, goto out; } - /* must be enouch BCLKs for data */ + /* must be enough BCLKs for data */ bdiv = config->bclk / config->fclk; if (bdiv < config->sample_container_bits * config->num_slots) { trace_ssp_error("ec8"); @@ -355,7 +355,7 @@ static inline int ssp_set_config(struct dai *dai, break; case SOF_DAI_FMT_DSP_A: - start_delay = 1; + start_delay = 0; sscr0 |= SSCR0_MOD | SSCR0_FRDC(config->num_slots); @@ -405,10 +405,6 @@ static inline int ssp_set_config(struct dai *dai, sspsp |= SSPSP_STRTDLY(start_delay); sspsp |= SSPSP_SFRMWDTH(frame_len); - /* - * [dummy_start][valid_bits_slot[0...n-1]][dummy_stop], - * but don't count dummy_start for dummy_stop calculation. - */ bdiv_min = config->num_slots * config->sample_valid_bits; if (bdiv < bdiv_min) { trace_ssp_error("ecc"); @@ -416,10 +412,14 @@ static inline int ssp_set_config(struct dai *dai, goto out; } - dummy_stop = bdiv - bdiv_min; - sspsp |= SSPSP_DMYSTOP(SSPSP_DMYSTOP_MASK & dummy_stop); - sspsp |= SSPSP_EDMYSTOP(SSPSP_EDMYSTOP_MASK & - (dummy_stop >> SSPSP_DMYSTOP_BITS)); + frame_end_padding = bdiv - bdiv_min; + if (frame_end_padding > SSPSP2_FEP_MASK) { + trace_ssp_error("ecd"); + ret = -EINVAL; + goto out; + } + + sspsp2 |= (frame_end_padding & SSPSP2_FEP_MASK); data_size = config->sample_valid_bits; @@ -428,7 +428,11 @@ static inline int ssp_set_config(struct dai *dai, else sscr0 |= SSCR0_DSIZE(data_size); +#ifdef CONFIG_CANNONLAKE + mdivc = 0x1; +#else mdivc = 0x00100001; +#endif /* bypass divider for MCLK */ mdivr = 0x00000fff; diff --git a/src/include/reef/ssp.h b/src/include/reef/ssp.h index 453aaabe..770d94cf 100644 --- a/src/include/reef/ssp.h +++ b/src/include/reef/ssp.h @@ -167,9 +167,10 @@ extern const struct dai_ops ssp_ops; #if defined CONFIG_APOLLOLAKE || defined CONFIG_CANNONLAKE #define SSPSP_EDMYSTOP(x) ((x) << 26) #define SSPSP_EDMYSTOP_MASK 0x7 +#define SSPSP2_FEP_MASK 0xff #define SSTSS 0x38 #define SSCR2 0x40 -#define SSPSP2 0x44 +#define SSPSP2 0x44 #define SSCR3 0x48 #define SSIOC 0x4C -- 2.14.1

1 1

[Sound-open-firmware] [PATCH] version: Strip SOF_FW_XXX_ prefix from version number
by Liam Girdwood 21 Mar '18

21 Mar '18

The version information is generated using git tags and needs to be numerical for version.h usage. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- version.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/version.sh b/version.sh index 4f25ecd0..5413fb33 100755 --- a/version.sh +++ b/version.sh @@ -10,11 +10,22 @@ else DIR=$1 fi +# get version from git tag +GIT_TAG=`git describe --abbrev=4` + +# Some releases have a SOF_FW_XXX_ prefix on the tag and this prefix +# must be stripped for usage in version.h. i.e. we just need the number. +if [ $(expr match $GIT_TAG 'SOF_FW_[A-Z][A-Z][A-Z]_' ) -eq 11 ]; then + VER=`echo $GIT_TAG | cut -d_ -f4` +else + VER=$GIT_TAG +fi + # create git version if we are a git repo or git worktree if [ -e $DIR/.git -o -d $DIR/.git ]; then # version for make dist - git describe --abbrev=4 > $DIR/.version - git describe --abbrev=4 > $DIR/.tarball-version + echo $VER > $DIR/.version + echo $VER > $DIR/.tarball-version # git commit for IPC echo "#define REEF_TAG \"`git log --pretty=format:\"%h\" -1 | cut -c1-5`\"" > $DIR/src/include/version.h -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] cnl: don't switch to lower clock
by Liam Girdwood 20 Mar '18

20 Mar '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> We don't want clock optimizations right now, so stay with 400 MHz clock. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/platform/cannonlake/platform.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index 8bf2d7a4..68ebcb3c 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -144,9 +144,6 @@ int platform_boot_complete(uint32_t boot_message) mailbox_dspbox_write(sizeof(ready), &sram_window, sram_window.ext_hdr.hdr.size); - /* boot now complete so we can relax the CPU */ - clock_set_freq(CLK_CPU, CLK_DEFAULT_CPU_HZ); - /* tell host we are ready */ ipc_write(IPC_DIPCIDD, SRAM_WINDOW_HOST_OFFSET(0) >> 12); ipc_write(IPC_DIPCIDR, 0x80000000 | SOF_IPC_FW_READY); -- 2.14.1

1 0

[Sound-open-firmware] Open Source Firmware Conference 2018
by Philipp Deppenwiese 20 Mar '18

20 Mar '18

Hi There! On behalf on myself and 9elements GmbH. I would like to invite you to the Open Source Firmware Conference 2018, that is going to held from September 12th to 15th in Erlangen, Germany. Open Source has revolutionised the process of software development. However, firmware has traditionally been developed closed source by hardware manufactures. Today's use cases have new requirements regarding security and features like running web browser inside the firmware. Our conference is for everyone that is interested in the use cases and possibilities offered by open source firmware development. If you project is interested to join our conference which includes slots for talks and free tickets, feel free to contact us via osfc(a)9elements.com . Homepage: www.osfc.io Twiterr: osfc_io Best Regards, Philipp

1 0

[Sound-open-firmware] [PATCH] Disable high frequent trace message in dw_dma_irq_handler().
by yan.wang＠linux.intel.com 20 Mar '18

20 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> It will cause DMA trace local buffer overflow and unnecessary. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/drivers/dw-dma.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index a5717f3..2c46545 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -910,11 +910,12 @@ static void dw_dma_irq_handler(void *data) int i = dma_int->channel; status_intr = dw_read(dma, DW_INTR_STATUS); - if (!status_intr) + if (!status_intr) { trace_dma_error("eDI"); + trace_value(status_intr); + } - trace_dma("irq"); - trace_value(status_intr); + tracev_dma("irq"); /* get the source of our IRQ. */ status_block = dw_read(dma, DW_STATUS_BLOCK); -- 2.14.3

5 4

[Sound-open-firmware] [PATCH] dw-dma: Fix channel status for CNL
by Xiuli Pan 20 Mar '18

20 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> At the end of the DMA, we need to set the channel status into parapre, otherwise next dma start will fail. This will fix CNL pause resume issues. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 and GP-MRB nocodec and CNL nocodec SOF 1.1-stable: a3fab58d59dc9fc66ee8e5474d479a22e7f180bd SOF-Tool 1.1-stable: cc91c73aa3e91eea35abdeb76d578b97f718feff https://github.com/plbossart/sound/tree/topic/sof-v4.14: 4881a4bd906f8b52bebd209b88ff920005550d53 --- src/drivers/dw-dma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index a5717f3..768f204 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1101,6 +1101,7 @@ static void dw_dma_irq_handler(void *data) trace_dma("LSo"); /* disable channel, finished */ dw_write(dma, DW_DMA_CHAN_EN, CHAN_DISABLE(i)); + p->chan[i].status = COMP_STATE_PREPARE; } } #endif -- 2.7.4

2 1

[Sound-open-firmware] [PATCH 1/2] volume: fix errors in volume scaling multiplication
by Ranjani Sridharan 20 Mar '18

20 Mar '18

This patch fixes the errors in fixed-point multiplication function for volume scaling that caused sign inversions. It also breaks up the operation into 4 separate functions depending on the source and sink formats. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/include/reef/audio/format.h | 114 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 105 insertions(+), 9 deletions(-) diff --git a/src/include/reef/audio/format.h b/src/include/reef/audio/format.h index c9c23ec..669a314 100644 --- a/src/include/reef/audio/format.h +++ b/src/include/reef/audio/format.h @@ -153,22 +153,118 @@ static inline int16_t sat_int16(int32_t x) return (int16_t)x; } -/* Fractional multiplication with shift and saturation */ -static inline int32_t q_multsr_sat_32x32(int32_t x, int32_t y, - const int shift_bits) +static inline int32_t sign_extend_s24(int32_t x) { - return sat_int32(((((int64_t)x * y) >> (shift_bits - 1)) + 1) >> 1); + return (x << 8) >> 8; } -static inline int16_t q_multsr_sat_16x16(int16_t x, int32_t y, - const int shift_bits) +/* Truncate a 64-bit int by shift_bits + * This function rounds the result before truncating + */ +static inline int64_t shift_64(int64_t x, int shift_bits) { - return sat_int16(((((int32_t)x * y) >> (shift_bits - 1)) + 1) >> 1); + return (int64_t)(((x >> (shift_bits - 1)) + 1) >> 1); } -static inline int32_t sign_extend_s24(int32_t x) +/* Truncate a 32-bit int by shift_bits + * This function rounds the result before truncating + */ +static inline int32_t shift_32(int32_t x, int shift_bits) { - return (x << 8) >> 8; + return (int32_t)(((x >> (shift_bits - 1)) + 1) >> 1); +} + +/* Fractional multiplication with shift and saturation + * This function multiplies a 16-bit number by a 32-bit unsigned number and + * copies the result to a 32-bit int + */ +static inline void q_multsr_sat_16x32_32(int16_t *src, uint32_t vol, + const int shift_bits, int32_t *dest, + int offset, int sign_extend) +{ + int64_t temp; + + if (shift_bits == 0) { + /* Samples are Q1.15 and volume unsigned is Q1.16 */ + dest[offset] = (int32_t)(src[offset] * vol); + return; + } + + /* store the intermediate product in an int64 */ + temp = (int64_t)((int64_t)src[offset] * vol); + + /* round, truncate and saturate if needed */ + dest[offset] = sat_int32(shift_64(temp, shift_bits)); +} + +/* Fractional multiplication with shift and saturation + * This function multiplies 2 32-bit numbers and stores + * copies the result to a 32-bit int + */ +static inline void q_multsr_sat_32x32_32(int32_t *src, uint32_t vol, + const int shift_bits, int32_t *dest, + int offset, int sign_extend) +{ + int64_t temp; + + /* store the intermediate product in an int64 */ + if (sign_extend) { + /* Sample are Q1.23 and volume is unsigned Q1.16 + * sign extend the input samples + */ + temp = (int64_t)((int64_t)sign_extend_s24(src[offset]) * + vol); + } else { + /* Sample are Q1.31 and volume unsigned is Q1.16 */ + temp = (int64_t)((int64_t)src[offset] * vol); + } + + /* round, truncate and saturate if needed */ + dest[offset] = sat_int32(shift_64(temp, shift_bits)); +} + +/* Fractional multiplication with shift and saturation + * This function multiplies a 16-bit number by a 32-bit unsigned number and + * copies the result to a 16-bit int + */ +static inline void q_multsr_sat_16x16_16(int16_t *src, uint32_t vol, + const int shift_bits, int16_t *dest, + int offset, int sign_extend) +{ + int32_t temp; + + /* Sample are Q1.15 and volume is unsigned Q1.16 + * store the intermediate product in an int32 + */ + temp = (int32_t)((int32_t)src[offset] * vol); + + /* round, truncate and saturate if needed */ + dest[offset] = sat_int16(shift_32(temp, shift_bits)); +} + +/* Fractional multiplication with shift and saturation + * This function multiplies 2 32-bit numbers and + * copies the result to a 16-bit int + */ +static inline void q_multsr_sat_32x32_16(int32_t *src, uint32_t vol, + const int shift_bits, int16_t *dest, + int offset, int sign_extend) +{ + int64_t temp; + + /* store the intermediate product in an int64 */ + if (sign_extend) { + /* Sample are Q1.23 and volume is unsigned Q1.16 + * sign extend the input samples + */ + temp = (int64_t)((int64_t)sign_extend_s24(src[offset]) * vol); + } else { + /* Sample are Q1.31 and volume is unsigned Q1.16 */ + temp = (int64_t)((int64_t)src[offset] * vol); + } + + /* round, truncate and saturate if needed */ + dest[offset] = (int16_t)sat_int32(shift_64(temp, shift_bits)); } #endif -- 2.14.1

2 3

[Sound-open-firmware] Using the Qemu DSP emulator
by Daniel Baluta 19 Mar '18

19 Mar '18

Hi, I'm following the instruction on SOF wiki page on how to use the emulator [1] and both VM0 and VM1 are up, anyhow SOF DSP device isn't probed. How do you do it in your qemu setup? Are you using an ACPI file? (or DT?). I'm running the following commands: # ./xtensa-host.sh bxt # ./x86-host.sh bxt and pointing qemu to load my bzimage. thanks, Daniel. [1] https://www.alsa-project.org/main/index.php/Firmware#Using_the_Qemu_DSP_emu…

2 14

[Sound-open-firmware] [PATCH] topology: media: fix incorrect pipeline ID for media PCM
by Liam Girdwood 19 Mar '18

19 Mar '18

Missing include for pcm.m4 Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/sof/pipe-pcm-media.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index 1ca829f..9eaa187 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -14,6 +14,7 @@ include(`buffer.m4') include(`pga.m4') include(`mixercontrol.m4') include(`pipeline.m4') +include(`pcm.m4') # # Controls -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] Use tracev instead of trace for some high frequent traces on APL/CNL.
by yan.wang＠linux.intel.com 19 Mar '18

19 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> DMA trace itself uses DMA copying which will cause some DMA copying related traces are called recursively. So use tracev to avoid this. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/drivers/hda-dma.c | 2 +- src/ipc/apl-ipc.c | 4 ++-- src/ipc/cnl-ipc.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/drivers/hda-dma.c b/src/drivers/hda-dma.c index d2064e8..caea70e 100644 --- a/src/drivers/hda-dma.c +++ b/src/drivers/hda-dma.c @@ -114,7 +114,7 @@ static inline void hda_update_bits(struct dma *dma, uint32_t chan, /* notify DMA to copy bytes */ static int hda_dma_copy(struct dma *dma, int channel, int bytes) { - trace_host("GwU"); + tracev_host("GwU"); /* reset BSC before start next copy */ hda_update_bits(dma, channel, DGCS, DGCS_BSC, DGCS_BSC); diff --git a/src/ipc/apl-ipc.c b/src/ipc/apl-ipc.c index 4b8ee6b..5665482 100644 --- a/src/ipc/apl-ipc.c +++ b/src/ipc/apl-ipc.c @@ -61,7 +61,7 @@ static void irq_handler(void *arg) uint32_t dipcie; uint32_t msg = 0; - trace_ipc("IRQ"); + tracev_ipc("IRQ"); dipct = ipc_read(IPC_DIPCT); dipcie = ipc_read(IPC_DIPCIE); @@ -86,7 +86,7 @@ static void irq_handler(void *arg) /* reply message(done) from host */ if (dipcie & IPC_DIPCIE_DONE) { - trace_ipc("Rpy"); + tracev_ipc("Rpy"); /* mask Done interrupt */ ipc_write(IPC_DIPCCTL, ipc_read(IPC_DIPCCTL) & ~IPC_DIPCCTL_IPCIDIE); diff --git a/src/ipc/cnl-ipc.c b/src/ipc/cnl-ipc.c index 15687fc..347cad2 100644 --- a/src/ipc/cnl-ipc.c +++ b/src/ipc/cnl-ipc.c @@ -62,7 +62,7 @@ static void irq_handler(void *arg) uint32_t dipcida; uint32_t msg = 0; - trace_ipc("IRQ"); + tracev_ipc("IRQ"); dipctdr = ipc_read(IPC_DIPCTDR); dipcida = ipc_read(IPC_DIPCIDA); @@ -86,7 +86,7 @@ static void irq_handler(void *arg) /* reply message(done) from host */ if (dipcida & IPC_DIPCIDA_DONE) { - trace_ipc("Rpy"); + tracev_ipc("Rpy"); /* mask Done interrupt */ ipc_write(IPC_DIPCCTL, ipc_read(IPC_DIPCCTL) & ~IPC_DIPCCTL_IPCIDIE); -- 2.14.3

2 1

[Sound-open-firmware] [PATCH] rimage: manifest: Move text offset into non immutable ROM structure.
by Liam Girdwood 19 Mar '18

19 Mar '18

text_offset was added to an immutable ROM structure that would break some tools and cause instability. Fix this by creating a new structure for rimage manifest data that can be modified without breaking the ROM ABI. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- rimage/manifest.c | 18 +++++++++--------- src/include/uapi/manifest.h | 27 +++++++++++++++++---------- src/platform/apollolake/base_module.c | 20 +++++++++++--------- src/platform/cannonlake/base_module.c | 20 +++++++++++--------- src/platform/cannonlake/boot_module.c | 20 +++++++++++--------- 5 files changed, 59 insertions(+), 46 deletions(-) diff --git a/rimage/manifest.c b/rimage/manifest.c index 337f82a4..243c194f 100644 --- a/rimage/manifest.c +++ b/rimage/manifest.c @@ -194,7 +194,7 @@ static int man_get_module_manifest(struct image *image, struct module *module, { Elf32_Shdr *section; struct sof_man_segment_desc *segment; - struct sof_man_module sof_mod; + struct sof_man_module_manifest sof_mod; size_t count; int ret, man_section_idx; @@ -224,14 +224,14 @@ static int man_get_module_manifest(struct image *image, struct module *module, /* configure man_module with sofmod data */ memcpy(man_module->struct_id, "$AME", 4); - man_module->entry_point = sof_mod.entry_point; - memcpy(man_module->name, sof_mod.name, SOF_MAN_MOD_NAME_LEN); - memcpy(man_module->uuid, sof_mod.uuid, 16); - man_module->affinity_mask = sof_mod.affinity_mask; - man_module->type.auto_start = sof_mod.type.auto_start; - man_module->type.domain_dp = sof_mod.type.domain_dp; - man_module->type.domain_ll = sof_mod.type.domain_ll; - man_module->type.load_type = sof_mod.type.load_type; + man_module->entry_point = sof_mod.module.entry_point; + memcpy(man_module->name, sof_mod.module.name, SOF_MAN_MOD_NAME_LEN); + memcpy(man_module->uuid, sof_mod.module.uuid, 16); + man_module->affinity_mask = sof_mod.module.affinity_mask; + man_module->type.auto_start = sof_mod.module.type.auto_start; + man_module->type.domain_dp = sof_mod.module.type.domain_dp; + man_module->type.domain_ll = sof_mod.module.type.domain_ll; + man_module->type.load_type = sof_mod.module.type.load_type; /* read out text_fixup_size from memory mapping */ module->text_fixup_size = sof_mod.text_size; diff --git a/src/include/uapi/manifest.h b/src/include/uapi/manifest.h index e83725bd..f53a6628 100644 --- a/src/include/uapi/manifest.h +++ b/src/include/uapi/manifest.h @@ -75,7 +75,7 @@ union sof_man_segment_flags { } __attribute__((packed)); /* - * Module segment descriptor. + * Module segment descriptor. Used by ROM - Immutable. */ struct sof_man_segment_desc { union sof_man_segment_flags flags; @@ -93,7 +93,7 @@ struct sof_man_segment_desc { #define SOF_MAN_MOD_ID {'$', 'A', 'M', 'E'} /* - * Each module has an entry in the FW header. + * Each module has an entry in the FW header. Used by ROM - Immutable. */ struct sof_man_module { uint8_t struct_id[SOF_MAN_MOD_ID_LEN]; /* SOF_MAN_MOD_ID */ @@ -102,7 +102,6 @@ struct sof_man_module { struct sof_man_module_type type; uint8_t hash[SOF_MAN_MOD_SHA256_LEN]; uint32_t entry_point; - uint32_t text_size; uint16_t cfg_offset; uint16_t cfg_count; uint32_t affinity_mask; @@ -112,7 +111,7 @@ struct sof_man_module { } __attribute__((packed)); /* - * Each module has a configuration in the FW header. + * Each module has a configuration in the FW header. Used by ROM - Immutable. */ struct sof_man_mod_config { uint32_t par[4]; /* module parameters */ @@ -138,9 +137,9 @@ struct sof_man_mod_config { /* * The firmware has a standard header that is checked by the ROM on firmware - * loading. - * preload_page_count is used by DMA code loader and is entire image size on - * CNL. i.e. CNL: total size of the binary’s .text and .rodata + * loading. preload_page_count is used by DMA code loader and is entire + * image size on CNL. i.e. CNL: total size of the binary’s .text and .rodata + * Used by ROM - Immutable. */ struct sof_man_fw_header { uint8_t header_id[4]; @@ -163,7 +162,7 @@ struct sof_man_fw_header { /* * Firmware manifest descriptor. This can contain N modules and N module - * configs. + * configs. Used by ROM - Immutable. */ struct sof_man_fw_desc { struct sof_man_fw_header header; @@ -181,7 +180,7 @@ struct sof_man_fw_desc { } __attribute__((packed)); /* - * Component Descriptor + * Component Descriptor. Used by ROM - Immutable. */ struct sof_man_component_desc { uint32_t reserved[2]; /* all 0 */ @@ -194,7 +193,7 @@ struct sof_man_component_desc { /* - * Audio DSP extended metadata. + * Audio DSP extended metadata. Used by ROM - Immutable. */ struct sof_man_adsp_meta_file_ext { uint32_t ext_type; /* always 17 for ADSP extension */ @@ -204,6 +203,14 @@ struct sof_man_adsp_meta_file_ext { struct sof_man_component_desc comp_desc[1]; } __attribute__((packed)); +/* + * Module Manifest for rimage module metadata. Not used by ROM. + */ +struct sof_man_module_manifest { + struct sof_man_module module; + uint32_t text_size; +}; + /* utility to get module pointer from position */ static inline struct sof_man_module *sof_man_get_module( struct sof_man_fw_desc *desc, int index) diff --git a/src/platform/apollolake/base_module.c b/src/platform/apollolake/base_module.c index 56633c5b..141d7ba8 100644 --- a/src/platform/apollolake/base_module.c +++ b/src/platform/apollolake/base_module.c @@ -36,16 +36,18 @@ * the SOF executable image but is inserted by object copy as a ELF section * for parsing by rimage (to genrate the manifest). */ -struct sof_man_module apl_manifest = { - .name = "BASEFW", - .uuid = {0x2e, 0x9e, 0x86, 0xfc, 0xf8, 0x45, 0x45, 0x40, - 0xa4, 0x16, 0x89, 0x88, 0x0a, 0xe3, 0x20, 0xa9}, - .entry_point = REEF_TEXT_START, - .type = { - .load_type = SOF_MAN_MOD_TYPE_MODULE, - .domain_ll = 1, +struct sof_man_module_manifest apl_manifest = { + .module = { + .name = "BASEFW", + .uuid = {0x2e, 0x9e, 0x86, 0xfc, 0xf8, 0x45, 0x45, 0x40, + 0xa4, 0x16, 0x89, 0x88, 0x0a, 0xe3, 0x20, 0xa9}, + .entry_point = REEF_TEXT_START, + .type = { + .load_type = SOF_MAN_MOD_TYPE_MODULE, + .domain_ll = 1, + }, + .affinity_mask = 3, }, - .affinity_mask = 3, .text_size = REEF_TEXT_SIZE + L2_VECTOR_SIZE, }; diff --git a/src/platform/cannonlake/base_module.c b/src/platform/cannonlake/base_module.c index dd5d7199..ac1f8737 100644 --- a/src/platform/cannonlake/base_module.c +++ b/src/platform/cannonlake/base_module.c @@ -36,16 +36,18 @@ * the SOF executable image but is inserted by object copy as a ELF section * for parsing by rimage (to genrate the manifest). */ -struct sof_man_module cnl_manifest = { - .name = "BASEFW", - .uuid = {0x32, 0x8c, 0x39, 0x0e, 0xde, 0x5a, 0x4b, 0xba, - 0x93, 0xb1, 0xc5, 0x04, 0x32, 0x28, 0x0e, 0xe4}, - .entry_point = REEF_TEXT_START, - .type = { - .load_type = SOF_MAN_MOD_TYPE_MODULE, - .domain_ll = 1, +struct sof_man_module_manifest cnl_manifest = { + .module = { + .name = "BASEFW", + .uuid = {0x32, 0x8c, 0x39, 0x0e, 0xde, 0x5a, 0x4b, 0xba, + 0x93, 0xb1, 0xc5, 0x04, 0x32, 0x28, 0x0e, 0xe4}, + .entry_point = REEF_TEXT_START, + .type = { + .load_type = SOF_MAN_MOD_TYPE_MODULE, + .domain_ll = 1, + }, + .affinity_mask = 3, }, - .affinity_mask = 3, }; /* not used, but stops linker complaining */ diff --git a/src/platform/cannonlake/boot_module.c b/src/platform/cannonlake/boot_module.c index 7d965f5d..48374933 100644 --- a/src/platform/cannonlake/boot_module.c +++ b/src/platform/cannonlake/boot_module.c @@ -36,16 +36,18 @@ * the SOF executable image but is inserted by object copy as a ELF section * for parsing by rimage (to genrate the manifest). */ -struct sof_man_module cnl_bootldr_manifest = { - .name = "BRNGUP", - .uuid = {0xf3, 0xe4, 0x79, 0x2b, 0x75, 0x46, 0x49, 0xf6, - 0x89, 0xdf, 0x3b, 0xc1, 0x94, 0xa9, 0x1a, 0xeb}, - .entry_point = IMR_BOOT_LDR_TEXT_ENTRY_BASE, - .type = { - .load_type = SOF_MAN_MOD_TYPE_MODULE, - .domain_ll = 1, +struct sof_man_module_manifest cnl_bootldr_manifest = { + .module = { + .name = "BRNGUP", + .uuid = {0xf3, 0xe4, 0x79, 0x2b, 0x75, 0x46, 0x49, 0xf6, + 0x89, 0xdf, 0x3b, 0xc1, 0x94, 0xa9, 0x1a, 0xeb}, + .entry_point = IMR_BOOT_LDR_TEXT_ENTRY_BASE, + .type = { + .load_type = SOF_MAN_MOD_TYPE_MODULE, + .domain_ll = 1, + }, + .affinity_mask = 3, }, - .affinity_mask = 3, }; /* not used, but stops linker complaining */ -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] byt: panic: Set IPCD with panic reason IPCX for trace point.
by Liam Girdwood 17 Mar '18

17 Mar '18

Aligned with driver. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/baytrail/include/platform/platform.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 8b713dfe..036f5494 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -99,11 +99,12 @@ struct reef; /* Platform defined panic code */ #define platform_panic(__x) \ - shim_write(SHIM_IPCDH, (0xdead000 | (__x & 0xfff))) + shim_write(SHIM_IPCDL, (0xdead000 | (__x & 0xfff))); \ + shim_write(SHIM_IPCDH, SHIM_IPCDH_BUSY); /* Platform defined trace code */ #define platform_trace_point(__x) \ - shim_write(SHIM_IPCDH, (__x & 0x3fffffff)) + shim_write(SHIM_IPCXL, (__x & 0x3fffffff)) /* * APIs declared here are defined for every platform and IPC mechanism. */ -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] topology: pcm: Fix PCM ID for topologies > 1 PCM
by Liam Girdwood 17 Mar '18

17 Mar '18

PCM number was not being preserved and was always zero. This would overwrite previous PCMs and cause the FW to return invalid PCM error messages. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/m4/pcm.m4 | 36 +++++++++++++++---------------- topology/sof/pipe-low-latency-capture.m4 | 6 +++--- topology/sof/pipe-low-latency-playback.m4 | 6 +++--- topology/sof/pipe-passthrough-capture.m4 | 6 +++--- topology/sof/pipe-passthrough-playback.m4 | 6 +++--- topology/sof/pipe-pcm-media.m4 | 6 +++--- topology/sof/pipe-src-capture.m4 | 6 +++--- topology/sof/pipe-src-playback.m4 | 6 +++--- topology/sof/pipe-volume-capture.m4 | 6 +++--- topology/sof/pipe-volume-playback.m4 | 6 +++--- 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/topology/m4/pcm.m4 b/topology/m4/pcm.m4 index 596f2fe..f77cb01 100644 --- a/topology/m4/pcm.m4 +++ b/topology/m4/pcm.m4 @@ -3,18 +3,18 @@ divert(-1) dnl Define the macro for PCM playback/capture/capabilities dnl PCM name) -define(`N_PCMP', `PCM'PCM_ID`P') -define(`N_PCMC', `PCM'PCM_ID`C') +define(`N_PCMP', `PCM'$1`P') +define(`N_PCMC', `PCM'$1`C') -dnl W_PCM_PLAYBACK(stream, dmac, dmac_chan, periods_sink, periods_source, preload) +dnl W_PCM_PLAYBACK(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload) dnl PCM platform configuration define(`W_PCM_PLAYBACK', `SectionVendorTuples."'N_PCMP($1)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' -` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) -` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) -` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) ` }' `}' `SectionData."'N_PCMP($1)`_data_w_comp" {' @@ -23,18 +23,18 @@ define(`W_PCM_PLAYBACK', `SectionVendorTuples."'N_PCMP($1)`_tuples" {' ` tokens "sof_pcm_tokens"' ` tuples."word" {' -` SOF_TKN_PCM_DMAC' STR($2) -` SOF_TKN_PCM_DMAC_CHAN' STR($3) +` SOF_TKN_PCM_DMAC' STR($3) +` SOF_TKN_PCM_DMAC_CHAN' STR($4) ` }' `}' `SectionData."'N_PCMP($1)`_data" {' ` tuples "'N_PCMP($1)`_tuples"' `}' -`SectionWidget."'N_PCMP`" {' +`SectionWidget."'N_PCMP($1)`" {' ` index "'PIPELINE_ID`"' ` type "aif_in"' ` no_pm "true"' -` stream_name "'$1`"' +` stream_name "'$2`"' ` data [' ` "'N_PCMP($1)`_data"' ` "'N_PCMP($1)`_data_w_comp"' @@ -42,14 +42,14 @@ define(`W_PCM_PLAYBACK', `}') -dnl W_PCM_CAPTURE(stream, dmac, dmac_chan, periods_sink, periods_source, preload) +dnl W_PCM_CAPTURE(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload) define(`W_PCM_CAPTURE', `SectionVendorTuples."'N_PCMC($1)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' -` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) -` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) -` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) ` }' `}' `SectionData."'N_PCMC($1)`_data_w_comp" {' @@ -58,18 +58,18 @@ define(`W_PCM_CAPTURE', `SectionVendorTuples."'N_PCMC($1)`_tuples" {' ` tokens "sof_pcm_tokens"' ` tuples."word" {' -` SOF_TKN_PCM_DMAC' STR($2) -` SOF_TKN_PCM_DMAC_CHAN' STR($3) +` SOF_TKN_PCM_DMAC' STR($3) +` SOF_TKN_PCM_DMAC_CHAN' STR($4) ` }' `}' `SectionData."'N_PCMC($1)`_data" {' ` tuples "'N_PCMC($1)`_tuples"' `}' -`SectionWidget."'N_PCMC`" {' +`SectionWidget."'N_PCMC($1)`" {' ` index "'PIPELINE_ID`"' ` type "aif_out"' ` no_pm "true"' -` stream_name "'$1`"' +` stream_name "'$2`"' ` data [' ` "'N_PCMC($1)`_data"' ` "'N_PCMC($1)`_data_w_comp"' diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index 5619999..96fa3cc 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -29,7 +29,7 @@ C_CONTROLMIXER(PCM PCM_ID Capture Volume, PIPELINE_ID, # Host "Low Latency Capture" PCM uses pipeline DMAC and channel # with 0 sink and 2 source periods -W_PCM_CAPTURE(Low Latency Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 0) +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")) @@ -49,8 +49,8 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2, P_GRAPH(pipe-ll-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Low Latency Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(1))', + `dapm(Low Latency Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(1))', `dapm(N_BUFFER(1), N_PGA(0))', `dapm(N_PGA(0), N_BUFFER(0))')) diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index 4a4fca9..b7f2d11 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -54,7 +54,7 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, # Host "Low latency Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Low Latency Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +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")) @@ -93,8 +93,8 @@ W_BUFFER(3, COMP_BUFFER_SIZE(2, P_GRAPH(pipe-ll-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Low Latency Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Low Latency Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_PGA(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_PGA(0))', `dapm(N_MIXER(0), N_BUFFER(1))', diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4 index 07961b3..ff7c842 100644 --- a/topology/sof/pipe-passthrough-capture.m4 +++ b/topology/sof/pipe-passthrough-capture.m4 @@ -17,7 +17,7 @@ include(`pipeline.m4') # Host "Passthrough Capture" PCM uses pipeline DMAC and channel # with 0 sink and 2 source periods -W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) # Capture Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, @@ -41,8 +41,8 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, SCHE P_GRAPH(pipe-pass-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Passthrough Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(0))')) + `dapm(Passthrough Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(0))')) # # Pipeline Source and Sinks diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index 715fcee..84aa126 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -17,7 +17,7 @@ include(`pipeline.m4') # Host "Passthrough Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, @@ -41,8 +41,8 @@ W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, SCH P_GRAPH(pipe-pass-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Passthrough Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)')) + `dapm(N_PCMP(PCM_ID), Passthrough Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))')) # # Pipeline Source and Sinks diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index f2053b7..1ca829f 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -41,7 +41,7 @@ W_DATA(media_src_conf, media_src_tokens) # Host "Low latency Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Media Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +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")) @@ -70,8 +70,8 @@ W_BUFFER(2, COMP_BUFFER_SIZE(3, P_GRAPH(pipe-media-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Media Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Media Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_PGA(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_PGA(0))', `dapm(N_SRC(0), N_BUFFER(1))' diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4 index 1b1a58d..54eeea3 100644 --- a/topology/sof/pipe-src-capture.m4 +++ b/topology/sof/pipe-src-capture.m4 @@ -18,7 +18,7 @@ include(`pipeline.m4') # Host "Passthrough Capture" PCM uses pipeline DMAC and channel # with 4 sink and 0 source periods -W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) # # SRC Configuration @@ -58,8 +58,8 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-src-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Passthrough Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(0))', + `dapm(Passthrough Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(0))', `dapm(N_BUFFER(0), N_SRC(0))', `dapm(N_SRC(0), N_BUFFER(1))')) diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4 index 9dfdcd8..51237ac 100644 --- a/topology/sof/pipe-src-playback.m4 +++ b/topology/sof/pipe-src-playback.m4 @@ -18,7 +18,7 @@ include(`pipeline.m4') # Host "Passthrough Playback" PCM uses pipeline DMAC and channel # with 4 sink and 0 source periods -W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) # # SRC Configuration @@ -58,8 +58,8 @@ W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-src-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Passthrough Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Passthrough Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_SRC(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_SRC(0))')) diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 61b70a9..c3917ca 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -31,7 +31,7 @@ C_CONTROLMIXER(Master Capture Volume, PIPELINE_ID, # Host "Passthrough Capture" PCM uses pipeline DMAC and channel # with 0 sink and 2 source periods -W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) +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")) @@ -63,8 +63,8 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-vol-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Passthrough Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(0))', + `dapm(Passthrough Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(0))', `dapm(N_BUFFER(0), N_PGA(0))', `dapm(N_PGA(0), N_BUFFER(1))')) diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 5fea0c7..194aad9 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -31,7 +31,7 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, # Host "Passthrough Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +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")) @@ -63,8 +63,8 @@ W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-vol-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Passthrough Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Passthrough Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_PGA(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_PGA(0))')) -- 2.14.1

1 0

[Sound-open-firmware] SOF git repo?
by Christian Daudt 16 Mar '18

16 Mar '18

Hi, Sorry for the dense first question but are there public git repos where I can see the current code/docs? I saw the talk @ELC2018 announcing the project, and looked at the nice splashy proj page at https://www.sofproject.org/ but it gives no hint (that I could find) of where to go after that. And I wanted to find out more about which parts and for which platforms your work is focused on. Some github comparisons between patches sent to this list and repos in there leads me to think that https://github.com/plbossart/sound-open-firmware is the place to start looking through code. Just wanted to confirm that that's the right place and if so to suggest to a link to it from the sofproject.org . I'm from Cypress and we do a lot of audio solutions in the IoT connectivity team I'm part of, so that led to a natural curiosity about a proj that is working on open sourcing sound firmware. I look forward to learning more about it! Thanks, Christian Daudt. PS: Using gmail instead of my cypress email because outlook and mailing lists don't mix well...

3 5

[Sound-open-firmware] [PATCH] topology: pcm: Fix PCM ID for topologies > 1 PCM
by Liam Girdwood 16 Mar '18

16 Mar '18

PCM number was not being preserved and was always zero. This would overwrite previous PCMs and cause the FW to return invalid PCM error messages. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/m4/pcm.m4 | 36 +++++++++++++++---------------- topology/sof/pipe-low-latency-capture.m4 | 6 +++--- topology/sof/pipe-low-latency-playback.m4 | 6 +++--- topology/sof/pipe-passthrough-capture.m4 | 6 +++--- topology/sof/pipe-passthrough-playback.m4 | 6 +++--- topology/sof/pipe-pcm-media.m4 | 6 +++--- topology/sof/pipe-src-capture.m4 | 6 +++--- topology/sof/pipe-src-playback.m4 | 6 +++--- topology/sof/pipe-volume-capture.m4 | 6 +++--- topology/sof/pipe-volume-playback.m4 | 6 +++--- 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/topology/m4/pcm.m4 b/topology/m4/pcm.m4 index 596f2fe..f77cb01 100644 --- a/topology/m4/pcm.m4 +++ b/topology/m4/pcm.m4 @@ -3,18 +3,18 @@ divert(-1) dnl Define the macro for PCM playback/capture/capabilities dnl PCM name) -define(`N_PCMP', `PCM'PCM_ID`P') -define(`N_PCMC', `PCM'PCM_ID`C') +define(`N_PCMP', `PCM'$1`P') +define(`N_PCMC', `PCM'$1`C') -dnl W_PCM_PLAYBACK(stream, dmac, dmac_chan, periods_sink, periods_source, preload) +dnl W_PCM_PLAYBACK(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload) dnl PCM platform configuration define(`W_PCM_PLAYBACK', `SectionVendorTuples."'N_PCMP($1)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' -` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) -` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) -` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) ` }' `}' `SectionData."'N_PCMP($1)`_data_w_comp" {' @@ -23,18 +23,18 @@ define(`W_PCM_PLAYBACK', `SectionVendorTuples."'N_PCMP($1)`_tuples" {' ` tokens "sof_pcm_tokens"' ` tuples."word" {' -` SOF_TKN_PCM_DMAC' STR($2) -` SOF_TKN_PCM_DMAC_CHAN' STR($3) +` SOF_TKN_PCM_DMAC' STR($3) +` SOF_TKN_PCM_DMAC_CHAN' STR($4) ` }' `}' `SectionData."'N_PCMP($1)`_data" {' ` tuples "'N_PCMP($1)`_tuples"' `}' -`SectionWidget."'N_PCMP`" {' +`SectionWidget."'N_PCMP($1)`" {' ` index "'PIPELINE_ID`"' ` type "aif_in"' ` no_pm "true"' -` stream_name "'$1`"' +` stream_name "'$2`"' ` data [' ` "'N_PCMP($1)`_data"' ` "'N_PCMP($1)`_data_w_comp"' @@ -42,14 +42,14 @@ define(`W_PCM_PLAYBACK', `}') -dnl W_PCM_CAPTURE(stream, dmac, dmac_chan, periods_sink, periods_source, preload) +dnl W_PCM_CAPTURE(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload) define(`W_PCM_CAPTURE', `SectionVendorTuples."'N_PCMC($1)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' -` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) -` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) -` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) ` }' `}' `SectionData."'N_PCMC($1)`_data_w_comp" {' @@ -58,18 +58,18 @@ define(`W_PCM_CAPTURE', `SectionVendorTuples."'N_PCMC($1)`_tuples" {' ` tokens "sof_pcm_tokens"' ` tuples."word" {' -` SOF_TKN_PCM_DMAC' STR($2) -` SOF_TKN_PCM_DMAC_CHAN' STR($3) +` SOF_TKN_PCM_DMAC' STR($3) +` SOF_TKN_PCM_DMAC_CHAN' STR($4) ` }' `}' `SectionData."'N_PCMC($1)`_data" {' ` tuples "'N_PCMC($1)`_tuples"' `}' -`SectionWidget."'N_PCMC`" {' +`SectionWidget."'N_PCMC($1)`" {' ` index "'PIPELINE_ID`"' ` type "aif_out"' ` no_pm "true"' -` stream_name "'$1`"' +` stream_name "'$2`"' ` data [' ` "'N_PCMC($1)`_data"' ` "'N_PCMC($1)`_data_w_comp"' diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index 5619999..96fa3cc 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -29,7 +29,7 @@ C_CONTROLMIXER(PCM PCM_ID Capture Volume, PIPELINE_ID, # Host "Low Latency Capture" PCM uses pipeline DMAC and channel # with 0 sink and 2 source periods -W_PCM_CAPTURE(Low Latency Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 0) +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")) @@ -49,8 +49,8 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2, P_GRAPH(pipe-ll-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Low Latency Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(1))', + `dapm(Low Latency Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(1))', `dapm(N_BUFFER(1), N_PGA(0))', `dapm(N_PGA(0), N_BUFFER(0))')) diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index 4a4fca9..b7f2d11 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -54,7 +54,7 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, # Host "Low latency Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Low Latency Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +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")) @@ -93,8 +93,8 @@ W_BUFFER(3, COMP_BUFFER_SIZE(2, P_GRAPH(pipe-ll-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Low Latency Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Low Latency Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_PGA(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_PGA(0))', `dapm(N_MIXER(0), N_BUFFER(1))', diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4 index 07961b3..ff7c842 100644 --- a/topology/sof/pipe-passthrough-capture.m4 +++ b/topology/sof/pipe-passthrough-capture.m4 @@ -17,7 +17,7 @@ include(`pipeline.m4') # Host "Passthrough Capture" PCM uses pipeline DMAC and channel # with 0 sink and 2 source periods -W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) # Capture Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, @@ -41,8 +41,8 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, SCHE P_GRAPH(pipe-pass-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Passthrough Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(0))')) + `dapm(Passthrough Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(0))')) # # Pipeline Source and Sinks diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index 715fcee..84aa126 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -17,7 +17,7 @@ include(`pipeline.m4') # Host "Passthrough Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, @@ -41,8 +41,8 @@ W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, SCH P_GRAPH(pipe-pass-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Passthrough Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)')) + `dapm(N_PCMP(PCM_ID), Passthrough Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))')) # # Pipeline Source and Sinks diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index f2053b7..1ca829f 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -41,7 +41,7 @@ W_DATA(media_src_conf, media_src_tokens) # Host "Low latency Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Media Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +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")) @@ -70,8 +70,8 @@ W_BUFFER(2, COMP_BUFFER_SIZE(3, P_GRAPH(pipe-media-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Media Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Media Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_PGA(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_PGA(0))', `dapm(N_SRC(0), N_BUFFER(1))' diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4 index 1b1a58d..54eeea3 100644 --- a/topology/sof/pipe-src-capture.m4 +++ b/topology/sof/pipe-src-capture.m4 @@ -18,7 +18,7 @@ include(`pipeline.m4') # Host "Passthrough Capture" PCM uses pipeline DMAC and channel # with 4 sink and 0 source periods -W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) # # SRC Configuration @@ -58,8 +58,8 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-src-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Passthrough Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(0))', + `dapm(Passthrough Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(0))', `dapm(N_BUFFER(0), N_SRC(0))', `dapm(N_SRC(0), N_BUFFER(1))')) diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4 index 9dfdcd8..51237ac 100644 --- a/topology/sof/pipe-src-playback.m4 +++ b/topology/sof/pipe-src-playback.m4 @@ -18,7 +18,7 @@ include(`pipeline.m4') # Host "Passthrough Playback" PCM uses pipeline DMAC and channel # with 4 sink and 0 source periods -W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) # # SRC Configuration @@ -58,8 +58,8 @@ W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-src-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Passthrough Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Passthrough Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_SRC(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_SRC(0))')) diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 61b70a9..c3917ca 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -31,7 +31,7 @@ C_CONTROLMIXER(Master Capture Volume, PIPELINE_ID, # Host "Passthrough Capture" PCM uses pipeline DMAC and channel # with 0 sink and 2 source periods -W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) +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")) @@ -63,8 +63,8 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-vol-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Passthrough Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(0))', + `dapm(Passthrough Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(0))', `dapm(N_BUFFER(0), N_PGA(0))', `dapm(N_PGA(0), N_BUFFER(1))')) diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 5fea0c7..194aad9 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -31,7 +31,7 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, # Host "Passthrough Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +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")) @@ -63,8 +63,8 @@ W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-vol-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Passthrough Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Passthrough Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_PGA(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_PGA(0))')) -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] core: ipc: Fix error handling pointer deref
by Liam Girdwood 16 Mar '18

16 Mar '18

elem.next/prev can be accessed whilst NULL in certain error handling conditions. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/ipc/intel-ipc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 4173a276..a9398229 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -254,6 +254,9 @@ static int ipc_stream_pcm_params(uint32_t stream) cd->params = pcm_params->params; #ifdef CONFIG_HOST_PTABLE + + list_init(&elem_list); + /* use DMA to read in compressed page table ringbuffer from host */ err = get_page_descriptors(iipc, &pcm_params->params.buffer); if (err < 0) { @@ -264,7 +267,6 @@ static int ipc_stream_pcm_params(uint32_t stream) /* Parse host tables */ host = (struct sof_ipc_comp_host *)&cd->comp; ring_size = pcm_params->params.buffer.size; - list_init(&elem_list); err = parse_page_descriptors(iipc, &pcm_params->params.buffer, &elem_list, host->direction); @@ -650,6 +652,9 @@ static int ipc_dma_trace_config(uint32_t header) trace_ipc_error("DA1"); #ifdef CONFIG_HOST_PTABLE + + list_init(&elem_list); + /* use DMA to read in compressed page table ringbuffer from host */ err = get_page_descriptors(iipc, &params->buffer); if (err < 0) { @@ -661,7 +666,6 @@ static int ipc_dma_trace_config(uint32_t header) /* Parse host tables */ ring_size = params->buffer.size; - list_init(&elem_list); err = parse_page_descriptors(iipc, &params->buffer, &elem_list, SOF_IPC_STREAM_CAPTURE); -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] topology: byt-rt5640: Fix DAI config
by Liam Girdwood 16 Mar '18

16 Mar '18

DAI config was coming from deprecated machine driver. Fix it to use bytcr-rt5640 machine driver. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/reef-byt-rt5640.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index 879e9a9..bf2b004 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -1,5 +1,5 @@ # -# Topology for generic Baytrail board with no codec. +# Topology for generic Baytrail board with no RT5640. # # Include topology builder @@ -76,7 +76,7 @@ SectionGraph."pipe-byt-rt5640" { # 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, SSP-Codec + 1, SSP, 2, SSP-Codec, PIPELINE_SOURCE_1, 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, Baytrail Audio, I2S, 24, +DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), -- 2.14.1

2 3

[Sound-open-firmware] [PATCH] Don't call dma_trace_init_complete if dma trace is disabled.
by Mike Mason 16 Mar '18

16 Mar '18

Hide dma_trace_init_complete if --disable-dma-trace was passed to configure. Otherwise, the compile with fail. Signed-off-by: Mike Mason <michael.w.mason(a)intel.com> --- src/platform/apollolake/platform.c | 2 ++ src/platform/baytrail/platform.c | 2 ++ src/platform/cannonlake/platform.c | 2 ++ src/platform/haswell/platform.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/src/platform/apollolake/platform.c b/src/platform/apollolake/platform.c index 84f8e71..f601961 100644 --- a/src/platform/apollolake/platform.c +++ b/src/platform/apollolake/platform.c @@ -263,7 +263,9 @@ int platform_init(struct reef *reef) } /* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif return 0; } diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index cec8297..658ae35 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -407,7 +407,9 @@ int platform_init(struct reef *reef) #endif /* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif return 0; } diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index 8bf2d7a..28643e0 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -284,7 +284,9 @@ int platform_init(struct reef *reef) } /* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif return 0; } diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index f84d6e3..569c80a 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -284,7 +284,9 @@ int platform_init(struct reef *reef) dai_probe(ssp1); /* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif return 0; } -- 2.16.2

3 2

[Sound-open-firmware] [PATCH 1/2] topology: byt-rt5640: rt5640 uses SSP2-Codec
by Liam Girdwood 16 Mar '18

16 Mar '18

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/reef-byt-rt5640.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index d301ea6..14313db 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-rt5640" { # 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, SSP-Codec, + 1, SSP, 2, SSP2-Codec, 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, SSP-Codec, + 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) -- 2.14.1

1 1

[Sound-open-firmware] [PATCH] trace: dma: remove disable DMA trace option
by Liam Girdwood 16 Mar '18

16 Mar '18

DMA based trace is the standard default trace method. mailbox trace is no longer supported. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- configure.ac | 10 -------- src/ipc/dma-copy.c | 2 -- src/ipc/intel-ipc.c | 4 --- src/lib/Makefile.am | 6 +---- src/lib/trace.c | 70 +---------------------------------------------------- 5 files changed, 2 insertions(+), 90 deletions(-) diff --git a/configure.ac b/configure.ac index bb4d2e9f..9b74c6a9 100644 --- a/configure.ac +++ b/configure.ac @@ -241,16 +241,6 @@ case "$with_dsp_core" in esac -# dma trace support (Optional), dma trace by default -AC_ARG_ENABLE([dma-trace], - AS_HELP_STRING([--disable-dma-trace], [Disabled dma trace and use fallback mailbox trace])) - -AS_IF([test "x$enable_dma_trace" != "xno"], [ - AC_DEFINE([CONFIG_DMA_TRACE], [1], [Configure DMA trace]) - ]) - -AM_CONDITIONAL(BUILD_DMA_TRACE, test "x$enable_dma_trace" != "xno") - PLATFORM_BOOT_LDR_LDSCRIPT="boot_ldr.x" AC_SUBST(PLATFORM_BOOT_LDR_LDSCRIPT) diff --git a/src/ipc/dma-copy.c b/src/ipc/dma-copy.c index 3c073567..ba7592af 100644 --- a/src/ipc/dma-copy.c +++ b/src/ipc/dma-copy.c @@ -79,9 +79,7 @@ static void dma_complete(void *data, uint32_t type, struct dma_sg_elem *next) if (type == DMA_IRQ_TYPE_LLIST) wait_completed(comp); -#if defined(CONFIG_DMA_TRACE) ipc_dma_trace_send_position(); -#endif next->size = DMA_RELOAD_END; } diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 8263fffe..4173a276 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -631,7 +631,6 @@ static int ipc_glb_pm_message(uint32_t header) } } -#if defined(CONFIG_DMA_TRACE) /* * Debug IPC Operations. */ @@ -747,7 +746,6 @@ static int ipc_glb_debug_message(uint32_t header) return -EINVAL; } } -#endif /* * Topology IPC Operations. @@ -963,10 +961,8 @@ int ipc_cmd(void) return ipc_glb_stream_message(hdr->cmd); case iGS(SOF_IPC_GLB_DAI_MSG): return ipc_glb_dai_message(hdr->cmd); -#if defined(CONFIG_DMA_TRACE) case iGS(SOF_IPC_GLB_TRACE_MSG): return ipc_glb_debug_message(hdr->cmd); -#endif default: trace_ipc_error("eGc"); trace_value(type); diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index c4da98c9..ea91904a 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -8,12 +8,8 @@ libcore_a_SOURCES = \ trace.c \ schedule.c \ agent.c \ - interrupt.c - -if BUILD_DMA_TRACE -libcore_a_SOURCES += \ + interrupt.c \ dma-trace.c -endif libcore_a_CFLAGS = \ $(ARCH_CFLAGS) \ diff --git a/src/lib/trace.c b/src/lib/trace.c index bfac6d32..de99a4e6 100644 --- a/src/lib/trace.c +++ b/src/lib/trace.c @@ -49,9 +49,7 @@ void _trace_error(uint32_t event) { unsigned long flags; volatile uint64_t *t; -#if defined(CONFIG_DMA_TRACE) uint64_t dt[2]; -#endif uint64_t time; if (!trace.enable) @@ -59,12 +57,10 @@ void _trace_error(uint32_t event) time = platform_timer_get(platform_timer); -#if defined(CONFIG_DMA_TRACE) /* save event to DMA tracing buffer */ dt[0] = time; dt[1] = event; dtrace_event((const char*)dt, sizeof(uint64_t) * 2); -#endif /* send event by mail box too. */ spin_lock_irq(&trace.lock, flags); @@ -88,9 +84,8 @@ void _trace_error(uint32_t event) void _trace_error_atomic(uint32_t event) { volatile uint64_t *t; -#if defined(CONFIG_DMA_TRACE) uint64_t dt[2]; -#endif + uint64_t time; if (!trace.enable) @@ -98,12 +93,10 @@ void _trace_error_atomic(uint32_t event) time = platform_timer_get(platform_timer); -#if defined(CONFIG_DMA_TRACE) /* save event to DMA tracing buffer */ dt[0] = time; dt[1] = event; dtrace_event_atomic((const char*)dt, sizeof(uint64_t) * 2); -#endif /* write timestamp and event to trace buffer */ t = (volatile uint64_t*)(MAILBOX_TRACE_BASE + trace.pos); @@ -119,8 +112,6 @@ void _trace_error_atomic(uint32_t event) dcache_writeback_region((void*)t, sizeof(uint64_t) * 2); } -#if defined(CONFIG_DMA_TRACE) - void _trace_event(uint32_t event) { uint64_t dt[2]; @@ -145,62 +136,6 @@ void _trace_event_atomic(uint32_t event) dtrace_event_atomic((const char*)dt, sizeof(uint64_t) * 2); } -#else - -void _trace_event(uint32_t event) -{ - unsigned long flags; - uint64_t time, *t; - - if (!trace.enable) - return; - - time = platform_timer_get(platform_timer); - - /* send event by mail box too. */ - spin_lock_irq(&trace.lock, flags); - - /* write timestamp and event to trace buffer */ - t = (uint64_t *)(MAILBOX_TRACE_BASE + trace.pos); - trace.pos += (sizeof(uint64_t) << 1); - - if (trace.pos > MAILBOX_TRACE_SIZE - sizeof(uint64_t) * 2) - trace.pos = 0; - - spin_unlock_irq(&trace.lock, flags); - - t[0] = time; - t[1] = event; - - /* writeback trace data */ - dcache_writeback_region((void *)t, sizeof(uint64_t) * 2); -} - -void _trace_event_atomic(uint32_t event) -{ - uint64_t time, *t; - - if (!trace.enable) - return; - - time = platform_timer_get(platform_timer); - - /* write timestamp and event to trace buffer */ - t = (uint64_t *)(MAILBOX_TRACE_BASE + trace.pos); - trace.pos += (sizeof(uint64_t) << 1); - - if (trace.pos > MAILBOX_TRACE_SIZE - sizeof(uint64_t) * 2) - trace.pos = 0; - - t[0] = time; - t[1] = event; - - /* writeback trace data */ - dcache_writeback_region((void *)t, sizeof(uint64_t) * 2); -} - -#endif - void trace_off(void) { trace.enable = 0; @@ -208,10 +143,7 @@ void trace_off(void) void trace_init(struct reef *reef) { - -#if defined(CONFIG_DMA_TRACE) dma_trace_init_early(reef); -#endif trace.enable = 1; trace.pos = 0; spinlock_init(&trace.lock); -- 2.14.1

3 6

[Sound-open-firmware] [PATCH] Increase HEAP_SYSTEM_SIZE for DMA trace local buffer.
by yan.wang＠linux.intel.com 16 Mar '18

16 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> After enable DMA trace on APL, original HEAP_SYSTEM_SIZE is not enough and will cause allocation failure. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/platform/apollolake/include/platform/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/apollolake/include/platform/memory.h b/src/platform/apollolake/include/platform/memory.h index 6bdb0ba..a0dab04 100644 --- a/src/platform/apollolake/include/platform/memory.h +++ b/src/platform/apollolake/include/platform/memory.h @@ -180,7 +180,7 @@ #define HEAP_SYSTEM_BASE \ (REEF_TEXT_BASE + REEF_TEXT_SIZE +\ REEF_DATA_SIZE + REEF_BSS_DATA_SIZE) -#define HEAP_SYSTEM_SIZE 0x2000 +#define HEAP_SYSTEM_SIZE 0x3200 #define HEAP_RUNTIME_BASE (HEAP_SYSTEM_BASE + HEAP_SYSTEM_SIZE) #define HEAP_RUNTIME_SIZE \ -- 2.14.3

1 0

[Sound-open-firmware] [PATCH] topology: byt-rt5640. Fix DAI stream name.
by Liam Girdwood 15 Mar '18

15 Mar '18

Stream name should match bytcr driver and not legacy byt-rt5640 driver. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/reef-byt-rt5640.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index c971d41..879e9a9 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-rt5640" { # 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, Audio + 1, SSP, 2, SSP-Codec 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, Audio, + 2, SSP, 2, SSP-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) -- 2.14.1

2 2

[Sound-open-firmware] [PATCH] cnl: enable L1 cache
by Liam Girdwood 15 Mar '18

15 Mar '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> Enable L1 cache for DSP. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/platform/cannonlake/cannonlake.x.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/cannonlake/cannonlake.x.in b/src/platform/cannonlake/cannonlake.x.in index 0ed5bc60..47acd5e0 100644 --- a/src/platform/cannonlake/cannonlake.x.in +++ b/src/platform/cannonlake/cannonlake.x.in @@ -158,7 +158,7 @@ _memmap_cacheattr_bp_base = 0x22022000; _memmap_cacheattr_unused_mask = 0x00F00FFF; _memmap_cacheattr_wb_trapnull = 0x4422422F; _memmap_cacheattr_wba_trapnull = 0x4422422F; -_memmap_cacheattr_wbna_trapnull = 0x25222222; +_memmap_cacheattr_wbna_trapnull = 0xFF42FFF2; _memmap_cacheattr_wt_trapnull = 0x1122122F; _memmap_cacheattr_bp_trapnull = 0x2222222F; _memmap_cacheattr_wb_strict = 0x44F24FFF; -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] cnl: fix buffer caps
by Liam Girdwood 15 Mar '18

15 Mar '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> DMA buffers should only reside in HEAP_HP_BUFFER. This assures 128 byte address alignment. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/platform/cannonlake/memory.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/platform/cannonlake/memory.c b/src/platform/cannonlake/memory.c index 16fa6008..69c445b1 100644 --- a/src/platform/cannonlake/memory.c +++ b/src/platform/cannonlake/memory.c @@ -75,8 +75,8 @@ struct mm memmap = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, .info = {.free = HEAP_SYSTEM_SIZE,}, - .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_CACHE | - SOF_MEM_CAPS_HP | SOF_MEM_CAPS_DMA, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_EXT | + SOF_MEM_CAPS_CACHE, }, .runtime[0] = { .blocks = ARRAY_SIZE(rt_heap_map), @@ -84,8 +84,8 @@ struct mm memmap = { .heap = HEAP_RUNTIME_BASE, .size = HEAP_RUNTIME_SIZE, .info = {.free = HEAP_RUNTIME_SIZE,}, - .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_CACHE | - SOF_MEM_CAPS_HP | SOF_MEM_CAPS_DMA, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_EXT | + SOF_MEM_CAPS_CACHE, }, .buffer[0] = { .blocks = ARRAY_SIZE(buf_heap_map), @@ -93,8 +93,8 @@ struct mm memmap = { .heap = HEAP_BUFFER_BASE, .size = HEAP_BUFFER_SIZE, .info = {.free = HEAP_BUFFER_SIZE,}, - .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_CACHE | - SOF_MEM_CAPS_HP | SOF_MEM_CAPS_DMA, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_EXT | + SOF_MEM_CAPS_CACHE, }, .buffer[1] = { .blocks = ARRAY_SIZE(hp_buf_heap_map), -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] topology: byt-da7213: fix topology file name.
by Liam Girdwood 15 Mar '18

15 Mar '18

reef-byt-da7212 -> reef-byt->da7213 Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/Makefile.am | 4 ++-- topology/{reef-byt-da7212.m4 => reef-byt-da7213.m4} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename topology/{reef-byt-da7212.m4 => reef-byt-da7213.m4} (97%) diff --git a/topology/Makefile.am b/topology/Makefile.am index a62aa78..f161ba2 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -26,7 +26,7 @@ MACHINES = \ reef-byt-rt5640.tplg \ reef-byt-rt5645.tplg \ reef-byt-rt5651.tplg \ - reef-byt-da7212.tplg \ + reef-byt-da7213.tplg \ reef-cnl-rt274.tplg \ reef-hsw-rt5640.tplg @@ -56,6 +56,6 @@ EXTRA_DIST = \ reef-byt-rt5640.m4 \ reef-byt-rt5645.m4 \ reef-byt-rt5651.m4 \ - reef-byt-da7212.m4 \ + reef-byt-da7213.m4 \ reef-cnl-rt274.m4 \ reef-hsw-rt5640.m4 diff --git a/topology/reef-byt-da7212.m4 b/topology/reef-byt-da7213.m4 similarity index 97% rename from topology/reef-byt-da7212.m4 rename to topology/reef-byt-da7213.m4 index a9789c6..1e77e7e 100644 --- a/topology/reef-byt-da7212.m4 +++ b/topology/reef-byt-da7213.m4 @@ -1,5 +1,5 @@ # -# Topology for generic Baytrail board with no codec. +# Topology for generic Baytrail board with DA7213 codec. # # Include topology builder -- 2.14.1

2 1

[Sound-open-firmware] [PATCH v2] apl-ssp: fix capture double speed issue
by Keyon Jie 15 Mar '18

15 Mar '18

Previously TFT and RFT are set to 0s which means we are using threshold level 1, where interrupt asserts for every valid bits of each slot(e.g. for s16_le capture, interrupts assert for each 16 bits), but DMAC will treat it as notification of one full sample(e.g. 32 bits for s16_le stereo) and read those all bits, this will lead to capture with double speed at format s16_le stereo. Here add handle for FIFO trigger Threshold level, set them to bytes for each full sample(active_slots * valid_bits / 8), and the issue is fixed. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/drivers/apl-ssp.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 1ee107c..a863b44 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -43,6 +43,19 @@ #define trace_ssp_error(__e) trace_error(TRACE_CLASS_SSP, __e) #define tracev_ssp(__e) tracev_event(TRACE_CLASS_SSP, __e) +/* FIXME: move this to a helper and optimize */ +static int hweight_32(uint32_t mask) +{ + int i; + int count = 0; + + for (i = 0; i < 32; i++) { + count += mask & 1; + mask >>= 1; + } + return count; +} + /* save SSP context prior to entering D3 */ static int ssp_context_store(struct dai *dai) { @@ -96,6 +109,11 @@ static inline int ssp_set_config(struct dai *dai, uint32_t dummy_stop; uint32_t frame_len = 0; uint32_t bdiv_min; + uint32_t tft; + uint32_t rft; + uint32_t active_tx_slots = 2; + uint32_t active_rx_slots = 2; + bool inverted_frame = false; int ret = 0; @@ -353,6 +371,9 @@ static inline int ssp_set_config(struct dai *dai, sspsp |= SSPSP_SFRMP(!inverted_frame); sspsp |= SSPSP_FSRT; + active_tx_slots = hweight_32(config->tx_slot_mask); + active_rx_slots = hweight_32(config->rx_slot_mask); + break; case SOF_DAI_FMT_DSP_B: @@ -371,6 +392,9 @@ static inline int ssp_set_config(struct dai *dai, */ sspsp |= SSPSP_SFRMP(!inverted_frame); + active_tx_slots = hweight_32(config->tx_slot_mask); + active_rx_slots = hweight_32(config->rx_slot_mask); + break; default: trace_ssp_error("eca"); @@ -408,6 +432,27 @@ static inline int ssp_set_config(struct dai *dai, /* bypass divider for MCLK */ mdivr = 0x00000fff; + /* setting TFT and RFT */ + switch (config->sample_valid_bits) { + case 16: + /* use 2 bytes for each slot */ + tft = active_tx_slots * 2; + rft = active_rx_slots * 2; + break; + case 24: + case 32: + /* use 4 bytes for each slot */ + tft = active_tx_slots * 4; + rft = active_rx_slots * 4; + break; + default: + trace_ssp_error("ecd"); + ret = -EINVAL; + goto out; + } + + sscr3 |= SSCR3_TX(tft) | SSCR3_RX(rft); + trace_ssp("coe"); ssp_write(dai, SSCR0, sscr0); ssp_write(dai, SSCR1, sscr1); -- 2.14.1

3 2

[Sound-open-firmware] [PATCH] volume: remove unnecessary logic for mute/unmute
by Ranjani Sridharan 15 Mar '18

15 Mar '18

This patch removes unnecessary logic for mute/unmute in volume component. Mute is handled by the driver by sending 0 for volume gain and unmute is handled by sending a non-zero value. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/volume.c | 75 ++++++++++++------------------------------------------ 1 file changed, 16 insertions(+), 59 deletions(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index 0620e18..23e801c 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -74,7 +74,6 @@ struct comp_data { uint32_t chan[SOF_IPC_MAX_CHANNELS]; uint32_t volume[SOF_IPC_MAX_CHANNELS]; /* current volume */ uint32_t tvolume[SOF_IPC_MAX_CHANNELS]; /* target volume */ - uint32_t mvolume[SOF_IPC_MAX_CHANNELS]; /* mute volume */ void (*scale_vol)(struct comp_dev *dev, struct comp_buffer *sink, struct comp_buffer *source, uint32_t frames); struct work volwork; @@ -441,25 +440,6 @@ static inline void volume_set_chan(struct comp_dev *dev, int chan, uint32_t vol) cd->tvolume[chan] = v; } -static inline void volume_set_chan_mute(struct comp_dev *dev, int chan) -{ - struct comp_data *cd = comp_get_drvdata(dev); - - /* Check if not muted already */ - if (cd->volume[chan] != 0) - cd->mvolume[chan] = cd->volume[chan]; - cd->tvolume[chan] = 0; -} - -static inline void volume_set_chan_unmute(struct comp_dev *dev, int chan) -{ - struct comp_data *cd = comp_get_drvdata(dev); - - /* Check if muted */ - if (cd->volume[chan] == 0) - cd->tvolume[chan] = cd->mvolume[chan]; -} - static int volume_ctrl_set_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); @@ -472,48 +452,25 @@ static int volume_ctrl_set_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *c return -EINVAL; } - switch (cdata->cmd) { - case SOF_CTRL_CMD_VOLUME: - trace_volume("vst"); - trace_value(cdata->comp_id); - for (j = 0; j < cdata->num_elems; j++) { - trace_value(cdata->chanv[j].channel); - trace_value(cdata->chanv[j].value); - i = cdata->chanv[j].channel; - if ((i >= 0) && (i < SOF_IPC_MAX_CHANNELS)) - volume_set_chan(dev, i, cdata->chanv[j].value); - else { - trace_volume_error("gs2"); - tracev_value(i); - } - } - work_schedule_default(&cd->volwork, VOL_RAMP_US); - break; + if (cdata->cmd != SOF_CTRL_CMD_VOLUME) { + trace_volume_error("ev0"); + return -EINVAL; + } - case SOF_CTRL_CMD_SWITCH: - trace_volume("mst"); - trace_value(cdata->comp_id); - for (j = 0; j < cdata->num_elems; j++) { - trace_value(cdata->chanv[j].channel); - trace_value(cdata->chanv[j].value); - i = cdata->chanv[j].channel; - if ((i >= 0) && (i < SOF_IPC_MAX_CHANNELS)) { - if (cdata->chanv[j].value) - volume_set_chan_unmute(dev, i); - else - volume_set_chan_mute(dev, i); - } else { - trace_volume_error("gs3"); - tracev_value(i); - } + trace_volume("vst"); + trace_value(cdata->comp_id); + for (j = 0; j < cdata->num_elems; j++) { + trace_value(cdata->chanv[j].channel); + trace_value(cdata->chanv[j].value); + i = cdata->chanv[j].channel; + if (i >= 0 && i < SOF_IPC_MAX_CHANNELS) { + volume_set_chan(dev, i, cdata->chanv[j].value); + } else { + trace_volume_error("gs2"); + tracev_value(i); } - work_schedule_default(&cd->volwork, VOL_RAMP_US); - break; - - default: - trace_volume_error("gs1"); - return -EINVAL; } + work_schedule_default(&cd->volwork, VOL_RAMP_US); return 0; } -- 2.14.1

3 3

[Sound-open-firmware] [PATCH] topology: Add stream name to DAI widgets for binding to DAI links
by Liam Girdwood 15 Mar '18

15 Mar '18

DAI Widgets need bound to a DAI link to complete the DAPM graph. This is only working atm as we are only using one DAI. Add stream name to DAI widgets to be used by topology binder. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/m4/dai.m4 | 44 +++++++++++++++++-------------- topology/reef-apl-nocodec.m4 | 4 +-- topology/reef-bdw-rt286.m4 | 4 +-- topology/reef-bdw-rt5640.m4 | 4 +-- topology/reef-bxt-nocodec.m4 | 4 +-- topology/reef-byt-da7212.m4 | 4 +-- topology/reef-byt-nocodec.m4 | 4 +-- topology/reef-byt-rt5640.m4 | 4 +-- topology/reef-byt-rt5645.m4 | 4 +-- topology/reef-byt-rt5651.m4 | 4 +-- topology/reef-cht-max98090.m4 | 4 +-- topology/reef-cht-nocodec.m4 | 4 +-- topology/reef-cnl-rt274.m4 | 4 +-- topology/reef-hsw-rt5640.m4 | 4 +-- topology/sof/pipe-dai-capture.m4 | 2 +- topology/sof/pipe-dai-playback.m4 | 2 +- topology/sof/pipe-passthrough-capture.m4 | 2 +- topology/sof/pipe-passthrough-playback.m4 | 2 +- topology/sof/pipe-src-capture.m4 | 2 +- topology/sof/pipe-src-playback.m4 | 2 +- topology/sof/pipe-volume-capture.m4 | 2 +- topology/sof/pipe-volume-playback.m4 | 2 +- topology/test/test-capture-ssp.m4 | 2 +- topology/test/test-playback-ssp.m4 | 2 +- topology/test/test-ssp.m4 | 4 +-- topology/test/test-tone-playback-ssp.m4 | 2 +- 26 files changed, 63 insertions(+), 59 deletions(-) diff --git a/topology/m4/dai.m4 b/topology/m4/dai.m4 index 163dfab..0b030af 100644 --- a/topology/m4/dai.m4 +++ b/topology/m4/dai.m4 @@ -7,14 +7,14 @@ define(`N_DAI', DAI_NAME) define(`N_DAI_OUT', DAI_NAME`.OUT') define(`N_DAI_IN', DAI_NAME`.IN') -dnl W_DAI_OUT(type, index, format, periods_sink, periods_source, preload, data) +dnl W_DAI_OUT(type, index, dai_link, format, periods_sink, periods_source, preload, data) define(`W_DAI_OUT', `SectionVendorTuples."'N_DAI_OUT($2)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' -` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) -` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) -` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) ` }' `}' `SectionData."'N_DAI_OUT($2)`_data_w_comp" {' @@ -41,7 +41,7 @@ define(`W_DAI_OUT', `SectionVendorTuples."'N_DAI_OUT($2)`_tuples_comp_str" {' ` tokens "sof_comp_tokens"' ` tuples."string" {' -` SOF_TKN_COMP_FORMAT' STR($3) +` SOF_TKN_COMP_FORMAT' STR($4) ` }' `}' `SectionData."'N_DAI_OUT($2)`_data_comp_str" {' @@ -50,24 +50,25 @@ define(`W_DAI_OUT', `SectionWidget."'N_DAI_OUT`" {' ` index "'PIPELINE_ID`"' ` type "dai_in"' +` stream_name' STR($3) ` no_pm "true"' ` data [' ` "'N_DAI_OUT($2)`_data_w"' ` "'N_DAI_OUT($2)`_data_w_comp"' ` "'N_DAI_OUT($2)`_data_str"' ` "'N_DAI_OUT($2)`_data_comp_str"' -` "'$7`"' +` "'$8`"' ` ]' `}') -dnl W_DAI_IN(type, index, format, periods_sink, periods_source, preload, data) +dnl W_DAI_IN(type, index, dai_link, format, periods_sink, periods_source, preload, data) define(`W_DAI_IN', `SectionVendorTuples."'N_DAI_IN($2)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' -` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) -` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) -` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) ` }' `}' `SectionData."'N_DAI_IN($2)`_data_w_comp" {' @@ -94,7 +95,7 @@ define(`W_DAI_IN', `SectionVendorTuples."'N_DAI_IN($2)`_tuples_comp_str" {' ` tokens "sof_comp_tokens"' ` tuples."string" {' -` SOF_TKN_COMP_FORMAT' STR($3) +` SOF_TKN_COMP_FORMAT' STR($4) ` }' `}' `SectionData."'N_DAI_IN($2)`_data_comp_str" {' @@ -103,13 +104,14 @@ define(`W_DAI_IN', `SectionWidget."'N_DAI_IN`" {' ` index "'PIPELINE_ID`"' ` type "dai_out"' +` stream_name' STR($3) ` no_pm "true"' ` data [' ` "'N_DAI_IN($2)`_data_w"' ` "'N_DAI_IN($2)`_data_w_comp"' ` "'N_DAI_IN($2)`_data_str"' ` "'N_DAI_IN($2)`_data_comp_str"' -` "'$7`"' +` "'$8`"' ` ]' `}') @@ -183,13 +185,14 @@ define(`DAI_CONFIG', `}') dnl DAI_ADD(pipeline, -dnl pipe id, dai type, dai_index, +dnl pipe id, dai type, dai_index, dai_be, dnl buffer, periods, format, dnl frames, deadline, priority, core) define(`DAI_ADD', `undefine(`PIPELINE_ID')' `undefine(`DAI_TYPE')' `undefine(`DAI_INDEX')' +`undefine(`DAI_BE')' `undefine(`DAI_BUF')' `undefine(`DAI_PERIODS')' `undefine(`DAI_FORMAT')' @@ -200,14 +203,15 @@ define(`DAI_ADD', `define(`PIPELINE_ID', $2)' `define(`DAI_TYPE', STR($3))' `define(`DAI_INDEX', STR($4))' -`define(`DAI_BUF', $5)' +`define(`DAI_BE', $5)' +`define(`DAI_BUF', $6)' `define(`DAI_NAME', $3$4)' -`define(`DAI_PERIODS', $6)' -`define(`DAI_FORMAT', $7)' -`define(`SCHEDULE_FRAMES', $8)' -`define(`SCHEDULE_DEADLINE', $9)' -`define(`SCHEDULE_PRIORITY', $10)' -`define(`SCHEDULE_CORE', $11)' +`define(`DAI_PERIODS', $7)' +`define(`DAI_FORMAT', $8)' +`define(`SCHEDULE_FRAMES', $9)' +`define(`SCHEDULE_DEADLINE', $10)' +`define(`SCHEDULE_PRIORITY', $11)' +`define(`SCHEDULE_CORE', $12)' `include($1)' ) diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4 index cf0a20e..78a1a4e 100644 --- a/topology/reef-apl-nocodec.m4 +++ b/topology/reef-apl-nocodec.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-apl-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, + 1, SSP, 2, 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, + 2, SSP, 2, NoCodec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-bdw-rt286.m4 b/topology/reef-bdw-rt286.m4 index fa894f6..a305e7d 100644 --- a/topology/reef-bdw-rt286.m4 +++ b/topology/reef-bdw-rt286.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-bdw-rt286" { # 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, + 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, + 2, SSP, 0, Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4 index ec920a5..3fbb844 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, + 1, SSP, 0, Audio, 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, + 2, SSP, 0, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4 index b7717d0..7e2b624 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, + 1, SSP, 2, 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, + 2, SSP, 2, NoCodec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-da7212.m4 b/topology/reef-byt-da7212.m4 index 7515c63..a9789c6 100644 --- a/topology/reef-byt-da7212.m4 +++ b/topology/reef-byt-da7212.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-da7212" { # 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, + 1, SSP, 2, SSP2-Codec, 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, + 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4 index b3ca196..3be5d00 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, + 1, SSP, 2, 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, + 2, SSP, 2, NoCodec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index 9fa15a2..c971d41 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-rt5640" { # 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, + 1, SSP, 2, Audio 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, + 2, SSP, 2, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-rt5645.m4 b/topology/reef-byt-rt5645.m4 index c81a4db..15cac48 100644 --- a/topology/reef-byt-rt5645.m4 +++ b/topology/reef-byt-rt5645.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-rt5645" { # 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, + 1, SSP, 2, SSP2-Codec, 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, + 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4 index ec114d7..656efd2 100644 --- a/topology/reef-byt-rt5651.m4 +++ b/topology/reef-byt-rt5651.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-rt5651" { # 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, + 1, SSP, 2, SS2-Codec, 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, + 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-cht-max98090.m4 b/topology/reef-cht-max98090.m4 index 5690df4..ab1b639 100644 --- a/topology/reef-cht-max98090.m4 +++ b/topology/reef-cht-max98090.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-cht-max98090" { # 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, - 1, SSP, 2, + 1, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_1, 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, 2, + 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s16le, 48, 1000, 0, 0) diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4 index 32acb62..3f61e44 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, + 1, SSP, 2, 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, + 2, SSP, 2, NoCodec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-cnl-rt274.m4 b/topology/reef-cnl-rt274.m4 index e95363b..495fab3 100644 --- a/topology/reef-cnl-rt274.m4 +++ b/topology/reef-cnl-rt274.m4 @@ -47,14 +47,14 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4, # 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, + 1, SSP, 0, SSP0-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, + 2, SSP, 0, SSP0-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4 index 1f63820..5ab33ea 100644 --- a/topology/reef-hsw-rt5640.m4 +++ b/topology/reef-hsw-rt5640.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-hsw-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, + 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, + 2, SSP, 0, Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/sof/pipe-dai-capture.m4 b/topology/sof/pipe-dai-capture.m4 index a5a72d0..3f16f87 100644 --- a/topology/sof/pipe-dai-capture.m4 +++ b/topology/sof/pipe-dai-capture.m4 @@ -8,7 +8,7 @@ include(`pipeline.m4') # # DAI definitions # -W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 2, 0, 0, dai0c_plat_conf) +W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 2, 0, 0, dai0c_plat_conf) # # DAI pipeline - always use 0 for DAIs diff --git a/topology/sof/pipe-dai-playback.m4 b/topology/sof/pipe-dai-playback.m4 index e70998b..2397875 100644 --- a/topology/sof/pipe-dai-playback.m4 +++ b/topology/sof/pipe-dai-playback.m4 @@ -8,7 +8,7 @@ include(`pipeline.m4') # # DAI definitions # -W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf) +W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf) # # DAI pipeline - always use 0 for DAIs diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4 index a13887a..07961b3 100644 --- a/topology/sof/pipe-passthrough-capture.m4 +++ b/topology/sof/pipe-passthrough-capture.m4 @@ -27,7 +27,7 @@ W_BUFFER(0, COMP_BUFFER_SIZE(2, # # DAI definitions # -W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, 2, 2, dai0c_plat_conf) +W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2, dai0c_plat_conf) # # DAI pipeline - always use 0 for DAIs diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index 8a9e8ff..715fcee 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -27,7 +27,7 @@ W_BUFFER(0, COMP_BUFFER_SIZE(2, # # DAI definitions # -W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf) +W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf) # # DAI pipeline - always use 0 for DAIs diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4 index a58eb68..1b1a58d 100644 --- a/topology/sof/pipe-src-capture.m4 +++ b/topology/sof/pipe-src-capture.m4 @@ -42,7 +42,7 @@ W_BUFFER(1, COMP_BUFFER_SIZE(4, # # DAI definitions # -W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, DAI_PERIODS, +W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS, DAI_PERIODS, dai0c_plat_conf) # diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4 index 7bf8f47..9dfdcd8 100644 --- a/topology/sof/pipe-src-playback.m4 +++ b/topology/sof/pipe-src-playback.m4 @@ -42,7 +42,7 @@ W_BUFFER(1, COMP_BUFFER_SIZE(4, # # DAI definitions # -W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, DAI_PERIODS, +W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS, DAI_PERIODS, dai0p_plat_conf) # diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 5aa0d12..61b70a9 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -47,7 +47,7 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2, # # DAI definitions # -W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, DAI_PERIODS, +W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS, DAI_PERIODS, dai0c_plat_conf) # diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index d6624b0..5fea0c7 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -47,7 +47,7 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2, # # DAI definitions # -W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, DAI_PERIODS, +W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS, DAI_PERIODS, dai0p_plat_conf) # diff --git a/topology/test/test-capture-ssp.m4 b/topology/test/test-capture-ssp.m4 index 8950222..3d10d7a 100644 --- a/topology/test/test-capture-ssp.m4 +++ b/topology/test/test-capture-ssp.m4 @@ -53,7 +53,7 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-capture.m4, # capture DAI is SSP TEST_SSP_PORT 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, TEST_SSP_PORT, + 2, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, PIPELINE_SINK_2, 2, TEST_SSP_FORMAT, 48, 1000, 0, 0) diff --git a/topology/test/test-playback-ssp.m4 b/topology/test/test-playback-ssp.m4 index db6cb6c..ab775a4 100644 --- a/topology/test/test-playback-ssp.m4 +++ b/topology/test/test-playback-ssp.m4 @@ -53,7 +53,7 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-playback.m4, # playback DAI is SSP TEST_SSP_PORT 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, TEST_SSP_PORT, + 1, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, PIPELINE_SOURCE_1, 2, TEST_SSP_FORMAT, 48, 1000, 0, 0) diff --git a/topology/test/test-ssp.m4 b/topology/test/test-ssp.m4 index 01e3a02..fa5fd29 100644 --- a/topology/test/test-ssp.m4 +++ b/topology/test/test-ssp.m4 @@ -64,14 +64,14 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-capture.m4, # playback DAI is SSP TEST_SSP_PORT 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, TEST_SSP_PORT, + 1, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, PIPELINE_SOURCE_1, 2, TEST_SSP_FORMAT, 48, 1000, 0, 0) # capture DAI is SSP TEST_SSP_PORT 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, TEST_SSP_PORT, + 2, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, PIPELINE_SINK_2, 2, TEST_SSP_FORMAT, 48, 1000, 0, 0) diff --git a/topology/test/test-tone-playback-ssp.m4 b/topology/test/test-tone-playback-ssp.m4 index 9231316..7cf1ed5 100644 --- a/topology/test/test-tone-playback-ssp.m4 +++ b/topology/test/test-tone-playback-ssp.m4 @@ -45,7 +45,7 @@ PIPELINE_ADD(sof/pipe-tone.m4, # playback DAI is SSP2 using 2 periods # Buffers use TEST_SSP_FORMAT format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 5, SSP, TEST_SSP_PORT, + 5, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, PIPELINE_SOURCE_5, 2, TEST_SSP_FORMAT, 48, 1000, 2, 0) -- 2.14.1

2 6

[Sound-open-firmware] [PATCH] host: Stop dma when pause
by Xiuli Pan 15 Mar '18

15 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> For gw-dma host, we need to stop the dma to make sure status are correct for resume. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 and GP-MRB nocodec SOF 1.1-stable: aa09938fd330232b201f5683faf8e32975ffcfac SOF-Tool 1.1-stable: 8d9b8d51f9c60e1c1725e9ccd3da22c0b523d0cf https://github.com/plbossart/sound/tree/topic/sof-v4.14: 84ed2d3ba0220424dd441f3a28ed2fe83967ad3a --- src/audio/host.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/audio/host.c b/src/audio/host.c index 287c886..744ca02 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -465,6 +465,9 @@ 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.7.4

6 5

[Sound-open-firmware] [PATCH] apl-ssp: fix capture double speed issue
by Keyon Jie 15 Mar '18

15 Mar '18

Previously TFT and RFT are set to 0s which means we are using threshold level 1, where interrupt asserts for every valid bits of each slot(e.g. for s16_le capture, interrupts assert for each 16 bits), but DMAC will treat it as notification of one full sample(e.g. 32 bits for s16_le stereo) and read those all bits, this will lead to capture with double speed at format s16_le stereo. Here add handle for FIFO trigger Threshold level, set them to bytes for each full sample(active_slots * valid_bits / 8), and the issue is fixed. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/drivers/apl-ssp.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 1ee107c..ecf70fb 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -43,6 +43,19 @@ #define trace_ssp_error(__e) trace_error(TRACE_CLASS_SSP, __e) #define tracev_ssp(__e) tracev_event(TRACE_CLASS_SSP, __e) +/* FIXME: move this to a helper and optimize */ +static int hweight_32(uint32_t mask) +{ + int i; + int count = 0; + + for (i = 0; i < 32; i++) { + count += mask & 1; + mask >>= 1; + } + return count; +} + /* save SSP context prior to entering D3 */ static int ssp_context_store(struct dai *dai) { @@ -96,6 +109,9 @@ static inline int ssp_set_config(struct dai *dai, uint32_t dummy_stop; uint32_t frame_len = 0; uint32_t bdiv_min; + uint32_t active_tx_slots = 2; + uint32_t active_rx_slots = 2; + bool inverted_frame = false; int ret = 0; @@ -353,6 +369,9 @@ static inline int ssp_set_config(struct dai *dai, sspsp |= SSPSP_SFRMP(!inverted_frame); sspsp |= SSPSP_FSRT; + active_tx_slots = hweight_32(config->tx_slot_mask); + active_rx_slots = hweight_32(config->rx_slot_mask); + break; case SOF_DAI_FMT_DSP_B: @@ -371,6 +390,9 @@ static inline int ssp_set_config(struct dai *dai, */ sspsp |= SSPSP_SFRMP(!inverted_frame); + active_tx_slots = hweight_32(config->tx_slot_mask); + active_rx_slots = hweight_32(config->rx_slot_mask); + break; default: trace_ssp_error("eca"); @@ -408,6 +430,9 @@ static inline int ssp_set_config(struct dai *dai, /* bypass divider for MCLK */ mdivr = 0x00000fff; + sscr3 |= SSCR3_TX(active_tx_slots * config->sample_valid_bits / 8) | + SSCR3_RX(active_rx_slots * config->sample_valid_bits / 8); + trace_ssp("coe"); ssp_write(dai, SSCR0, sscr0); ssp_write(dai, SSCR1, sscr1); -- 2.14.1

3 6

[Sound-open-firmware] [PATCH 1/2] interrupt: apollolake: fix the software interrupt macro num gap
by Keyon Jie 14 Mar '18

14 Mar '18

We add SOFTWARE1 and remove SOFTWARE10 to fix the gap, and change the corresponding calling. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/platform/apollolake/include/platform/interrupt.h | 18 +++++++++--------- src/platform/apollolake/include/platform/platform.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/platform/apollolake/include/platform/interrupt.h b/src/platform/apollolake/include/platform/interrupt.h index 2fddea1..7c0208e 100644 --- a/src/platform/apollolake/include/platform/interrupt.h +++ b/src/platform/apollolake/include/platform/interrupt.h @@ -41,23 +41,23 @@ #define IRQ_NUM_SOFTWARE0 0 /* level 1 */ #define IRQ_NUM_TIMER1 1 /* level 1 */ #define IRQ_NUM_EXT_LEVEL1 2 /* level 1 */ -#define IRQ_NUM_SOFTWARE2 3 /* level 1 */ -#define IRQ_NUM_SOFTWARE3 4 /* level 2 */ +#define IRQ_NUM_SOFTWARE1 3 /* level 1 */ +#define IRQ_NUM_SOFTWARE2 4 /* level 2 */ #define IRQ_NUM_TIMER2 5 /* level 2 */ #define IRQ_NUM_EXT_LEVEL2 6 /* level 2 */ -#define IRQ_NUM_SOFTWARE4 7 /* level 2 */ -#define IRQ_NUM_SOFTWARE5 8 /* level 3 */ +#define IRQ_NUM_SOFTWARE3 7 /* level 2 */ +#define IRQ_NUM_SOFTWARE4 8 /* level 3 */ #define IRQ_NUM_TIMER3 9 /* level 3 */ #define IRQ_NUM_EXT_LEVEL3 10 /* level 3 */ -#define IRQ_NUM_SOFTWARE6 11 /* level 3 */ -#define IRQ_NUM_SOFTWARE7 12 /* level 4 */ +#define IRQ_NUM_SOFTWARE5 11 /* level 3 */ +#define IRQ_NUM_SOFTWARE6 12 /* level 4 */ #define IRQ_NUM_EXT_LEVEL4 13 /* level 4 */ -#define IRQ_NUM_SOFTWARE8 14 /* level 4 */ -#define IRQ_NUM_SOFTWARE9 15 /* level 5 */ +#define IRQ_NUM_SOFTWARE7 14 /* level 4 */ +#define IRQ_NUM_SOFTWARE8 15 /* level 5 */ #define IRQ_NUM_EXT_LEVEL5 16 /* level 5 */ #define IRQ_NUM_EXT_LEVEL6 17 /* level 5 */ #define IRQ_NUM_EXT_LEVEL7 18 /* level 5 */ -#define IRQ_NUM_SOFTWARE10 19 /* level 5 */ +#define IRQ_NUM_SOFTWARE9 19 /* level 5 */ #define IRQ_NUM_NMI 20 /* level 7 */ /* IRQ Level 2 bits */ diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index 8a84308..c21179c 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -46,11 +46,11 @@ struct reef; #define PLATFORM_IPC_INTERUPT IRQ_EXT_IPC_LVL2(0) /* pipeline IRQ */ -#define PLATFORM_SCHEDULE_IRQ IRQ_NUM_SOFTWARE5 +#define PLATFORM_SCHEDULE_IRQ IRQ_NUM_SOFTWARE4 -#define PLATFORM_IRQ_TASK_HIGH IRQ_NUM_SOFTWARE4 -#define PLATFORM_IRQ_TASK_MED IRQ_NUM_SOFTWARE3 -#define PLATFORM_IRQ_TASK_LOW IRQ_NUM_SOFTWARE2 +#define PLATFORM_IRQ_TASK_HIGH IRQ_NUM_SOFTWARE3 +#define PLATFORM_IRQ_TASK_MED IRQ_NUM_SOFTWARE2 +#define PLATFORM_IRQ_TASK_LOW IRQ_NUM_SOFTWARE1 #define PLATFORM_SCHEDULE_COST 200 -- 2.14.1

2 2

[Sound-open-firmware] [RFC PATCH v2 0/5] APL/CNL: Enable DMA trace on APL/CNL.
by yan.wang＠linux.intel.com 14 Mar '18

14 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> This patch set is only for initial review and trying. It can work fine on my CNL platform. I also tested on BYT MB, It doesn't cause regression. Yan Wang (5): APL/CNL: Add stream_tag variable for saving parameter from kernel driver. APL/CNL: Implement host DMA copy in existed DMA copy API. APL/CNL: Save stream tag and host buffer size from kernel driver. APL/CNL: Implement host DMA setting and position update on APL/CNL. APL/CNL: Initialize DMA trace data structure and definition on APL/CNL. src/include/reef/dma-trace.h | 1 + src/include/reef/dma.h | 2 + src/include/uapi/ipc.h | 1 + src/ipc/dma-copy.c | 44 ++++++++++++- src/ipc/intel-ipc.c | 8 ++- src/lib/dma-trace.c | 77 ++++++++++++++++++++++ .../apollolake/include/platform/platform.h | 2 +- src/platform/apollolake/platform.c | 3 + .../cannonlake/include/platform/platform.h | 2 +- src/platform/cannonlake/platform.c | 3 + 10 files changed, 139 insertions(+), 4 deletions(-) -- 2.14.3

2 6

[Sound-open-firmware] [PATCH] dw-dma: Fix channel status
by Xiuli Pan 14 Mar '18

14 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> At the end of the DMA, we need to set the channel status into parapre, otherwise next dma start will fail. This will fix APL pause resume issues. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> -- Test with: Mininow max rt5651 and GP-MRB nocodec SOF master: 728f1ff3e32e14e19847ba513f8b0e3af80762c0 SOF-Tool master: 5b5bbe31e6d914079707bfa6c129c2730ea7aeff https://github.com/plbossart/sound/tree/topic/sof-v4.14: fe5e29155127a717ba5ae454b4bdde99afa67723 --- src/drivers/dw-dma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index f6f776a..ff0f74a 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -953,6 +953,7 @@ static void dw_dma_irq_handler(void *data) trace_dma("LSo"); /* disable channel, finished */ dw_write(dma, DW_DMA_CHAN_EN, CHAN_DISABLE(i)); + p->chan[i].status = COMP_STATE_PREPARE; } } #endif -- 2.7.4

3 3

[Sound-open-firmware] [PATCH 0/5][RFC] APL/CNL: Enable DMA trace on APL/CNL.
by yan.wang＠linux.intel.com 14 Mar '18

14 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> This patch set is only for initial review and trying. It can work fine on my CNL platform. I also tested on BYT MB, It doesn't cause regression. Yan Wang (5): SOF: APL/CNL: Add stream_tag variable for saving parameter from kernel driver. Implement host DMA copy in existed DMA copy API. SOF: APL/CNL: Save stream tag and host buffer size from kernel driver. SOF: APL/CNL: Implement host DMA setting and position update on APL/CNL. SOF: APL/CNL: Initialize DMA trace data structure on APL/CNL. src/include/reef/dma-trace.h | 1 + src/include/reef/dma.h | 4 +++ src/include/uapi/ipc.h | 1 + src/ipc/dma-copy.c | 40 ++++++++++++++++++++- src/ipc/intel-ipc.c | 8 ++++- src/lib/dma-trace.c | 73 ++++++++++++++++++++++++++++++++++++++ src/platform/apollolake/platform.c | 3 ++ src/platform/cannonlake/platform.c | 3 ++ 8 files changed, 131 insertions(+), 2 deletions(-) -- 2.14.3

3 9

[Sound-open-firmware] [PATCH_V3 2/2] cnl: dma: refine dma interrupt processing on cnl
by Rander Wang 13 Mar '18

13 Mar '18

On cnl, all the dma share the same interrupt pin, so all the dma controller need to be checked in interrupt function. --- V3:make it work only on CNL Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- src/drivers/dw-dma.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index 7659bec..33b5e5f 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1138,6 +1138,28 @@ static void dw_dma_irq_handler(void *data) } } +#if defined CONFIG_CANNONLAKE +/*All the dma share the same interrupt on CNL, so check each dma*/ +/*controller when interrupt coming, then do the work */ +static void dw_dma_irq_cnl(void *data) +{ + struct dma *dma; + uint32_t status_intr; + + /*check interrupt status of DMA controller 0*/ + dma = dma_get(DMA_GP_LP_DMAC0); + status_intr = dw_read(dma, DW_INTR_STATUS); + if (status_intr) + dw_dma_irq_handler(dma); + + /*check interrupt status of DMA controller 1*/ + dma = dma_get(DMA_GP_LP_DMAC1); + status_intr = dw_read(dma, DW_INTR_STATUS); + if (status_intr) + dw_dma_irq_handler(dma); +} +#endif + static int dw_dma_probe(struct dma *dma) { struct dma_pdata *dw_pdata; @@ -1160,7 +1182,11 @@ static int dw_dma_probe(struct dma *dma) } /* register our IRQ handler */ +#if defined CONFIG_CANNONLAKE + interrupt_register(dma_irq(dma), dw_dma_irq_cnl, dma); +#else interrupt_register(dma_irq(dma), dw_dma_irq_handler, dma); +#endif interrupt_enable(dma_irq(dma)); return 0; -- 2.14.1

2 2

[Sound-open-firmware] [PATCH_V4] cnl: dma: refine dma interrupt processing on cnl
by Rander Wang 13 Mar '18

13 Mar '18

On cnl, all the dma share the same interrupt pin, so all the dma controller need to be checked in interrupt function. --- V4: refine code style Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- src/drivers/dw-dma.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index 7659bec..690dafc 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1032,7 +1032,7 @@ static int dw_dma_probe(struct dma *dma) #else /* this will probably be called at the end of every period copied */ -static void dw_dma_irq_handler(void *data) +static void dma_irq_handler(void *data) { struct dma *dma = (struct dma *)data; struct dma_pdata *p = dma_get_drvdata(dma); @@ -1138,6 +1138,33 @@ static void dw_dma_irq_handler(void *data) } } +#if defined CONFIG_CANNONLAKE +/*All the dma share the same interrupt on CNL, so check each dma*/ +/*controller when interrupt coming, then do the work */ +static void dw_dma_irq_handler(void *data) +{ + struct dma *dma; + uint32_t status_intr; + + /*check interrupt status of DMA controller 0*/ + dma = dma_get(DMA_GP_LP_DMAC0); + status_intr = dw_read(dma, DW_INTR_STATUS); + if (status_intr) + dma_irq_handler(dma); + + /*check interrupt status of DMA controller 1*/ + dma = dma_get(DMA_GP_LP_DMAC1); + status_intr = dw_read(dma, DW_INTR_STATUS); + if (status_intr) + dma_irq_handler(dma); +} +#else +static void dw_dma_irq_handler(void *data) +{ + dma_irq_handler(data); +} +#endif + static int dw_dma_probe(struct dma *dma) { struct dma_pdata *dw_pdata; -- 2.14.1

4 3

[Sound-open-firmware] [PATCH] volume: fix volume underflows
by Ranjani Sridharan 13 Mar '18

13 Mar '18

This patch fixes the bug with volume ramp down which causes volume to underflow causing unspecified behaviour. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/volume.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index 51a5826..0620e18 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -307,7 +307,7 @@ static uint64_t vol_work(void *data, uint64_t delay) struct comp_data *cd = comp_get_drvdata(dev); uint32_t vol; int again = 0; - int i; + int i, new_vol; /* inc/dec each volume if it's not at target */ for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) { @@ -332,14 +332,19 @@ static uint64_t vol_work(void *data, uint64_t delay) } } else { /* ramp down */ - vol -= VOL_RAMP_STEP; - - /* ramp completed ? */ - if (vol <= cd->tvolume[i] || vol <= VOL_MIN) + new_vol = vol - VOL_RAMP_STEP; + if (new_vol <= 0) { + /* cannot ramp down below 0 */ vol_update(cd, i); - else { - cd->volume[i] = vol; - again = 1; + } else { + /* ramp completed ? */ + if (new_vol <= cd->tvolume[i] || + new_vol <= VOL_MIN) { + vol_update(cd, i); + } else { + cd->volume[i] = new_vol; + again = 1; + } } } -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] library: fix host library build errors
by Ranjani Sridharan 13 Mar '18

13 Mar '18

This patch fixes the errors in host library compilation. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/Makefile.am | 2 +- src/library/include/platform/memory.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index ae58289..40e3779 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -31,7 +31,7 @@ SOF_SRC = \ SRC_SRC = \ src.c \ - src_core.c + src_generic.c EQ_FIR_SRC = \ eq_fir.c \ diff --git a/src/library/include/platform/memory.h b/src/library/include/platform/memory.h index 78541e7..ed7de10 100644 --- a/src/library/include/platform/memory.h +++ b/src/library/include/platform/memory.h @@ -38,6 +38,8 @@ #endif #define HEAP_BUFFER_SIZE (1024 * 128) +#define PLATFORM_HEAP_RUNTIME 1 +#define PLATFORM_HEAP_BUFFER 3 #if 0 /* physical DSP addresses */ -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] Use trace verbose intead of trace.
by yan.wang＠linux.intel.com 12 Mar '18

12 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> Too many trace will cause local trace buffer overflow. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/audio/host.c | 2 +- src/audio/tone.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio/host.c b/src/audio/host.c index 7a7c153..287c886 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -845,7 +845,7 @@ static int host_copy(struct comp_dev *dev) struct host_data *hd = comp_get_drvdata(dev); struct dma_sg_elem *local_elem; - trace_host("cpy"); + tracev_host("cpy"); if (dev->state != COMP_STATE_ACTIVE) return 0; diff --git a/src/audio/tone.c b/src/audio/tone.c index 5308af0..e4e9892 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -598,7 +598,7 @@ static int tone_copy(struct comp_dev * dev) struct comp_buffer *sink; struct comp_data *cd = comp_get_drvdata(dev); - trace_comp("cpy"); + tracev_comp("cpy"); /* tone component sink buffer */ sink = list_first_item(&dev->bsink_list, struct comp_buffer, -- 2.14.3

2 1

[Sound-open-firmware] [PATCH 1/2] interrupt: apollolake: cleanup interrupt mask
by Keyon Jie 12 Mar '18

12 Mar '18

We don't have SOFTWARE1 interrupt on apollolake, but have SOFTWARE10, here correct it. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/platform/apollolake/include/platform/interrupt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/apollolake/include/platform/interrupt.h b/src/platform/apollolake/include/platform/interrupt.h index 2fddea1..5c63da8 100644 --- a/src/platform/apollolake/include/platform/interrupt.h +++ b/src/platform/apollolake/include/platform/interrupt.h @@ -144,7 +144,6 @@ #define IRQ_MASK_SOFTWARE0 (1 << IRQ_NUM_SOFTWARE0) #define IRQ_MASK_TIMER1 (1 << IRQ_NUM_TIMER1) #define IRQ_MASK_EXT_LEVEL1 (1 << IRQ_NUM_EXT_LEVEL1) -#define IRQ_MASK_SOFTWARE1 (1 << IRQ_NUM_SOFTWARE1) #define IRQ_MASK_SOFTWARE2 (1 << IRQ_NUM_SOFTWARE2) #define IRQ_MASK_TIMER2 (1 << IRQ_NUM_TIMER2) #define IRQ_MASK_EXT_LEVEL2 (1 << IRQ_NUM_EXT_LEVEL2) @@ -161,6 +160,7 @@ #define IRQ_MASK_EXT_LEVEL6 (1 << IRQ_NUM_EXT_LEVEL6) #define IRQ_MASK_EXT_LEVEL7 (1 << IRQ_NUM_EXT_LEVEL7) #define IRQ_MASK_SOFTWARE9 (1 << IRQ_NUM_SOFTWARE9) +#define IRQ_MASK_SOFTWARE10 (1 << IRQ_NUM_SOFTWARE10) void platform_interrupt_init(void); -- 2.14.1

3 3

[Sound-open-firmware] [PATCH] timer: remove TIMER_AUDIO macro
by Liam Girdwood 12 Mar '18

12 Mar '18

Not used anywhere so delete it. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/apollolake/include/platform/timer.h | 2 -- src/platform/baytrail/include/platform/timer.h | 2 -- src/platform/cannonlake/include/platform/timer.h | 2 -- src/platform/haswell/include/platform/timer.h | 2 -- 4 files changed, 8 deletions(-) diff --git a/src/platform/apollolake/include/platform/timer.h b/src/platform/apollolake/include/platform/timer.h index 7609324..de7fa8b 100644 --- a/src/platform/apollolake/include/platform/timer.h +++ b/src/platform/apollolake/include/platform/timer.h @@ -45,8 +45,6 @@ #define TIMER3 IRQ_EXT_TSTAMP0_LVL2(0) #define TIMER4 IRQ_EXT_TSTAMP1_LVL2(0) -#define TIMER_AUDIO TIMER3 - struct comp_dev; struct sof_ipc_stream_posn; diff --git a/src/platform/baytrail/include/platform/timer.h b/src/platform/baytrail/include/platform/timer.h index 8f0aea4..a603f38 100644 --- a/src/platform/baytrail/include/platform/timer.h +++ b/src/platform/baytrail/include/platform/timer.h @@ -44,8 +44,6 @@ #define TIMER2 IRQ_NUM_TIMER3 #define TIMER3 IRQ_NUM_EXT_TIMER -#define TIMER_AUDIO TIMER3 - struct comp_dev; struct sof_ipc_stream_posn; diff --git a/src/platform/cannonlake/include/platform/timer.h b/src/platform/cannonlake/include/platform/timer.h index e00746d..a072f45 100644 --- a/src/platform/cannonlake/include/platform/timer.h +++ b/src/platform/cannonlake/include/platform/timer.h @@ -46,8 +46,6 @@ #define TIMER3 IRQ_EXT_TSTAMP0_LVL2(0) #define TIMER4 IRQ_EXT_TSTAMP1_LVL2(0) -#define TIMER_AUDIO TIMER3 - struct comp_dev; struct sof_ipc_stream_posn; diff --git a/src/platform/haswell/include/platform/timer.h b/src/platform/haswell/include/platform/timer.h index 0aa3ed2..690d6c6 100644 --- a/src/platform/haswell/include/platform/timer.h +++ b/src/platform/haswell/include/platform/timer.h @@ -43,8 +43,6 @@ #define TIMER1 IRQ_NUM_TIMER2 #define TIMER2 IRQ_NUM_TIMER3 -#define TIMER_AUDIO TIMER0 - struct comp_dev; struct sof_ipc_stream_posn; -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] hsw: timer: Use timer 1 for generic workqueue.
by Liam Girdwood 12 Mar '18

12 Mar '18

Timer 1 is the correct priority. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/haswell/platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index 95d80f8..f84d6e3 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -117,8 +117,8 @@ static const struct sof_ipc_window sram_window = { static struct work_queue_timesource platform_generic_queue = { .timer = { - .id = TIMER2, /* external timer using SSP */ - .irq = IRQ_NUM_TIMER3, + .id = TIMER1, /* internal timer */ + .irq = IRQ_NUM_TIMER2, }, .clk = CLK_CPU, .notifier = NOTIFIER_ID_CPU_FREQ, -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] hsw: timer: HSW/BDW use DSP core timers and have no ext timer.
by Liam Girdwood 12 Mar '18

12 Mar '18

HSW/BDW both use internal core DSP timers and dont have any external timer. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/haswell/timer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/platform/haswell/timer.c b/src/platform/haswell/timer.c index bb74330..464b332 100644 --- a/src/platform/haswell/timer.c +++ b/src/platform/haswell/timer.c @@ -37,24 +37,27 @@ void platform_timer_start(struct timer *timer) { + arch_timer_enable(timer); } void platform_timer_stop(struct timer *timer) { + arch_timer_disable(timer); } int platform_timer_set(struct timer *timer, uint64_t ticks) { - return 0; + return arch_timer_set(timer, ticks); } void platform_timer_clear(struct timer *timer) { + arch_timer_clear(timer); } uint64_t platform_timer_get(struct timer *timer) { - return 0; + return arch_timer_get_system(timer); } /* get timestamp for host stream DMA position */ -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] volume: fix bug pertaining to volume ramp down
by Ranjani Sridharan 12 Mar '18

12 Mar '18

This patch fixes the bug in the check for terminating the volume ramp down. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index 45a343e..51a5826 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -335,7 +335,7 @@ static uint64_t vol_work(void *data, uint64_t delay) vol -= VOL_RAMP_STEP; /* ramp completed ? */ - if (vol <= cd->tvolume[i] || vol >= VOL_MAX) + if (vol <= cd->tvolume[i] || vol <= VOL_MIN) vol_update(cd, i); else { cd->volume[i] = vol; -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] apl-ssp: fix for I2S/DSP_A/DSP_B/LEFT_J modes
by Keyon Jie 10 Mar '18

10 Mar '18

Clean up SSPSP bits to make SSP output follow ALSA ASoC definition of all I2S/DSP_A/DSP_B/LEFT_J modes. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/drivers/apl-ssp.c | 88 ++++++++++++++++++++++++++++++++++++++------------ src/include/reef/ssp.h | 3 ++ 2 files changed, 71 insertions(+), 20 deletions(-) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index c32bd35..42ffd03 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -93,7 +93,9 @@ static inline int ssp_set_config(struct dai *dai, uint32_t i2s_n; uint32_t data_size; uint32_t start_delay; + uint32_t dummy_stop; uint32_t frame_len = 0; + uint32_t bdiv_min; bool inverted_frame = false; int ret = 0; @@ -265,8 +267,7 @@ static inline int ssp_set_config(struct dai *dai, /* must be enouch BCLKs for data */ bdiv = config->bclk / config->fclk; - if (bdiv < config->sample_container_bits * - ((config->rx_slot_mask + 1) / 2)) { + if (bdiv < config->sample_container_bits * config->num_slots) { trace_ssp_error("ec8"); ret = -EINVAL; goto out; @@ -283,16 +284,27 @@ static inline int ssp_set_config(struct dai *dai, switch (config->format & SOF_DAI_FMT_FORMAT_MASK) { case SOF_DAI_FMT_I2S: - start_delay = config->sample_container_bits > - config->sample_valid_bits ? 1 : 0; + start_delay = 1; sscr0 |= SSCR0_FRDC(config->num_slots); - /* set asserted frame length */ - frame_len = config->sample_container_bits; + if (bdiv % 2) { + trace_ssp_error("eca"); + ret = -EINVAL; + goto out; + } - /* handle frame polarity, I2S default is falling/active low */ - sspsp |= SSPSP_SFRMP(!inverted_frame); + /* set asserted frame length to half frame length */ + frame_len = bdiv / 2; + + /* + * handle frame polarity, I2S default is falling/active low, + * non-inverted(inverted_frame=0) -- active low(SFRMP=0), + * inverted(inverted_frame=1) -- rising/active high(SFRMP=1), + * so, we should set SFRMP to inverted_frame. + */ + sspsp |= SSPSP_SFRMP(inverted_frame); + sspsp |= SSPSP_FSRT; break; @@ -305,25 +317,41 @@ static inline int ssp_set_config(struct dai *dai, /* LJDFD enable */ sscr2 &= ~SSCR2_LJDFD; - /* set asserted frame length */ - frame_len = config->sample_container_bits; + if (bdiv % 2) { + trace_ssp_error("ecb"); + ret = -EINVAL; + goto out; + } - /* LEFT_J default is rising/active high, opposite of I2S */ - sspsp |= SSPSP_SFRMP(inverted_frame); + /* set asserted frame length to half frame length */ + frame_len = bdiv / 2; + + /* + * handle frame polarity, LEFT_J default is rising/active high, + * non-inverted(inverted_frame=0) -- active high(SFRMP=1), + * inverted(inverted_frame=1) -- falling/active low(SFRMP=0), + * so, we should set SFRMP to !inverted_frame. + */ + sspsp |= SSPSP_SFRMP(!inverted_frame); break; case SOF_DAI_FMT_DSP_A: - start_delay = config->sample_container_bits > - config->sample_valid_bits ? 1 : 0; + start_delay = 1; sscr0 |= SSCR0_MOD | SSCR0_FRDC(config->num_slots); /* set asserted frame length */ - frame_len = config->sample_container_bits; + frame_len = 1; - /* handle frame polarity, DSP_A default is rising/active high */ - sspsp |= SSPSP_SFRMP(inverted_frame); + /* + * handle frame polarity, DSP_A default is rising/active high, + * non-inverted(inverted_frame=0) -- active high(SFRMP=1), + * inverted(inverted_frame=1) -- falling/active low(SFRMP=0), + * so, we should set SFRMP to !inverted_frame. + */ + sspsp |= SSPSP_SFRMP(!inverted_frame); + sspsp |= SSPSP_FSRT; break; case SOF_DAI_FMT_DSP_B: @@ -335,9 +363,13 @@ static inline int ssp_set_config(struct dai *dai, /* set asserted frame length */ frame_len = 1; - /* handle frame polarity, DSP_A default is rising/active high */ + /* + * handle frame polarity, DSP_B default is rising/active high, + * non-inverted(inverted_frame=0) -- active high(SFRMP=1), + * inverted(inverted_frame=1) -- falling/active low(SFRMP=0), + * so, we should set SFRMP to !inverted_frame. + */ sspsp |= SSPSP_SFRMP(!inverted_frame); - sspsp |= SSPSP_FSRT; break; default: @@ -346,9 +378,25 @@ static inline int ssp_set_config(struct dai *dai, goto out; } - sspsp |= SSPSP_DMYSTRT(start_delay); + sspsp |= SSPSP_STRTDLY(start_delay); sspsp |= SSPSP_SFRMWDTH(frame_len); + /* + * [dummy_start][valid_bits_slot[0...n-1]][dummy_stop], + * but don't count dummy_start for dummy_stop calculation. + */ + bdiv_min = config->num_slots * config->sample_valid_bits; + if (bdiv < bdiv_min) { + trace_ssp_error("ecc"); + ret = -EINVAL; + goto out; + } + + dummy_stop = bdiv - bdiv_min; + sspsp |= SSPSP_DMYSTOP(SSPSP_DMYSTOP_MASK & dummy_stop); + sspsp |= SSPSP_EDMYSTOP(SSPSP_EDMYSTOP_MASK & + (dummy_stop >> SSPSP_DMYSTOP_BITS)); + data_size = config->sample_valid_bits; if (data_size > 16) diff --git a/src/include/reef/ssp.h b/src/include/reef/ssp.h index e041121..453aaab 100644 --- a/src/include/reef/ssp.h +++ b/src/include/reef/ssp.h @@ -160,10 +160,13 @@ extern const struct dai_ops ssp_ops; #define SSPSP_SFRMDLY(x) ((x) << 9) #define SSPSP_SFRMWDTH(x) ((x) << 16) #define SSPSP_DMYSTOP(x) ((x) << 23) +#define SSPSP_DMYSTOP_BITS 2 +#define SSPSP_DMYSTOP_MASK ((0x1 << SSPSP_DMYSTOP_BITS) - 1) #define SSPSP_FSRT (1 << 25) #if defined CONFIG_APOLLOLAKE || defined CONFIG_CANNONLAKE #define SSPSP_EDMYSTOP(x) ((x) << 26) +#define SSPSP_EDMYSTOP_MASK 0x7 #define SSTSS 0x38 #define SSCR2 0x40 #define SSPSP2 0x44 -- 2.14.1

4 3

[Sound-open-firmware] [PATCH_V2 2/2] cnl: dma: refine dma interrupt processing on cnl
by Rander Wang 09 Mar '18

09 Mar '18

On cnl, all the dma share the same interrupt pin, so all the dma controller need to be checked in interrupt function. --- V2: rebase on master Tested with: SOF master kernel:pierre V4.14 branch Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- src/drivers/dw-dma.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index ccefc50..3d92b21 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1138,6 +1138,26 @@ static void dw_dma_irq_handler(void *data) } } +/*All the dma share the same interrupt on CNL, so check each dma*/ +/*controller when interrupt coming, then do the work */ +static void dw_dma_irq_cnl(void *data) +{ + struct dma *dma; + uint32_t status_intr; + + /*check interrupt status of DMA controller 0*/ + dma = dma_get(DMA_GP_LP_DMAC0); + status_intr = dw_read(dma, DW_INTR_STATUS); + if (status_intr) + dw_dma_irq_handler(dma); + + /*check interrupt status of DMA controller 1*/ + dma = dma_get(DMA_GP_LP_DMAC1); + status_intr = dw_read(dma, DW_INTR_STATUS); + if (status_intr) + dw_dma_irq_handler(dma); +} + static int dw_dma_probe(struct dma *dma) { struct dma_pdata *dw_pdata; @@ -1160,7 +1180,11 @@ static int dw_dma_probe(struct dma *dma) } /* register our IRQ handler */ +#if defined CONFIG_CANNONLAKE + interrupt_register(dma_irq(dma), dw_dma_irq_cnl, dma); +#else interrupt_register(dma_irq(dma), dw_dma_irq_handler, dma); +#endif interrupt_enable(dma_irq(dma)); return 0; -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] ssp: fix inverted_frame handling for BYT and APL/CNL
by Pierre-Louis Bossart 09 Mar '18

09 Mar '18

inverted_frame variable should only be set in the _IF cases Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- This should apply on top of Keyon's APL/CNL fixes src/drivers/apl-ssp.c | 2 +- src/drivers/ssp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 42ffd03..1ee107c 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -196,6 +196,7 @@ static inline int ssp_set_config(struct dai *dai, case SOF_DAI_FMT_NB_NF: break; case SOF_DAI_FMT_NB_IF: + inverted_frame = true; /* handled later with format */ break; case SOF_DAI_FMT_IB_IF: sspsp |= SSPSP_SCMODE(2); @@ -203,7 +204,6 @@ static inline int ssp_set_config(struct dai *dai, break; case SOF_DAI_FMT_IB_NF: sspsp |= SSPSP_SCMODE(2); - inverted_frame = true; /* handled later with format */ break; default: trace_ssp_error("ec3"); diff --git a/src/drivers/ssp.c b/src/drivers/ssp.c index 4b195ec..827a4d8 100644 --- a/src/drivers/ssp.c +++ b/src/drivers/ssp.c @@ -223,6 +223,7 @@ static inline int ssp_set_config(struct dai *dai, case SOF_DAI_FMT_NB_NF: break; case SOF_DAI_FMT_NB_IF: + inverted_frame = true; /* handled later with format */ break; case SOF_DAI_FMT_IB_IF: sspsp |= SSPSP_SCMODE(2); @@ -230,7 +231,6 @@ static inline int ssp_set_config(struct dai *dai, break; case SOF_DAI_FMT_IB_NF: sspsp |= SSPSP_SCMODE(2); - inverted_frame = true; /* handled later with format */ break; default: trace_ssp_error("ec3"); -- 2.14.1

1 0

[Sound-open-firmware] [PATCH 1/6] SRC: Files structure change and add Xtensa optimized versions
by Seppo Ingalsuo 09 Mar '18

09 Mar '18

This patch moves generic common code to src.c/h from src_core.c/h and places generic C optimized filter to src_generic.c. The HiFi EP version is in src_hifi2ep.c and HiFi3 version is in src_hifi3.c. Use of the Xtensa optimized versions require xt-xcc compiler. The non-used SRC in/out rates query code is removed. The 24 bit coefficients were replaced by 32 bit coefficients those are compatible with Xtensa fractional integer types. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/Makefile.am | 4 +- src/audio/src.c | 346 ++++++++++++++++++-- src/audio/{src_core.h => src.h} | 17 +- src/audio/src_config.h | 57 +++- src/audio/src_core.c | 676 ---------------------------------------- src/audio/src_generic.c | 435 ++++++++++++++++++++++++++ src/audio/src_hifi2ep.c | 562 +++++++++++++++++++++++++++++++++ src/audio/src_hifi3.c | 567 +++++++++++++++++++++++++++++++++ 8 files changed, 1938 insertions(+), 726 deletions(-) rename src/audio/{src_core.h => src.h} (93%) delete mode 100644 src/audio/src_core.c create mode 100644 src/audio/src_generic.c create mode 100644 src/audio/src_hifi2ep.c create mode 100644 src/audio/src_hifi3.c diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index bccedbf..ae58289 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -1006,7 +1006,9 @@ libaudio_a_SOURCES = \ fir.c \ tone.c \ src.c \ - src_core.c \ + src_generic.c \ + src_hifi2ep.c \ + src_hifi3.c \ mixer.c \ mux.c \ volume.c \ diff --git a/src/audio/src.c b/src/audio/src.c index c7ac649..cca0cbc 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -43,7 +43,17 @@ #include <reef/audio/component.h> #include <reef/audio/pipeline.h> #include <uapi/ipc.h> -#include "src_core.h" + +#include "src_config.h" +#include "src.h" + +#if SRC_SHORT +#include <reef/audio/coefficients/src/src_tiny_int16_define.h> +#include <reef/audio/coefficients/src/src_tiny_int16_table.h> +#else +#include <reef/audio/coefficients/src/src_std_int32_define.h> +#include <reef/audio/coefficients/src/src_std_int32_table.h> +#endif #ifdef MODULE_TEST #include <stdio.h> @@ -53,6 +63,10 @@ #define tracev_src(__e) tracev_event(TRACE_CLASS_SRC, __e) #define trace_src_error(__e) trace_error(TRACE_CLASS_SRC, __e) +/* The FIR maximum lengths are per channel so need to multiply them */ +#define MAX_FIR_DELAY_SIZE_XNCH (PLATFORM_MAX_CHANNELS * MAX_FIR_DELAY_SIZE) +#define MAX_OUT_DELAY_SIZE_XNCH (PLATFORM_MAX_CHANNELS * MAX_OUT_DELAY_SIZE) + /* src component private data */ struct comp_data { struct polyphase_src src; @@ -63,14 +77,273 @@ struct comp_data { int32_t *sbuf_w_ptr; int32_t *sbuf_r_ptr; int sbuf_avail; - void (* src_func)(struct comp_dev *dev, + void (*src_func)(struct comp_dev *dev, struct comp_buffer *source, struct comp_buffer *sink, size_t *consumed, size_t *produced); - void (* polyphase_func)(struct src_stage_prm *s); + void (*polyphase_func)(struct src_stage_prm *s); }; +/* Calculate ceil() for integer division */ +int src_ceil_divide(int a, int b) +{ + int c; + + c = a / b; + if (c * b < a) + c++; + + return c; +} + +/* Calculates the needed FIR delay line length */ +static int src_fir_delay_length(struct src_stage *s) +{ + return s->subfilter_length + (s->num_of_subfilters - 1) * s->idm + + s->blk_in; +} + +/* Calculates the FIR output delay line length */ +static int src_out_delay_length(struct src_stage *s) +{ + return 1 + (s->num_of_subfilters - 1) * s->odm; +} + +/* Returns index of a matching sample rate */ +static int src_find_fs(int fs_list[], int list_length, int fs) +{ + int i; + + for (i = 0; i < list_length; i++) { + if (fs_list[i] == fs) + return i; + } + return -EINVAL; +} + +/* Calculates buffers to allocate for a SRC mode */ +int src_buffer_lengths(struct src_param *a, int fs_in, int fs_out, int nch, + int frames, int frames_is_for_source) +{ + struct src_stage *stage1; + struct src_stage *stage2; + int q; + int den; + int num; + int frames2; + + if (nch > PLATFORM_MAX_CHANNELS) { + trace_src_error("che"); + tracev_value(nch); + return -EINVAL; + } + + a->nch = nch; + a->idx_in = src_find_fs(src_in_fs, NUM_IN_FS, fs_in); + a->idx_out = src_find_fs(src_out_fs, NUM_OUT_FS, fs_out); + + /* Check that both in and out rates are supported */ + if (a->idx_in < 0 || a->idx_out < 0) { + trace_src_error("us1"); + tracev_value(fs_in); + tracev_value(fs_out); + return -EINVAL; + } + + stage1 = src_table1[a->idx_out][a->idx_in]; + stage2 = src_table2[a->idx_out][a->idx_in]; + + /* Check from stage1 parameter for a deleted in/out rate combination.*/ + if (stage1->filter_length < 1) { + trace_src_error("us2"); + tracev_value(fs_in); + tracev_value(fs_out); + return -EINVAL; + } + + a->fir_s1 = nch * src_fir_delay_length(stage1); + a->out_s1 = nch * src_out_delay_length(stage1); + + /* Find out how many additional times the SRC can be executed + * while having block size less or equal to max_frames. + */ + if (frames_is_for_source) { + /* Times that stage1 needs to run to input length of frames */ + a->stage1_times_max = src_ceil_divide(frames, stage1->blk_in); + q = frames / stage1->blk_in; + a->stage1_times = MAX(q, 1); + a->blk_in = a->stage1_times * stage1->blk_in; + + /* Times that stage2 needs to run */ + den = stage2->blk_in * stage1->blk_in; + num = frames * stage2->blk_out * stage1->blk_out; + frames2 = src_ceil_divide(num, den); + a->stage2_times_max = src_ceil_divide(frames2, stage2->blk_out); + q = frames2 / stage2->blk_out; + a->stage2_times = MAX(q, 1); + a->blk_out = a->stage2_times * stage2->blk_out; + } else { + /* Times that stage2 needs to run to output length of frames */ + a->stage2_times_max = src_ceil_divide(frames, stage2->blk_out); + q = frames / stage2->blk_out; + a->stage2_times = MAX(q, 1); + a->blk_out = a->stage2_times * stage2->blk_out; + + /* Times that stage1 needs to run */ + num = frames * stage2->blk_in * stage1->blk_in; + den = stage2->blk_out * stage1->blk_out; + frames2 = src_ceil_divide(num, den); + a->stage1_times_max = src_ceil_divide(frames2, stage1->blk_in); + q = frames2 / stage1->blk_in; + a->stage1_times = MAX(q, 1); + a->blk_in = a->stage1_times * stage1->blk_in; + } + + if (stage2->filter_length == 1) { + a->fir_s2 = 0; + a->out_s2 = 0; + a->stage2_times = 0; + a->stage2_times_max = 0; + a->sbuf_length = 0; + } else { + a->fir_s2 = nch * src_fir_delay_length(stage2); + a->out_s2 = nch * src_out_delay_length(stage2); + /* 2x is an empirically tested length. Since the sink buffer + * capability to receive samples varies a shorter stage 2 output + * block will create a peak in internal buffer usage. + */ + + /* TODO 1: Equation for needed length */ + a->sbuf_length = 2 * nch * stage1->blk_out + * a->stage1_times_max; + } + + a->src_multich = a->fir_s1 + a->fir_s2 + a->out_s1 + a->out_s2; + a->total = a->sbuf_length + a->src_multich; + + return 0; +} + +static void src_state_reset(struct src_state *state) +{ + state->fir_delay_size = 0; + state->out_delay_size = 0; +} + +static int init_stages(struct src_stage *stage1, struct src_stage *stage2, + struct polyphase_src *src, struct src_param *p, + int n, int32_t *delay_lines_start) +{ + /* Clear FIR state */ + src_state_reset(&src->state1); + src_state_reset(&src->state2); + + src->number_of_stages = n; + src->stage1 = stage1; + src->stage2 = stage2; + if (n == 1 && stage1->blk_out == 0) + return -EINVAL; + + /* Optimized SRC requires subfilter length multiple of 4 */ + if (stage1->filter_length > 1 && (stage1->subfilter_length & 0x3) > 0) + return -EINVAL; + + if (stage2->filter_length > 1 && (stage2->subfilter_length & 0x3) > 0) + return -EINVAL; + + /* Delay line sizes */ + src->state1.fir_delay_size = p->fir_s1; + src->state1.out_delay_size = p->out_s1; + src->state1.fir_delay = delay_lines_start; + src->state1.out_delay = + src->state1.fir_delay + src->state1.fir_delay_size; + /* Initialize to last ensures that circular wrap cannot happen + * mid-frame. The size is multiple of channels count. + */ + src->state1.fir_wp = &src->state1.fir_delay[p->fir_s1 - 1]; + src->state1.out_rp = src->state1.out_delay; + if (n > 1) { + src->state2.fir_delay_size = p->fir_s2; + src->state2.out_delay_size = p->out_s2; + src->state2.fir_delay = + src->state1.out_delay + src->state1.out_delay_size; + src->state2.out_delay = + src->state2.fir_delay + src->state2.fir_delay_size; + /* Initialize to last ensures that circular wrap cannot happen + * mid-frame. The size is multiple of channels count. + */ + src->state2.fir_wp = &src->state2.fir_delay[p->fir_s2 - 1]; + src->state2.out_rp = src->state2.out_delay; + } else { + src->state2.fir_delay_size = 0; + src->state2.out_delay_size = 0; + src->state2.fir_delay = NULL; + src->state2.out_delay = NULL; + } + + /* Check the sizes are less than MAX */ + if (src->state1.fir_delay_size > MAX_FIR_DELAY_SIZE_XNCH || + src->state1.out_delay_size > MAX_OUT_DELAY_SIZE_XNCH || + src->state2.fir_delay_size > MAX_FIR_DELAY_SIZE_XNCH || + src->state2.out_delay_size > MAX_OUT_DELAY_SIZE_XNCH) { + src->state1.fir_delay = NULL; + src->state1.out_delay = NULL; + src->state2.fir_delay = NULL; + src->state2.out_delay = NULL; + return -EINVAL; + } + + return 0; +} + +void src_polyphase_reset(struct polyphase_src *src) +{ + src->number_of_stages = 0; + src->stage1 = NULL; + src->stage2 = NULL; + src_state_reset(&src->state1); + src_state_reset(&src->state2); +} + +int src_polyphase_init(struct polyphase_src *src, struct src_param *p, + int32_t *delay_lines_start) +{ + struct src_stage *stage1; + struct src_stage *stage2; + int n_stages; + int ret; + + if (p->idx_in < 0 || p->idx_out < 0) + return -EINVAL; + + /* Get setup for 2 stage conversion */ + stage1 = src_table1[p->idx_out][p->idx_in]; + stage2 = src_table2[p->idx_out][p->idx_in]; + ret = init_stages(stage1, stage2, src, p, 2, delay_lines_start); + if (ret < 0) + return -EINVAL; + + /* Get number of stages used for optimize opportunity. 2nd + * stage length is one if conversion needs only one stage. + * If input and output rate is the same return 0 to + * use a simple copy function instead of 1 stage FIR with one + * tap. + */ + n_stages = (src->stage2->filter_length == 1) ? 1 : 2; + if (p->idx_in == p->idx_out) + n_stages = 0; + + /* If filter length for first stage is zero this is a deleted + * mode from in/out matrix. Computing of such SRC mode needs + * to be prevented. + */ + if (src->stage1->filter_length == 0) + return -EINVAL; + + return n_stages; +} + /* Fallback function */ static void src_fallback(struct comp_dev *dev, struct comp_buffer *source, struct comp_buffer *sink, size_t *bytes_read, size_t *bytes_written) @@ -91,8 +364,9 @@ static void src_2s_s32_default(struct comp_dev *dev, int s2_blk_in; int s2_blk_out; struct comp_data *cd = comp_get_drvdata(dev); - int32_t *dest = (int32_t *) sink->w_ptr; - int32_t *src = (int32_t *) source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + int32_t *src = (int32_t *)source->r_ptr; + int32_t *sbuf_addr = cd->delay_lines; int32_t *sbuf_end_addr = &cd->delay_lines[cd->param.sbuf_length]; int32_t sbuf_size = cd->param.sbuf_length * sizeof(int32_t); int nch = dev->params.channels; @@ -107,6 +381,7 @@ static void src_2s_s32_default(struct comp_dev *dev, s1.x_end_addr = source->end_addr; s1.x_size = source->size; + s1.y_addr = sbuf_addr; s1.y_end_addr = sbuf_end_addr; s1.y_size = sbuf_size; s1.state = &cd->src.state1; @@ -117,6 +392,7 @@ static void src_2s_s32_default(struct comp_dev *dev, s2.x_end_addr = sbuf_end_addr; s2.x_size = sbuf_size; + s2.y_addr = sink->addr; s2.y_end_addr = sink->end_addr; s2.y_size = sink->size; s2.state = &cd->src.state2; @@ -125,14 +401,13 @@ static void src_2s_s32_default(struct comp_dev *dev, s2.y_wptr = dest; s2.nch = nch; - /* Test if 1st stage can be run with default block length to reach * the period length or just under it. */ s1.times = cd->param.stage1_times; s1_blk_in = s1.times * cd->src.stage1->blk_in * nch; s1_blk_out = s1.times * cd->src.stage1->blk_out * nch; - if ((avail_b >= s1_blk_in * sz) && (sbuf_free >= s1_blk_out)) { + if (avail_b >= s1_blk_in * sz && sbuf_free >= s1_blk_out) { cd->polyphase_func(&s1); cd->sbuf_w_ptr = s1.y_wptr; @@ -147,8 +422,9 @@ static void src_2s_s32_default(struct comp_dev *dev, s1.times = 1; s1_blk_in = cd->src.stage1->blk_in * nch; s1_blk_out = cd->src.stage1->blk_out * nch; - while ((n1 < cd->param.stage1_times_max) && (avail_b >= s1_blk_in * sz) - && (sbuf_free >= s1_blk_out)) { + while (n1 < cd->param.stage1_times_max && + avail_b >= s1_blk_in * sz && + sbuf_free >= s1_blk_out) { cd->polyphase_func(&s1); cd->sbuf_w_ptr = s1.y_wptr; @@ -163,7 +439,7 @@ static void src_2s_s32_default(struct comp_dev *dev, s2.times = cd->param.stage2_times; s2_blk_in = s2.times * cd->src.stage2->blk_in * nch; s2_blk_out = s2.times * cd->src.stage2->blk_out * nch; - if ((cd->sbuf_avail >= s2_blk_in) && (free_b >= s2_blk_out * sz)) { + if (cd->sbuf_avail >= s2_blk_in && free_b >= s2_blk_out * sz) { cd->polyphase_func(&s2); cd->sbuf_r_ptr = s2.x_rptr; @@ -173,14 +449,13 @@ static void src_2s_s32_default(struct comp_dev *dev, n2 = s2.times; } - /* Run one block at time the remaining 2nd stage output */ s2.times = 1; s2_blk_in = cd->src.stage2->blk_in * nch; s2_blk_out = cd->src.stage2->blk_out * nch; - while ((n2 < cd->param.stage2_times_max) - && (cd->sbuf_avail >= s2_blk_in) - && (free_b >= s2_blk_out * sz)) { + while (n2 < cd->param.stage2_times_max && + cd->sbuf_avail >= s2_blk_in && + free_b >= s2_blk_out * sz) { cd->polyphase_func(&s2); cd->sbuf_r_ptr = s2.x_rptr; @@ -205,10 +480,10 @@ static void src_1s_s32_default(struct comp_dev *dev, int n_written = 0; s1.times = cd->param.stage1_times; - s1.x_rptr = (int32_t *) source->r_ptr; + s1.x_rptr = (int32_t *)source->r_ptr; s1.x_end_addr = source->end_addr; s1.x_size = source->size; - s1.y_wptr = (int32_t *) sink->w_ptr; + s1.y_wptr = (int32_t *)sink->w_ptr; s1.y_end_addr = sink->end_addr; s1.y_size = sink->size; s1.state = &cd->src.state1; @@ -229,8 +504,8 @@ static void src_copy_s32_default(struct comp_dev *dev, size_t *bytes_read, size_t *bytes_written) { struct comp_data *cd = comp_get_drvdata(dev); - int32_t *src = (int32_t *) source->r_ptr; - int32_t *snk = (int32_t *) sink->w_ptr; + int32_t *src = (int32_t *)source->r_ptr; + int32_t *snk = (int32_t *)sink->w_ptr; int nch = dev->params.channels; int frames = cd->param.blk_in; int n; @@ -241,9 +516,10 @@ static void src_copy_s32_default(struct comp_dev *dev, n = frames * nch; while (n > 0) { - n_wrap_src = (int32_t *) source->end_addr - src; - n_wrap_snk = (int32_t *) sink->end_addr - snk; - n_wrap_min = (n_wrap_src < n_wrap_snk) ? n_wrap_src : n_wrap_snk; + n_wrap_src = (int32_t *)source->end_addr - src; + n_wrap_snk = (int32_t *)sink->end_addr - snk; + n_wrap_min = (n_wrap_src < n_wrap_snk) ? + n_wrap_src : n_wrap_snk; n_copy = (n < n_wrap_min) ? n : n_wrap_min; memcpy(snk, src, n_copy * sizeof(int32_t)); @@ -253,7 +529,6 @@ static void src_copy_s32_default(struct comp_dev *dev, snk += n_copy; src_circ_inc_wrap(&src, source->end_addr, source->size); src_circ_inc_wrap(&snk, sink->end_addr, sink->size); - } *bytes_read = frames * nch * sizeof(int32_t); *bytes_written = frames * nch * sizeof(int32_t); @@ -263,7 +538,7 @@ static struct comp_dev *src_new(struct sof_ipc_comp *comp) { struct comp_dev *dev; struct sof_ipc_comp_src *src; - struct sof_ipc_comp_src *ipc_src = (struct sof_ipc_comp_src *) comp; + struct sof_ipc_comp_src *ipc_src = (struct sof_ipc_comp_src *)comp; struct comp_data *cd; trace_src("new"); @@ -276,14 +551,14 @@ static struct comp_dev *src_new(struct sof_ipc_comp *comp) dev = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, COMP_SIZE(struct sof_ipc_comp_src)); - if (dev == NULL) + if (!dev) return NULL; - src = (struct sof_ipc_comp_src *) &dev->comp; + src = (struct sof_ipc_comp_src *)&dev->comp; memcpy(src, ipc_src, sizeof(struct sof_ipc_comp_src)); cd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*cd)); - if (cd == NULL) { + if (!cd) { rfree(dev); return NULL; } @@ -306,7 +581,7 @@ static void src_free(struct comp_dev *dev) trace_src("fre"); /* Free dynamically reserved buffers for SRC algorithm */ - if (cd->delay_lines != NULL) + if (!cd->delay_lines) rfree(cd->delay_lines); rfree(cd); @@ -347,7 +622,8 @@ static int src_params(struct comp_dev *dev) } /* Calculate source and sink rates, one rate will come from IPC new - * and the other from params. */ + * and the other from params. + */ if (src->source_rate == 0) { /* params rate is source rate */ source_rate = params->rate; @@ -383,12 +659,12 @@ static int src_params(struct comp_dev *dev) } /* free any existing delay lines. TODO reuse if same size */ - if (cd->delay_lines != NULL) + if (!cd->delay_lines) rfree(cd->delay_lines); cd->delay_lines = rballoc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, delay_lines_size); - if (cd->delay_lines == NULL) { + if (!cd->delay_lines) { trace_src_error("sr3"); trace_value(delay_lines_size); return -EINVAL; @@ -424,7 +700,6 @@ static int src_params(struct comp_dev *dev) trace_src("SFa"); cd->src_func = src_fallback; return -EINVAL; - break; } /* Calculate period size based on config. First make sure that @@ -438,7 +713,7 @@ static int src_params(struct comp_dev *dev) * buffer_set_size will return an error if the required length would * be too long. */ - q = src_ceil_divide(cd->param.blk_out, (int) dev->frames) + 1; + q = src_ceil_divide(cd->param.blk_out, (int)dev->frames) + 1; /* Configure downstream buffer */ sink = list_first_item(&dev->bsink_list, struct comp_buffer, @@ -459,7 +734,6 @@ static int src_params(struct comp_dev *dev) return -EINVAL; } - return 0; } @@ -518,7 +792,8 @@ static int src_copy(struct comp_dev *dev) /* make sure source component buffer has enough data available and that * the sink component buffer has enough free bytes for copy. Also - * check for XRUNs */ + * check for XRUNs. + */ if (source->avail < need_source) { trace_src_error("xru"); return -EIO; /* xrun */ @@ -530,6 +805,9 @@ static int src_copy(struct comp_dev *dev) cd->src_func(dev, source, sink, &consumed, &produced); + tracev_value(consumed >> 3); + tracev_value(produced >> 3); + /* Calc new free and available if data was processed. These * functions must not be called with 0 consumed/produced. */ diff --git a/src/audio/src_core.h b/src/audio/src.h similarity index 93% rename from src/audio/src_core.h rename to src/audio/src.h index 3ea6028..3208693 100644 --- a/src/audio/src_core.h +++ b/src/audio/src.h @@ -29,8 +29,8 @@ * */ -#ifndef SRC_CORE_H -#define SRC_CORE_H +#ifndef SRC_H +#define SRC_H #define MAX(a, b) (((a) > (b)) ? (a) : (b)) #define MIN(a, b) (((a) < (b)) ? (a) : (b)) @@ -68,12 +68,12 @@ struct src_stage { }; struct src_state { - int fir_delay_size; - int out_delay_size; - int fir_wi; - int out_ri; + int fir_delay_size; /* samples */ + int out_delay_size; /* samples */ int32_t *fir_delay; int32_t *out_delay; + int32_t *fir_wp; + int32_t *out_rp; }; struct polyphase_src { @@ -91,6 +91,7 @@ struct src_stage_prm { int32_t *x_end_addr; size_t x_size; int32_t *y_wptr; + int32_t *y_addr; int32_t *y_end_addr; size_t y_size; struct src_state *state; @@ -100,13 +101,13 @@ struct src_stage_prm { static inline void src_circ_inc_wrap(int32_t **ptr, int32_t *end, size_t size) { if (*ptr >= end) - *ptr = (int32_t *) ((size_t) * ptr - size); + *ptr = (int32_t *)((size_t)*ptr - size); } static inline void src_circ_dec_wrap(int32_t **ptr, int32_t *addr, size_t size) { if (*ptr < addr) - *ptr = (int32_t *) ((size_t) * ptr + size); + *ptr = (int32_t *)((size_t)*ptr + size); } void src_polyphase_reset(struct polyphase_src *src); diff --git a/src/audio/src_config.h b/src/audio/src_config.h index 3ad4c78..65d6247 100644 --- a/src/audio/src_config.h +++ b/src/audio/src_config.h @@ -34,14 +34,57 @@ #include <config.h> -#if defined CONFIG_BAYTRAIL || defined CONFIG_CHERRYTRAIL || defined CONFIG_BROADWELL || defined CONFIG_HASWELL -#define SRC_SHORT 1 -#include <reef/audio/coefficients/src/src_tiny_int16_define.h> -#include <reef/audio/coefficients/src/src_tiny_int16_table.h> +/* If next defines are set to 1 the SRC is configured automatically. Setting + * to zero temporarily is useful is for testing needs. + * Setting SRC_AUTODSP to 0 allows to manually set the code variant. + * Setting SRC_AUTOCOEF to 0 allows to select the coefficient type. + */ +#define SRC_AUTOARCH 1 +#define SRC_AUTOCOEF 1 + +/* Force manually some code variant when SRC_AUTODSP is set to zero. These + * are useful in code debugging. + */ +#if SRC_AUTOARCH == 0 +#define SRC_GENERIC 1 +#define SRC_HIFIEP 0 +#define SRC_HIFI3 0 +#endif +#if SRC_AUTOCOEF == 0 +#define SRC_SHORT 0 +#endif + +/* Select 16 bit coefficients for specific platforms. + * Otherwise 32 bits is the default. + */ +#if SRC_AUTOCOEF == 1 +#if defined CONFIG_BAYTRAIL || defined CONFIG_CHERRYTRAIL \ + || defined CONFIG_BROADWELL || defined CONFIG_HASWELL +#define SRC_SHORT 1 /* Use int16_t filter coefficients */ #else -#define SHORT_SHORT 0 -#include <reef/audio/coefficients/src/src_std_int24_define.h> -#include <reef/audio/coefficients/src/src_std_int24_table.h> +#define SRC_SHORT 0 /* Use int32_t filter coefficients */ +#endif +#endif + +/* Select optimized code variant when xt-xcc compiler is used */ +#if SRC_AUTOARCH == 1 +#if defined __XCC__ +#include <xtensa/config/core-isa.h> +#define SRC_GENERIC 0 +#if XCHAL_HAVE_HIFI2EP == 1 +#define SRC_HIFIEP 1 +#define SRC_HIFI3 0 +#endif +#if XCHAL_HAVE_HIFI3 == 1 +#define SRC_HIFI3 1 +#define SRC_HIFIEP 0 +#endif +#else +/* GCC */ +#define SRC_GENERIC 1 +#define SRC_HIFIEP 0 +#define SRC_HIFI3 0 +#endif #endif #endif diff --git a/src/audio/src_core.c b/src/audio/src_core.c deleted file mode 100644 index d8b9a3d..0000000 --- a/src/audio/src_core.c +++ /dev/null @@ -1,676 +0,0 @@ -/* - * Copyright (c) 2016, Intel Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the Intel Corporation nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * Author: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> - * - */ - -/* Non optimized default C implementation guaranteed to work on any - * architecture. - */ - -#include <stdint.h> - -#ifdef MODULE_TEST -#include <stdio.h> -#endif - -#include <reef/alloc.h> -#include <reef/audio/format.h> -#include <reef/math/numbers.h> -#include "src_core.h" -#include "src_config.h" - -#define trace_src(__e) trace_event(TRACE_CLASS_SRC, __e) -#define tracev_src(__e) tracev_event(TRACE_CLASS_SRC, __e) -#define trace_src_error(__e) trace_error(TRACE_CLASS_SRC, __e) - -/* TODO: These should be defined somewhere else. */ -#define SOF_RATES_LENGTH 15 -int sof_rates[SOF_RATES_LENGTH] = {8000, 11025, 12000, 16000, 18900, - 22050, 24000, 32000, 44100, 48000, 64000, 88200, 96000, 176400, - 192000}; - -/* The FIR maximum lengths are per channel so need to multiply them */ -#define MAX_FIR_DELAY_SIZE_XNCH (PLATFORM_MAX_CHANNELS * MAX_FIR_DELAY_SIZE) -#define MAX_OUT_DELAY_SIZE_XNCH (PLATFORM_MAX_CHANNELS * MAX_OUT_DELAY_SIZE) - -/* Calculate ceil() for integer division */ -int src_ceil_divide(int a, int b) -{ - int c; - - c = a / b; - if (c * b < a) - c++; - - return c; -} - -/* Calculates the needed FIR delay line length */ -static int src_fir_delay_length(struct src_stage *s) -{ - return s->subfilter_length + (s->num_of_subfilters - 1) * s->idm - + s->blk_in; -} - -/* Calculates the FIR output delay line length */ -static int src_out_delay_length(struct src_stage *s) -{ - - return 1 + (s->num_of_subfilters - 1) * s->odm; -} - -/* Returns index of a matching sample rate */ -static int src_find_fs(int fs_list[], int list_length, int fs) -{ - int i; - - for (i = 0; i < list_length; i++) { - if (fs_list[i] == fs) - return i; - } - return -EINVAL; -} - -/* Match SOF and defined SRC input rates into a bit mask */ -int32_t src_input_rates(void) -{ - int n; - int b; - int mask = 0; - - for (n = SOF_RATES_LENGTH - 1; n >= 0; n--) { - b = (src_find_fs(src_in_fs, NUM_IN_FS, sof_rates[n]) >= 0) - ? 1 : 0; - mask = (mask << 1) | b; - } - return mask; -} - -/* Match SOF and defined SRC output rates into a bit mask */ -int32_t src_output_rates(void) -{ - int n; - int b; - int mask = 0; - - for (n = SOF_RATES_LENGTH - 1; n >= 0; n--) { - b = (src_find_fs(src_out_fs, NUM_OUT_FS, sof_rates[n]) >= 0) - ? 1 : 0; - mask = (mask << 1) | b; - } - return mask; -} - -/* Calculates buffers to allocate for a SRC mode */ -int src_buffer_lengths(struct src_param *a, int fs_in, int fs_out, int nch, - int frames, int frames_is_for_source) -{ - struct src_stage *stage1; - struct src_stage *stage2; - int q; - int den; - int num; - int frames2; - - if (nch > PLATFORM_MAX_CHANNELS) { - trace_src_error("che"); - tracev_value(nch); - return -EINVAL; - } - - a->nch = nch; - a->idx_in = src_find_fs(src_in_fs, NUM_IN_FS, fs_in); - a->idx_out = src_find_fs(src_out_fs, NUM_OUT_FS, fs_out); - - /* Check that both in and out rates are supported */ - if ((a->idx_in < 0) || (a->idx_out < 0)) { - trace_src_error("us1"); - tracev_value(fs_in); - tracev_value(fs_out); - return -EINVAL; - } - - stage1 = src_table1[a->idx_out][a->idx_in]; - stage2 = src_table2[a->idx_out][a->idx_in]; - - /* Check from stage1 parameter for a deleted in/out rate combination.*/ - if (stage1->filter_length < 1) { - trace_src_error("us2"); - tracev_value(fs_in); - tracev_value(fs_out); - return -EINVAL; - } - - a->fir_s1 = nch * src_fir_delay_length(stage1); - a->out_s1 = nch * src_out_delay_length(stage1); - - /* Find out how many additional times the SRC can be executed - while having block size less or equal to max_frames. - */ - if (frames_is_for_source) { - /* Times that stage1 needs to run to input length of frames */ - a->stage1_times_max = src_ceil_divide(frames, stage1->blk_in); - q = frames / stage1->blk_in; - a->stage1_times = MAX(q, 1); - a->blk_in = a->stage1_times * stage1->blk_in; - - /* Times that stage2 needs to run */ - den = stage2->blk_in * stage1->blk_in; - num = frames * stage2->blk_out * stage1->blk_out; - frames2 = src_ceil_divide(num, den); - a->stage2_times_max = src_ceil_divide(frames2, stage2->blk_out); - q = frames2 / stage2->blk_out; - a->stage2_times = MAX(q, 1); - a->blk_out = a->stage2_times * stage2->blk_out; - } else { - /* Times that stage2 needs to run to output length of frames */ - a->stage2_times_max = src_ceil_divide(frames, stage2->blk_out); - q = frames / stage2->blk_out; - a->stage2_times = MAX(q, 1); - a->blk_out = a->stage2_times * stage2->blk_out; - - /* Times that stage1 needs to run */ - num = frames * stage2->blk_in * stage1->blk_in; - den = stage2->blk_out * stage1->blk_out; - frames2 = src_ceil_divide(num, den); - a->stage1_times_max = src_ceil_divide(frames2, stage1->blk_in); - q = frames2 / stage1->blk_in; - a->stage1_times = MAX(q, 1); - a->blk_in = a->stage1_times * stage1->blk_in; - } - - if (stage2->filter_length == 1) { - a->fir_s2 = 0; - a->out_s2 = 0; - a->stage2_times = 0; - a->stage2_times_max = 0; - a->sbuf_length = 0; - } else { - a->fir_s2 = nch * src_fir_delay_length(stage2); - a->out_s2 = nch * src_out_delay_length(stage2); - /* 2x is an empirically tested length. Since the sink buffer - * capability to receive samples varies a shorter stage 2 output - * block will create a peak in internal buffer usage. - */ - a->sbuf_length = 2 * nch * stage1->blk_out * a->stage1_times_max; - } - - a->src_multich = a->fir_s1 + a->fir_s2 + a->out_s1 + a->out_s2; - a->total = a->sbuf_length + a->src_multich; - - return 0; -} - -static void src_state_reset(struct src_state *state) -{ - - state->fir_delay_size = 0; - state->out_delay_size = 0; - state->fir_wi = 0; - state->out_ri = 0; -} - -static int init_stages( - struct src_stage *stage1, struct src_stage *stage2, - struct polyphase_src *src, struct src_param *p, - int n, int32_t *delay_lines_start) -{ - /* Clear FIR state */ - src_state_reset(&src->state1); - src_state_reset(&src->state2); - - src->number_of_stages = n; - src->stage1 = stage1; - src->stage2 = stage2; - if ((n == 1) && (stage1->blk_out == 0)) - return -EINVAL; - - /* Delay line sizes */ - src->state1.fir_delay_size = p->fir_s1; - src->state1.out_delay_size = p->out_s1; - src->state1.fir_delay = delay_lines_start; - src->state1.out_delay = - src->state1.fir_delay + src->state1.fir_delay_size; - if (n > 1) { - src->state2.fir_delay_size = p->fir_s2; - src->state2.out_delay_size = p->out_s2; - src->state2.fir_delay = - src->state1.out_delay + src->state1.out_delay_size; - src->state2.out_delay = - src->state2.fir_delay + src->state2.fir_delay_size; - } else { - src->state2.fir_delay_size = 0; - src->state2.out_delay_size = 0; - src->state2.fir_delay = NULL; - src->state2.out_delay = NULL; - } - - /* Check the sizes are less than MAX */ - if ((src->state1.fir_delay_size > MAX_FIR_DELAY_SIZE_XNCH) - || (src->state1.out_delay_size > MAX_OUT_DELAY_SIZE_XNCH) - || (src->state2.fir_delay_size > MAX_FIR_DELAY_SIZE_XNCH) - || (src->state2.out_delay_size > MAX_OUT_DELAY_SIZE_XNCH)) { - src->state1.fir_delay = NULL; - src->state1.out_delay = NULL; - src->state2.fir_delay = NULL; - src->state2.out_delay = NULL; - return -EINVAL; - } - - return 0; -} - -void src_polyphase_reset(struct polyphase_src *src) -{ - - src->number_of_stages = 0; - src->stage1 = NULL; - src->stage2 = NULL; - src_state_reset(&src->state1); - src_state_reset(&src->state2); -} - -int src_polyphase_init(struct polyphase_src *src, struct src_param *p, - int32_t *delay_lines_start) -{ - struct src_stage *stage1; - struct src_stage *stage2; - int n_stages; - int ret; - - if ((p->idx_in < 0) || (p->idx_out < 0)) { - return -EINVAL; - } - - /* Get setup for 2 stage conversion */ - stage1 = src_table1[p->idx_out][p->idx_in]; - stage2 = src_table2[p->idx_out][p->idx_in]; - ret = init_stages(stage1, stage2, src, p, 2, delay_lines_start); - if (ret < 0) - return -EINVAL; - - /* Get number of stages used for optimize opportunity. 2nd - * stage length is one if conversion needs only one stage. - * If input and output rate is the same return 0 to - * use a simple copy function instead of 1 stage FIR with one - * tap. - */ - n_stages = (src->stage2->filter_length == 1) ? 1 : 2; - if (p->idx_in == p->idx_out) - n_stages = 0; - - /* If filter length for first stage is zero this is a deleted - * mode from in/out matrix. Computing of such SRC mode needs - * to be prevented. - */ - if (src->stage1->filter_length == 0) - return -EINVAL; - - return n_stages; -} - -#if SRC_SHORT == 1 - -/* Calculate a FIR filter part that does not need circular modification */ - -static inline void fir_part(int64_t y[], int *id, int *ic, - const int32_t data[], const int16_t coef[], int nch_x_taps, int nch) -{ - int64_t tap0; - int64_t tap1; - int n; - int64_t a = 0; - int64_t b = 0; - int c = *ic; - int d = *id; - int d_end = d - nch_x_taps; - - /* Data is Q1.31, coef is Q1.15, product is Q2.46 */ - if (nch == 2) { - for (n = 0; n < (nch_x_taps >> 2); n++) { - tap0 = coef[c++]; - tap1 = coef[c++]; - b += data[d--] * tap0; - a += data[d--] * tap0; - b += data[d--] * tap1; - a += data[d--] * tap1; - } - if (d > d_end) { - tap0 = coef[c++]; - b += data[d--] * tap0; - a += data[d--] * tap0; - } - y[1] += b; - y[0] += a; - } else { - while (d > d_end) { - tap0 = coef[c++]; - for (n = nch - 1; n >= 0; n--) - y[n] += data[d--] * tap0; - } - } - *ic = c; - *id = d; -} - -#else - -static inline void fir_part(int64_t y[], int *id, int *ic, - const int32_t data[], const int32_t coef[], int nch_x_taps, int nch) -{ - int64_t tap0; - int64_t tap1; - int n; - int64_t a = 0; - int64_t b = 0; - int c = *ic; - int d = *id; - int d_end = d - nch_x_taps; - - /* Data is Q1.31, coef is Q1.23, product is Q2.54 */ - if (nch == 2) { - for (n = 0; n < (nch_x_taps >> 2); n++) { - tap0 = coef[c++]; - tap1 = coef[c++]; - b += data[d--] * tap0; - a += data[d--] * tap0; - b += data[d--] * tap1; - a += data[d--] * tap1; - } - if (d > d_end) { - tap0 = coef[c++]; - b += data[d--] * tap0; - a += data[d--] * tap0; - } - y[1] += b; - y[0] += a; - } else { - while (d > d_end) { - tap0 = coef[c++]; - for (n = nch - 1; n >= 0; n--) - y[n] += data[d--] * tap0; - } - } - *ic = c; - *id = d; -} - -#endif - -#if SRC_SHORT == 1 - -static void fir_filter(int ri0, int *ci, int wi0, int32_t in_delay[], - int32_t out_delay[], const int16_t coefs[], int dsm1, int taps, - int shift, int nch) -{ - int n2; - int i; - int64_t y[PLATFORM_MAX_CHANNELS]; - int ri = ri0; - int wi = wi0; - int n1 = ri0 + 1; /* Convert to number of sequential frames */ - int qshift = 15 + shift; /* Q2.46 -> Q2.31 */ - int32_t rnd = 1 << (qshift - 1); /* Half LSB */ - int nch_x_taps = nch * taps; - - /* Initialize to half LSB for rounding */ - for (i = 0; i < nch; i++) - y[i] = rnd; - - if (n1 >= nch_x_taps) { - fir_part(y, &ri, ci, in_delay, coefs, nch_x_taps, nch); - } else { - n2 = nch_x_taps - n1; - fir_part(y, &ri, ci, in_delay, coefs, n1, nch); - ri = dsm1; - fir_part(y, &ri, ci, in_delay, coefs, n2, nch); - } - - for (i = 0; i < nch; i++) - out_delay[wi++] = sat_int32(y[i] >> qshift); -} -#else - -static void fir_filter(int ri0, int *ci, int wi0, int32_t in_delay[], - int32_t out_delay[], const int32_t coefs[], int dsm1, int taps, - int shift, int nch) -{ - int n2; - int i; - int64_t y[PLATFORM_MAX_CHANNELS]; - int ri = ri0; - int wi = wi0; - int n1 = ri0 + 1; /* Convert to number of sequential frames */ - int qshift = 23 + shift; /* Q2.54 -> Q2.31 */ - int32_t rnd = 1 << (qshift - 1); /* Half LSB */ - int nch_x_taps = nch * taps; - - /* Initialize to half LSB for rounding */ - for (i = 0; i < nch; i++) - y[i] = rnd; - - if (n1 >= nch_x_taps) { - fir_part(y, &ri, ci, in_delay, coefs, nch_x_taps, nch); - } else { - n2 = nch_x_taps - n1; - fir_part(y, &ri, ci, in_delay, coefs, n1, nch); - ri = dsm1; - fir_part(y, &ri, ci, in_delay, coefs, n2, nch); - } - - for (i = 0; i < nch; i++) - out_delay[wi++] = sat_int32(y[i] >> qshift); - -} - -#endif - -void src_polyphase_stage_cir(struct src_stage_prm * s) -{ - struct src_state *fir = s->state; - struct src_stage *cfg = s->stage; - int n; - int m; - int f; - int ci; - int ri; - int n_wrap_fir; - int n_wrap_buf; - int n_wrap_min; - int n_min; - int wi; - const void *coef = cfg->coefs; - int32_t *in_delay = fir->fir_delay; - int32_t *out_delay = fir->out_delay; - int dsm1 = fir->fir_delay_size - 1; - int shift = cfg->shift; - int nch = s->nch; - int rewind = -nch * (cfg->blk_in - + (cfg->num_of_subfilters - 1) * cfg->idm) + nch - 1; - int nch_x_idm = cfg->idm * nch; - int nch_x_odm = cfg->odm * nch; - size_t sz = sizeof(int32_t); - int blk_in_bytes = nch * cfg->blk_in * sz; - int blk_out_bytes = nch * cfg->num_of_subfilters * sz; - - - for (n = 0; n < s->times; n++) { - /* Input data */ - m = blk_in_bytes; - while (m > 0) { - n_wrap_fir = (fir->fir_delay_size - fir->fir_wi) * sz; - n_wrap_buf = s->x_end_addr - s->x_rptr; - n_wrap_min = (n_wrap_fir < n_wrap_buf) - ? n_wrap_fir : n_wrap_buf; - n_min = (m < n_wrap_min) ? m : n_wrap_min; - while (n_min > 0) { - fir->fir_delay[fir->fir_wi++] = *s->x_rptr; - s->x_rptr++; - n_min -= sz; - m -= sz; - } - /* Check for wrap */ - src_circ_inc_wrap(&s->x_rptr, s->x_end_addr, s->x_size); - if (fir->fir_wi == fir->fir_delay_size) - fir->fir_wi = 0; - } - - /* Filter */ - ci = 0; /* Reset to 1st coefficient */ - ri = fir->fir_wi + rewind; /* Newest data for last subfilter */ - if (ri < 0) - ri += fir->fir_delay_size; - - wi = fir->out_ri; - for (f = 0; f < cfg->num_of_subfilters; f++) { - fir_filter(ri, &ci, wi, in_delay, out_delay, coef, - dsm1, cfg->subfilter_length, shift, nch); - - wi += nch_x_odm; - if (wi >= fir->out_delay_size) - wi -= fir->out_delay_size; - - ri += nch_x_idm; /* Next sub-filter start */ - if (ri >= fir->fir_delay_size) - ri -= fir->fir_delay_size; - } - - /* Output */ - m = blk_out_bytes; - while (m > 0) { - n_wrap_fir = (fir->out_delay_size - fir->out_ri) * sz; - n_wrap_buf = s->y_end_addr - s->y_wptr; - n_wrap_min = (n_wrap_fir < n_wrap_buf) - ? n_wrap_fir : n_wrap_buf; - n_min = (m < n_wrap_min) ? m : n_wrap_min; - while (n_min > 0) { - *s->y_wptr = fir->out_delay[fir->out_ri++]; - s->y_wptr++; - n_min -= sz; - m -= sz; - } - /* Check wrap */ - src_circ_inc_wrap(&s->y_wptr, s->y_end_addr, s->y_size); - if (fir->out_ri == fir->out_delay_size) - fir->out_ri = 0; - } - } -} - -void src_polyphase_stage_cir_s24(struct src_stage_prm *s) -{ - struct src_state *fir = s->state; - struct src_stage *cfg = s->stage; - int n; - int m; - int f; - int ci; - int ri; - int n_wrap_fir; - int n_wrap_buf; - int n_wrap_min; - int n_min; - int wi; - const void *coef = cfg->coefs; - int32_t *in_delay = fir->fir_delay; - int32_t *out_delay = fir->out_delay; - int dsm1 = fir->fir_delay_size - 1; - int shift = cfg->shift; - int nch = s->nch; - int rewind = -nch * (cfg->blk_in - + (cfg->num_of_subfilters - 1) * cfg->idm) + nch - 1; - int nch_x_idm = cfg->idm * nch; - int nch_x_odm = cfg->odm * nch; - size_t sz = sizeof(int32_t); - int blk_in_bytes = nch * cfg->blk_in * sz; - int blk_out_bytes = nch * cfg->num_of_subfilters * sz; - - for (n = 0; n < s->times; n++) { - /* Input data */ - m = blk_in_bytes; - while (m > 0) { - n_wrap_fir = (fir->fir_delay_size - fir->fir_wi) * sz; - n_wrap_buf = s->x_end_addr - s->x_rptr; - n_wrap_min = (n_wrap_fir < n_wrap_buf) - ? n_wrap_fir : n_wrap_buf; - n_min = (m < n_wrap_min) ? m : n_wrap_min; - while (n_min > 0) { - fir->fir_delay[fir->fir_wi++] = *s->x_rptr << 8; - s->x_rptr++; - n_min -= sz; - m -= sz; - } - /* Check for wrap */ - src_circ_inc_wrap(&s->x_rptr, s->x_end_addr, s->x_size); - if (fir->fir_wi == fir->fir_delay_size) - fir->fir_wi = 0; - } - - /* Filter */ - ci = 0; /* Reset to 1st coefficient */ - ri = fir->fir_wi + rewind; /* Newest data for last subfilter */ - if (ri < 0) - ri += fir->fir_delay_size; - - wi = fir->out_ri; - for (f = 0; f < cfg->num_of_subfilters; f++) { - fir_filter(ri, &ci, wi, in_delay, out_delay, coef, - dsm1, cfg->subfilter_length, shift, nch); - - wi += nch_x_odm; - if (wi >= fir->out_delay_size) - wi -= fir->out_delay_size; - - ri += nch_x_idm; /* Next sub-filter start */ - if (ri >= fir->fir_delay_size) - ri -= fir->fir_delay_size; - } - - /* Output */ - m = blk_out_bytes; - while (m > 0) { - n_wrap_fir = (fir->out_delay_size - fir->out_ri) * sz; - n_wrap_buf = s->y_end_addr - s->y_wptr; - n_wrap_min = (n_wrap_fir < n_wrap_buf) - ? n_wrap_fir : n_wrap_buf; - n_min = (m < n_wrap_min) ? m : n_wrap_min; - while (n_min > 0) { - *s->y_wptr = fir->out_delay[fir->out_ri++] >> 8; - s->y_wptr++; - n_min -= sz; - m -= sz; - } - /* Check wrap */ - src_circ_inc_wrap(&s->y_wptr, s->y_end_addr, s->y_size); - if (fir->out_ri == fir->out_delay_size) - fir->out_ri = 0; - } - } - -} diff --git a/src/audio/src_generic.c b/src/audio/src_generic.c new file mode 100644 index 0000000..9caa090 --- /dev/null +++ b/src/audio/src_generic.c @@ -0,0 +1,435 @@ +/* + * Copyright (c) 2016, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> + * + */ + +/* Default C implementation guaranteed to work on any + * architecture. + */ + +#include <stdint.h> +#include <reef/alloc.h> +#include <reef/audio/format.h> +#include <reef/math/numbers.h> + +#include "src_config.h" +#include "src.h" + +#if SRC_GENERIC + +#if SRC_SHORT /* 16 bit coefficients version */ + +static inline void fir_filter_generic(int32_t *rp, const void *cp, int32_t *wp0, + int32_t *fir_start, int32_t *fir_end, const int fir_delay_length, + const int taps_x_nch, const int shift, const int nch) +{ + int64_t y0; + int64_t y1; + int32_t *data; + const int16_t *coef; + int i; + int j; + int n1; + int n2; + int frames; + const int qshift = 15 + shift; /* Q2.46 -> Q2.31 */ + const int32_t rnd = 1 << (qshift - 1); /* Half LSB */ + int32_t *d = rp; + int32_t *wp = wp0; + + /* Check for 2ch FIR case */ + if (nch == 2) { + /* Decrement data pointer to next channel start. Note that + * initialization code ensures that circular wrap does not + * happen mid-frame. + */ + data = d - 1; + + /* Initialize to half LSB for rounding, prepare for FIR core */ + y0 = rnd; + y1 = rnd; + coef = (const int16_t *)cp; + frames = fir_end - data; /* Frames until wrap */ + n1 = ((taps_x_nch < frames) ? taps_x_nch : frames) >> 1; + n2 = (taps_x_nch >> 1) - n1; + + /* The FIR is calculated as Q1.15 x Q1.31 -> Q2.46. The + * output shift includes the shift by 15 for Qx.46 to + * Qx.31. + */ + for (i = 0; i < n1; i++) { + y0 += (int64_t)(*coef) * (*data); + data++; + y1 += (int64_t)(*coef) * (*data); + data++; + coef++; + } + if (data == fir_end) + data = fir_start; + + for (i = 0; i < n2; i++) { + y0 += (int64_t)(*coef) * (*data); + data++; + y1 += (int64_t)(*coef) * (*data); + data++; + coef++; + } + + *wp = sat_int32(y1 >> qshift); + *(wp + 1) = sat_int32(y0 >> qshift); + return; + } + + for (j = 0; j < nch; j++) { + /* Decrement data pointer to next channel start. Note that + * initialization code ensures that circular wrap does not + * happen mid-frame. + */ + data = d--; + + /* Initialize to half LSB for rounding, prepare for FIR core */ + y0 = rnd; + coef = (const int16_t *)cp; + frames = fir_end - data + nch - j - 1; /* Frames until wrap */ + n1 = (taps_x_nch < frames) ? taps_x_nch : frames; + n2 = taps_x_nch - n1; + + /* The FIR is calculated as Q1.15 x Q1.31 -> Q2.46. The + * output shift includes the shift by 15 for Qx.46 to + * Qx.31. + */ + for (i = 0; i < n1; i += nch) { + y0 += (int64_t)(*coef) * (*data); + coef++; + data += nch; + } + if (data >= fir_end) + data -= fir_delay_length; + + for (i = 0; i < n2; i += nch) { + y0 += (int64_t)(*coef) * (*data); + coef++; + data += nch; + } + + *wp = sat_int32(y0 >> qshift); + wp++; + } +} + +#else /* 32bit coefficients version */ + +static inline void fir_filter_generic(int32_t *rp, const void *cp, int32_t *wp0, + int32_t *fir_start, int32_t *fir_end, int fir_delay_length, + const int taps_x_nch, const int shift, const int nch) +{ + int64_t y0; + int64_t y1; + int32_t *data; + const int32_t *coef; + int i; + int j; + int frames; + int n1; + int n2; + + const int qshift = 23 + shift; /* Qx.54 -> Qx.31 */ + const int32_t rnd = 1 << (qshift - 1); /* Half LSB */ + int32_t *d = rp; + int32_t *wp = wp0; + + /* Check for 2ch FIR case */ + if (nch == 2) { + /* Decrement data pointer to next channel start. Note that + * initialization code ensures that circular wrap does not + * happen mid-frame. + */ + data = d - 1; + + /* Initialize to half LSB for rounding, prepare for FIR core */ + y0 = rnd; + y1 = rnd; + coef = (const int32_t *)cp; + frames = fir_end - data; /* Frames until wrap */ + n1 = ((taps_x_nch < frames) ? taps_x_nch : frames) >> 1; + n2 = (taps_x_nch >> 1) - n1; + + /* The FIR is calculated as Q1.23 x Q1.31 -> Q2.54. The + * output shift includes the shift by 23 for Qx.54 to + * Qx.31. + */ + for (i = 0; i < n1; i++) { + y0 += (int64_t)(*coef >> 8) * (*data); + data++; + y1 += (int64_t)(*coef >> 8) * (*data); + data++; + coef++; + } + if (data == fir_end) + data = fir_start; + + for (i = 0; i < n2; i++) { + y0 += (int64_t)(*coef >> 8) * (*data); + data++; + y1 += (int64_t)(*coef >> 8) * (*data); + data++; + coef++; + } + *wp = sat_int32(y1 >> qshift); + *(wp + 1) = sat_int32(y0 >> qshift); + return; + } + + for (j = 0; j < nch; j++) { + /* Decrement data pointer to next channel start. Note that + * initialization code ensures that circular wrap does not + * happen mid-frame. + */ + data = d--; + + /* Initialize to half LSB for rounding, prepare for FIR core */ + y0 = rnd; + coef = (const int32_t *)cp; + frames = fir_end - data + nch - j - 1; /* Frames until wrap */ + n1 = (taps_x_nch < frames) ? taps_x_nch : frames; + n2 = taps_x_nch - n1; + + /* The FIR is calculated as Q1.23 x Q1.31 -> Q2.54. The + * output shift includes the shift by 23 for Qx.54 to + * Qx.31. + */ + for (i = 0; i < n1; i += nch) { + y0 += (int64_t)(*coef >> 8) * (*data); + coef++; + data += nch; + } + if (data >= fir_end) + data -= fir_delay_length; + + for (i = 0; i < n2; i += nch) { + y0 += (int64_t)(*coef >> 8) * (*data); + coef++; + data += nch; + } + *wp = sat_int32(y0 >> qshift); + wp++; + } +} + +#endif /* 32bit coefficients version */ + +void src_polyphase_stage_cir(struct src_stage_prm *s) +{ + int i; + int n; + int m; + int n_wrap_buf; + int n_wrap_fir; + int n_min; + int32_t *rp; + int32_t *wp; + + struct src_state *fir = s->state; + struct src_stage *cfg = s->stage; + int32_t *fir_delay = fir->fir_delay; + int32_t *fir_end = &fir->fir_delay[fir->fir_delay_size]; + int32_t *out_delay_end = &fir->out_delay[fir->out_delay_size]; + const void *cp; /* Can be int32_t or int16_t */ + const size_t out_size = fir->out_delay_size * sizeof(int32_t); + const int nch = s->nch; + const int nch_x_odm = cfg->odm * nch; + const int blk_in_words = nch * cfg->blk_in; + const int blk_out_words = nch * cfg->num_of_subfilters; + const int fir_length = fir->fir_delay_size; + const int rewind = nch * (cfg->blk_in + + (cfg->num_of_subfilters - 1) * cfg->idm) - nch; + const int nch_x_idm = nch * cfg->idm; + const size_t fir_size = fir->fir_delay_size * sizeof(int32_t); + const int taps_x_nch = cfg->subfilter_length * nch; + +#if SRC_SHORT + const size_t subfilter_size = cfg->subfilter_length * sizeof(int16_t); +#else + const size_t subfilter_size = cfg->subfilter_length * sizeof(int32_t); +#endif + + for (n = 0; n < s->times; n++) { + /* Input data */ + m = blk_in_words; + while (m > 0) { + /* Number of words without circular wrap */ + n_wrap_buf = s->x_end_addr - s->x_rptr; + n_wrap_fir = fir->fir_wp - fir->fir_delay + 1; + n_min = (n_wrap_fir < n_wrap_buf) + ? n_wrap_fir : n_wrap_buf; + n_min = (m < n_min) ? m : n_min; + m -= n_min; + for (i = 0; i < n_min; i++) { + *fir->fir_wp = *s->x_rptr; + fir->fir_wp--; + s->x_rptr++; + } + /* Check for wrap */ + src_circ_dec_wrap(&fir->fir_wp, fir_delay, fir_size); + src_circ_inc_wrap(&s->x_rptr, s->x_end_addr, s->x_size); + } + + /* Filter */ + cp = cfg->coefs; /* Reset to 1st coefficient */ + rp = fir->fir_wp + rewind; + src_circ_inc_wrap(&rp, fir_end, fir_size); + wp = fir->out_rp; + for (i = 0; i < cfg->num_of_subfilters; i++) { + fir_filter_generic(rp, cp, wp, + fir_delay, fir_end, fir_length, + taps_x_nch, cfg->shift, nch); + wp += nch_x_odm; + cp += subfilter_size; + src_circ_inc_wrap(&wp, out_delay_end, out_size); + rp -= nch_x_idm; /* Next sub-filter start */ + src_circ_dec_wrap(&rp, fir_delay, fir_size); + } + + /* Output */ + m = blk_out_words; + while (m > 0) { + n_wrap_fir = out_delay_end - fir->out_rp; + n_wrap_buf = s->y_end_addr - s->y_wptr; + n_min = (n_wrap_fir < n_wrap_buf) + ? n_wrap_fir : n_wrap_buf; + n_min = (m < n_min) ? m : n_min; + m -= n_min; + for (i = 0; i < n_min; i++) { + *s->y_wptr = *fir->out_rp; + s->y_wptr++; + fir->out_rp++; + } + /* Check wrap */ + src_circ_inc_wrap(&s->y_wptr, s->y_end_addr, s->y_size); + src_circ_inc_wrap(&fir->out_rp, out_delay_end, + out_size); + } + } +} + +void src_polyphase_stage_cir_s24(struct src_stage_prm *s) +{ + int i; + int n; + int m; + int n_wrap_buf; + int n_wrap_fir; + int n_min; + int32_t *rp; + int32_t *wp; + + struct src_state *fir = s->state; + struct src_stage *cfg = s->stage; + int32_t *fir_delay = fir->fir_delay; + int32_t *fir_end = &fir->fir_delay[fir->fir_delay_size]; + int32_t *out_delay_end = &fir->out_delay[fir->out_delay_size]; + const void *cp; /* Can be int32_t or int16_t */ + const size_t out_size = fir->out_delay_size * sizeof(int32_t); + const int nch = s->nch; + const int nch_x_odm = cfg->odm * nch; + const int blk_in_words = nch * cfg->blk_in; + const int blk_out_words = nch * cfg->num_of_subfilters; + const int fir_length = fir->fir_delay_size; + const int rewind = nch * (cfg->blk_in + + (cfg->num_of_subfilters - 1) * cfg->idm) - nch; + const int nch_x_idm = nch * cfg->idm; + const size_t fir_size = fir->fir_delay_size * sizeof(int32_t); + const int taps_x_nch = cfg->subfilter_length * nch; + +#if SRC_SHORT + const size_t subfilter_size = cfg->subfilter_length * sizeof(int16_t); +#else + const size_t subfilter_size = cfg->subfilter_length * sizeof(int32_t); +#endif + + for (n = 0; n < s->times; n++) { + /* Input data */ + m = blk_in_words; + while (m > 0) { + /* Number of words without circular wrap */ + n_wrap_buf = s->x_end_addr - s->x_rptr; + n_wrap_fir = fir->fir_wp - fir->fir_delay + 1; + n_min = (n_wrap_fir < n_wrap_buf) + ? n_wrap_fir : n_wrap_buf; + n_min = (m < n_min) ? m : n_min; + m -= n_min; + for (i = 0; i < n_min; i++) { + *fir->fir_wp = *s->x_rptr << 8; + fir->fir_wp--; + s->x_rptr++; + } + /* Check for wrap */ + src_circ_dec_wrap(&fir->fir_wp, fir_delay, fir_size); + src_circ_inc_wrap(&s->x_rptr, s->x_end_addr, s->x_size); + } + + /* Filter */ + cp = cfg->coefs; /* Reset to 1st coefficient */ + rp = fir->fir_wp + rewind; + src_circ_inc_wrap(&rp, fir_end, fir_size); + wp = fir->out_rp; + for (i = 0; i < cfg->num_of_subfilters; i++) { + fir_filter_generic(rp, cp, wp, + fir_delay, fir_end, fir_length, + taps_x_nch, cfg->shift, nch); + wp += nch_x_odm; + cp += subfilter_size; + src_circ_inc_wrap(&wp, out_delay_end, out_size); + rp -= nch_x_idm; /* Next sub-filter start */ + src_circ_dec_wrap(&rp, fir_delay, fir_size); + } + + /* Output */ + m = blk_out_words; + while (m > 0) { + n_wrap_fir = out_delay_end - fir->out_rp; + n_wrap_buf = s->y_end_addr - s->y_wptr; + n_min = (n_wrap_fir < n_wrap_buf) + ? n_wrap_fir : n_wrap_buf; + n_min = (m < n_min) ? m : n_min; + m -= n_min; + for (i = 0; i < n_min; i++) { + *s->y_wptr = *fir->out_rp >> 8; + s->y_wptr++; + fir->out_rp++; + } + /* Check wrap */ + src_circ_inc_wrap(&s->y_wptr, s->y_end_addr, s->y_size); + src_circ_inc_wrap(&fir->out_rp, out_delay_end, + out_size); + } + } +} + +#endif diff --git a/src/audio/src_hifi2ep.c b/src/audio/src_hifi2ep.c new file mode 100644 index 0000000..0d03ffa --- /dev/null +++ b/src/audio/src_hifi2ep.c @@ -0,0 +1,562 @@ +/* + * Copyright (c) 2017, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> + * + */ + +/* HiFi EP optimized code parts for SRC */ + +#include <stdint.h> +#include <reef/alloc.h> +#include <reef/audio/format.h> +#include <reef/math/numbers.h> + +#include "src_config.h" +#include "src.h" + +#if SRC_HIFIEP + +#include <xtensa/config/defs.h> +#include <xtensa/tie/xt_hifi2.h> + +/* HiFi EP has + * 4x 56 bit registers in register file Q + * 8x 48 bit registers in register file P + */ + +#if SRC_SHORT /* 16 bit coefficients version */ + +static inline void fir_filter(ae_q32s *rp, const void *cp, ae_q32s *wp0, + const int taps_div_4, const int shift, const int nch) +{ + /* This function uses + * 2x 56 bit registers Q, + * 4x 48 bit registers P + * 3x integers + * 4x address pointers, + */ + ae_q56s a0; + ae_q56s a1; + ae_p24x2f data2; + ae_p24x2f coef2; + ae_p24x2f p0; + ae_p24x2f p1; + ae_p16x2s *coefp; + ae_p24x2f *dp = (ae_p24x2f *)rp; + ae_p24x2f *dp0; + ae_q32s *wp = wp0; + int i; + int j; + const int inc = sizeof(ae_p24x2f); + + /* 2ch FIR case */ + if (nch == 2) { + /* Move data pointer back by one sample to start from right + * channel sample. Discard read value p0. + */ + AE_LP24F_C(p0, dp, -sizeof(ae_p24f)); + + /* Reset coefficient pointer and clear accumulator */ + coefp = (ae_p16x2s *)cp; + a0 = AE_ZEROQ56(); + a1 = AE_ZEROQ56(); + + /* Compute FIR filter for current channel with four + * taps per every loop iteration. Two coefficients + * are loaded simultaneously. Data is read + * from interleaved buffer with stride of channels + * count. + */ + for (i = 0; i < taps_div_4; i++) { + /* Load two coefficients. Coef2_h contains tap *coefp + * and coef2_l contains the next tap. + */ + coef2 = AE_LP16X2F_I(coefp, 0); + coefp++; + + /* Load two data samples from two channels */ + AE_LP24X2F_C(p0, dp, inc); /* r0, l0 */ + AE_LP24X2F_C(p1, dp, inc); /* r1, l1 */ + + /* Select to d0 successive left channel samples, to d1 + * successive right channel samples. Then accumulate + * data2_h * coef2_h + data2_l * coef2_l. The Q1.31 + * data and Q1.15 coefficients are used as 24 bits as + * Q1.23 values. + */ + data2 = AE_SELP24_LL(p0, p1); + AE_MULAAFP24S_HH_LL(a0, data2, coef2); + data2 = AE_SELP24_HH(p0, p1); + AE_MULAAFP24S_HH_LL(a1, data2, coef2); + + /* Repeat for next two taps */ + coef2 = AE_LP16X2F_I(coefp, 0); + coefp++; + AE_LP24X2F_C(p0, dp, inc); /* r2, l2 */ + AE_LP24X2F_C(p1, dp, inc); /* r3, l3 */ + data2 = AE_SELP24_LL(p0, p1); + AE_MULAAFP24S_HH_LL(a0, data2, coef2); + data2 = AE_SELP24_HH(p0, p1); + AE_MULAAFP24S_HH_LL(a1, data2, coef2); + } + + /* Scale FIR output with right shifts, round/saturate + * to Q1.31, and store 32 bit output. + */ + AE_SQ32F_I(AE_ROUNDSQ32SYM(AE_SRAAQ56(a0, shift)), wp, 0); + AE_SQ32F_I(AE_ROUNDSQ32SYM(AE_SRAAQ56(a1, shift)), wp, + sizeof(int32_t)); + return; + } + + for (j = 0; j < nch; j++) { + /* Copy pointer and advance to next ch with dummy load */ + dp0 = dp; + AE_LP24F_C(p0, dp, -sizeof(ae_p24f)); + + /* Reset coefficient pointer and clear accumulator */ + coefp = (ae_p16x2s *)cp; + a0 = AE_ZEROQ56(); + + /* Compute FIR filter for current channel with four + * taps per every loop iteration. Two coefficients + * are loaded simultaneously. Data is read + * from interleaved buffer with stride of channels + * count. + */ + for (i = 0; i < taps_div_4; i++) { + /* Load two coefficients */ + coef2 = *coefp++; + + /* Load two data samples */ + AE_LP24F_C(p0, dp0, inc); + AE_LP24F_C(p1, dp0, inc); + + /* Pack p0 and p1 to data2_h and data2_l */ + data2 = AE_SELP24_LL(p0, p1); + + /* Accumulate data2_h * coef2_h + data2_l * coef2_l */ + AE_MULAAFP24S_HH_LL(a0, data2, coef2); + + /* Repeat for next two filter taps */ + coef2 = *coefp++; + AE_LP24F_C(p0, dp0, inc); + AE_LP24F_C(p1, dp0, inc); + data2 = AE_SELP24_LL(p0, p1); + AE_MULAAFP24S_HH_LL(a0, data2, coef2); + } + + /* Scale FIR output with right shifts, round/saturate + * to Q1.31, and store 32 bit output. Advance write + * pointer to next sample. + */ + AE_SQ32F_I(AE_ROUNDSQ32SYM(AE_SRAAQ56(a0, shift)), wp, 0); + wp++; + } +} + +#else /* 32bit coefficients version */ + +static inline void fir_filter(ae_q32s *rp, const void *cp, ae_q32s *wp0, + const int taps_div_4, const int shift, const int nch) +{ + /* This function uses + * 2x 56 bit registers Q, + * 4x 48 bit registers P + * 3x integers + * 4x address pointers, + */ + ae_q56s a0; + ae_q56s a1; + ae_p24x2f p0; + ae_p24x2f p1; + ae_p24x2f data2; + ae_p24x2f coef2; + ae_p24x2f *coefp; + ae_p24x2f *dp = (ae_p24x2f *)rp; + ae_p24x2f *dp0; + ae_q32s *wp = wp0; + int i; + int j; + const int inc = sizeof(ae_p24x2f); + + /* 2ch FIR case */ + if (nch == 2) { + /* Move data pointer back by one sample to start from right + * channel sample. Discard read value p0. + */ + AE_LP24F_C(p0, dp, -sizeof(ae_p24f)); + + /* Reset coefficient pointer and clear accumulator */ + coefp = (ae_p24x2f *)cp; + a0 = AE_ZEROQ56(); + a1 = AE_ZEROQ56(); + + /* Compute FIR filter for current channel with four + * taps per every loop iteration. Two coefficients + * are loaded simultaneously. Data is read + * from interleaved buffer with stride of channels + * count. + */ + for (i = 0; i < taps_div_4; i++) { + /* Load two coefficients. Coef2_h contains tap *coefp + * and coef2_l contains the next tap. + */ + /* TODO: Ensure coefficients are 64 bits aligned */ + coef2 = AE_LP24X2F_I(coefp, 0); + coefp++; + + /* Load two data samples from two channels */ + AE_LP24X2F_C(p0, dp, inc); /* r0, l0 */ + AE_LP24X2F_C(p1, dp, inc); /* r1, l1 */ + + /* Select to d0 successive left channel samples, to d1 + * successive right channel samples. + */ + + /* Accumulate to m + * data2_h * coef2_h + data2_l * coef2_l. The Q1.31 + * data and Q1.15 coefficients are used as 24 bits as + * Q1.23 values. + */ + data2 = AE_SELP24_LL(p0, p1); + AE_MULAAFP24S_HH_LL(a0, data2, coef2); + data2 = AE_SELP24_HH(p0, p1); + AE_MULAAFP24S_HH_LL(a1, data2, coef2); + + /* Repeat for next two taps */ + coef2 = AE_LP24X2F_I(coefp, 0); + coefp++; + AE_LP24X2F_C(p0, dp, inc); /* r2, l2 */ + AE_LP24X2F_C(p1, dp, inc); /* r3, l3 */ + data2 = AE_SELP24_LL(p0, p1); + AE_MULAAFP24S_HH_LL(a0, data2, coef2); + data2 = AE_SELP24_HH(p0, p1); + AE_MULAAFP24S_HH_LL(a1, data2, coef2); + } + + /* Scale FIR output with right shifts, round/saturate + * to Q1.31, and store 32 bit output. + */ + AE_SQ32F_I(AE_ROUNDSQ32SYM(AE_SRAAQ56(a0, shift)), wp, 0); + AE_SQ32F_I(AE_ROUNDSQ32SYM(AE_SRAAQ56(a1, shift)), wp, + sizeof(int32_t)); + return; + } + + for (j = 0; j < nch; j++) { + /* Copy pointer and advance to next ch with dummy load */ + dp0 = dp; + AE_LP24F_C(p0, dp, -sizeof(ae_p24f)); + + /* Reset coefficient pointer and clear accumulator */ + coefp = (ae_p24x2f *)cp; + a0 = AE_ZEROQ56(); + + /* Compute FIR filter for current channel with four + * taps per every loop iteration. Two coefficients + * are loaded simultaneously. Data is read + * from interleaved buffer with stride of channels + * count. + */ + for (i = 0; i < taps_div_4; i++) { + /* Load two coefficients */ + coef2 = *coefp++; + + /* Load two data samples and place them to L and H of + * data2. + */ + AE_LP24F_C(p0, dp0, inc); + AE_LP24F_C(p1, dp0, inc); + data2 = AE_SELP24_LH(p0, p1); + + /* Accumulate to m + * data2_h * coef2_h + data2_l * coef2_l. The Q1.31 + * data and coefficients are used as the most + * significant 24 bits as Q1.23 values. + */ + AE_MULAAFP24S_HH_LL(a0, data2, coef2); + + /* Repeat for next two filter taps */ + coef2 = *coefp++; + AE_LP24F_C(p0, dp0, inc); + AE_LP24F_C(p1, dp0, inc); + data2 = AE_SELP24_LH(p0, p1); + AE_MULAAFP24S_HH_LL(a0, data2, coef2); + } + + /* Scale FIR output with right shifts, round/saturate + * to Q1.31, and store 32 bit output. Advance write + * pointer to next sample. + */ + AE_SQ32F_I(AE_ROUNDSQ32SYM(AE_SRAAQ56(a0, shift)), wp, 0); + wp++; + } +} +#endif /* 32bit coefficients version */ + +void src_polyphase_stage_cir(struct src_stage_prm *s) +{ + /* This function uses + * 1x 56 bit registers Q, + * 0x 48 bit registers P, + * 16x integers + * 7x address pointers, + */ + ae_q56s q; + ae_q32s *rp; + ae_q32s *wp; + int i; + int n; + int m; + int n_wrap_buf; + int n_min; + struct src_state *fir = s->state; + struct src_stage *cfg = s->stage; + int32_t *fir_end = &fir->fir_delay[fir->fir_delay_size]; + int32_t *out_delay_end = &fir->out_delay[fir->out_delay_size]; + const void *cp; /* Can be int32_t or int16_t */ + const size_t out_size = fir->out_delay_size * sizeof(int32_t); + const int nch = s->nch; + const int nch_x_odm = cfg->odm * nch; + const int blk_in_words = nch * cfg->blk_in; + const int blk_out_words = nch * cfg->num_of_subfilters; + const int sz = sizeof(int32_t); + const int n_sz = -sizeof(int32_t); + const int rewind_sz = sz * (nch * (cfg->blk_in + + (cfg->num_of_subfilters - 1) * cfg->idm) - nch); + const int nch_x_idm_sz = -nch * cfg->idm * sizeof(int32_t); + const int taps_div_4 = cfg->subfilter_length >> 2; + +#if SRC_SHORT + const size_t subfilter_size = cfg->subfilter_length * sizeof(int16_t); +#else + const size_t subfilter_size = cfg->subfilter_length * sizeof(int32_t); +#endif + + for (n = 0; n < s->times; n++) { + /* Input data to filter */ + m = blk_in_words; + + /* Setup circular buffer for FIR input data delay */ + AE_SETCBEGIN0(fir->fir_delay); + AE_SETCEND0(fir_end); + + while (m > 0) { + /* Number of words until circular wrap */ + n_wrap_buf = s->x_end_addr - s->x_rptr; + n_min = (m < n_wrap_buf) ? m : n_wrap_buf; + m -= n_min; + for (i = 0; i < n_min; i++) { + /* Load 32 bits sample to accumulator */ + q = AE_LQ32F_I((ae_q32s *)s->x_rptr++, 0); + + /* Store to circular buffer, advance pointer */ + AE_SQ32F_C(q, (ae_q32s *)fir->fir_wp, n_sz); + } + + /* Check for wrap */ + src_circ_inc_wrap(&s->x_rptr, s->x_end_addr, s->x_size); + } + + /* Do filter */ + cp = cfg->coefs; /* Reset to 1st coefficient */ + rp = (ae_q32s *)fir->fir_wp; + + /* Do circular modification to pointer rp by amount of + * rewind to to data start. Loaded value q is discarded. + */ + AE_LQ32F_C(q, (ae_q32s *)rp, rewind_sz); + + /* Reset FIR write pointer and compute all polyphase + * sub-filters. + */ + wp = (ae_q32s *)fir->out_rp; + for (i = 0; i < cfg->num_of_subfilters; i++) { + fir_filter(rp, cp, wp, taps_div_4, cfg->shift, nch); + wp += nch_x_odm; + cp += subfilter_size; + src_circ_inc_wrap((int32_t **)&wp, out_delay_end, + out_size); + + /* Circular advance pointer rp by number of + * channels x input delay multiplier. Loaded value q + * is discarded. + */ + AE_LQ32F_C(q, rp, nch_x_idm_sz); + } + + /* Output */ + + /* Setup circular buffer for SRC out delay access */ + AE_SETCBEGIN0(fir->out_delay); + AE_SETCEND0(out_delay_end); + m = blk_out_words; + while (m > 0) { + n_wrap_buf = s->y_end_addr - s->y_wptr; + n_min = (m < n_wrap_buf) ? m : n_wrap_buf; + m -= n_min; + for (i = 0; i < n_min; i++) { + /* Circular load followed by linear store */ + AE_LQ32F_C(q, (ae_q32s *)fir->out_rp, sz); + AE_SQ32F_I(q, (ae_q32s *)s->y_wptr, 0); + s->y_wptr++; + } + /* Check wrap */ + src_circ_inc_wrap(&s->y_wptr, s->y_end_addr, s->y_size); + } + } +} + +void src_polyphase_stage_cir_s24(struct src_stage_prm *s) +{ + /* This function uses + * 1x 56 bit registers Q, + * 0x 48 bit registers P, + * 16x integers + * 7x address pointers, + */ + ae_q56s q; + ae_q32s *rp; + ae_q32s *wp; + int i; + int n; + int m; + int n_wrap_buf; + int n_min; + struct src_state *fir = s->state; + struct src_stage *cfg = s->stage; + int32_t *fir_end = &fir->fir_delay[fir->fir_delay_size]; + int32_t *out_delay_end = &fir->out_delay[fir->out_delay_size]; + const void *cp; /* Can be int32_t or int16_t */ + const size_t out_size = fir->out_delay_size * sizeof(int32_t); + const int nch = s->nch; + const int nch_x_odm = cfg->odm * nch; + const int blk_in_words = nch * cfg->blk_in; + const int blk_out_words = nch * cfg->num_of_subfilters; + const int sz = sizeof(int32_t); + const int n_sz = -sizeof(int32_t); + const int rewind_sz = sz * (nch * (cfg->blk_in + + (cfg->num_of_subfilters - 1) * cfg->idm) - nch); + const int nch_x_idm_sz = -nch * cfg->idm * sizeof(int32_t); + const int taps_div_4 = cfg->subfilter_length >> 2; + +#if SRC_SHORT + const size_t subfilter_size = cfg->subfilter_length * sizeof(int16_t); +#else + const size_t subfilter_size = cfg->subfilter_length * sizeof(int32_t); +#endif + + for (n = 0; n < s->times; n++) { + /* Input data to filter */ + m = blk_in_words; + + /* Setup circular buffer for FIR input data delay */ + AE_SETCBEGIN0(fir->fir_delay); + AE_SETCEND0(fir_end); + + while (m > 0) { + /* Number of words without circular wrap */ + n_wrap_buf = s->x_end_addr - s->x_rptr; + n_min = (m < n_wrap_buf) ? m : n_wrap_buf; + m -= n_min; + for (i = 0; i < n_min; i++) { + /* Load 32 bits sample to accumulator + * and left shift by 8, advance read + * pointer. + */ + q = AE_SLLIQ56(AE_LQ32F_I( + (ae_q32s *)s->x_rptr++, 0), 8); + + /* Store to circular buffer, advance + * write pointer. + */ + AE_SQ32F_C(q, (ae_q32s *)fir->fir_wp, n_sz); + } + + /* Check for wrap */ + src_circ_inc_wrap(&s->x_rptr, s->x_end_addr, s->x_size); + } + + /* Do filter */ + cp = cfg->coefs; /* Reset to 1st coefficient */ + rp = (ae_q32s *)fir->fir_wp; + + /* Do circular modification to pointer rp by amount of + * rewind to to data start. Loaded value q is discarded. + */ + AE_LQ32F_C(q, (ae_q32s *)rp, rewind_sz); + + /* Reset FIR output write pointer and compute all polyphase + * sub-filters. + */ + wp = (ae_q32s *)fir->out_rp; + for (i = 0; i < cfg->num_of_subfilters; i++) { + fir_filter(rp, cp, wp, taps_div_4, cfg->shift, nch); + wp += nch_x_odm; + cp += subfilter_size; + src_circ_inc_wrap((int32_t **)&wp, out_delay_end, + out_size); + + /* Circular advance pointer rp by number of + * channels x input delay multiplier. Loaded value q + * is discarded. + */ + AE_LQ32F_C(q, rp, nch_x_idm_sz); + } + + /* Output */ + + /* Setup circular buffer for SRC out delay access */ + AE_SETCBEGIN0(fir->out_delay); + AE_SETCEND0(out_delay_end); + m = blk_out_words; + while (m > 0) { + n_wrap_buf = s->y_end_addr - s->y_wptr; + n_min = (m < n_wrap_buf) ? m : n_wrap_buf; + m -= n_min; + for (i = 0; i < n_min; i++) { + /* Circular load for 32 bit sample, + * advance pointer. + */ + AE_LQ32F_C(q, (ae_q32s *)fir->out_rp, sz); + + /* Store value as shifted right by 8 for + * sign extended 24 bit value, advance pointer. + */ + AE_SQ32F_I(AE_SRAIQ56(q, 8), + (ae_q32s *)s->y_wptr, 0); + s->y_wptr++; + } + /* Check wrap */ + src_circ_inc_wrap(&s->y_wptr, s->y_end_addr, s->y_size); + } + } +} + +#endif diff --git a/src/audio/src_hifi3.c b/src/audio/src_hifi3.c new file mode 100644 index 0000000..96d3c99 --- /dev/null +++ b/src/audio/src_hifi3.c @@ -0,0 +1,567 @@ +/* + * Copyright (c) 2016, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> + * + */ + +/* HiFi3 optimized code parts for SRC */ + +#include <stdint.h> +#include <reef/alloc.h> +#include <reef/audio/format.h> +#include <reef/math/numbers.h> + +#include "src_config.h" +#include "src.h" + +#if SRC_HIFI3 + +#include <xtensa/config/defs.h> +#include <xtensa/tie/xt_hifi3.h> + +/* HiFi3 has + * 16x 64 bit registers in register file AE_DR + */ + +#if SRC_SHORT /* 16 bit coefficients version */ + +static inline void fir_filter(ae_f32 *rp, const void *cp, ae_f32 *wp0, + const int taps_div_4, const int shift, const int nch) +{ + /* This function uses + * 6x 64 bit registers + * 3x integers + * 5x address pointers, + */ + ae_f64 a0; + ae_f64 a1; + ae_valign u; + ae_f16x4 coef4; + ae_f32x2 d0; + ae_f32x2 d1; + ae_f32x2 data2; + ae_f16x4 *coefp; + ae_f32x2 *dp; + ae_f32 *dp0; + ae_f32 *dp1; + int i; + int j; + ae_f32 *wp = wp0; + const int inc = nch * sizeof(int32_t); + + if (nch == 2) { + /* Move data pointer back by one sample to start from right + * channel sample. Discard read value p0. + */ + dp = (ae_f32x2 *)rp; + AE_L32_XC(d0, (ae_f32 *)dp, -sizeof(ae_f32)); + + /* Reset coefficient pointer and clear accumulator */ + coefp = (ae_f16x4 *)cp; + a0 = AE_ZERO64(); + a1 = AE_ZERO64(); + + /* Compute FIR filter for current channel with four + * taps per every loop iteration. Four coefficients + * are loaded simultaneously. Data is read + * from interleaved buffer with stride of channels + * count. + */ + for (i = 0; i < taps_div_4; i++) { + /* Load four coefficients */ + AE_LA16X4_IP(coef4, u, coefp); + + /* Load two data samples from two channels */ + AE_L32X2_XC(d0, dp, inc); /* r0, l0 */ + AE_L32X2_XC(d1, dp, inc); /* r1, l1 */ + + /* Select to data2 sequential samples from a channel + * and then accumulate to a0 and a1 + * data2_h * coef4_3 + data2_l * coef4_2. + * The data is 32 bits Q1.31 and coefficient 16 bits + * Q1.15. The accumulators are Q17.47. + */ + data2 = AE_SEL32_LL(d0, d1); /* l0, l1 */ + AE_MULAAFD32X16_H3_L2(a0, data2, coef4); + data2 = AE_SEL32_HH(d0, d1); /* r0, r1 */ + AE_MULAAFD32X16_H3_L2(a1, data2, coef4); + + /* Load two data samples from two channels */ + AE_L32X2_XC(d0, dp, inc); /* r2, l2 */ + AE_L32X2_XC(d1, dp, inc); /* r3, l3 */ + + /* Accumulate + * data2_h * coef4_1 + data2_l * coef4_0. + */ + data2 = AE_SEL32_LL(d0, d1); /* l2, l3 */ + AE_MULAAFD32X16_H1_L0(a0, data2, coef4); + data2 = AE_SEL32_HH(d0, d1); /* r2, r3 */ + AE_MULAAFD32X16_H1_L0(a1, data2, coef4); + } + + /* Scale FIR output with right shifts, round/saturate + * to Q1.31, and store 32 bit output. + */ + AE_S32_L_XP(AE_ROUND32F48SSYM(AE_SRAA64(a0, shift)), wp, + sizeof(int32_t)); + AE_S32_L_XP(AE_ROUND32F48SSYM(AE_SRAA64(a1, shift)), wp, + sizeof(int32_t)); + + return; + } + + dp1 = (ae_f32 *)rp; + for (j = 0; j < nch; j++) { + /* Copy pointer and advance to next ch with dummy load */ + dp0 = dp1; + AE_L32_XC(d0, dp1, -sizeof(ae_f32)); + + /* Reset coefficient pointer and clear accumulator */ + coefp = (ae_f16x4 *)cp; + a0 = AE_ZERO64(); + + /* Compute FIR filter for current channel with four + * taps per every loop iteration. Data is read from + * interleaved buffer with stride of channels count. + */ + for (i = 0; i < taps_div_4; i++) { + /* Load four coefficients */ + AE_LA16X4_IP(coef4, u, coefp); + + /* Load two data samples, place to high and + * low of data2. + */ + AE_L32_XC(d0, dp0, inc); + AE_L32_XC(d1, dp0, inc); + data2 = AE_SEL32_LL(d0, d1); + + /* Accumulate + * data2_h * coef4_3 + data2_l* coef4_2. + * The data is 32 bits Q1.31 and coefficient 16 bits + * Q1.15. The accumulator is Q17.47. + */ + AE_MULAAFD32X16_H3_L2(a0, data2, coef4); + + /* Repeat with next two samples */ + AE_L32_XC(d0, dp0, inc); + AE_L32_XC(d1, dp0, inc); + data2 = AE_SEL32_LL(d0, d1); + + /* Accumulate + * data2_h * coef4_1 + data2_l * coef4_0. + */ + AE_MULAAFD32X16_H1_L0(a0, data2, coef4); + } + + /* Scale FIR output with right shifts, round/saturate Q17.47 + * to Q1.31, and store 32 bit output. Advance write + * pointer to next sample. + */ + AE_S32_L_XP(AE_ROUND32F48SSYM(AE_SRAA64(a0, shift)), wp, + sizeof(int32_t)); + } +} + +#else /* 32bit coefficients version */ + +static inline void fir_filter(ae_f32 *rp, const void *cp, ae_f32 *wp0, + const int taps_div_4, const int shift, const int nch) +{ + /* This function uses + * 6x 64 bit registers + * 3x integers + * 5x address pointers, + */ + ae_f64 a0; + ae_f64 a1; + ae_f24x2 data2; + ae_f24x2 coef2; + ae_f24x2 d0; + ae_f24x2 d1; + ae_f24x2 *coefp; + ae_f24x2 *dp; + ae_f24 *dp1; + ae_f24 *dp0; + int i; + int j; + ae_f32 *wp = wp0; + const int inc = nch * sizeof(int32_t); + + if (nch == 2) { + /* Move data pointer back by one sample to start from right + * channel sample. Discard read value p0. + */ + dp = (ae_f24x2 *)rp; + AE_L32F24_XC(d0, (ae_f24 *)dp, -sizeof(ae_f24)); + + /* Reset coefficient pointer and clear accumulator */ + coefp = (ae_f24x2 *)cp; + a0 = AE_ZERO64(); + a1 = AE_ZERO64(); + + /* Compute FIR filter for current channel with four + * taps per every loop iteration. Two coefficients + * are loaded simultaneously. Data is read + * from interleaved buffer with stride of channels + * count. + */ + for (i = 0; i < taps_div_4; i++) { + /* Load two coefficients. Coef2_h contains tap *coefp + * and coef2_l contains the next tap. + */ + /* TODO: Ensure coefficients are 64 bits aligned */ + AE_L32X2F24_IP(coef2, coefp, sizeof(ae_f24x2)); + + /* Load two data samples from two channels */ + AE_L32X2F24_XC(d0, dp, inc); /* r0, l0 */ + AE_L32X2F24_XC(d1, dp, inc); /* r1, l1 */ + + /* Select to d0 successive left channel samples, to d1 + * successive right channel samples. Then Accumulate + * to a0 and a1 + * data2_h * coef2_h + data2_l * coef2_l. The Q1.31 + * data and Q1.15 coefficients are used as 24 bits as + * Q1.23 values. + */ + data2 = AE_SELP24_LL(d0, d1); + AE_MULAAFP24S_HH_LL(a0, data2, coef2); + data2 = AE_SELP24_HH(d0, d1); + AE_MULAAFP24S_HH_LL(a1, data2, coef2); + + /* Repeat for next two taps */ + AE_L32X2F24_IP(coef2, coefp, sizeof(ae_f24x2)); + AE_L32X2F24_XC(d0, dp, inc); /* r2, l2 */ + AE_L32X2F24_XC(d1, dp, inc); /* r3, l3 */ + data2 = AE_SELP24_LL(d0, d1); + AE_MULAAFP24S_HH_LL(a0, data2, coef2); + data2 = AE_SELP24_HH(d0, d1); + AE_MULAAFP24S_HH_LL(a1, data2, coef2); + } + + /* Scale FIR output with right shifts, round/saturate + * to Q1.31, and store 32 bit output. + */ + AE_S32_L_XP(AE_ROUND32F48SSYM(AE_SRAA64(a0, shift)), wp, + sizeof(int32_t)); + AE_S32_L_XP(AE_ROUND32F48SSYM(AE_SRAA64(a1, shift)), wp, + sizeof(int32_t)); + + return; + } + + dp1 = (ae_f24 *)rp; + for (j = 0; j < nch; j++) { + /* Copy pointer and advance to next ch with dummy load */ + dp0 = dp1; + AE_L32F24_XC(data2, dp1, -sizeof(ae_f24)); + + /* Reset coefficient pointer and clear accumulator */ + coefp = (ae_f24x2 *)cp; + a0 = AE_ZERO64(); + + /* Compute FIR filter for current channel with four + * taps per every loop iteration. Data is read from + * interleaved buffer with stride of channels count. + */ + for (i = 0; i < taps_div_4; i++) { + /* Load two coefficients */ + coef2 = *coefp++; + + /* Load two data samples, place to high and + * low of data2. + */ + AE_L32F24_XC(d0, dp0, inc); + AE_L32F24_XC(d1, dp0, inc); + data2 = AE_SELP24_LL(d0, d1); + + /* Accumulate to data2_h * coef2_h + + * data2_l*coef2_l. The Q1.31 bit data is used + * as Q1.23 from MSB side bits of the 32 bit + * word. The accumulator m is Q17.47. + */ + AE_MULAAFD24_HH_LL(a0, data2, coef2); + + /* Repeat the same for next two filter taps */ + coef2 = *coefp++; + AE_L32F24_XC(d0, dp0, inc); + AE_L32F24_XC(d1, dp0, inc); + data2 = AE_SELP24_LL(d0, d1); + AE_MULAAFD24_HH_LL(a0, data2, coef2); + } + + /* Scale FIR output with right shifts, round/saturate Q17.47 + * to Q1.31, and store 32 bit output. Advance write + * pointer to next sample. + */ + AE_S32_L_XP(AE_ROUND32F48SSYM(AE_SRAA64(a0, shift)), wp, + sizeof(int32_t)); + } +} + +#endif /* 32bit coefficients version */ + +void src_polyphase_stage_cir(struct src_stage_prm *s) +{ + /* This function uses + * 1x 64 bit registers + * 16x integers + * 7x address pointers, + */ + ae_int32x2 q; + ae_f32 *rp; + ae_f32 *wp; + int i; + int n; + int m; + int n_wrap_buf; + int n_min; + struct src_state *fir = s->state; + struct src_stage *cfg = s->stage; + int32_t *fir_end = &fir->fir_delay[fir->fir_delay_size]; + int32_t *out_delay_end = &fir->out_delay[fir->out_delay_size]; + const void *cp; /* Can be int32_t or int16_t */ + const size_t out_size = fir->out_delay_size * sizeof(int32_t); + const int nch = s->nch; + const int nch_x_odm = cfg->odm * nch; + const int blk_in_words = nch * cfg->blk_in; + const int blk_out_words = nch * cfg->num_of_subfilters; + const int sz = sizeof(int32_t); + const int n_sz = -sizeof(int32_t); + const int rewind_sz = sz * (nch * (cfg->blk_in + + (cfg->num_of_subfilters - 1) * cfg->idm) - nch); + const int nch_x_idm_sz = -nch * cfg->idm * sizeof(int32_t); + const int taps_div_4 = cfg->subfilter_length >> 2; + +#if SRC_SHORT + const size_t subfilter_size = cfg->subfilter_length * sizeof(int16_t); +#else + const size_t subfilter_size = cfg->subfilter_length * sizeof(int32_t); +#endif + + for (n = 0; n < s->times; n++) { + /* Input data to filter */ + m = blk_in_words; + + /* Setup circular buffer for FIR input data delay */ + AE_SETCBEGIN0(fir->fir_delay); + AE_SETCEND0(fir_end); + + while (m > 0) { + /* Number of words until circular wrap */ + n_wrap_buf = s->x_end_addr - s->x_rptr; + n_min = (m < n_wrap_buf) ? m : n_wrap_buf; + m -= n_min; + for (i = 0; i < n_min; i++) { + /* Load 32 bits sample to accumulator, + * advance pointer. + */ + AE_L32_XP(q, (ae_int32 *)s->x_rptr, sz); + + /* Store to circular buffer, advance pointer */ + AE_S32_L_XC(q, (ae_int32 *)fir->fir_wp, n_sz); + } + + /* Check for wrap */ + src_circ_inc_wrap(&s->x_rptr, s->x_end_addr, s->x_size); + } + + /* Do filter */ + cp = cfg->coefs; /* Reset to 1st coefficient */ + rp = (ae_f32 *)fir->fir_wp; + + /* Do circular modification to pointer rp by amount of + * rewind to to data start. Loaded value q is discarded. + */ + AE_L32_XC(q, rp, rewind_sz); + + /* Reset FIR write pointer and compute all polyphase + * sub-filters. + */ + wp = (ae_f32 *)fir->out_rp; + for (i = 0; i < cfg->num_of_subfilters; i++) { + fir_filter(rp, cp, wp, taps_div_4, cfg->shift, nch); + wp += nch_x_odm; + cp += subfilter_size; + src_circ_inc_wrap((int32_t **)&wp, out_delay_end, + out_size); + + /* Circular advance pointer rp by number of + * channels x input delay multiplier. Loaded value q + * is discarded. + */ + AE_L32_XC(q, rp, nch_x_idm_sz); + } + + /* Output */ + + /* Setup circular buffer for SRC out delay access */ + AE_SETCBEGIN0(fir->out_delay); + AE_SETCEND0(out_delay_end); + m = blk_out_words; + while (m > 0) { + n_wrap_buf = s->y_end_addr - s->y_wptr; + n_min = (m < n_wrap_buf) ? m : n_wrap_buf; + m -= n_min; + for (i = 0; i < n_min; i++) { + /* Circular load followed by linear store, + * advance read and write pointers. + */ + AE_L32_XC(q, (ae_int32 *)fir->out_rp, sz); + AE_S32_L_XP(q, (ae_int32 *)s->y_wptr, sz); + } + + /* Check wrap */ + src_circ_inc_wrap(&s->y_wptr, s->y_end_addr, s->y_size); + } + } +} + +void src_polyphase_stage_cir_s24(struct src_stage_prm *s) +{ + /* This function uses + * 1x 64 bit registers + * 16x integers + * 7x address pointers, + */ + ae_int32x2 q; + ae_f32 *rp; + ae_f32 *wp; + int i; + int n; + int m; + int n_wrap_buf; + int n_min; + + struct src_state *fir = s->state; + struct src_stage *cfg = s->stage; + int32_t *fir_end = &fir->fir_delay[fir->fir_delay_size]; + int32_t *out_delay_end = &fir->out_delay[fir->out_delay_size]; + const void *cp; /* Can be int32_t or int16_t */ + const size_t out_size = fir->out_delay_size * sizeof(int32_t); + const int nch = s->nch; + const int nch_x_odm = cfg->odm * nch; + const int blk_in_words = nch * cfg->blk_in; + const int blk_out_words = nch * cfg->num_of_subfilters; + const int sz = sizeof(int32_t); + const int n_sz = -sizeof(int32_t); + const int rewind_sz = sz * (nch * (cfg->blk_in + + (cfg->num_of_subfilters - 1) * cfg->idm) - nch); + const int nch_x_idm_sz = -nch * cfg->idm * sizeof(int32_t); + const int taps_div_4 = cfg->subfilter_length >> 2; + +#if SRC_SHORT + const size_t subfilter_size = cfg->subfilter_length * sizeof(int16_t); +#else + const size_t subfilter_size = cfg->subfilter_length * sizeof(int32_t); +#endif + + for (n = 0; n < s->times; n++) { + /* Input data */ + m = blk_in_words; + + /* Setup circular buffer for FIR input data delay */ + AE_SETCBEGIN0(fir->fir_delay); + AE_SETCEND0(fir_end); + + while (m > 0) { + /* Number of words without circular wrap */ + n_wrap_buf = s->x_end_addr - s->x_rptr; + n_min = (m < n_wrap_buf) ? m : n_wrap_buf; + m -= n_min; + for (i = 0; i < n_min; i++) { + /* Load 32 bits sample to accumulator + * and left shift by 8, advance read + * pointer. + */ + AE_L32_XP(q, (ae_int32 *)s->x_rptr, sz); + AE_S32_L_XC(AE_SLAI32(q, 8), + (ae_int32 *)fir->fir_wp, n_sz); + } + + /* Check for wrap */ + src_circ_inc_wrap(&s->x_rptr, s->x_end_addr, s->x_size); + } + + /* Do filter */ + cp = cfg->coefs; /* Reset to 1st coefficient */ + rp = (ae_f32 *)fir->fir_wp; + + /* Do circular modification to pointer rp by amount of + * rewind to to data start. Loaded value q is discarded. + */ + AE_L32_XC(q, rp, rewind_sz); + + /* Reset FIR output write pointer and compute all polyphase + * sub-filters. + */ + wp = (ae_f32 *)fir->out_rp; + for (i = 0; i < cfg->num_of_subfilters; i++) { + fir_filter(rp, cp, wp, taps_div_4, cfg->shift, nch); + wp += nch_x_odm; + cp += subfilter_size; + src_circ_inc_wrap((int32_t **)&wp, out_delay_end, + out_size); + + /* Circular advance pointer rp by number of + * channels x input delay multiplier. Loaded value q + * is discarded. + */ + AE_L32_XC(q, rp, nch_x_idm_sz); + } + + /* Output */ + + /* Setup circular buffer for SRC out delay access */ + AE_SETCBEGIN0(fir->out_delay); + AE_SETCEND0(out_delay_end); + m = blk_out_words; + while (m > 0) { + n_wrap_buf = s->y_end_addr - s->y_wptr; + n_min = (m < n_wrap_buf) ? m : n_wrap_buf; + m -= n_min; + for (i = 0; i < n_min; i++) { + /* Circular load for 32 bit sample, + * advance read pointer. + */ + AE_L32_XC(q, (ae_int32 *)fir->out_rp, sz); + + /* Store value as shifted right by 8 + * for sign extended 24 bit value, + * advance write pointer. + */ + AE_S32_L_XP(AE_SRAI32(q, 8), + (ae_int32 *)s->y_wptr, sz); + } + + /* Check wrap */ + src_circ_inc_wrap(&s->y_wptr, s->y_end_addr, s->y_size); + } + } +} + +#endif -- 2.14.1

3 9

[Sound-open-firmware] [PATCH] Fix channel number of CNL DMA.
by yan.wang＠linux.intel.com 09 Mar '18

09 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> The channel numbers of playback and capture are reversed on CNL. The channel number of playback is 9. The channel number of capture is 7. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/platform/cannonlake/dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/cannonlake/dma.c b/src/platform/cannonlake/dma.c index 4c488c1..59e0fc7 100644 --- a/src/platform/cannonlake/dma.c +++ b/src/platform/cannonlake/dma.c @@ -134,7 +134,7 @@ static struct dma dma[] = { .plat_data = { .id = DMA_HOST_IN_DMAC, .base = GTW_HOST_IN_STREAM_BASE(0), - .channels = 9, + .channels = 7, .irq = IRQ_EXT_HOST_DMA_IN_LVL3(0, 0), }, .ops = &hda_host_dma_ops, @@ -143,7 +143,7 @@ static struct dma dma[] = { .plat_data = { .id = DMA_HOST_OUT_DMAC, .base = GTW_HOST_OUT_STREAM_BASE(0), - .channels = 7, + .channels = 9, .irq = IRQ_EXT_HOST_DMA_OUT_LVL3(0, 0), }, .ops = &hda_host_dma_ops, -- 2.14.3

3 3

[Sound-open-firmware] [PATCH] Fix timer on CNL.
by yan.wang＠linux.intel.com 09 Mar '18

09 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> Work queue cannot work rightly because it uses wrong timer setting. Based on Keyon's comments, use SSP CLK intead of CPU CLK. It is confirmed on my CNL platform. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/platform/cannonlake/platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index c49dcb8..c9449ed 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -129,8 +129,8 @@ static struct work_queue_timesource platform_generic_queue = { .id = TIMER3, /* external timer */ .irq = IRQ_EXT_TSTAMP0_LVL2(0), }, - .clk = CLK_CPU, - .notifier = NOTIFIER_ID_CPU_FREQ, + .clk = CLK_SSP, + .notifier = NOTIFIER_ID_SSP_FREQ, .timer_set = platform_timer_set, .timer_clear = platform_timer_clear, .timer_get = platform_timer_get, -- 2.14.3

4 3

[Sound-open-firmware] [PATCH] pipeline: fix error handling
by Pierre-Louis Bossart 09 Mar '18

09 Mar '18

missing assignment of 'ret' variable, fix Detected with sonarcloud. Fixes: 4252c49d537 ('pipeline: Add XRUN state and handler within pipeline') Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/audio/pipeline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 728b64d..c7f8aed 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -1063,14 +1063,14 @@ static int pipeline_xrun_recover(struct pipeline *p) p->xrun_bytes = 0; /* prepare the pipeline */ - pipeline_prepare(p, p->source_comp); + ret = pipeline_prepare(p, p->source_comp); if (ret < 0) { trace_pipe_error("px1"); return ret; } /* restart pipeline comps */ - pipeline_cmd(p, p->source_comp, COMP_CMD_START, NULL); + ret = pipeline_cmd(p, p->source_comp, COMP_CMD_START, NULL); if (ret < 0) { trace_pipe_error("px2"); return ret; -- 2.14.1

2 1

[Sound-open-firmware] [PATCH 2/2] cnl: dma: refine dma interrupt processing on cnl
by Rander Wang 09 Mar '18

09 Mar '18

On cnl, all the dma share the same interrupt pin, so all the dma controller need to be checked in interrupt function. Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- src/drivers/dw-dma.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index f736679..a06087e 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1136,6 +1136,26 @@ static void dw_dma_irq_handler(void *data) } } +/*All the dma share the same interrupt on CNL, so check each dma*/ +/*controller when interrupt coming, then do the work */ +static void dw_dma_irq_cnl(void *data) +{ + struct dma *dma; + uint32_t status_intr; + + /*check interrupt status of DMA controller 0*/ + dma = dma_get(DMA_GP_LP_DMAC0); + status_intr = dw_read(dma, DW_INTR_STATUS); + if (status_intr) + dw_dma_irq_handler(dma); + + /*check interrupt status of DMA controller 1*/ + dma = dma_get(DMA_GP_LP_DMAC1); + status_intr = dw_read(dma, DW_INTR_STATUS); + if (status_intr) + dw_dma_irq_handler(dma); +} + static int dw_dma_probe(struct dma *dma) { struct dma_pdata *dw_pdata; @@ -1157,7 +1177,11 @@ static int dw_dma_probe(struct dma *dma) } /* register our IRQ handler */ +#ifdef CONFIG_CANNONLAKE + interrupt_register(dma_irq(dma), dw_dma_irq_cnl, dma); +#else interrupt_register(dma_irq(dma), dw_dma_irq_handler, dma); +#endif interrupt_enable(dma_irq(dma)); return 0; -- 2.14.1

3 8

[Sound-open-firmware] [PATCH] clk: add missing break in switch block
by Pierre-Louis Bossart 09 Mar '18

09 Mar '18

Make static analyzers happy by adding a break. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/platform/baytrail/clk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/platform/baytrail/clk.c b/src/platform/baytrail/clk.c index fc1cd9d..fc535ca 100644 --- a/src/platform/baytrail/clk.c +++ b/src/platform/baytrail/clk.c @@ -214,6 +214,7 @@ uint32_t clock_set_freq(int clock, uint32_t hz) /* tell anyone interested we have now changed CPU freq */ notifier_event(NOTIFIER_ID_SSP_FREQ, CLOCK_NOTIFY_POST, &notify_data); + break; default: break; -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] dw-dma: simplify conditional statement
by Pierre-Louis Bossart 09 Mar '18

09 Mar '18

detected with sonarcloud: fix pointer test and avoid redundant evaluation of lli as always true. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/drivers/dw-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index f6f776a..7659bec 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -779,7 +779,7 @@ static inline void dw_dma_chan_reload_lli(struct dma *dma, int channel) struct dw_lli2 *lli = p->chan[channel].lli_current; /* only need to reload if this is a block transfer */ - if (lli == 0 || (lli && lli->llp == 0)) { + if (!lli || lli->llp == 0) { p->chan[channel].status = COMP_STATE_PREPARE; return; } -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] volume: fix error in logical operations
by Pierre-Louis Bossart 09 Mar '18

09 Mar '18

Detected with sonarcloud: test evaluates as always true. Make sure both volume and switch are handled correctly Fixes: 43e86cab608 ('volume: fix logic for volume mute/unmute') Cc: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/audio/volume.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index ee9b361..45a343e 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -525,7 +525,8 @@ static int volume_ctrl_get_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *c return -EINVAL; } - if (cdata->cmd == SOF_CTRL_CMD_VOLUME || SOF_CTRL_CMD_SWITCH) { + if (cdata->cmd == SOF_CTRL_CMD_VOLUME || + cdata->cmd == SOF_CTRL_CMD_SWITCH) { trace_volume("vgt"); trace_value(cdata->comp_id); for (j = 0; j < cdata->num_elems; j++) { -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] cnl: ssp: fix DSP_B setting in ssp
by Rander Wang 08 Mar '18

08 Mar '18

set ssp according to DSP_B spec Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- src/drivers/apl-ssp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index a726f3c..c32bd35 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -333,10 +333,11 @@ static inline int ssp_set_config(struct dai *dai, sscr0 |= SSCR0_MOD | SSCR0_FRDC(config->num_slots); /* set asserted frame length */ - frame_len = config->sample_container_bits; + frame_len = 1; /* handle frame polarity, DSP_A default is rising/active high */ - sspsp |= SSPSP_SFRMP(inverted_frame); + sspsp |= SSPSP_SFRMP(!inverted_frame); + sspsp |= SSPSP_FSRT; break; default: -- 2.14.1

4 8

[Sound-open-firmware] [PATCH 0/7] ASoC: SOF: Memory window stream update support
by Xiuli Pan 07 Mar '18

07 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> This patch set is split from 2 patch. And used with master SOF FW. Pan Xiuli (7): ASoC: SOF: Add position update related header ASoc: SOF: Refine memory window for APL ASoc: SOF: Add memory window for BYT ASoc: SOF: Add memory window for HSW ASoc: SOF: Add memory window for BDW ASoC: SOF: Add position offset update in PCM ASoc: SOF: Add position update through memory window sound/soc/sof/hw-apl.c | 27 +++++++++++-- sound/soc/sof/hw-bdw.c | 101 ++++++++++++++++++++++++++++++++++++++++++---- sound/soc/sof/hw-byt.c | 102 +++++++++++++++++++++++++++++++++++++++++++---- sound/soc/sof/hw-hsw.c | 101 ++++++++++++++++++++++++++++++++++++++++++---- sound/soc/sof/ipc.c | 73 +++++++++++++++++++++++++-------- sound/soc/sof/pcm.c | 16 ++++++-- sound/soc/sof/sof-priv.h | 2 + 7 files changed, 377 insertions(+), 45 deletions(-) -- 2.7.4

2 8

[Sound-open-firmware] [PATCH] dma: change dma transfer type to enum.
by Keyon Jie 07 Mar '18

07 Mar '18

Change to use enum for dma transfer type. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/drivers/dw-dma.c | 2 +- src/drivers/hda-dma.c | 2 +- src/include/reef/dma.h | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index c2d6917..49f782d 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -249,7 +249,7 @@ /* data for each DMA channel */ struct dma_chan_data { uint32_t status; - uint32_t direction; + enum dma_copy_dir direction; struct dw_lli2 *lli; struct dw_lli2 *lli_current; uint32_t desc_count; diff --git a/src/drivers/hda-dma.c b/src/drivers/hda-dma.c index 06b2d9c..d2064e8 100644 --- a/src/drivers/hda-dma.c +++ b/src/drivers/hda-dma.c @@ -84,7 +84,7 @@ struct hda_chan_data { uint32_t status; uint32_t desc_count; uint32_t desc_avail; - uint32_t direction; + enum dma_copy_dir direction; }; struct dma_pdata { diff --git a/src/include/reef/dma.h b/src/include/reef/dma.h index f82b533..247bcbf 100644 --- a/src/include/reef/dma.h +++ b/src/include/reef/dma.h @@ -38,13 +38,15 @@ #include <reef/reef.h> #include <reef/wait.h> -/* DMA directions */ -#define DMA_DIR_MEM_TO_MEM 0 /* local memcpy */ -#define DMA_DIR_HMEM_TO_LMEM 1 /* host to local memcpy */ -#define DMA_DIR_LMEM_TO_HMEM 2 /* local to host memcpy */ -#define DMA_DIR_MEM_TO_DEV 3 -#define DMA_DIR_DEV_TO_MEM 4 -#define DMA_DIR_DEV_TO_DEV 5 +/* types of DMA directions */ +enum dma_copy_dir { + DMA_DIR_MEM_TO_MEM = 0, /* local memcpy */ + DMA_DIR_HMEM_TO_LMEM, /* host to local memcpy */ + DMA_DIR_LMEM_TO_HMEM, /* local to host memcpy */ + DMA_DIR_MEM_TO_DEV, + DMA_DIR_DEV_TO_MEM, + DMA_DIR_DEV_TO_DEV, +}; /* DMA IRQ types */ #define DMA_IRQ_TYPE_BLOCK (1 << 0) @@ -71,7 +73,7 @@ struct dma_sg_config { uint32_t src_width; /* in bytes */ uint32_t dest_width; /* in bytes */ uint32_t burst_elems; - uint32_t direction; + enum dma_copy_dir direction; uint32_t src_dev; uint32_t dest_dev; uint32_t cyclic; /* circular buffer */ -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] topology: Remove volume mute in volume pipeline
by Xiuli Pan 07 Mar '18

07 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Volume mute will cause a regression. Delete it now. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 and GP-MRB nocodec SOF master: 77ed88aa4a26c3ff6f479bf0894a13c87119ffdc SOF-Tool master: 3105de2481b5b5511b2fa844fe859f023f434b4c https://github.com/plbossart/sound/tree/topic/sof-v4.14: d919ea06b7f79c95ab4eb68baf05e9faf3a894c1 --- topology/sof/pipe-volume-playback.m4 | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 90fe303..d6624b0 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -25,15 +25,6 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, Channel register and shift for Front Left/Right, LIST(` ', KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) -# Volume Mixer Switch control with max value of 1 -C_CONTROLMIXER(Master Playback Volume Switch, PIPELINE_ID, - CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), - CONTROLMIXER_MAX(max value 1 indicates switch type control, 1), - false, - , - Channel register and shift for Front Left/Right, - LIST(` ', KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) - # # Components and Buffers # @@ -43,7 +34,7 @@ C_CONTROLMIXER(Master Playback Volume Switch, PIPELINE_ID, W_PCM_PLAYBACK(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 Switch", "Master Playback Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Playback Volume")) # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, -- 2.7.4

2 1

[Sound-open-firmware] [PATCH] hda-dma: fix src_width and dest_width for 32 bit container case
by Keyon Jie 07 Mar '18

07 Mar '18

The src_width and dest_width are configured already in Bytes, here fix it, otherwise 24/32 bit copying with hda-dma may have problem. Reported-by: Zhigang Wu <zhigang.wu(a)linux.intel.com> Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/drivers/hda-dma.c | 6 +++--- src/include/reef/dma.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/drivers/hda-dma.c b/src/drivers/hda-dma.c index 57cb7fc..06b2d9c 100644 --- a/src/drivers/hda-dma.c +++ b/src/drivers/hda-dma.c @@ -343,11 +343,11 @@ static int hda_dma_set_config(struct dma *dma, int channel, /* firmware control buffer */ dgcs = DGCS_FWCB; - /* set DGCS.SCS bit to 0 for 32 bit container */ + /* set DGCS.SCS bit to 1 for 16bit(2B) container */ if ((config->direction == DMA_DIR_HMEM_TO_LMEM && - config->dest_width <= 16) || + config->dest_width <= 2) || (config->direction == DMA_DIR_LMEM_TO_HMEM && - config->src_width <= 16)) + config->src_width <= 2)) dgcs |= DGCS_SCS; /* init channel in HW */ diff --git a/src/include/reef/dma.h b/src/include/reef/dma.h index 71bce56..f82b533 100644 --- a/src/include/reef/dma.h +++ b/src/include/reef/dma.h @@ -68,8 +68,8 @@ struct dma_sg_elem { /* DMA physical SG params */ struct dma_sg_config { - uint32_t src_width; - uint32_t dest_width; + uint32_t src_width; /* in bytes */ + uint32_t dest_width; /* in bytes */ uint32_t burst_elems; uint32_t direction; uint32_t src_dev; -- 2.14.1

2 1

[Sound-open-firmware] [PATCH_V2 1/2] cnl: dma: refine dma probe
by Rander Wang 07 Mar '18

07 Mar '18

Probe each dma individually --- V2: rebase on master Tested with: SOF master kernel:pierre V4.14 branch Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- src/drivers/dw-dma.c | 38 +++++++++++--------------------------- src/platform/cannonlake/platform.c | 5 +++++ 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index c2d6917..ccefc50 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1048,14 +1048,7 @@ static void dw_dma_irq_handler(void *data) status_intr = dw_read(dma, DW_INTR_STATUS); if (!status_intr) { -#ifdef CONFIG_CANNONLAKE - dma++; - status_intr = dw_read(dma, DW_INTR_STATUS); - if (!status_intr) - trace_dma_error("eI0"); -#else trace_dma_error("eI0"); -#endif } tracev_dma("DIr"); @@ -1148,31 +1141,22 @@ static void dw_dma_irq_handler(void *data) static int dw_dma_probe(struct dma *dma) { struct dma_pdata *dw_pdata; - struct dma *dmac = dma; int i; -#ifdef CONFIG_CANNONLAKE - int j; - - for (j = 0; j < MAX_GPDMA_COUNT; j++) -#endif - { - /* allocate private data */ - dw_pdata = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, - sizeof(*dw_pdata)); - dma_set_drvdata(dmac, dw_pdata); - spinlock_init(&dmac->lock); + /* allocate private data */ + dw_pdata = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + sizeof(*dw_pdata)); + dma_set_drvdata(dma, dw_pdata); - dw_dma_setup(dmac); + spinlock_init(&dma->lock); - /* init work */ - for (i = 0; i < DW_MAX_CHAN; i++) { - dw_pdata->chan[i].dma = dmac; - dw_pdata->chan[i].channel = i; - dw_pdata->chan[i].status = COMP_STATE_INIT; - } + dw_dma_setup(dma); - dmac++; + /* init work */ + for (i = 0; i < DW_MAX_CHAN; i++) { + dw_pdata->chan[i].dma = dma; + dw_pdata->chan[i].channel = i; + dw_pdata->chan[i].status = COMP_STATE_INIT; } /* register our IRQ handler */ diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index 32a4454..ad26a06 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -259,6 +259,11 @@ int platform_init(struct reef *reef) return -ENODEV; dma_probe(dmac); + dmac = dma_get(DMA_GP_LP_DMAC1); + if (!dmac) + return -ENODEV; + dma_probe(dmac); + dmac = dma_get(DMA_HOST_OUT_DMAC); if (!dmac) return -ENODEV; -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] topology: test: add simple test for Up2 board
by Pierre-Louis Bossart 07 Mar '18

07 Mar '18

Up^2 board exposes I2S signals on the 40-pin connector (https://wiki.up-community.org/Pinout_UP2) Add test for SSP5 (marked in pinout as AVS_I2S6) Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- topology/test/tplg-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index eaa6f8b..16d3630 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -106,6 +106,7 @@ simple_test baytrail src "Baytrail Audio" s24le 2 s24le 25 24 2400000 19200000 # for APL simple_test nocodec volume "NoCodec" s16le 4 s16le 16 16 1536000 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 # 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 1

[Sound-open-firmware] [PATCH 0/3] Use correct clock values
by Pierre-Louis Bossart 07 Mar '18

07 Mar '18

Copy-pastes left uncorrected... Still TODO for CNL/APL: 1. use SSP for workqueues 2. match external timer with MCLK value from topology (not sure how). Pierre-Louis Bossart (3): clk: fix ApolloLake SSP clock values clk: fix CNL clk allocation platform: cnl: fix clock settings src/platform/apollolake/clk.c | 3 +-- src/platform/cannonlake/clk.c | 2 +- src/platform/cannonlake/platform.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) -- 2.14.1

3 6

[Sound-open-firmware] [PATCH] hda-dma: fix configure direction wrong issue
by Keyon Jie 07 Mar '18

07 Mar '18

The directions configured in sg_elem are actually dma transfer type, not playback/capture direction, here correct them. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/drivers/hda-dma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/drivers/hda-dma.c b/src/drivers/hda-dma.c index 87221a8..57cb7fc 100644 --- a/src/drivers/hda-dma.c +++ b/src/drivers/hda-dma.c @@ -313,7 +313,7 @@ static int hda_dma_set_config(struct dma *dma, int channel, list_for_item(plist, &config->elem_list) { sg_elem = container_of(plist, struct dma_sg_elem, list); - if (config->direction == SOF_IPC_STREAM_PLAYBACK) + if (config->direction == DMA_DIR_HMEM_TO_LMEM) addr = sg_elem->dest; else addr = sg_elem->src; @@ -344,10 +344,10 @@ static int hda_dma_set_config(struct dma *dma, int channel, dgcs = DGCS_FWCB; /* set DGCS.SCS bit to 0 for 32 bit container */ - if ((config->direction == SOF_IPC_STREAM_PLAYBACK && - config->dest_width <= 16) || - (config->direction == SOF_IPC_STREAM_CAPTURE && - config->src_width <= 16)) + if ((config->direction == DMA_DIR_HMEM_TO_LMEM && + config->dest_width <= 16) || + (config->direction == DMA_DIR_LMEM_TO_HMEM && + config->src_width <= 16)) dgcs |= DGCS_SCS; /* init channel in HW */ -- 2.14.1

2 2

[Sound-open-firmware] [PATCH] topology: fix dai capture tokens and move buffer size macro definition
by Ranjani Sridharan 06 Mar '18

06 Mar '18

This patch fixes typo in dai capture tokens and moves te buffer size macro definition to buffer.m4 Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- topology/dsps/bdw.m4 | 2 +- topology/dsps/bxt.m4 | 2 +- topology/dsps/byt.m4 | 2 +- topology/dsps/cht.m4 | 2 +- topology/dsps/cnl.m4 | 2 +- topology/dsps/hsw.m4 | 2 +- topology/m4/buffer.m4 | 22 ++++++++++++++++++++++ topology/m4/pcm.m4 | 22 ---------------------- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/topology/dsps/bdw.m4 b/topology/dsps/bdw.m4 index a6022b9..c2bf04e 100644 --- a/topology/dsps/bdw.m4 +++ b/topology/dsps/bdw.m4 @@ -31,7 +31,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC " W_DATA(dai0p_plat_conf, dai0p_plat_tokens) # DAI0 platform capture configuration -W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC "1"')) +W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"')) W_DATA(dai0c_plat_conf, dai0c_plat_tokens) diff --git a/topology/dsps/bxt.m4 b/topology/dsps/bxt.m4 index 4d45386..df61d1a 100644 --- a/topology/dsps/bxt.m4 +++ b/topology/dsps/bxt.m4 @@ -34,7 +34,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC " W_DATA(dai0p_plat_conf, dai0p_plat_tokens) # DAI0 platform capture configuration -W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC "1"')) +W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"')) W_DATA(dai0c_plat_conf, dai0c_plat_tokens) diff --git a/topology/dsps/byt.m4 b/topology/dsps/byt.m4 index ab707f8..d1d4886 100644 --- a/topology/dsps/byt.m4 +++ b/topology/dsps/byt.m4 @@ -31,7 +31,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC " W_DATA(dai0p_plat_conf, dai0p_plat_tokens) # DAI0 platform capture configuration -W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC "1"')) +W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"')) W_DATA(dai0c_plat_conf, dai0c_plat_tokens) diff --git a/topology/dsps/cht.m4 b/topology/dsps/cht.m4 index 41529dc..4ed114f 100644 --- a/topology/dsps/cht.m4 +++ b/topology/dsps/cht.m4 @@ -31,7 +31,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC " W_DATA(dai0p_plat_conf, dai0p_plat_tokens) # DAI0 platform capture configuration -W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC "1"')) +W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"')) W_DATA(dai0c_plat_conf, dai0c_plat_tokens) diff --git a/topology/dsps/cnl.m4 b/topology/dsps/cnl.m4 index 431db32..41ece94 100644 --- a/topology/dsps/cnl.m4 +++ b/topology/dsps/cnl.m4 @@ -35,7 +35,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC " W_DATA(dai0p_plat_conf, dai0p_plat_tokens) # DAI0 platform capture configuration -W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC "1"')) +W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"')) W_DATA(dai0c_plat_conf, dai0c_plat_tokens) diff --git a/topology/dsps/hsw.m4 b/topology/dsps/hsw.m4 index 5db318f..754fc41 100644 --- a/topology/dsps/hsw.m4 +++ b/topology/dsps/hsw.m4 @@ -31,7 +31,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC " W_DATA(dai0p_plat_conf, dai0p_plat_tokens) # DAI0 platform capture configuration -W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC "1"')) +W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"')) W_DATA(dai0c_plat_conf, dai0c_plat_tokens) diff --git a/topology/m4/buffer.m4 b/topology/m4/buffer.m4 index fc06ba0..4bfd212 100644 --- a/topology/m4/buffer.m4 +++ b/topology/m4/buffer.m4 @@ -26,4 +26,26 @@ define(`W_BUFFER', ` ]' `}') +dnl COMP_BUFFER_SIZE( num_periods, sample_size, channels, fmames) +define(`COMP_BUFFER_SIZE', `eval(`$1 * $2 * $3 * $4')') + +dnl PCM_PLAYBACK_ADD(name, pipeline, pcm_id, dai_id, playback) +define(`PCM_PLAYBACK_ADD', +`SectionPCM.STR($1) {' +`' +` index STR($2)' +`' +` # used for binding to the PCM' +` id STR($3)' +`' +` dai.STR($1 $3) {' +` id STR($4)' +` }' +`' +` pcm."playback" {' +`' +` capabilities STR($5)' +` }' +`}') + divert(0)dnl diff --git a/topology/m4/pcm.m4 b/topology/m4/pcm.m4 index d767350..596f2fe 100644 --- a/topology/m4/pcm.m4 +++ b/topology/m4/pcm.m4 @@ -93,28 +93,6 @@ define(`PCM_CAPABILITIES', ` buffer_size_max STR($12)' `}') -dnl COMP_BUFFER_SIZE( num_periods, sample_size, channels, fmames) -define(`COMP_BUFFER_SIZE', `eval(`$1 * $2 * $3 * $4')') - -dnl PCM_PLAYBACK_ADD(name, pipeline, pcm_id, dai_id, playback) -define(`PCM_PLAYBACK_ADD', -`SectionPCM.STR($1) {' -`' -` index STR($2)' -`' -` # used for binding to the PCM' -` id STR($3)' -`' -` dai.STR($1 $3) {' -` id STR($4)' -` }' -`' -` pcm."playback" {' -`' -` capabilities STR($5)' -` }' -`}') - dnl PCM_CAPTURE_ADD(name, pipeline, pcm_id, dai_id, capture) define(`PCM_CAPTURE_ADD', `SectionPCM.STR($1) {' -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] topology: byt-rt5651: Fix BE DAI link name.
by Liam Girdwood 06 Mar '18

06 Mar '18

Should be SSP2-Codec. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/reef-byt-rt5651.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4 index 96147d3..ec114d7 100644 --- a/topology/reef-byt-rt5651.m4 +++ b/topology/reef-byt-rt5651.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, Baytrail Audio, I2S, 24, +DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), -- 2.14.1

1 0

[Sound-open-firmware] [PATCH V4 1/2] ASoc: SOF: Add memory window for all platform
by Xiuli Pan 06 Mar '18

06 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add memory window handler for BYT, HSW and BDW. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- v1: rebase and some typo fix v2: rebase and fix window setting v3: rebase v4: rebase and add err handler for get_window function Test with: Mininow max rt5651 SOF master: e92ef97834489f52c0f20445d401a8c6e0aaed62 SOF-Tool master: 5b8dfd13019cfd29999503b56c902f56209000ed https://github.com/plbossart/sound/tree/topic/sof-v4.14: d919ea06b7f79c95ab4eb68baf05e9faf3a894c1 --- sound/soc/sof/hw-apl.c | 23 +++++++++--- sound/soc/sof/hw-bdw.c | 97 +++++++++++++++++++++++++++++++++++++++++++++---- sound/soc/sof/hw-byt.c | 98 +++++++++++++++++++++++++++++++++++++++++++++----- sound/soc/sof/hw-hsw.c | 97 +++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 289 insertions(+), 26 deletions(-) diff --git a/sound/soc/sof/hw-apl.c b/sound/soc/sof/hw-apl.c index bfbdd915..1823153 100644 --- a/sound/soc/sof/hw-apl.c +++ b/sound/soc/sof/hw-apl.c @@ -1089,12 +1089,18 @@ static int apl_prepare(struct snd_sof_dev *sdev, unsigned int format, static void apl_get_windows(struct snd_sof_dev *sdev) { struct sof_ipc_window_elem *elem; + u32 outbox_offset = 0; + u32 stream_offset = 0; + u32 inbox_offset = 0; + u32 outbox_size = 0; + u32 stream_size = 0; + u32 inbox_size = 0; int i; - u32 inbox_offset = 0, outbox_offset = 0; - u32 inbox_size = 0, outbox_size = 0; - if (!sdev->info_window) + if (!sdev->info_window) { + dev_err(sdev->dev, "error: have no window info\n"); return; + } for (i = 0; i < sdev->info_window->num_windows; i++) { elem = &sdev->info_window->window[i]; @@ -1135,6 +1141,9 @@ static void apl_get_windows(struct snd_sof_dev *sdev) elem->size, "debug"); break; case SOF_IPC_REGION_STREAM: + stream_offset = + elem->offset + SRAM_WINDOW_OFFSET(elem->id); + stream_size = elem->size; snd_sof_debugfs_create_item(sdev, sdev->bar[APL_DSP_BAR] + elem->offset + @@ -1151,10 +1160,16 @@ static void apl_get_windows(struct snd_sof_dev *sdev) elem->size, "regs"); break; default: - break; + dev_err(sdev->dev, "error: get illegal window info\n"); + return; } } + if (outbox_size == 0 || inbox_size == 0) { + dev_err(sdev->dev, "error: get illegal mailbox window\n"); + return; + } + snd_sof_dsp_mailbox_init(sdev, inbox_offset, inbox_size, outbox_offset, outbox_size); diff --git a/sound/soc/sof/hw-bdw.c b/sound/soc/sof/hw-bdw.c index b1c9508..1fe2807 100644 --- a/sound/soc/sof/hw-bdw.c +++ b/sound/soc/sof/hw-bdw.c @@ -66,7 +66,6 @@ static const struct snd_sof_debugfs_map bdw_debugfs[] = { {"iram", BDW_DSP_BAR, IRAM_OFFSET, BDW_IRAM_SIZE}, {"dram", BDW_DSP_BAR, DRAM_OFFSET, BDW_DRAM_SIZE}, {"shim", BDW_DSP_BAR, SHIM_OFFSET, SHIM_SIZE}, - {"mbox", BDW_DSP_BAR, MBOX_OFFSET, MBOX_SIZE}, }; /* @@ -389,6 +388,88 @@ static irqreturn_t bdw_irq_thread(int irq, void *context) /* * IPC Firmware ready. */ +static void bdw_get_windows(struct snd_sof_dev *sdev) +{ + struct sof_ipc_window_elem *elem; + u32 outbox_offset = 0; + u32 stream_offset = 0; + u32 inbox_offset = 0; + u32 outbox_size = 0; + u32 stream_size = 0; + u32 inbox_size = 0; + int i; + + if (!sdev->info_window) { + dev_err(sdev->dev, "error: have no window info\n"); + return; + } + + for (i = 0; i < sdev->info_window->num_windows; i++) { + elem = &sdev->info_window->window[i]; + + switch (elem->type) { + case SOF_IPC_REGION_UPBOX: + inbox_offset = elem->offset + MBOX_OFFSET; + inbox_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[BDW_DSP_BAR] + + inbox_offset, + elem->size, "inbox"); + break; + case SOF_IPC_REGION_DOWNBOX: + outbox_offset = elem->offset + MBOX_OFFSET; + outbox_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[BDW_DSP_BAR] + + outbox_offset, + elem->size, "outbox"); + break; + case SOF_IPC_REGION_TRACE: + snd_sof_debugfs_create_item(sdev, + sdev->bar[BDW_DSP_BAR] + + elem->offset + MBOX_OFFSET, + elem->size, "etrace"); + break; + case SOF_IPC_REGION_DEBUG: + snd_sof_debugfs_create_item(sdev, + sdev->bar[BDW_DSP_BAR] + + elem->offset + MBOX_OFFSET, + elem->size, "debug"); + break; + case SOF_IPC_REGION_STREAM: + stream_offset = elem->offset + MBOX_OFFSET; + stream_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[BDW_DSP_BAR] + + stream_offset, + elem->size, "stream"); + break; + case SOF_IPC_REGION_REGS: + snd_sof_debugfs_create_item(sdev, + sdev->bar[BDW_DSP_BAR] + + elem->offset + MBOX_OFFSET, + elem->size, "regs"); + break; + default: + dev_err(sdev->dev, "error: get illegal window info\n"); + return; + } + } + + if (outbox_size == 0 || inbox_size == 0) { + dev_err(sdev->dev, "error: get illegal mailbox window\n"); + return; + } + + snd_sof_dsp_mailbox_init(sdev, inbox_offset, inbox_size, + outbox_offset, outbox_size); + + dev_dbg(sdev->dev, " mailbox upstream 0x%x - size 0x%x\n", + inbox_offset, inbox_size); + dev_dbg(sdev->dev, " mailbox downstream 0x%x - size 0x%x\n", + outbox_offset, outbox_size); +} + static int bdw_fw_ready(struct snd_sof_dev *sdev, u32 msg_id) { struct sof_ipc_fw_ready *fw_ready = &sdev->fw_ready; @@ -409,14 +490,16 @@ static int bdw_fw_ready(struct snd_sof_dev *sdev, u32 msg_id) fw_ready->hostbox_offset, fw_ready->hostbox_size); - dev_dbg(sdev->dev, " mailbox DSP initiated 0x%x - size 0x%x\n", - fw_ready->dspbox_offset, fw_ready->dspbox_size); - dev_dbg(sdev->dev, " mailbox Host initiated 0x%x - size 0x%x\n", - fw_ready->hostbox_offset, fw_ready->hostbox_size); - - dev_info(sdev->dev, " Firmware info: version %d:%d-%s build %d on %s:%s\n", + dev_info(sdev->dev, + " Firmware info: version %d:%d-%s build %d on %s:%s\n", v->major, v->minor, v->tag, v->build, v->date, v->time); + /* now check for extended data */ + snd_sof_fw_parse_ext_data(sdev, MBOX_OFFSET + + sizeof(struct sof_ipc_fw_ready)); + + bdw_get_windows(sdev); + return 0; } diff --git a/sound/soc/sof/hw-byt.c b/sound/soc/sof/hw-byt.c index 367fab9..8d27e18 100644 --- a/sound/soc/sof/hw-byt.c +++ b/sound/soc/sof/hw-byt.c @@ -76,7 +76,6 @@ static const struct snd_sof_debugfs_map byt_debugfs[] = { {"iram", BYT_DSP_BAR, IRAM_OFFSET, IRAM_SIZE}, {"dram", BYT_DSP_BAR, DRAM_OFFSET, DRAM_SIZE}, {"shim", BYT_DSP_BAR, SHIM_OFFSET, SHIM_SIZE}, - {"mbox", BYT_DSP_BAR, MBOX_OFFSET, MBOX_SIZE}, }; static const struct snd_sof_debugfs_map cht_debugfs[] = { @@ -92,7 +91,6 @@ static const struct snd_sof_debugfs_map cht_debugfs[] = { {"iram", BYT_DSP_BAR, IRAM_OFFSET, IRAM_SIZE}, {"dram", BYT_DSP_BAR, DRAM_OFFSET, DRAM_SIZE}, {"shim", BYT_DSP_BAR, SHIM_OFFSET, SHIM_SIZE}, - {"mbox", BYT_DSP_BAR, MBOX_OFFSET, MBOX_SIZE}, }; /* @@ -160,6 +158,88 @@ static void byt_block_read(struct snd_sof_dev *sdev, u32 offset, void *dest, /* * IPC Firmware ready. */ +static void byt_get_windows(struct snd_sof_dev *sdev) +{ + struct sof_ipc_window_elem *elem; + u32 outbox_offset = 0; + u32 stream_offset = 0; + u32 inbox_offset = 0; + u32 outbox_size = 0; + u32 stream_size = 0; + u32 inbox_size = 0; + int i; + + if (!sdev->info_window) { + dev_err(sdev->dev, "error: have no window info\n"); + return; + } + + for (i = 0; i < sdev->info_window->num_windows; i++) { + elem = &sdev->info_window->window[i]; + + switch (elem->type) { + case SOF_IPC_REGION_UPBOX: + inbox_offset = elem->offset + MBOX_OFFSET; + inbox_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[BYT_DSP_BAR] + + inbox_offset, + elem->size, "inbox"); + break; + case SOF_IPC_REGION_DOWNBOX: + outbox_offset = elem->offset + MBOX_OFFSET; + outbox_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[BYT_DSP_BAR] + + outbox_offset, + elem->size, "outbox"); + break; + case SOF_IPC_REGION_TRACE: + snd_sof_debugfs_create_item(sdev, + sdev->bar[BYT_DSP_BAR] + + elem->offset + MBOX_OFFSET, + elem->size, "etrace"); + break; + case SOF_IPC_REGION_DEBUG: + snd_sof_debugfs_create_item(sdev, + sdev->bar[BYT_DSP_BAR] + + elem->offset + MBOX_OFFSET, + elem->size, "debug"); + break; + case SOF_IPC_REGION_STREAM: + stream_offset = elem->offset + MBOX_OFFSET; + stream_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[BYT_DSP_BAR] + + stream_offset, + elem->size, "stream"); + break; + case SOF_IPC_REGION_REGS: + snd_sof_debugfs_create_item(sdev, + sdev->bar[BYT_DSP_BAR] + + elem->offset + MBOX_OFFSET, + elem->size, "regs"); + break; + default: + dev_err(sdev->dev, "error: get illegal window info\n"); + return; + } + } + + if (outbox_size == 0 || inbox_size == 0) { + dev_err(sdev->dev, "error: get illegal mailbox window\n"); + return; + } + + snd_sof_dsp_mailbox_init(sdev, inbox_offset, inbox_size, + outbox_offset, outbox_size); + + dev_dbg(sdev->dev, " mailbox upstream 0x%x - size 0x%x\n", + inbox_offset, inbox_size); + dev_dbg(sdev->dev, " mailbox downstream 0x%x - size 0x%x\n", + outbox_offset, outbox_size); +} + static int byt_fw_ready(struct snd_sof_dev *sdev, u32 msg_id) { struct sof_ipc_fw_ready *fw_ready = &sdev->fw_ready; @@ -180,14 +260,16 @@ static int byt_fw_ready(struct snd_sof_dev *sdev, u32 msg_id) fw_ready->hostbox_offset, fw_ready->hostbox_size); - dev_dbg(sdev->dev, " mailbox DSP initiated 0x%x - size 0x%x\n", - fw_ready->dspbox_offset, fw_ready->dspbox_size); - dev_dbg(sdev->dev, " mailbox Host initiated 0x%x - size 0x%x\n", - fw_ready->hostbox_offset, fw_ready->hostbox_size); - - dev_info(sdev->dev, " Firmware info: version %d:%d-%s build %d on %s:%s\n", + dev_info(sdev->dev, + " Firmware info: version %d:%d-%s build %d on %s:%s\n", v->major, v->minor, v->tag, v->build, v->date, v->time); + /* now check for extended data */ + snd_sof_fw_parse_ext_data(sdev, MBOX_OFFSET + + sizeof(struct sof_ipc_fw_ready)); + + byt_get_windows(sdev); + return 0; } diff --git a/sound/soc/sof/hw-hsw.c b/sound/soc/sof/hw-hsw.c index 495009a..f636ce4 100644 --- a/sound/soc/sof/hw-hsw.c +++ b/sound/soc/sof/hw-hsw.c @@ -66,7 +66,6 @@ static const struct snd_sof_debugfs_map hsw_debugfs[] = { {"iram", HSW_DSP_BAR, IRAM_OFFSET, HSW_IRAM_SIZE}, {"dram", HSW_DSP_BAR, DRAM_OFFSET, HSW_DRAM_SIZE}, {"shim", HSW_DSP_BAR, SHIM_OFFSET, SHIM_SIZE}, - {"mbox", HSW_DSP_BAR, MBOX_OFFSET, MBOX_SIZE}, }; /* @@ -389,6 +388,88 @@ static irqreturn_t hsw_irq_thread(int irq, void *context) /* * IPC Firmware ready. */ +static void hsw_get_windows(struct snd_sof_dev *sdev) +{ + struct sof_ipc_window_elem *elem; + u32 outbox_offset = 0; + u32 stream_offset = 0; + u32 inbox_offset = 0; + u32 outbox_size = 0; + u32 stream_size = 0; + u32 inbox_size = 0; + int i; + + if (!sdev->info_window) { + dev_err(sdev->dev, "error: have no window info\n"); + return; + } + + for (i = 0; i < sdev->info_window->num_windows; i++) { + elem = &sdev->info_window->window[i]; + + switch (elem->type) { + case SOF_IPC_REGION_UPBOX: + inbox_offset = elem->offset + MBOX_OFFSET; + inbox_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[HSW_DSP_BAR] + + inbox_offset, + elem->size, "inbox"); + break; + case SOF_IPC_REGION_DOWNBOX: + outbox_offset = elem->offset + MBOX_OFFSET; + outbox_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[HSW_DSP_BAR] + + outbox_offset, + elem->size, "outbox"); + break; + case SOF_IPC_REGION_TRACE: + snd_sof_debugfs_create_item(sdev, + sdev->bar[HSW_DSP_BAR] + + elem->offset + MBOX_OFFSET, + elem->size, "etrace"); + break; + case SOF_IPC_REGION_DEBUG: + snd_sof_debugfs_create_item(sdev, + sdev->bar[HSW_DSP_BAR] + + elem->offset + MBOX_OFFSET, + elem->size, "debug"); + break; + case SOF_IPC_REGION_STREAM: + stream_offset = elem->offset + MBOX_OFFSET; + stream_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[HSW_DSP_BAR] + + stream_offset, + elem->size, "stream"); + break; + case SOF_IPC_REGION_REGS: + snd_sof_debugfs_create_item(sdev, + sdev->bar[HSW_DSP_BAR] + + elem->offset + MBOX_OFFSET, + elem->size, "regs"); + break; + default: + dev_err(sdev->dev, "error: get illegal window info\n"); + return; + } + } + + if (outbox_size == 0 || inbox_size == 0) { + dev_err(sdev->dev, "error: get illegal mailbox window\n"); + return; + } + + snd_sof_dsp_mailbox_init(sdev, inbox_offset, inbox_size, + outbox_offset, outbox_size); + + dev_dbg(sdev->dev, " mailbox upstream 0x%x - size 0x%x\n", + inbox_offset, inbox_size); + dev_dbg(sdev->dev, " mailbox downstream 0x%x - size 0x%x\n", + outbox_offset, outbox_size); +} + static int hsw_fw_ready(struct snd_sof_dev *sdev, u32 msg_id) { struct sof_ipc_fw_ready *fw_ready = &sdev->fw_ready; @@ -409,14 +490,16 @@ static int hsw_fw_ready(struct snd_sof_dev *sdev, u32 msg_id) fw_ready->hostbox_offset, fw_ready->hostbox_size); - dev_dbg(sdev->dev, " mailbox DSP initiated 0x%x - size 0x%x\n", - fw_ready->dspbox_offset, fw_ready->dspbox_size); - dev_dbg(sdev->dev, " mailbox Host initiated 0x%x - size 0x%x\n", - fw_ready->hostbox_offset, fw_ready->hostbox_size); - - dev_info(sdev->dev, " Firmware info: version %d:%d-%s build %d on %s:%s\n", + dev_info(sdev->dev, + " Firmware info: version %d:%d-%s build %d on %s:%s\n", v->major, v->minor, v->tag, v->build, v->date, v->time); + /* now check for extended data */ + snd_sof_fw_parse_ext_data(sdev, MBOX_OFFSET + + sizeof(struct sof_ipc_fw_ready)); + + hsw_get_windows(sdev); + return 0; } -- 2.7.4

2 2

[Sound-open-firmware] [PATCH] dma-trace: fix DMA trace buffer must be DMA-able memory
by Liam Girdwood 06 Mar '18

06 Mar '18

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/lib/dma-trace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index 211f34f..b08e7fb 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -132,8 +132,9 @@ int dma_trace_init_early(struct reef *reef) buffer = &trace_data->dmatb; /* allocate new buffer */ - buffer->addr = rballoc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, - DMA_TRACE_LOCAL_SIZE); + buffer->addr = rballoc(RZONE_RUNTIME, + SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, + DMA_TRACE_LOCAL_SIZE); if (buffer->addr == NULL) { trace_buffer_error("ebm"); return -ENOMEM; -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] apl: probe all SSP ports in platform init
by Liam Girdwood 06 Mar '18

06 Mar '18

Fix. We must probe all our SSP ports in platform init. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/apollolake/dai.c | 3 ++- src/platform/apollolake/include/platform/platform.h | 3 +++ src/platform/apollolake/platform.c | 14 +++++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/platform/apollolake/dai.c b/src/platform/apollolake/dai.c index 6149d26..7c2aaa9 100644 --- a/src/platform/apollolake/dai.c +++ b/src/platform/apollolake/dai.c @@ -34,6 +34,7 @@ #include <reef/ssp.h> #include <reef/stream.h> #include <reef/audio/component.h> +#include <platform/platform.h> #include <platform/memory.h> #include <platform/interrupt.h> #include <platform/dma.h> @@ -41,7 +42,7 @@ #include <string.h> #include <config.h> -static struct dai ssp[6] = { +static struct dai ssp[PLATFORM_NUM_SSP] = { { .type = SOF_DAI_INTEL_SSP, .index = 0, diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index 995efca..8a84308 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -109,6 +109,9 @@ struct reef; /* platform has low power memory type */ #define PLATFORM_MEM_HAS_LP_RAM +/* number of SSP ports in platform */ +#define PLATFORM_NUM_SSP 6 + /* Platform defined panic code */ #define platform_panic(__x) \ sw_reg_write(SRAM_REG_FW_STATUS, (0xdead000 | __x) & 0x3fffffff) diff --git a/src/platform/apollolake/platform.c b/src/platform/apollolake/platform.c index ae8a854..9574970 100644 --- a/src/platform/apollolake/platform.c +++ b/src/platform/apollolake/platform.c @@ -178,7 +178,8 @@ static void platform_memory_windows_init(void) int platform_init(struct reef *reef) { struct dma *dmac; - struct dai *ssp2; + struct dai *ssp; + int i; platform_interrupt_init(); @@ -254,9 +255,12 @@ int platform_init(struct reef *reef) /* init SSP ports */ trace_point(TRACE_BOOT_PLATFORM_SSP); - ssp2 = dai_get(SOF_DAI_INTEL_SSP, 4); - if (ssp2 == NULL) - return -ENODEV; - dai_probe(ssp2); + for (i = 0; i < PLATFORM_NUM_SSP; i++) { + ssp = dai_get(SOF_DAI_INTEL_SSP, i); + if (ssp == NULL) + return -ENODEV; + dai_probe(ssp); + } + return 0; } -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] host: host-gw: only check first_copy for playback
by Keyon Jie 06 Mar '18

06 Mar '18

For capture, we don't need produce empty bytes, here add check to fix capture can't start issue. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/audio/host.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/audio/host.c b/src/audio/host.c index a76e340..7a7c153 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -851,7 +851,8 @@ static int host_copy(struct comp_dev *dev) return 0; #if defined CONFIG_DMA_GW - if (hd->first_copy) { + if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK && + hd->first_copy) { /* * host dma will not start copy at this point yet, just produce * empty period bytes for it. -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] alloc: rmalloc must check other zones/pools for capabilities
by Liam Girdwood 06 Mar '18

06 Mar '18

rmalloc should also check the buffer heap if no capable memory can be found in the runtime heap. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/lib/alloc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/lib/alloc.c b/src/lib/alloc.c index 6221d26..27916e3 100644 --- a/src/lib/alloc.c +++ b/src/lib/alloc.c @@ -351,10 +351,17 @@ static void *rmalloc_runtime(uint32_t caps, size_t bytes) struct mm_heap *heap; int i; + /* check runtime heap for capabilities */ heap = get_runtime_heap_from_caps(caps); + if (heap) + goto find; + + /* next check buffer heap for capabilities */ + heap = get_buffer_heap_from_caps(caps); if (heap == NULL) goto error; +find: for (i = 0; i < heap->blocks; i++) { /* is block big enough */ -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] rmbox: remove legacy code and use sof debugFS by default.
by Liam Girdwood 06 Mar '18

06 Mar '18

Dump error log by default with no args. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- rmbox/rmbox.c | 99 +++++++++++------------------------------------------------ 1 file changed, 18 insertions(+), 81 deletions(-) diff --git a/rmbox/rmbox.c b/rmbox/rmbox.c index 9403cc7..115be83 100644 --- a/rmbox/rmbox.c +++ b/rmbox/rmbox.c @@ -47,42 +47,6 @@ #define TRACE_CLASS_EQ_FIR (19 << 24) #define TRACE_CLASS_EQ_IIR (20 << 24) -#define MAILBOX_HOST_OFFSET 0x144000 - -#define MAILBOX_OUTBOX_OFFSET 0x0 -#define MAILBOX_OUTBOX_SIZE 0x400 -#define MAILBOX_OUTBOX_BASE \ - (MAILBOX_BASE + MAILBOX_OUTBOX_OFFSET) - -#define MAILBOX_INBOX_OFFSET MAILBOX_OUTBOX_SIZE -#define MAILBOX_INBOX_SIZE 0x400 -#define MAILBOX_INBOX_BASE \ - (MAILBOX_BASE + MAILBOX_INBOX_OFFSET) - -#define MAILBOX_EXCEPTION_OFFSET \ - (MAILBOX_INBOX_SIZE + MAILBOX_OUTBOX_SIZE) -#define MAILBOX_EXCEPTION_SIZE 0x100 -#define MAILBOX_EXCEPTION_BASE \ - (MAILBOX_BASE + MAILBOX_EXCEPTION_OFFSET) - -#define MAILBOX_DEBUG_OFFSET \ - (MAILBOX_EXCEPTION_SIZE + MAILBOX_EXCEPTION_OFFSET) -#define MAILBOX_DEBUG_SIZE 0x100 -#define MAILBOX_DEBUG_BASE \ - (MAILBOX_BASE + MAILBOX_DEBUG_OFFSET) - -#define MAILBOX_STREAM_OFFSET \ - (MAILBOX_DEBUG_SIZE + MAILBOX_DEBUG_OFFSET) -#define MAILBOX_STREAM_SIZE 0x200 -#define MAILBOX_STREAM_BASE \ - (MAILBOX_BASE + MAILBOX_STREAM_OFFSET) - -#define MAILBOX_TRACE_OFFSET \ - (MAILBOX_STREAM_SIZE + MAILBOX_STREAM_OFFSET) -#define MAILBOX_TRACE_SIZE 0x380 -#define MAILBOX_TRACE_BASE \ - (MAILBOX_BASE + MAILBOX_TRACE_OFFSET) - #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) @@ -218,8 +182,7 @@ static void show_trace(uint64_t val, uint64_t addr, uint64_t *timestamp, double } } -static int trace_read(const char *in_file, const char *out_file, double clk, - int offset) +static int trace_read(const char *in_file, const char *out_file, double clk) { int count, i; FILE *in_fd = NULL, *out_fd = NULL; @@ -250,11 +213,6 @@ trace: if (count != TRACE_BLOCK_SIZE) break; - if (addr < offset) { - addr += TRACE_BLOCK_SIZE; - continue; - } - val = *((uint64_t*)tmp); for (i = 0; i < TRACE_BLOCK_SIZE / 2; i++) { @@ -277,21 +235,10 @@ trace: return 0; } -static void show_debug(uint32_t val, uint32_t addr) +static void show_data(uint32_t val, uint32_t addr) { - printf("debug: 0x%x (%2.2d) = \t0x%8.8x \t(%8.8d) \t|%c%c%c%c|\n", - (unsigned int)addr - MAILBOX_DEBUG_OFFSET, - ((unsigned int)addr - MAILBOX_DEBUG_OFFSET) / 4, - val, val, - get_char(val, 3), get_char(val, 2), - get_char(val, 1), get_char(val, 0)); -} - -static void show_exception(uint32_t val, uint32_t addr) -{ - printf("exp: 0x%x (%2.2d) = \t0x%8.8x \t(%8.8d) \t|%c%c%c%c|\n", - (unsigned int)addr - MAILBOX_EXCEPTION_OFFSET, - ((unsigned int)addr - MAILBOX_EXCEPTION_OFFSET) / 4, + printf("data: 0x%x = \t0x%8.8x \t(%8.8d) \t|%c%c%c%c|\n", + (unsigned int)addr, val, val, get_char(val, 3), get_char(val, 2), get_char(val, 1), get_char(val, 0)); @@ -299,7 +246,9 @@ static void show_exception(uint32_t val, uint32_t addr) static const char *debugfs[] = { - "dmac0","dmac1", "ssp0", "ssp1", "ssp2", "iram", "dram", "shim", "mbox" + "dmac0", "dmac1", "ssp0", "ssp1", + "ssp2", "iram", "dram", "shim", + "mbox", "etrace", }; static int snapshot(const char *name) @@ -362,12 +311,11 @@ static int snapshot(const char *name) int main(int argc, char *argv[]) { int opt, count, trace = 0; - const char * out_file = NULL, *in_file = "/sys/kernel/debug/sof/mbox"; + const char * out_file = NULL, *in_file = NULL; FILE *in_fd = NULL, *out_fd = NULL; char c, tmp[8] = {0}; uint64_t addr = 0, val, timestamp = 0, align = 4, i; double clk = 19.2; - int title_dbg_done = 0, title_exp_done = 0; while ((opt = getopt(argc, argv, "ho:i:s:m:c:t")) != -1) { switch (opt) { @@ -393,7 +341,15 @@ int main(int argc, char *argv[]) /* trace requested ? */ if (trace) - return trace_read("/sys/kernel/debug/sof/trace", out_file, clk, 0); + return trace_read("/sys/kernel/debug/sof/trace", + out_file, clk); + + /* default option with no infile is to dump errors/debug data */ + if (in_file == NULL) { + fprintf(stdout, "\nError log:\n"); + return trace_read("/sys/kernel/debug/sof/etrace", + out_file, clk); + } /* open infile for reading */ in_fd = fopen(in_file, "r"); @@ -432,21 +388,7 @@ convert: tmp[align - i - 1] = c; } - if (addr >= MAILBOX_DEBUG_OFFSET && - addr < MAILBOX_DEBUG_OFFSET + MAILBOX_DEBUG_SIZE) { - - if (!title_dbg_done++) - fprintf(stdout, "\nDebug log:\n"); - - show_debug(val, addr); - } else if (addr >= MAILBOX_EXCEPTION_OFFSET && - addr < MAILBOX_EXCEPTION_OFFSET + MAILBOX_EXCEPTION_SIZE) { - - if (!title_exp_done++) - fprintf(stdout, "\nException log:\n"); - - show_exception(val, addr); - } + show_data(val, addr); if (out_fd) { count = fwrite(&tmp[0], 1, align, out_fd); @@ -457,11 +399,6 @@ convert: addr += align; } - /* read debug */ - fprintf(stdout, "\nError log:\n"); - trace_read("/sys/kernel/debug/sof/mbox", out_file, clk, - MAILBOX_TRACE_OFFSET); - /* close files */ fclose(in_fd); if (out_fd) -- 2.14.1

1 0

[Sound-open-firmware] [PATCH 1/2] cnl: dma: refine dma probe
by Rander Wang 06 Mar '18

06 Mar '18

Probe each dma individually Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- src/drivers/dw-dma.c | 37 ++++++++++--------------------------- src/platform/cannonlake/platform.c | 5 +++++ 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index 15d608c..f736679 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1029,7 +1029,6 @@ static int dw_dma_probe(struct dma *dma) } #else - /* this will probably be called at the end of every period copied */ static void dw_dma_irq_handler(void *data) { @@ -1047,14 +1046,7 @@ static void dw_dma_irq_handler(void *data) status_intr = dw_read(dma, DW_INTR_STATUS); if (!status_intr) { -#ifdef CONFIG_CANNONLAKE - dma++; - status_intr = dw_read(dma, DW_INTR_STATUS); - if (!status_intr) - trace_dma_error("eI0"); -#else trace_dma_error("eI0"); -#endif } tracev_dma("DIr"); @@ -1147,30 +1139,21 @@ static void dw_dma_irq_handler(void *data) static int dw_dma_probe(struct dma *dma) { struct dma_pdata *dw_pdata; - struct dma *dmac = dma; int i; -#ifdef CONFIG_CANNONLAKE - int j; - - for (j = 0; j < MAX_GPDMA_COUNT; j++) -#endif - { - /* allocate private data */ - dw_pdata = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*dw_pdata)); - dma_set_drvdata(dmac, dw_pdata); - spinlock_init(&dmac->lock); + /* allocate private data */ + dw_pdata = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*dw_pdata)); + dma_set_drvdata(dma, dw_pdata); - dw_dma_setup(dmac); + spinlock_init(&dma->lock); - /* init work */ - for (i = 0; i < DW_MAX_CHAN; i++) { - dw_pdata->chan[i].dma = dmac; - dw_pdata->chan[i].channel = i; - dw_pdata->chan[i].status = COMP_STATE_INIT; - } + dw_dma_setup(dma); - dmac++; + /* init work */ + for (i = 0; i < DW_MAX_CHAN; i++) { + dw_pdata->chan[i].dma = dma; + dw_pdata->chan[i].channel = i; + dw_pdata->chan[i].status = COMP_STATE_INIT; } /* register our IRQ handler */ diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index beb6582..1a9b88a 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -253,6 +253,11 @@ int platform_init(struct reef *reef) return -ENODEV; dma_probe(dmac); + dmac = dma_get(DMA_GP_LP_DMAC1); + if (!dmac) + return -ENODEV; + dma_probe(dmac); + dmac = dma_get(DMA_HOST_OUT_DMAC); if (!dmac) return -ENODEV; -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] topology: break up topology builder m4 files into per component macros
by Ranjani Sridharan 06 Mar '18

06 Mar '18

This patch break up the local.m4 and build.m4 topology builder includes into per component m4 files Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- topology/m4/buffer.m4 | 29 ++ topology/m4/dai.m4 | 214 ++++++++++ topology/m4/local.m4 | 654 ------------------------------ topology/m4/mixer.m4 | 43 ++ topology/m4/mixercontrol.m4 | 49 +++ topology/m4/pcm.m4 | 161 ++++++++ topology/m4/pga.m4 | 44 ++ topology/m4/{build.m4 => pipeline.m4} | 60 +-- topology/m4/src.m4 | 41 ++ topology/m4/tone.m4 | 43 ++ topology/m4/utils.m4 | 65 +++ topology/reef-apl-nocodec.m4 | 5 +- topology/reef-bdw-rt286.m4 | 5 +- topology/reef-bdw-rt5640.m4 | 5 +- topology/reef-bxt-nocodec.m4 | 5 +- topology/reef-byt-da7212.m4 | 5 +- topology/reef-byt-nocodec.m4 | 5 +- topology/reef-byt-rt5640.m4 | 5 +- topology/reef-byt-rt5645.m4 | 5 +- topology/reef-byt-rt5651.m4 | 5 +- topology/reef-cht-max98090.m4 | 5 +- topology/reef-cht-nocodec.m4 | 5 +- topology/reef-cnl-rt274.m4 | 5 +- topology/reef-hsw-rt5640.m4 | 5 +- topology/sof/pipe-dai-capture.m4 | 4 +- topology/sof/pipe-dai-playback.m4 | 4 +- topology/sof/pipe-low-latency-capture.m4 | 6 +- topology/sof/pipe-low-latency-playback.m4 | 7 +- topology/sof/pipe-passthrough-capture.m4 | 7 +- topology/sof/pipe-passthrough-playback.m4 | 7 +- topology/sof/pipe-pcm-media.m4 | 7 +- topology/sof/pipe-src-capture.m4 | 8 +- topology/sof/pipe-src-playback.m4 | 8 +- topology/sof/pipe-tone.m4 | 7 +- topology/sof/pipe-volume-capture.m4 | 8 +- topology/sof/pipe-volume-playback.m4 | 8 +- topology/test/test-capture-ssp.m4 | 5 +- topology/test/test-playback-ssp.m4 | 5 +- topology/test/test-ssp.m4 | 5 +- topology/test/test-tone-playback-ssp.m4 | 5 +- 40 files changed, 836 insertions(+), 733 deletions(-) create mode 100644 topology/m4/buffer.m4 create mode 100644 topology/m4/dai.m4 delete mode 100644 topology/m4/local.m4 create mode 100644 topology/m4/mixer.m4 create mode 100644 topology/m4/mixercontrol.m4 create mode 100644 topology/m4/pcm.m4 create mode 100644 topology/m4/pga.m4 rename topology/m4/{build.m4 => pipeline.m4} (76%) create mode 100644 topology/m4/src.m4 create mode 100644 topology/m4/tone.m4 create mode 100644 topology/m4/utils.m4 diff --git a/topology/m4/buffer.m4 b/topology/m4/buffer.m4 new file mode 100644 index 0000000..fc06ba0 --- /dev/null +++ b/topology/m4/buffer.m4 @@ -0,0 +1,29 @@ +divert(-1) + +dnl Define the macro for buffer widget + +dnl Buffer name) +define(`N_BUFFER', `BUF'PIPELINE_ID`.'$1) + +dnl W_BUFFER(name, size, capabilities) +define(`W_BUFFER', +`SectionVendorTuples."'N_BUFFER($1)`_tuples" {' +` tokens "sof_buffer_tokens"' +` tuples."word" {' +` SOF_TKN_BUF_SIZE' STR($2) +` SOF_TKN_BUF_CAPS' STR($3) +` }' +`}' +`SectionData."'N_BUFFER($1)`_data" {' +` tuples "'N_BUFFER($1)`_tuples"' +`}' +`SectionWidget."'N_BUFFER($1)`" {' +` index "'PIPELINE_ID`"' +` type "buffer"' +` no_pm "true"' +` data [' +` "'N_BUFFER($1)`_data"' +` ]' +`}') + +divert(0)dnl diff --git a/topology/m4/dai.m4 b/topology/m4/dai.m4 new file mode 100644 index 0000000..163dfab --- /dev/null +++ b/topology/m4/dai.m4 @@ -0,0 +1,214 @@ +divert(-1) + +dnl Define macros for DAI IN/OUT widgets and DAI config + +dnl DAI name) +define(`N_DAI', DAI_NAME) +define(`N_DAI_OUT', DAI_NAME`.OUT') +define(`N_DAI_IN', DAI_NAME`.IN') + +dnl W_DAI_OUT(type, index, format, periods_sink, periods_source, preload, data) +define(`W_DAI_OUT', +`SectionVendorTuples."'N_DAI_OUT($2)`_tuples_w_comp" {' +` tokens "sof_comp_tokens"' +` tuples."word" {' +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` }' +`}' +`SectionData."'N_DAI_OUT($2)`_data_w_comp" {' +` tuples "'N_DAI_OUT($2)`_tuples_w_comp"' +`}' +`SectionVendorTuples."'N_DAI_OUT($2)`_tuples_w" {' +` tokens "sof_dai_tokens"' +` tuples."word" {' +` SOF_TKN_DAI_INDEX' $2 +` }' +`}' +`SectionData."'N_DAI_OUT($2)`_data_w" {' +` tuples "'N_DAI_OUT($2)`_tuples_w"' +`}' +`SectionVendorTuples."'N_DAI_OUT($2)`_tuples_str" {' +` tokens "sof_dai_tokens"' +` tuples."string" {' +` SOF_TKN_DAI_TYPE' $1 +` }' +`}' +`SectionData."'N_DAI_OUT($2)`_data_str" {' +` tuples "'N_DAI_OUT($2)`_tuples_str"' +`}' +`SectionVendorTuples."'N_DAI_OUT($2)`_tuples_comp_str" {' +` tokens "sof_comp_tokens"' +` tuples."string" {' +` SOF_TKN_COMP_FORMAT' STR($3) +` }' +`}' +`SectionData."'N_DAI_OUT($2)`_data_comp_str" {' +` tuples "'N_DAI_OUT($2)`_tuples_comp_str"' +`}' +`SectionWidget."'N_DAI_OUT`" {' +` index "'PIPELINE_ID`"' +` type "dai_in"' +` no_pm "true"' +` data [' +` "'N_DAI_OUT($2)`_data_w"' +` "'N_DAI_OUT($2)`_data_w_comp"' +` "'N_DAI_OUT($2)`_data_str"' +` "'N_DAI_OUT($2)`_data_comp_str"' +` "'$7`"' +` ]' +`}') + +dnl W_DAI_IN(type, index, format, periods_sink, periods_source, preload, data) +define(`W_DAI_IN', +`SectionVendorTuples."'N_DAI_IN($2)`_tuples_w_comp" {' +` tokens "sof_comp_tokens"' +` tuples."word" {' +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` }' +`}' +`SectionData."'N_DAI_IN($2)`_data_w_comp" {' +` tuples "'N_DAI_IN($2)`_tuples_w_comp"' +`}' +`SectionVendorTuples."'N_DAI_IN($2)`_tuples_w" {' +` tokens "sof_dai_tokens"' +` tuples."word" {' +` SOF_TKN_DAI_INDEX' $2 +` }' +`}' +`SectionData."'N_DAI_IN($2)`_data_w" {' +` tuples "'N_DAI_IN($2)`_tuples_w"' +`}' +`SectionVendorTuples."'N_DAI_IN($2)`_tuples_str" {' +` tokens "sof_dai_tokens"' +` tuples."string" {' +` SOF_TKN_DAI_TYPE' $1 +` }' +`}' +`SectionData."'N_DAI_IN($2)`_data_str" {' +` tuples "'N_DAI_IN($2)`_tuples_str"' +`}' +`SectionVendorTuples."'N_DAI_IN($2)`_tuples_comp_str" {' +` tokens "sof_comp_tokens"' +` tuples."string" {' +` SOF_TKN_COMP_FORMAT' STR($3) +` }' +`}' +`SectionData."'N_DAI_IN($2)`_data_comp_str" {' +` tuples "'N_DAI_IN($2)`_tuples_comp_str"' +`}' +`SectionWidget."'N_DAI_IN`" {' +` index "'PIPELINE_ID`"' +` type "dai_out"' +` no_pm "true"' +` data [' +` "'N_DAI_IN($2)`_data_w"' +` "'N_DAI_IN($2)`_data_w_comp"' +` "'N_DAI_IN($2)`_data_str"' +` "'N_DAI_IN($2)`_data_comp_str"' +` "'$7`"' +` ]' +`}') + +dnl D_DAI(id, playback, capture, data)) +define(`D_DAI', `SectionDAI."'N_DAI`" {' +` index "'PIPELINE_ID`"' +` id "'$1`"' +` playback "'$2`"' +` capture "'$3`"' +`}') + +dnl DAI_CLOCK(clock, freq, codec_master) +define(`DAI_CLOCK', + $1 STR($3) + $1_freq STR($2)) + + +dnl DAI_TDM(slots, width, tx_mask, rx_mask) +define(`DAI_TDM', +` tdm_slots 'STR($1) +` tdm_slot_width 'STR($2) +` tx_slots 'STR($3) +` rx_slots 'STR($4) +) + +dnl DAI Config) +define(`N_DAI_CONFIG', `DAICONFIG.'$1) + +dnl DAI_CONFIG(type, idx, name, format, valid bits, mclk, bclk, fsync, tdm) +define(`DAI_CONFIG', +`SectionHWConfig."'$1$2`" {' +`' +` id "'$2`"' +` format "'$4`"' +`' +` '$6 +` '$7 +` '$8 +` '$9 +`}' +`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples_str" {' +` tokens "sof_dai_tokens"' +` tuples."string" {' +` SOF_TKN_DAI_TYPE' STR($1) +` }' +`}' +`SectionData."'N_DAI_CONFIG($1$2)`_data_str" {' +` tuples "'N_DAI_CONFIG($1$2)`_tuples_str"' +`}' +`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {' +` tokens "sof_dai_tokens"' +` tuples."word" {' +` SOF_TKN_DAI_SAMPLE_BITS' STR($5) +` }' +`}' +`SectionData."'N_DAI_CONFIG($1$2)`_data" {' +` tuples "'N_DAI_CONFIG($1$2)`_tuples"' +`}' +`' +`SectionBE."'$3`" {' +` index "0"' +` default_hw_conf_id "'$2`"' +`' +` hw_configs [' +` "'$1$2`"' +` ]' +` data [' +` "'N_DAI_CONFIG($1$2)`_data"' +` "'N_DAI_CONFIG($1$2)`_data_str"' +` ]' +`}') + +dnl DAI_ADD(pipeline, +dnl pipe id, dai type, dai_index, +dnl buffer, periods, format, +dnl frames, deadline, priority, core) +define(`DAI_ADD', +`undefine(`PIPELINE_ID')' +`undefine(`DAI_TYPE')' +`undefine(`DAI_INDEX')' +`undefine(`DAI_BUF')' +`undefine(`DAI_PERIODS')' +`undefine(`DAI_FORMAT')' +`undefine(`SCHEDULE_FRAMES')' +`undefine(`SCHEDULE_DEADLINE')' +`undefine(`SCHEDULE_PRIORITY')' +`undefine(`SCHEDULE_CORE')' +`define(`PIPELINE_ID', $2)' +`define(`DAI_TYPE', STR($3))' +`define(`DAI_INDEX', STR($4))' +`define(`DAI_BUF', $5)' +`define(`DAI_NAME', $3$4)' +`define(`DAI_PERIODS', $6)' +`define(`DAI_FORMAT', $7)' +`define(`SCHEDULE_FRAMES', $8)' +`define(`SCHEDULE_DEADLINE', $9)' +`define(`SCHEDULE_PRIORITY', $10)' +`define(`SCHEDULE_CORE', $11)' +`include($1)' +) + +divert(0)dnl diff --git a/topology/m4/local.m4 b/topology/m4/local.m4 deleted file mode 100644 index df6ea14..0000000 diff --git a/topology/m4/mixer.m4 b/topology/m4/mixer.m4 new file mode 100644 index 0000000..1f2376e --- /dev/null +++ b/topology/m4/mixer.m4 @@ -0,0 +1,43 @@ +divert(-1) + +dnl Define macro for Mixer widget + +dnl Mixer Name) +define(`N_MIXER', `MIXER'PIPELINE_ID`.'$1) + +dnl Pipe Buffer name in pipeline (pipeline, buffer) +define(`NPIPELINE_MIXER', `MIXER'$1`.'$2) + +dnl W_MIXER(name, format, periods_sink, periods_source, preload) +define(`W_MIXER', +`SectionVendorTuples."'N_MIXER($1)`_tuples_w" {' +` tokens "sof_comp_tokens"' +` tuples."word" {' +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($3) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($4) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($5) +` }' +`}' +`SectionData."'N_MIXER($1)`_data_w" {' +` tuples "'N_MIXER($1)`_tuples_w"' +`}' +`SectionVendorTuples."'N_MIXER($1)`_tuples_str" {' +` tokens "sof_comp_tokens"' +` tuples."string" {' +` SOF_TKN_COMP_FORMAT' STR($2) +` }' +`}' +`SectionData."'N_MIXER($1)`_data_str" {' +` tuples "'N_MIXER($1)`_tuples_str"' +`}' +`SectionWidget."'N_MIXER($1)`" {' +` index "'PIPELINE_ID`"' +` type "mixer"' +` no_pm "true"' +` data [' +` "'N_MIXER($1)`_data_w"' +` "'N_MIXER($1)`_data_str"' +` ]' +`}') + +divert(0)dnl diff --git a/topology/m4/mixercontrol.m4 b/topology/m4/mixercontrol.m4 new file mode 100644 index 0000000..77a3784 --- /dev/null +++ b/topology/m4/mixercontrol.m4 @@ -0,0 +1,49 @@ +divert(-1) + +dnl Define macro for mixer control + +dnl KCONTROL_CHANNEL(name, reg, shift) +define(`KCONTROL_CHANNEL', +`channel.STR($1) {' +` reg STR($2)' +` shift STR($3)' +` }') + +dnl CONTROLMIXER_MAX(comment, value) +define(`CONTROLMIXER_MAX', +`#$1' +` max STR($2)') + +dnl CONTROLMIXER_TLV(comment, value) +define(`CONTROLMIXER_TLV', +`#$1' +` tlv STR($2)') + +dnl CONTROLMIXER_OPS(info, comment, get, put) +define(`CONTROLMIXER_OPS', +`ops."ctl" {' +` info STR($1)' +` #$2' +` get STR($3)' +` put STR($4)' +` }') + +dnl C_CONTROLMIXER(name, index, ops, max, invert, tlv, KCONTROL_CHANNELS) +define(`C_CONTROLMIXER', +`SectionControlMixer.STR($1) {' +`' +` # control belongs to this index group' +` index STR($2)' +`' +` #$7' +` $8' +` # control uses bespoke driver get/put/info ID' +` $3' +`' +` $4' +` invert STR($5)' +` $6' + +`}') + +divert(0)dnl diff --git a/topology/m4/pcm.m4 b/topology/m4/pcm.m4 new file mode 100644 index 0000000..d767350 --- /dev/null +++ b/topology/m4/pcm.m4 @@ -0,0 +1,161 @@ +divert(-1) + +dnl Define the macro for PCM playback/capture/capabilities + +dnl PCM name) +define(`N_PCMP', `PCM'PCM_ID`P') +define(`N_PCMC', `PCM'PCM_ID`C') + +dnl W_PCM_PLAYBACK(stream, dmac, dmac_chan, periods_sink, periods_source, preload) +dnl PCM platform configuration +define(`W_PCM_PLAYBACK', +`SectionVendorTuples."'N_PCMP($1)`_tuples_w_comp" {' +` tokens "sof_comp_tokens"' +` tuples."word" {' +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` }' +`}' +`SectionData."'N_PCMP($1)`_data_w_comp" {' +` tuples "'N_PCMP($1)`_tuples_w_comp"' +`}' +`SectionVendorTuples."'N_PCMP($1)`_tuples" {' +` tokens "sof_pcm_tokens"' +` tuples."word" {' +` SOF_TKN_PCM_DMAC' STR($2) +` SOF_TKN_PCM_DMAC_CHAN' STR($3) +` }' +`}' +`SectionData."'N_PCMP($1)`_data" {' +` tuples "'N_PCMP($1)`_tuples"' +`}' +`SectionWidget."'N_PCMP`" {' +` index "'PIPELINE_ID`"' +` type "aif_in"' +` no_pm "true"' +` stream_name "'$1`"' +` data [' +` "'N_PCMP($1)`_data"' +` "'N_PCMP($1)`_data_w_comp"' +` ]' +`}') + + +dnl W_PCM_CAPTURE(stream, dmac, dmac_chan, periods_sink, periods_source, preload) +define(`W_PCM_CAPTURE', +`SectionVendorTuples."'N_PCMC($1)`_tuples_w_comp" {' +` tokens "sof_comp_tokens"' +` tuples."word" {' +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` }' +`}' +`SectionData."'N_PCMC($1)`_data_w_comp" {' +` tuples "'N_PCMC($1)`_tuples_w_comp"' +`}' +`SectionVendorTuples."'N_PCMC($1)`_tuples" {' +` tokens "sof_pcm_tokens"' +` tuples."word" {' +` SOF_TKN_PCM_DMAC' STR($2) +` SOF_TKN_PCM_DMAC_CHAN' STR($3) +` }' +`}' +`SectionData."'N_PCMC($1)`_data" {' +` tuples "'N_PCMC($1)`_tuples"' +`}' +`SectionWidget."'N_PCMC`" {' +` index "'PIPELINE_ID`"' +` type "aif_out"' +` no_pm "true"' +` stream_name "'$1`"' +` data [' +` "'N_PCMC($1)`_data"' +` "'N_PCMC($1)`_data_w_comp"' +` ]' +`}') + +dnl PCM_CAPABILITIES(name, formats, rate_min, rate_max, channels_min, channels_max, periods_min, periods_max, period_size_min, period_size_max, buffer_size_min, buffer_size_max) +define(`PCM_CAPABILITIES', +`SectionPCMCapabilities.STR($1) {' +`' +` formats "$2"' +` rate_min STR($3)' +` rate_max STR($4)' +` channels_min STR($5)' +` channels_max STR($6)' +` periods_min STR($7)' +` periods_max STR($8)' +` period_size_min STR($9)' +` period_size_max STR($10)' +` buffer_size_min STR($11)' +` buffer_size_max STR($12)' +`}') + +dnl COMP_BUFFER_SIZE( num_periods, sample_size, channels, fmames) +define(`COMP_BUFFER_SIZE', `eval(`$1 * $2 * $3 * $4')') + +dnl PCM_PLAYBACK_ADD(name, pipeline, pcm_id, dai_id, playback) +define(`PCM_PLAYBACK_ADD', +`SectionPCM.STR($1) {' +`' +` index STR($2)' +`' +` # used for binding to the PCM' +` id STR($3)' +`' +` dai.STR($1 $3) {' +` id STR($4)' +` }' +`' +` pcm."playback" {' +`' +` capabilities STR($5)' +` }' +`}') + +dnl PCM_CAPTURE_ADD(name, pipeline, pcm_id, dai_id, capture) +define(`PCM_CAPTURE_ADD', +`SectionPCM.STR($1) {' +`' +` index STR($2)' +`' +` # used for binding to the PCM' +` id STR($3)' +`' +` dai.STR($1 $3) {' +` id STR($4)' +` }' +`' +` pcm."capture" {' +`' +` capabilities STR($5)' +` }' +`}') + +dnl PCM_DUPLEX_ADD(name, pipeline, pcm_id, dai_id, playback, capture) +define(`PCM_DUPLEX_ADD', +`SectionPCM.STR($1) {' +`' +` index STR($2)' +`' +` # used for binding to the PCM' +` id STR($3)' +`' +` dai.STR($1 $3) {' +` id STR($4)' +` }' +`' +` pcm."capture" {' +`' +` capabilities STR($6)' +` }' +`' +` pcm."playback" {' +`' +` capabilities STR($5)' +` }' +`}') + +divert(0)dnl diff --git a/topology/m4/pga.m4 b/topology/m4/pga.m4 new file mode 100644 index 0000000..f38f820 --- /dev/null +++ b/topology/m4/pga.m4 @@ -0,0 +1,44 @@ +divert(-1) + +dnl Define macro for PGA widget + +dnl PGA name) +define(`N_PGA', `PGA'PIPELINE_ID`.'$1) + +dnl W_PGA(name, format, periods_sink, periods_source, preload, kcontrol0. kcontrol1...etc) +define(`W_PGA', +`SectionVendorTuples."'N_PGA($1)`_tuples_w" {' +` tokens "sof_comp_tokens"' +` tuples."word" {' +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($3) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($4) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($5) +` }' +`}' +`SectionData."'N_PGA($1)`_data_w" {' +` tuples "'N_PGA($1)`_tuples_w"' +`}' +`SectionVendorTuples."'N_PGA($1)`_tuples_str" {' +` tokens "sof_comp_tokens"' +` tuples."string" {' +` SOF_TKN_COMP_FORMAT' STR($2) +` }' +`}' +`SectionData."'N_PGA($1)`_data_str" {' +` tuples "'N_PGA($1)`_tuples_str"' +`}' +`SectionWidget."'N_PGA($1)`" {' +` index "'PIPELINE_ID`"' +` type "pga"' +` no_pm "true"' +` data [' +` "'N_PGA($1)`_data_w"' +` "'N_PGA($1)`_data_str"' +` ]' +` mixer [' + $6 +` ]' + +`}') + +divert(0)dnl diff --git a/topology/m4/build.m4 b/topology/m4/pipeline.m4 similarity index 76% rename from topology/m4/build.m4 rename to topology/m4/pipeline.m4 index 9361219..7a91439 100644 --- a/topology/m4/build.m4 +++ b/topology/m4/pipeline.m4 @@ -1,5 +1,36 @@ divert(-1) +dnl Define macro for pipeline widget + +dnl Pipeline name) +define(`N_PIPELINE', `PIPELINE.'PIPELINE_ID`.'$1) + +dnl W_PIPELINE(stream, deadline, priority, frames, core, timer, platform) +define(`W_PIPELINE', +`SectionVendorTuples."'N_PIPELINE($1)`_tuples" {' +` tokens "sof_sched_tokens"' +` tuples."word" {' +` SOF_TKN_SCHED_DEADLINE' STR($2) +` SOF_TKN_SCHED_PRIORITY' STR($3) +` SOF_TKN_SCHED_CORE' STR($5) +` SOF_TKN_SCHED_FRAMES' STR($4) +` SOF_TKN_SCHED_TIMER' STR($6) +` }' +`}' +`SectionData."'N_PIPELINE($1)`_data" {' +` tuples "'N_PIPELINE($1)`_tuples"' +`}' +`SectionWidget."'N_PIPELINE($1)`" {' +` index "'PIPELINE_ID`"' +` type "scheduler"' +` no_pm "true"' +` stream_name "'$1`"' +` data [' +` "'N_PIPELINE($1)`_data"' +` "'$7`"' +` ]' +`}') + dnl PIPELINE_PCM_ADD(pipeline, dnl pipe id, pcm, max channels, format, dnl frames, deadline, priority, core, dmac, dmac_chan) @@ -85,33 +116,4 @@ define(`PIPELINE_ADD', `include($1)' ) -dnl DAI_ADD(pipeline, -dnl pipe id, dai type, dai_index, -dnl buffer, periods, format, -dnl frames, deadline, priority, core) -define(`DAI_ADD', -`undefine(`PIPELINE_ID')' -`undefine(`DAI_TYPE')' -`undefine(`DAI_INDEX')' -`undefine(`DAI_BUF')' -`undefine(`DAI_PERIODS')' -`undefine(`DAI_FORMAT')' -`undefine(`SCHEDULE_FRAMES')' -`undefine(`SCHEDULE_DEADLINE')' -`undefine(`SCHEDULE_PRIORITY')' -`undefine(`SCHEDULE_CORE')' -`define(`PIPELINE_ID', $2)' -`define(`DAI_TYPE', STR($3))' -`define(`DAI_INDEX', STR($4))' -`define(`DAI_BUF', $5)' -`define(`DAI_NAME', $3$4)' -`define(`DAI_PERIODS', $6)' -`define(`DAI_FORMAT', $7)' -`define(`SCHEDULE_FRAMES', $8)' -`define(`SCHEDULE_DEADLINE', $9)' -`define(`SCHEDULE_PRIORITY', $10)' -`define(`SCHEDULE_CORE', $11)' -`include($1)' -) - divert(0)dnl diff --git a/topology/m4/src.m4 b/topology/m4/src.m4 new file mode 100644 index 0000000..aca18e3 --- /dev/null +++ b/topology/m4/src.m4 @@ -0,0 +1,41 @@ +divert(-1) + +dnl Defines the macro for SRC widget + +dnl SRC name) +define(`N_SRC', `SRC'PIPELINE_ID`.'$1) + +dnl W_SRC(name, format, periods_sink, periods_source, data, preload) +define(`W_SRC', +`SectionVendorTuples."'N_SRC($1)`_tuples_w" {' +` tokens "sof_comp_tokens"' +` tuples."word" {' +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($3) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($4) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` }' +`}' +`SectionData."'N_SRC($1)`_data_w" {' +` tuples "'N_SRC($1)`_tuples_w"' +`}' +`SectionVendorTuples."'N_SRC($1)`_tuples_str" {' +` tokens "sof_comp_tokens"' +` tuples."string" {' +` SOF_TKN_COMP_FORMAT' STR($2) +` }' +`}' +`SectionData."'N_SRC($1)`_data_str" {' +` tuples "'N_SRC($1)`_tuples_str"' +`}' +`SectionWidget."'N_SRC($1)`" {' +` index "'PIPELINE_ID`"' +` type "src"' +` no_pm "true"' +` data [' +` "'N_SRC($1)`_data_w"' +` "'N_SRC($1)`_data_str"' +` "'$5`"' +` ]' +`}') + +divert(0)dnl diff --git a/topology/m4/tone.m4 b/topology/m4/tone.m4 new file mode 100644 index 0000000..6a88b37 --- /dev/null +++ b/topology/m4/tone.m4 @@ -0,0 +1,43 @@ +divert(-1) + +dnl Define macro for siggen widget + +dnl Tone name) +define(`N_TONE', `TONE'PIPELINE_ID`.'$1) + +dnl W_TONE(name, format, periods_sink, periods_source, preload, kcontrols_list) +define(`W_TONE', +`SectionVendorTuples."'N_TONE($1)`_tuples_w" {' +` tokens "sof_comp_tokens"' +` tuples."word" {' +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($3) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($4) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($5) +` }' +`}' +`SectionData."'N_TONE($1)`_data_w" {' +` tuples "'N_TONE($1)`_tuples_w"' +`}' +`SectionVendorTuples."'N_TONE($1)`_tuples_str" {' +` tokens "sof_comp_tokens"' +` tuples."string" {' +` SOF_TKN_COMP_FORMAT' STR($2) +` }' +`}' +`SectionData."'N_TONE($1)`_data_str" {' +` tuples "'N_TONE($1)`_tuples_str"' +`}' +`SectionWidget."'N_TONE($1)`" {' +` index "'PIPELINE_ID`"' +` type "siggen"' +` no_pm "true"' +` data [' +` "'N_TONE($1)`_data_w"' +` "'N_TONE($1)`_data_str"' +` ]' +` mixer [' + $6 +` ]' +`}') + +divert(0)dnl diff --git a/topology/m4/utils.m4 b/topology/m4/utils.m4 new file mode 100644 index 0000000..e929244 --- /dev/null +++ b/topology/m4/utils.m4 @@ -0,0 +1,65 @@ +divert(-1) + +define(`concat',`$1$2') + +define(`STR', `"'$1`"') + +dnl Argument iterator. +define(`argn', `ifelse(`$1', 1, ``$2'', + `argn(decr(`$1'), shift(shift($@)))')') + +dnl Defines a list of items from a variable number of params. +dnl Use as last argument in a macro. +dnl The first argument specifies the number of tabs to be added for formatting +define(`LIST_LOOP', `argn(j,$@) +$1ifelse(i,`2', `', `define(`i', decr(i))define(`j', incr(j))$0($@)')') + +define(`LIST', `pushdef(`i', $#)pushdef(`j', `2')LIST_LOOP($@)popdef(i)popdef(j)') + +dnl Sums a list of variable arguments. Use as last argument in macro. +define(`SUM_LOOP', `eval(argn(j,$@) + ifelse(i,`1', `', `define(`i', decr(i)) define(`j', incr(j)) + $0($@)'))') + +dnl Memory capabilities +define(`MEMCAPS', `pushdef(`i', $#) pushdef(`j', `1') SUM_LOOP($@)') + +dnl create direct DAPM/pipeline link between 2 widgets) +define(`dapm', `"$1, , $2"') + +dnl COMP_SAMPLE_SIZE(FMT) +define(`COMP_SAMPLE_SIZE', +`ifelse( + $1, `s16le', `2', + $1, `s24_4le', `4', + $1, `s32le', `4', + $1, `float', `4', + `4')') + +dnl P_GRAPH(name, CONNECTIONS) +define(`P_GRAPH', +`SectionGraph.STR($1) {' +` index STR($2)' +`' +` lines [' +` $3' +` ]' +`}') + +dnl W_VENDORTUPLES(name, tokens, RATE_OUT) +define(`W_VENDORTUPLES', +`SectionVendorTuples.STR($1) {' +` tokens STR($2)' +`' +` tuples."word" {' +` $3' +` }' +`}') + +dnl W_DATA(name, tuples) +define(`W_DATA', +`SectionData.STR($1) {' +` tuples STR($2)' +`}') + +divert(0) dnl + diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4 index d4ac613..cf0a20e 100644 --- a/topology/reef-apl-nocodec.m4 +++ b/topology/reef-apl-nocodec.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`pipeline.m4') +include(`utils.m4') +include(`dai.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/reef-bdw-rt286.m4 b/topology/reef-bdw-rt286.m4 index eaba2d9..fa894f6 100644 --- a/topology/reef-bdw-rt286.m4 +++ b/topology/reef-bdw-rt286.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`pipeline.m4') +include(`utils.m4') +include(`dai.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4 index 5d4485b..ec920a5 100644 --- a/topology/reef-bdw-rt5640.m4 +++ b/topology/reef-bdw-rt5640.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4 index dbac98a..b7717d0 100644 --- a/topology/reef-bxt-nocodec.m4 +++ b/topology/reef-bxt-nocodec.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/reef-byt-da7212.m4 b/topology/reef-byt-da7212.m4 index 840ea69..7515c63 100644 --- a/topology/reef-byt-da7212.m4 +++ b/topology/reef-byt-da7212.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4 index 56aee22..b3ca196 100644 --- a/topology/reef-byt-nocodec.m4 +++ b/topology/reef-byt-nocodec.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`pipeline.m4') +include(`utils.m4') +include(`dai.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index f8d0e40..9fa15a2 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/reef-byt-rt5645.m4 b/topology/reef-byt-rt5645.m4 index 023d92d..c81a4db 100644 --- a/topology/reef-byt-rt5645.m4 +++ b/topology/reef-byt-rt5645.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4 index ccac260..96147d3 100644 --- a/topology/reef-byt-rt5651.m4 +++ b/topology/reef-byt-rt5651.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/reef-cht-max98090.m4 b/topology/reef-cht-max98090.m4 index 3218402..5690df4 100644 --- a/topology/reef-cht-max98090.m4 +++ b/topology/reef-cht-max98090.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4 index 24560ee..32acb62 100644 --- a/topology/reef-cht-nocodec.m4 +++ b/topology/reef-cht-nocodec.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`pipeline.m4') +include(`utils.m4') +include(`dai.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/reef-cnl-rt274.m4 b/topology/reef-cnl-rt274.m4 index f91a74f..e95363b 100644 --- a/topology/reef-cnl-rt274.m4 +++ b/topology/reef-cnl-rt274.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4 index 663686b..1f63820 100644 --- a/topology/reef-hsw-rt5640.m4 +++ b/topology/reef-hsw-rt5640.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/sof/pipe-dai-capture.m4 b/topology/sof/pipe-dai-capture.m4 index 3699138..a5a72d0 100644 --- a/topology/sof/pipe-dai-capture.m4 +++ b/topology/sof/pipe-dai-capture.m4 @@ -1,7 +1,9 @@ # DAI Capture connector # Include topology builder -include(`local.m4') +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') # # DAI definitions diff --git a/topology/sof/pipe-dai-playback.m4 b/topology/sof/pipe-dai-playback.m4 index d35d3b1..e70998b 100644 --- a/topology/sof/pipe-dai-playback.m4 +++ b/topology/sof/pipe-dai-playback.m4 @@ -1,7 +1,9 @@ # DAI Playback connector # Include topology builder -include(`local.m4') +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') # # DAI definitions diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index 7adfd14..5619999 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -5,7 +5,11 @@ # host PCM_C <--B5-- volume(0C) <--B4-- source DAI0 # Include topology builder -include(`local.m4') +include(`utils.m4') +include(`buffer.m4') +include(`pcm.m4') +include(`pga.m4') +include(`mixercontrol.m4') # # Controls diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index 11cf07d..4a4fca9 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -20,7 +20,12 @@ # # Include topology builder -include(`local.m4') +include(`utils.m4') +include(`buffer.m4') +include(`pcm.m4') +include(`pga.m4') +include(`mixer.m4') +include(`mixercontrol.m4') # # Controls diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4 index cfa357a..a13887a 100644 --- a/topology/sof/pipe-passthrough-capture.m4 +++ b/topology/sof/pipe-passthrough-capture.m4 @@ -5,8 +5,11 @@ # host PCM_C <-- B0 <-- sink DAI0 # Include topology builder -include(`local.m4') - +include(`utils.m4') +include(`buffer.m4') +include(`pcm.m4') +include(`dai.m4') +include(`pipeline.m4') # # Components and Buffers diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index 3218431..8a9e8ff 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -5,8 +5,11 @@ # host PCM_P --> B0 --> sink DAI0 # Include topology builder -include(`local.m4') - +include(`utils.m4') +include(`buffer.m4') +include(`pcm.m4') +include(`dai.m4') +include(`pipeline.m4') # # Components and Buffers diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index 0196f98..f2053b7 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -8,7 +8,12 @@ # # Include topology builder -include(`local.m4') +include(`utils.m4') +include(`src.m4') +include(`buffer.m4') +include(`pga.m4') +include(`mixercontrol.m4') +include(`pipeline.m4') # # Controls diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4 index 824dcdb..a58eb68 100644 --- a/topology/sof/pipe-src-capture.m4 +++ b/topology/sof/pipe-src-capture.m4 @@ -5,8 +5,12 @@ # host PCM_P --> SRC --> sink DAI0 # Include topology builder -include(`local.m4') - +include(`utils.m4') +include(`src.m4') +include(`buffer.m4') +include(`pcm.m4') +include(`dai.m4') +include(`pipeline.m4') # # Components and Buffers diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4 index 3009ff7..7bf8f47 100644 --- a/topology/sof/pipe-src-playback.m4 +++ b/topology/sof/pipe-src-playback.m4 @@ -5,8 +5,12 @@ # host PCM_P --> SRC --> sink DAI0 # Include topology builder -include(`local.m4') - +include(`utils.m4') +include(`src.m4') +include(`buffer.m4') +include(`pcm.m4') +include(`dai.m4') +include(`pipeline.m4') # # Components and Buffers diff --git a/topology/sof/pipe-tone.m4 b/topology/sof/pipe-tone.m4 index 899c426..09ed32c 100644 --- a/topology/sof/pipe-tone.m4 +++ b/topology/sof/pipe-tone.m4 @@ -8,7 +8,12 @@ # # Include topology builder -include(`local.m4') +include(`utils.m4') +include(`buffer.m4') +include(`pga.m4') +include(`tone.m4') +include(`mixercontrol.m4') +include(`pipeline.m4') # # Controls diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 299a0f8..5aa0d12 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -5,7 +5,13 @@ # host PCM_C <-- B0 <-- Volume 0 <-- B1 <-- source DAI0 # Include topology builder -include(`local.m4') +include(`utils.m4') +include(`buffer.m4') +include(`pcm.m4') +include(`pga.m4') +include(`dai.m4') +include(`mixercontrol.m4') +include(`pipeline.m4') # # Controls diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 3e3f98e..90fe303 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -5,7 +5,13 @@ # host PCM_P --> B0 --> Volume 0 --> B1 --> sink DAI0 # Include topology builder -include(`local.m4') +include(`utils.m4') +include(`buffer.m4') +include(`pcm.m4') +include(`pga.m4') +include(`dai.m4') +include(`mixercontrol.m4') +include(`pipeline.m4') # # Controls diff --git a/topology/test/test-capture-ssp.m4 b/topology/test/test-capture-ssp.m4 index 2c808ba..8950222 100644 --- a/topology/test/test-capture-ssp.m4 +++ b/topology/test/test-capture-ssp.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`dai.m4') +include(`utils.m4') +include(`pipeline.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/test/test-playback-ssp.m4 b/topology/test/test-playback-ssp.m4 index 093ad17..db6cb6c 100644 --- a/topology/test/test-playback-ssp.m4 +++ b/topology/test/test-playback-ssp.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`pipeline.m4') +include(`dai.m4') +include(`utils.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/test/test-ssp.m4 b/topology/test/test-ssp.m4 index 304aab9..01e3a02 100644 --- a/topology/test/test-ssp.m4 +++ b/topology/test/test-ssp.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`dai.m4') +include(`utils.m4') +include(`pipeline.m4') # Include TLV library include(`common/tlv.m4') diff --git a/topology/test/test-tone-playback-ssp.m4 b/topology/test/test-tone-playback-ssp.m4 index 2fe6693..9231316 100644 --- a/topology/test/test-tone-playback-ssp.m4 +++ b/topology/test/test-tone-playback-ssp.m4 @@ -3,8 +3,9 @@ # # Include topology builder -include(`local.m4') -include(`build.m4') +include(`pipeline.m4') +include(`dai.m4') +include(`utils.m4') # Include TLV library include(`common/tlv.m4') -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] dma: dw-dma: fix wrong memory capabilities flags
by Xiuli Pan 06 Mar '18

06 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Runtime heap does not support DMA, fix this bug. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 and GP-MRB with Nocodec SOF master: e92ef97834489f52c0f20445d401a8c6e0aaed62 SOF-Tool master: 5b8dfd13019cfd29999503b56c902f56209000ed https://github.com/plbossart/sound/tree/topic/sof-v4.14: d919ea06b7f79c95ab4eb68baf05e9faf3a894c1 --- src/drivers/dw-dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index c2d6917..18e4583 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -552,9 +552,9 @@ static int dw_dma_set_config(struct dma *dma, int channel, /* allocate descriptors for channel */ if (p->chan[channel].lli) rfree(p->chan[channel].lli); - p->chan[channel].lli = rzalloc(RZONE_RUNTIME, - SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, - sizeof(struct dw_lli2) * p->chan[channel].desc_count); + p->chan[channel].lli = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, + sizeof(struct dw_lli2) * + p->chan[channel].desc_count); if (p->chan[channel].lli == NULL) { trace_dma_error("eD1"); ret = -ENOMEM; -- 2.7.4

2 1

[Sound-open-firmware] [PATCH V3 1/2] ASoc: SOF: Add memory window for all platform
by Xiuli Pan 06 Mar '18

06 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add memory window handler for BYT, HSW and BDW. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 GP-MRB nocodec SOF master: 1693b66bb1d804ded975767cc1e5911e6ff9c93c SOF-Tool master: a02abb799405d0e4ad0d6bb46eacf6fbe958c06e https://github.com/plbossart/sound/tree/topic/sof-v4.14: 9513a73b981bc1917705671ec54402a7e21672eb --- sound/soc/sof/hw-apl.c | 11 +++++-- sound/soc/sof/hw-bdw.c | 86 ++++++++++++++++++++++++++++++++++++++++++------- sound/soc/sof/hw-byt.c | 87 +++++++++++++++++++++++++++++++++++++++++++------- sound/soc/sof/hw-hsw.c | 85 +++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 233 insertions(+), 36 deletions(-) diff --git a/sound/soc/sof/hw-apl.c b/sound/soc/sof/hw-apl.c index bfbdd915..de0efe1 100644 --- a/sound/soc/sof/hw-apl.c +++ b/sound/soc/sof/hw-apl.c @@ -1089,9 +1089,13 @@ static int apl_prepare(struct snd_sof_dev *sdev, unsigned int format, static void apl_get_windows(struct snd_sof_dev *sdev) { struct sof_ipc_window_elem *elem; + u32 outbox_offset = 0; + u32 stream_offset = 0; + u32 inbox_offset = 0; + u32 outbox_size = 0; + u32 stream_size = 0; + u32 inbox_size = 0; int i; - u32 inbox_offset = 0, outbox_offset = 0; - u32 inbox_size = 0, outbox_size = 0; if (!sdev->info_window) return; @@ -1135,6 +1139,9 @@ static void apl_get_windows(struct snd_sof_dev *sdev) elem->size, "debug"); break; case SOF_IPC_REGION_STREAM: + stream_offset = + elem->offset + SRAM_WINDOW_OFFSET(elem->id); + stream_size = elem->size; snd_sof_debugfs_create_item(sdev, sdev->bar[APL_DSP_BAR] + elem->offset + diff --git a/sound/soc/sof/hw-bdw.c b/sound/soc/sof/hw-bdw.c index bc3141f..5ec0c5b 100644 --- a/sound/soc/sof/hw-bdw.c +++ b/sound/soc/sof/hw-bdw.c @@ -63,7 +63,6 @@ static const struct snd_sof_debugfs_map bdw_debugfs[] = { {"iram", BDW_DSP_BAR, IRAM_OFFSET, BDW_IRAM_SIZE}, {"dram", BDW_DSP_BAR, DRAM_OFFSET, BDW_DRAM_SIZE}, {"shim", BDW_DSP_BAR, SHIM_OFFSET, SHIM_SIZE}, - {"mbox", BDW_DSP_BAR, MBOX_OFFSET, MBOX_SIZE}, }; /* @@ -379,6 +378,75 @@ static irqreturn_t bdw_irq_thread(int irq, void *context) /* * IPC Firmware ready. */ +static void bdw_get_windows(struct snd_sof_dev *sdev) +{ + struct sof_ipc_window_elem *elem; + u32 outbox_offset = 0; + u32 stream_offset = 0; + u32 inbox_offset = 0; + u32 outbox_size = 0; + u32 stream_size = 0; + u32 inbox_size = 0; + int i; + + if (sdev->info_window == NULL) + return; + + for (i = 0; i < sdev->info_window->num_windows; i++) { + + elem = &sdev->info_window->window[i]; + + switch (elem->type) { + case SOF_IPC_REGION_UPBOX: + inbox_offset = elem->offset + MBOX_OFFSET; + inbox_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[BDW_DSP_BAR] + inbox_offset, + elem->size, "inbox"); + break; + case SOF_IPC_REGION_DOWNBOX: + outbox_offset = elem->offset + MBOX_OFFSET; + outbox_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[BDW_DSP_BAR] + outbox_offset, + elem->size, "outbox"); + break; + case SOF_IPC_REGION_TRACE: + snd_sof_debugfs_create_item(sdev, + sdev->bar[BDW_DSP_BAR] + elem->offset + + MBOX_OFFSET, elem->size, "etrace"); + break; + case SOF_IPC_REGION_DEBUG: + snd_sof_debugfs_create_item(sdev, + sdev->bar[BDW_DSP_BAR] + elem->offset + + MBOX_OFFSET, elem->size, "debug"); + break; + case SOF_IPC_REGION_STREAM: + stream_offset = elem->offset + MBOX_OFFSET; + stream_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[BDW_DSP_BAR] + stream_offset, + elem->size, "stream"); + break; + case SOF_IPC_REGION_REGS: + snd_sof_debugfs_create_item(sdev, + sdev->bar[BDW_DSP_BAR] + elem->offset + + MBOX_OFFSET, elem->size, "regs"); + break; + default: + break; + } + } + + snd_sof_dsp_mailbox_init(sdev, inbox_offset, inbox_size, + outbox_offset, outbox_size); + + dev_dbg(sdev->dev, " mailbox upstream 0x%x - size 0x%x\n", + inbox_offset, inbox_size); + dev_dbg(sdev->dev, " mailbox downstream 0x%x - size 0x%x\n", + outbox_offset, outbox_size); +} + static int bdw_fw_ready(struct snd_sof_dev *sdev, u32 msg_id) { struct sof_ipc_fw_ready *fw_ready = &sdev->fw_ready; @@ -394,19 +462,15 @@ static int bdw_fw_ready(struct snd_sof_dev *sdev, u32 msg_id) /* copy data from the DSP FW ready offset */ bdw_block_read(sdev, offset, fw_ready, sizeof(*fw_ready)); - snd_sof_dsp_mailbox_init(sdev, fw_ready->dspbox_offset, - fw_ready->dspbox_size, - fw_ready->hostbox_offset, - fw_ready->hostbox_size); - - dev_dbg(sdev->dev, " mailbox DSP initiated 0x%x - size 0x%x\n", - fw_ready->dspbox_offset, fw_ready->dspbox_size); - dev_dbg(sdev->dev, " mailbox Host initiated 0x%x - size 0x%x\n", - fw_ready->hostbox_offset, fw_ready->hostbox_size); - dev_info(sdev->dev, " Firmware info: version %d:%d-%s build %d on %s:%s\n", v->major, v->minor, v->tag, v->build, v->date, v->time); + /* now check for extended data */ + snd_sof_fw_parse_ext_data(sdev, + MBOX_OFFSET + sizeof(struct sof_ipc_fw_ready)); + + bdw_get_windows(sdev); + return 0; } diff --git a/sound/soc/sof/hw-byt.c b/sound/soc/sof/hw-byt.c index 209f72a..031cec6 100644 --- a/sound/soc/sof/hw-byt.c +++ b/sound/soc/sof/hw-byt.c @@ -73,7 +73,6 @@ static const struct snd_sof_debugfs_map byt_debugfs[] = { {"iram", BYT_DSP_BAR, IRAM_OFFSET, IRAM_SIZE}, {"dram", BYT_DSP_BAR, DRAM_OFFSET, DRAM_SIZE}, {"shim", BYT_DSP_BAR, SHIM_OFFSET, SHIM_SIZE}, - {"mbox", BYT_DSP_BAR, MBOX_OFFSET, MBOX_SIZE}, }; static const struct snd_sof_debugfs_map cht_debugfs[] = { @@ -89,7 +88,6 @@ static const struct snd_sof_debugfs_map cht_debugfs[] = { {"iram", BYT_DSP_BAR, IRAM_OFFSET, IRAM_SIZE}, {"dram", BYT_DSP_BAR, DRAM_OFFSET, DRAM_SIZE}, {"shim", BYT_DSP_BAR, SHIM_OFFSET, SHIM_SIZE}, - {"mbox", BYT_DSP_BAR, MBOX_OFFSET, MBOX_SIZE}, }; static void byt_dump(struct snd_sof_dev *sdev, u32 flags) @@ -197,6 +195,75 @@ static void byt_block_read(struct snd_sof_dev *sdev, u32 offset, void *dest, /* * IPC Firmware ready. */ +static void byt_get_windows(struct snd_sof_dev *sdev) +{ + struct sof_ipc_window_elem *elem; + u32 outbox_offset = 0; + u32 stream_offset = 0; + u32 inbox_offset = 0; + u32 outbox_size = 0; + u32 stream_size = 0; + u32 inbox_size = 0; + int i; + + if (sdev->info_window == NULL) + return; + + for (i = 0; i < sdev->info_window->num_windows; i++) { + + elem = &sdev->info_window->window[i]; + + switch (elem->type) { + case SOF_IPC_REGION_UPBOX: + inbox_offset = elem->offset + MBOX_OFFSET; + inbox_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[BYT_DSP_BAR] + inbox_offset, + elem->size, "inbox"); + break; + case SOF_IPC_REGION_DOWNBOX: + outbox_offset = elem->offset + MBOX_OFFSET; + outbox_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[BYT_DSP_BAR] + outbox_offset, + elem->size, "outbox"); + break; + case SOF_IPC_REGION_TRACE: + snd_sof_debugfs_create_item(sdev, + sdev->bar[BYT_DSP_BAR] + elem->offset + + MBOX_OFFSET, elem->size, "etrace"); + break; + case SOF_IPC_REGION_DEBUG: + snd_sof_debugfs_create_item(sdev, + sdev->bar[BYT_DSP_BAR] + elem->offset + + MBOX_OFFSET, elem->size, "debug"); + break; + case SOF_IPC_REGION_STREAM: + stream_offset = elem->offset + MBOX_OFFSET; + stream_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[BYT_DSP_BAR] + stream_offset, + elem->size, "stream"); + break; + case SOF_IPC_REGION_REGS: + snd_sof_debugfs_create_item(sdev, + sdev->bar[BYT_DSP_BAR] + elem->offset + + MBOX_OFFSET, elem->size, "regs"); + break; + default: + break; + } + } + + snd_sof_dsp_mailbox_init(sdev, inbox_offset, inbox_size, + outbox_offset, outbox_size); + + dev_dbg(sdev->dev, " mailbox upstream 0x%x - size 0x%x\n", + inbox_offset, inbox_size); + dev_dbg(sdev->dev, " mailbox downstream 0x%x - size 0x%x\n", + outbox_offset, outbox_size); +} + static int byt_fw_ready(struct snd_sof_dev *sdev, u32 msg_id) { struct sof_ipc_fw_ready *fw_ready = &sdev->fw_ready; @@ -212,19 +279,15 @@ static int byt_fw_ready(struct snd_sof_dev *sdev, u32 msg_id) /* copy data from the DSP FW ready offset */ byt_block_read(sdev, offset, fw_ready, sizeof(*fw_ready)); - snd_sof_dsp_mailbox_init(sdev, fw_ready->dspbox_offset, - fw_ready->dspbox_size, - fw_ready->hostbox_offset, - fw_ready->hostbox_size); - - dev_dbg(sdev->dev, " mailbox DSP initiated 0x%x - size 0x%x\n", - fw_ready->dspbox_offset, fw_ready->dspbox_size); - dev_dbg(sdev->dev, " mailbox Host initiated 0x%x - size 0x%x\n", - fw_ready->hostbox_offset, fw_ready->hostbox_size); - dev_info(sdev->dev, " Firmware info: version %d:%d-%s build %d on %s:%s\n", v->major, v->minor, v->tag, v->build, v->date, v->time); + /* now check for extended data */ + snd_sof_fw_parse_ext_data(sdev, + MBOX_OFFSET + sizeof(struct sof_ipc_fw_ready)); + + byt_get_windows(sdev); + return 0; } diff --git a/sound/soc/sof/hw-hsw.c b/sound/soc/sof/hw-hsw.c index c6366bb..2f36216 100644 --- a/sound/soc/sof/hw-hsw.c +++ b/sound/soc/sof/hw-hsw.c @@ -63,7 +63,6 @@ static const struct snd_sof_debugfs_map hsw_debugfs[] = { {"iram", HSW_DSP_BAR, IRAM_OFFSET, HSW_IRAM_SIZE}, {"dram", HSW_DSP_BAR, DRAM_OFFSET, HSW_DRAM_SIZE}, {"shim", HSW_DSP_BAR, SHIM_OFFSET, SHIM_SIZE}, - {"mbox", HSW_DSP_BAR, MBOX_OFFSET, MBOX_SIZE}, }; /* @@ -380,6 +379,75 @@ static irqreturn_t hsw_irq_thread(int irq, void *context) /* * IPC Firmware ready. */ +static void hsw_get_windows(struct snd_sof_dev *sdev) +{ + struct sof_ipc_window_elem *elem; + u32 outbox_offset = 0; + u32 stream_offset = 0; + u32 inbox_offset = 0; + u32 outbox_size = 0; + u32 stream_size = 0; + u32 inbox_size = 0; + int i; + + if (sdev->info_window == NULL) + return; + + for (i = 0; i < sdev->info_window->num_windows; i++) { + + elem = &sdev->info_window->window[i]; + + switch (elem->type) { + case SOF_IPC_REGION_UPBOX: + inbox_offset = elem->offset + MBOX_OFFSET; + inbox_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[HSW_DSP_BAR] + inbox_offset, + elem->size, "inbox"); + break; + case SOF_IPC_REGION_DOWNBOX: + outbox_offset = elem->offset + MBOX_OFFSET; + outbox_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[HSW_DSP_BAR] + outbox_offset, + elem->size, "outbox"); + break; + case SOF_IPC_REGION_TRACE: + snd_sof_debugfs_create_item(sdev, + sdev->bar[HSW_DSP_BAR] + elem->offset + + MBOX_OFFSET, elem->size, "etrace"); + break; + case SOF_IPC_REGION_DEBUG: + snd_sof_debugfs_create_item(sdev, + sdev->bar[HSW_DSP_BAR] + elem->offset + + MBOX_OFFSET, elem->size, "debug"); + break; + case SOF_IPC_REGION_STREAM: + stream_offset = elem->offset + MBOX_OFFSET; + stream_size = elem->size; + snd_sof_debugfs_create_item(sdev, + sdev->bar[HSW_DSP_BAR] + stream_offset, + elem->size, "stream"); + break; + case SOF_IPC_REGION_REGS: + snd_sof_debugfs_create_item(sdev, + sdev->bar[HSW_DSP_BAR] + elem->offset + + MBOX_OFFSET, elem->size, "regs"); + break; + default: + break; + } + } + + snd_sof_dsp_mailbox_init(sdev, inbox_offset, inbox_size, + outbox_offset, outbox_size); + + dev_dbg(sdev->dev, " mailbox upstream 0x%x - size 0x%x\n", + inbox_offset, inbox_size); + dev_dbg(sdev->dev, " mailbox downstream 0x%x - size 0x%x\n", + outbox_offset, outbox_size); +} + static int hsw_fw_ready(struct snd_sof_dev *sdev, u32 msg_id) { struct sof_ipc_fw_ready *fw_ready = &sdev->fw_ready; @@ -395,18 +463,13 @@ static int hsw_fw_ready(struct snd_sof_dev *sdev, u32 msg_id) /* copy data from the DSP FW ready offset */ hsw_block_read(sdev, offset, fw_ready, sizeof(*fw_ready)); - snd_sof_dsp_mailbox_init(sdev, fw_ready->dspbox_offset, - fw_ready->dspbox_size, - fw_ready->hostbox_offset, - fw_ready->hostbox_size); - - dev_dbg(sdev->dev, " mailbox DSP initiated 0x%x - size 0x%x\n", - fw_ready->dspbox_offset, fw_ready->dspbox_size); - dev_dbg(sdev->dev, " mailbox Host initiated 0x%x - size 0x%x\n", - fw_ready->hostbox_offset, fw_ready->hostbox_size); - dev_info(sdev->dev, " Firmware info: version %d:%d-%s build %d on %s:%s\n", v->major, v->minor, v->tag, v->build, v->date, v->time); + /* now check for extended data */ + snd_sof_fw_parse_ext_data(sdev, + MBOX_OFFSET + sizeof(struct sof_ipc_fw_ready)); + + hsw_get_windows(sdev); return 0; } -- 2.7.4

5 15

[Sound-open-firmware] [PATCH v4 1/8] topology: make list loop more generic with formatting argument
by Ranjani Sridharan 05 Mar '18

05 Mar '18

This patch adds changes to make list loop more generic with format argument Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- topology/m4/local.m4 | 13 ++++++++----- 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 | 3 ++- topology/sof/pipe-volume-capture.m4 | 2 +- topology/sof/pipe-volume-playback.m4 | 2 +- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/topology/m4/local.m4 b/topology/m4/local.m4 index 31221f3..1ebe19d 100644 --- a/topology/m4/local.m4 +++ b/topology/m4/local.m4 @@ -10,16 +10,16 @@ define(`argn', `ifelse(`$1', 1, ``$2'', dnl Defines a list of items from a variable number of params. dnl Use as last argument in a macro. +dnl The first argument specifies the number of tabs to be added for formatting define(`LIST_LOOP', `argn(j,$@) - ifelse(i,`1', `', `define(`i', decr(i)) define(`j', incr(j)) $0($@)')') +$1ifelse(i,`2', `', `define(`i', decr(i))define(`j', incr(j))$0($@)')') + +define(`LIST', `pushdef(`i', $#)pushdef(`j', `2')LIST_LOOP($@)popdef(i)popdef(j)') dnl Sums a list of variable arguments. Use as last argument in macro. define(`SUM_LOOP', `eval(argn(j,$@) ifelse(i,`1', `', `define(`i', decr(i)) define(`j', incr(j)) + $0($@)'))') -dnl Support a varaible list of kcontrols. -define(`KCONTROLS', `pushdef(`i', $#) pushdef(`j', `1') LIST_LOOP($@)') - dnl Memory capabilities define(`MEMCAPS', `pushdef(`i', $#) pushdef(`j', `1') SUM_LOOP($@)') @@ -165,7 +165,7 @@ define(`N_PGA', `PGA'PIPELINE_ID`.'$1) dnl W_PGA(name, format, periods_sink, periods_source, preload, kcontrol0. kcontrol1...etc) define(`W_PGA', -`pushdef(`args',`eval($#-6)')SectionVendorTuples."'N_PGA($1)`_tuples_w" {' +`SectionVendorTuples."'N_PGA($1)`_tuples_w" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' ` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($3) @@ -270,6 +270,9 @@ define(`W_TONE', ` "'N_TONE($1)`_data_w"' ` "'N_TONE($1)`_data_str"' ` ]' +` mixer [' + $6 +` ]' `}') dnl DAI name) diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index 41fc622..6bb1a3d 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -48,7 +48,7 @@ SectionControlMixer.STR(PCM PCM_ID Capture Volume) { W_PCM_CAPTURE(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, KCONTROLS("PCM PCM_ID Capture Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, LIST(` ', "PCM PCM_ID Capture Volume")) # 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 37f8be2..64761a9 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -91,10 +91,10 @@ SectionControlMixer.STR(Master Playback Volume) { W_PCM_PLAYBACK(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, KCONTROLS("PCM PCM_ID Playback Volume")) +W_PGA(0, PIPELINE_FORMAT, 1, 2, 1, LIST(` ', "PCM PCM_ID Playback Volume")) # "Master Playback Volume" has 1 source and 2 sink periods for DAI ping-pong -W_PGA(1, PIPELINE_FORMAT, 2, 1, 1, KCONTROLS("Master Playback Volume")) +W_PGA(1, PIPELINE_FORMAT, 2, 1, 1, LIST(` ', "Master Playback Volume")) # 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 1766aca..c1cff33 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -68,7 +68,7 @@ SectionData."media_src_conf" { W_PCM_PLAYBACK(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, KCONTROLS("PCM PCM_ID Playback Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "PCM PCM_ID Playback Volume")) # "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 a8064ab..f53f77f 100644 --- a/topology/sof/pipe-tone.m4 +++ b/topology/sof/pipe-tone.m4 @@ -32,6 +32,7 @@ SectionControlMixer.STR(Tone Volume PIPELINE_ID) { # control uses bespoke driver get/put/info ID 0 ops."ctl" { info "volsw" + # 256 binds the mixer control to volume get/put handlers get "256" put "256" } @@ -50,7 +51,7 @@ SectionControlMixer.STR(Tone Volume PIPELINE_ID) { W_TONE(0, PIPELINE_FORMAT, 2, 0, 0) # "Tone Volume" has 2 sink period and 2 source periods -W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, KCONTROLS("Tone Volume PIPELINE_ID")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, LIST(` ', "Tone Volume PIPELINE_ID")) # Low Latency Buffers W_BUFFER(0,COMP_BUFFER_SIZE(2, diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 2fd6b98..56494b4 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -47,7 +47,7 @@ SectionControlMixer.STR(Master Capture Volume) { W_PCM_CAPTURE(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, KCONTROLS("Master Capture Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Capture Volume")) # 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 9431177..24ae45c 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -73,7 +73,7 @@ SectionControlMixer.STR(Master Playback Volume Switch) { W_PCM_PLAYBACK(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, KCONTROLS("Master Playback Volume Switch", "Master Playback Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Playback Volume Switch", "Master Playback Volume")) # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, -- 2.14.1

1 7

[Sound-open-firmware] [PATCH v3 1/8] topology: make list loop more generic with formatting argument
by Ranjani Sridharan 05 Mar '18

05 Mar '18

This patch adds changes to make list loop more generic with format argument Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- topology/m4/local.m4 | 13 ++++++++----- 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 | 3 ++- topology/sof/pipe-volume-capture.m4 | 2 +- topology/sof/pipe-volume-playback.m4 | 2 +- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/topology/m4/local.m4 b/topology/m4/local.m4 index 31221f3..1ebe19d 100644 --- a/topology/m4/local.m4 +++ b/topology/m4/local.m4 @@ -10,16 +10,16 @@ define(`argn', `ifelse(`$1', 1, ``$2'', dnl Defines a list of items from a variable number of params. dnl Use as last argument in a macro. +dnl The first argument specifies the number of tabs to be added for formatting define(`LIST_LOOP', `argn(j,$@) - ifelse(i,`1', `', `define(`i', decr(i)) define(`j', incr(j)) $0($@)')') +$1ifelse(i,`2', `', `define(`i', decr(i))define(`j', incr(j))$0($@)')') + +define(`LIST', `pushdef(`i', $#)pushdef(`j', `2')LIST_LOOP($@)popdef(i)popdef(j)') dnl Sums a list of variable arguments. Use as last argument in macro. define(`SUM_LOOP', `eval(argn(j,$@) ifelse(i,`1', `', `define(`i', decr(i)) define(`j', incr(j)) + $0($@)'))') -dnl Support a varaible list of kcontrols. -define(`KCONTROLS', `pushdef(`i', $#) pushdef(`j', `1') LIST_LOOP($@)') - dnl Memory capabilities define(`MEMCAPS', `pushdef(`i', $#) pushdef(`j', `1') SUM_LOOP($@)') @@ -165,7 +165,7 @@ define(`N_PGA', `PGA'PIPELINE_ID`.'$1) dnl W_PGA(name, format, periods_sink, periods_source, preload, kcontrol0. kcontrol1...etc) define(`W_PGA', -`pushdef(`args',`eval($#-6)')SectionVendorTuples."'N_PGA($1)`_tuples_w" {' +`SectionVendorTuples."'N_PGA($1)`_tuples_w" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' ` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($3) @@ -270,6 +270,9 @@ define(`W_TONE', ` "'N_TONE($1)`_data_w"' ` "'N_TONE($1)`_data_str"' ` ]' +` mixer [' + $6 +` ]' `}') dnl DAI name) diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index 41fc622..6bb1a3d 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -48,7 +48,7 @@ SectionControlMixer.STR(PCM PCM_ID Capture Volume) { W_PCM_CAPTURE(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, KCONTROLS("PCM PCM_ID Capture Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, LIST(` ', "PCM PCM_ID Capture Volume")) # 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 37f8be2..64761a9 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -91,10 +91,10 @@ SectionControlMixer.STR(Master Playback Volume) { W_PCM_PLAYBACK(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, KCONTROLS("PCM PCM_ID Playback Volume")) +W_PGA(0, PIPELINE_FORMAT, 1, 2, 1, LIST(` ', "PCM PCM_ID Playback Volume")) # "Master Playback Volume" has 1 source and 2 sink periods for DAI ping-pong -W_PGA(1, PIPELINE_FORMAT, 2, 1, 1, KCONTROLS("Master Playback Volume")) +W_PGA(1, PIPELINE_FORMAT, 2, 1, 1, LIST(` ', "Master Playback Volume")) # 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 1766aca..c1cff33 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -68,7 +68,7 @@ SectionData."media_src_conf" { W_PCM_PLAYBACK(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, KCONTROLS("PCM PCM_ID Playback Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "PCM PCM_ID Playback Volume")) # "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 a8064ab..f53f77f 100644 --- a/topology/sof/pipe-tone.m4 +++ b/topology/sof/pipe-tone.m4 @@ -32,6 +32,7 @@ SectionControlMixer.STR(Tone Volume PIPELINE_ID) { # control uses bespoke driver get/put/info ID 0 ops."ctl" { info "volsw" + # 256 binds the mixer control to volume get/put handlers get "256" put "256" } @@ -50,7 +51,7 @@ SectionControlMixer.STR(Tone Volume PIPELINE_ID) { W_TONE(0, PIPELINE_FORMAT, 2, 0, 0) # "Tone Volume" has 2 sink period and 2 source periods -W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, KCONTROLS("Tone Volume PIPELINE_ID")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, LIST(` ', "Tone Volume PIPELINE_ID")) # Low Latency Buffers W_BUFFER(0,COMP_BUFFER_SIZE(2, diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 2fd6b98..56494b4 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -47,7 +47,7 @@ SectionControlMixer.STR(Master Capture Volume) { W_PCM_CAPTURE(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, KCONTROLS("Master Capture Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Capture Volume")) # 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 9431177..24ae45c 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -73,7 +73,7 @@ SectionControlMixer.STR(Master Playback Volume Switch) { W_PCM_PLAYBACK(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, KCONTROLS("Master Playback Volume Switch", "Master Playback Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Playback Volume Switch", "Master Playback Volume")) # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, -- 2.14.1

1 7

[Sound-open-firmware] [PATCH] topology: stringify buffer caps.
by Liam Girdwood 05 Mar '18

05 Mar '18

Needs to be string for proper alsa-conf parsing. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/m4/local.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/m4/local.m4 b/topology/m4/local.m4 index 14d742d..31221f3 100644 --- a/topology/m4/local.m4 +++ b/topology/m4/local.m4 @@ -71,7 +71,7 @@ define(`W_BUFFER', ` tokens "sof_buffer_tokens"' ` tuples."word" {' ` SOF_TKN_BUF_SIZE' STR($2) -` SOF_TKN_BUF_CAPS' $3 +` SOF_TKN_BUF_CAPS' STR($3) ` }' `}' `SectionData."'N_BUFFER($1)`_data" {' -- 2.14.1

1 0

[Sound-open-firmware] [PATCH v2 1/5] topology: create m4 wrapper for mixer control section
by Ranjani Sridharan 05 Mar '18

05 Mar '18

This patch adds m4 wrapper for mixercontrol section in pipeline definition Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- topology/m4/local.m4 | 55 +++++++++++++++++++++-- topology/sof/pipe-low-latency-capture.m4 | 36 ++++----------- topology/sof/pipe-low-latency-playback.m4 | 73 +++++++------------------------ topology/sof/pipe-pcm-media.m4 | 37 ++++------------ topology/sof/pipe-tone.m4 | 73 +++++++------------------------ topology/sof/pipe-volume-capture.m4 | 35 ++++----------- topology/sof/pipe-volume-playback.m4 | 70 +++++++---------------------- 7 files changed, 127 insertions(+), 252 deletions(-) diff --git a/topology/m4/local.m4 b/topology/m4/local.m4 index a340ec3..4521314 100644 --- a/topology/m4/local.m4 +++ b/topology/m4/local.m4 @@ -7,9 +7,13 @@ define(`STR', `"'$1`"') define(`argn', `ifelse(`$1', 1, ``$2'', `argn(decr(`$1'), shift(shift($@)))')') -define(`KCONTROLS', `pushdef(`i', $#) pushdef(`j', `1') KCONTROL_LOOP($@)') -define(`KCONTROL_LOOP', `argn(j,$@) - ifelse(i,`1', `', `define(`i', decr(i)) define(`j', incr(j)) $0($@)')') +define(`KCONTROLS', `pushdef(`i', $#)pushdef(`j', `1')KCONTROL_LOOP($@)popdef(i)popdef(j)') +define(`KCONTROL_LOOP',`argn(j,$@) + ifelse(i,`1', `',`define(`i', decr(i))define(`j', incr(j))$0($@)')') + +define(`MIXERCONTROLS', `pushdef(`i', $#)pushdef(`j', `1')MIXERCONTROL_LOOP($@)popdef(i)popdef(j)') +define(`MIXERCONTROL_LOOP',`argn(j,$@) + ifelse(i,`1', `',`define(`i', decr(i))define(`j', incr(j))$0($@)')') dnl create direct DAPM/pipeline link between 2 widgets) define(`dapm', `"$1, , $2"') @@ -549,4 +553,49 @@ define(`PCM_DUPLEX_ADD', ` }' `}') +dnl KCONTROL_CHANNEL(name, reg, shift) +define(`KCONTROL_CHANNEL', +`channel.STR($1) {' +` reg STR($2)' +` shift STR($3)' +` }') + +dnl CONTROLMIXER_MAX(comment, value) +define(`CONTROLMIXER_MAX', +`#$1' +` max STR($2)') + +dnl CONTROLMIXER_TLV(comment, value) +define(`CONTROLMIXER_TLV', +`#$1' +` tlv STR($2)') + +dnl CONTROLMIXER_OPS(info, comment, get, put) +define(`CONTROLMIXER_OPS', +`ops."ctl" {' +` info STR($1)' +` #$2' +` get STR($3)' +` put STR($4)' +` }') + +dnl C_CONTROLMIXER(name, index, ops, max, invert, tlv, KCONTROL_CHANNELS) +define(`C_CONTROLMIXER', +`SectionControlMixer.STR($1) {' +`' +` # control belongs to this index group' +` index STR($2)' +`' +` #$7' +` $8' +` # control uses bespoke driver get/put/info ID' +` $3' +`' +` $4' +` invert STR($5)' +` $6' +`}') + divert(0) dnl + + diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index 2602ebd..a82dee1 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -10,34 +10,14 @@ include(`local.m4') # # Controls # - -SectionControlMixer.STR(PCM PCM_ID Capture Volume) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "0" - shift "0" - } - channel."FR" { - reg "0" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # TLV 40 steps from -90dB to +20dB for 3dB - max "40" - invert "false" - tlv "vtlv_m90s3" -} +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(PCM PCM_ID Capture Volume, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 40), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 0, 0), KCONTROL_CHANNEL(FR, 0, 1))) # # Components and Buffers diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index ebb14ec..3b8d6aa 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -25,62 +25,23 @@ include(`local.m4') # # Controls # - -SectionControlMixer.STR(PCM PCM_ID Playback Volume) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "0" - shift "0" - } - channel."FR" { - reg "0" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # TLV 32 steps from -90dB to +6dB for 3dB - max "32" - invert "false" - tlv "vtlv_m90s3" -} - -SectionControlMixer.STR(Master Playback Volume) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # TLV 32 steps from -90dB to +6dB for 3dB - max "32" - invert "false" - tlv "vtlv_m90s3" -} +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(PCM PCM_ID Playback Volume, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 32), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 0, 0), KCONTROL_CHANNEL(FR, 0, 1))) + +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 32), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) # # Components and Buffers diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index 526ae35..65dc62d 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -13,35 +13,14 @@ include(`local.m4') # # Controls # - -SectionControlMixer.STR(PCM PCM_ID Playback Volume) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # TLV 32 steps from -90dB to +6dB for 3dB - max "32" - invert "false" - tlv "vtlv_m90s3" -} - +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(PCM PCM_ID Playback Volume, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 32), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) # # SRC Configuration diff --git a/topology/sof/pipe-tone.m4 b/topology/sof/pipe-tone.m4 index 8f92680..b735146 100644 --- a/topology/sof/pipe-tone.m4 +++ b/topology/sof/pipe-tone.m4 @@ -14,62 +14,23 @@ include(`local.m4') # Controls # -SectionControlMixer.STR(Tone Volume PIPELINE_ID) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - # 256 binds the mixer control to volume get/put handlers - get "256" - put "256" - } - - # TLV 32 steps from -90dB to +6dB for 3dB - max "32" - invert "false" - tlv "vtlv_m90s3" -} - -SectionControlMixer.STR(Tone Switch PIPELINE_ID) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "2" - shift "0" - } - channel."FR" { - reg "2" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - # 256 binds the mixer control to volume get/put handlers - get "256" - put "256" - } - - # max 1 indicates switch type mixer control - max "1" - invert "false" -} +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(Tone Volume PIPELINE_ID, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 32), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(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, + 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, + , + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 2, 0), KCONTROL_CHANNEL(FR, 2, 1))) # # Components and Buffers diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 58e5393..1cde24e 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -10,33 +10,14 @@ include(`local.m4') # # Controls # -SectionControlMixer.STR(Master Capture Volume) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # TLV 32 steps from -90dB to +6dB for 3dB - max "32" - invert "false" - tlv "vtlv_m90s3" -} +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(Master Capture Volume, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 32), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) # # Components and Buffers diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 8aa02fb..a6b5a1d 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -10,60 +10,24 @@ include(`local.m4') # # Controls # -SectionControlMixer.STR(Master Playback Volume) { +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 32), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) + +# Volume Mixer Switch control with max value of 1 +C_CONTROLMIXER(Master Playback Volume Switch, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(max value 1 indicates switch type control, 1), + false, + , + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # TLV 32 steps from -90dB to +6dB for 3dB - max "32" - invert "false" - tlv "vtlv_m90s3" -} - -SectionControlMixer.STR(Master Playback Volume Switch) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # Volume mute on/off - max "1" - invert "false" -} # # Components and Buffers # -- 2.14.1

2 7

[Sound-open-firmware] [PATCH] cnl: dma: refine dma interrupt processing on cnl
by Rander Wang 05 Mar '18

05 Mar '18

From: Rander Wang <rander.wang(a)intel.com> On cnl, all the dma share the same interrupt pin, so all the dma controller need to be checked in interrupt function. And also refine dma probe Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- src/drivers/dw-dma.c | 61 +++++++++++++++++++++----------------- src/platform/cannonlake/platform.c | 5 ++++ 2 files changed, 39 insertions(+), 27 deletions(-) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index 15d608c..a06087e 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1029,7 +1029,6 @@ static int dw_dma_probe(struct dma *dma) } #else - /* this will probably be called at the end of every period copied */ static void dw_dma_irq_handler(void *data) { @@ -1047,14 +1046,7 @@ static void dw_dma_irq_handler(void *data) status_intr = dw_read(dma, DW_INTR_STATUS); if (!status_intr) { -#ifdef CONFIG_CANNONLAKE - dma++; - status_intr = dw_read(dma, DW_INTR_STATUS); - if (!status_intr) - trace_dma_error("eI0"); -#else trace_dma_error("eI0"); -#endif } tracev_dma("DIr"); @@ -1144,37 +1136,52 @@ static void dw_dma_irq_handler(void *data) } } +/*All the dma share the same interrupt on CNL, so check each dma*/ +/*controller when interrupt coming, then do the work */ +static void dw_dma_irq_cnl(void *data) +{ + struct dma *dma; + uint32_t status_intr; + + /*check interrupt status of DMA controller 0*/ + dma = dma_get(DMA_GP_LP_DMAC0); + status_intr = dw_read(dma, DW_INTR_STATUS); + if (status_intr) + dw_dma_irq_handler(dma); + + /*check interrupt status of DMA controller 1*/ + dma = dma_get(DMA_GP_LP_DMAC1); + status_intr = dw_read(dma, DW_INTR_STATUS); + if (status_intr) + dw_dma_irq_handler(dma); +} + static int dw_dma_probe(struct dma *dma) { struct dma_pdata *dw_pdata; - struct dma *dmac = dma; int i; -#ifdef CONFIG_CANNONLAKE - int j; - - for (j = 0; j < MAX_GPDMA_COUNT; j++) -#endif - { - /* allocate private data */ - dw_pdata = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*dw_pdata)); - dma_set_drvdata(dmac, dw_pdata); - spinlock_init(&dmac->lock); + /* allocate private data */ + dw_pdata = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*dw_pdata)); + dma_set_drvdata(dma, dw_pdata); - dw_dma_setup(dmac); + spinlock_init(&dma->lock); - /* init work */ - for (i = 0; i < DW_MAX_CHAN; i++) { - dw_pdata->chan[i].dma = dmac; - dw_pdata->chan[i].channel = i; - dw_pdata->chan[i].status = COMP_STATE_INIT; - } + dw_dma_setup(dma); - dmac++; + /* init work */ + for (i = 0; i < DW_MAX_CHAN; i++) { + dw_pdata->chan[i].dma = dma; + dw_pdata->chan[i].channel = i; + dw_pdata->chan[i].status = COMP_STATE_INIT; } /* register our IRQ handler */ +#ifdef CONFIG_CANNONLAKE + interrupt_register(dma_irq(dma), dw_dma_irq_cnl, dma); +#else interrupt_register(dma_irq(dma), dw_dma_irq_handler, dma); +#endif interrupt_enable(dma_irq(dma)); return 0; diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index beb6582..1a9b88a 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -253,6 +253,11 @@ int platform_init(struct reef *reef) return -ENODEV; dma_probe(dmac); + dmac = dma_get(DMA_GP_LP_DMAC1); + if (!dmac) + return -ENODEV; + dma_probe(dmac); + dmac = dma_get(DMA_HOST_OUT_DMAC); if (!dmac) return -ENODEV; -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] topology: Add support for memory capabilities
by Liam Girdwood 05 Mar '18

05 Mar '18

Add support in topology to define different memory capabilities that can be included by standard pipeline definitions to set platform specific capabilities for buffers. This patch allows memory capabilities to be defined for each platform and included by all pipeline definitions. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/Makefile.am | 2 +- topology/common/Makefile.am | 3 ++- topology/common/memory.m4 | 15 +++++++++++++++ topology/dsps/bdw.m4 | 8 ++++++++ topology/dsps/bxt.m4 | 11 +++++++++++ topology/dsps/byt.m4 | 8 ++++++++ topology/dsps/cht.m4 | 8 ++++++++ topology/dsps/hsw.m4 | 8 ++++++++ topology/m4/local.m4 | 19 ++++++++++++++++--- topology/sof/pipe-low-latency-capture.m4 | 6 ++++-- topology/sof/pipe-low-latency-playback.m4 | 12 ++++++++---- topology/sof/pipe-passthrough-capture.m4 | 3 ++- topology/sof/pipe-passthrough-playback.m4 | 3 ++- topology/sof/pipe-pcm-media.m4 | 9 ++++++--- topology/sof/pipe-src-capture.m4 | 8 +++++--- topology/sof/pipe-src-playback.m4 | 6 ++++-- topology/sof/pipe-tone.m4 | 6 ++++-- topology/sof/pipe-volume-capture.m4 | 6 ++++-- topology/sof/pipe-volume-playback.m4 | 6 ++++-- topology/sof/tokens.m4 | 1 + topology/test/tplg-build.sh | 2 +- 21 files changed, 122 insertions(+), 28 deletions(-) create mode 100644 topology/common/memory.m4 diff --git a/topology/Makefile.am b/topology/Makefile.am index 1e80d57..a62aa78 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -34,7 +34,7 @@ MACHINES = \ .PRECIOUS: %.conf %.conf : %.m4 ${DEPS} - m4 -I m4 $< > $@ + m4 -I m4 -I common $< > $@ %.tplg : %.conf alsatplg -v 1 -c $< -o $@ diff --git a/topology/common/Makefile.am b/topology/common/Makefile.am index 980f0ce..7e207a7 100644 --- a/topology/common/Makefile.am +++ b/topology/common/Makefile.am @@ -1,3 +1,4 @@ EXTRA_DIST = \ - tlv.m4 + tlv.m4 \ + memory.m4 diff --git a/topology/common/memory.m4 b/topology/common/memory.m4 new file mode 100644 index 0000000..0852dff --- /dev/null +++ b/topology/common/memory.m4 @@ -0,0 +1,15 @@ +dnl +dnl Memory capabilities. +dnl +dnl These are ORed together to create a capability mask that's sent to the +dnl SOF firmware when creating buffer or allocating other memory resources. +dnl +dnl ** Must match SOF_MEM_CAPS_ values in ipc.h ** + +define(`MEM_CAP_RAM', eval(1 << 0)) +define(`MEM_CAP_ROM', eval(1 << 1)) +define(`MEM_CAP_EXT', eval(1 << 2)) +define(`MEM_CAP_LP', eval(1 << 3)) +define(`MEM_CAP_HP', eval(1 << 4)) +define(`MEM_CAP_DMA', eval(1 << 5)) +define(`MEM_CAP_CACHE', eval(1 << 6)) diff --git a/topology/dsps/bdw.m4 b/topology/dsps/bdw.m4 index 428e8bb..ad06362 100644 --- a/topology/dsps/bdw.m4 +++ b/topology/dsps/bdw.m4 @@ -2,6 +2,14 @@ # Broadwell differentiation for pipelines and components # +include(`memory.m4') + +dnl Memory capabilities for diferent buffer types on Broadwell +define(`PLATFORM_DAI_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE)) +define(`PLATFORM_HOST_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE)) +define(`PLATFORM_PASS_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE)) +define(`PLATFORM_COMP_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_CACHE)) + # Low Latency PCM Configuration SectionVendorTuples."pipe_ll_schedule_plat_tokens" { tokens "sof_sched_tokens" diff --git a/topology/dsps/bxt.m4 b/topology/dsps/bxt.m4 index 688e9fa..61bcb7e 100644 --- a/topology/dsps/bxt.m4 +++ b/topology/dsps/bxt.m4 @@ -2,6 +2,17 @@ # Broxton differentiation for pipelines and components # +include(`memory.m4') + +dnl Memory capabilities for diferent buffer types on Baytrail +define(`PLATFORM_DAI_MEM_CAP', + MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE, MEM_CAP_HP)) +define(`PLATFORM_HOST_MEM_CAP', + MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE, MEM_CAP_HP)) +define(`PLATFORM_PASS_MEM_CAP', + MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE, MEM_CAP_HP)) +define(`PLATFORM_COMP_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_CACHE)) + # Low Latency PCM Configuration SectionVendorTuples."pipe_ll_schedule_plat_tokens" { tokens "sof_sched_tokens" diff --git a/topology/dsps/byt.m4 b/topology/dsps/byt.m4 index b4defaa..64cee72 100644 --- a/topology/dsps/byt.m4 +++ b/topology/dsps/byt.m4 @@ -2,6 +2,14 @@ # Baytrail differentiation for pipelines and components # +include(`memory.m4') + +dnl Memory capabilities for diferent buffer types on Baytrail +define(`PLATFORM_DAI_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE)) +define(`PLATFORM_HOST_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE)) +define(`PLATFORM_PASS_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE)) +define(`PLATFORM_COMP_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_CACHE)) + # Low Latency PCM Configuration SectionVendorTuples."pipe_ll_schedule_plat_tokens" { tokens "sof_sched_tokens" diff --git a/topology/dsps/cht.m4 b/topology/dsps/cht.m4 index fdee83d..1f461d9 100644 --- a/topology/dsps/cht.m4 +++ b/topology/dsps/cht.m4 @@ -2,6 +2,14 @@ # Cherrytrail differentiation for pipelines and components # +include(`memory.m4') + +dnl Memory capabilities for diferent buffer types on Cherrytrail +define(`PLATFORM_DAI_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE)) +define(`PLATFORM_HOST_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE)) +define(`PLATFORM_PASS_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE)) +define(`PLATFORM_COMP_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_CACHE)) + # Low Latency PCM Configuration SectionVendorTuples."pipe_ll_schedule_plat_tokens" { tokens "sof_sched_tokens" diff --git a/topology/dsps/hsw.m4 b/topology/dsps/hsw.m4 index edb417f..074542a 100644 --- a/topology/dsps/hsw.m4 +++ b/topology/dsps/hsw.m4 @@ -2,6 +2,14 @@ # Haswell differentiation for pipelines and components # +include(`memory.m4') + +dnl Memory capabilities for diferent buffer types on Haswell +define(`PLATFORM_DAI_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE)) +define(`PLATFORM_HOST_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE)) +define(`PLATFORM_PASS_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE)) +define(`PLATFORM_COMP_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_CACHE)) + # Low Latency PCM Configuration SectionVendorTuples."pipe_ll_schedule_plat_tokens" { tokens "sof_sched_tokens" diff --git a/topology/m4/local.m4 b/topology/m4/local.m4 index 29b8b29..14d742d 100644 --- a/topology/m4/local.m4 +++ b/topology/m4/local.m4 @@ -4,13 +4,25 @@ define(`concat',`$1$2') define(`STR', `"'$1`"') +dnl Argument iterator. define(`argn', `ifelse(`$1', 1, ``$2'', `argn(decr(`$1'), shift(shift($@)))')') -define(`KCONTROLS', `pushdef(`i', $#) pushdef(`j', `1') KCONTROL_LOOP($@)') -define(`KCONTROL_LOOP', `argn(j,$@) +dnl Defines a list of items from a variable number of params. +dnl Use as last argument in a macro. +define(`LIST_LOOP', `argn(j,$@) ifelse(i,`1', `', `define(`i', decr(i)) define(`j', incr(j)) $0($@)')') +dnl Sums a list of variable arguments. Use as last argument in macro. +define(`SUM_LOOP', `eval(argn(j,$@) + ifelse(i,`1', `', `define(`i', decr(i)) define(`j', incr(j)) + $0($@)'))') + +dnl Support a varaible list of kcontrols. +define(`KCONTROLS', `pushdef(`i', $#) pushdef(`j', `1') LIST_LOOP($@)') + +dnl Memory capabilities +define(`MEMCAPS', `pushdef(`i', $#) pushdef(`j', `1') SUM_LOOP($@)') + dnl create direct DAPM/pipeline link between 2 widgets) define(`dapm', `"$1, , $2"') @@ -53,12 +65,13 @@ define(`W_SRC', dnl Buffer name) define(`N_BUFFER', `BUF'PIPELINE_ID`.'$1) -dnl W_BUFFER(name, size) +dnl W_BUFFER(name, size, capabilities) define(`W_BUFFER', `SectionVendorTuples."'N_BUFFER($1)`_tuples" {' ` tokens "sof_buffer_tokens"' ` tuples."word" {' ` SOF_TKN_BUF_SIZE' STR($2) +` SOF_TKN_BUF_CAPS' $3 ` }' `}' `SectionData."'N_BUFFER($1)`_data" {' diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index 2602ebd..41fc622 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -52,9 +52,11 @@ W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, KCONTROLS("PCM PCM_ID Capture Volume")) # Capture Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_DAI_MEM_CAP) W_BUFFER(1, COMP_BUFFER_SIZE(2, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_HOST_MEM_CAP) # # Pipeline Graph diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index ebb14ec..37f8be2 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -101,13 +101,17 @@ W_MIXER(0, PIPELINE_FORMAT, 1, 1, 1) # Low Latency Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_HOST_MEM_CAP) W_BUFFER(1, COMP_BUFFER_SIZE(1, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS,SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS,SCHEDULE_FRAMES), + PLATFORM_COMP_MEM_CAP) W_BUFFER(2, COMP_BUFFER_SIZE(1, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_COMP_MEM_CAP) W_BUFFER(3, COMP_BUFFER_SIZE(2, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_DAI_MEM_CAP) # # Pipeline Graph diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4 index 2c2a495..b0dfe48 100644 --- a/topology/sof/pipe-passthrough-capture.m4 +++ b/topology/sof/pipe-passthrough-capture.m4 @@ -18,7 +18,8 @@ W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) # Capture Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_PASS_MEM_CAP) # # DAI definitions diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index 1722256..b86f1b3 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -18,7 +18,8 @@ W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_PASS_MEM_CAP) # # DAI definitions diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index 526ae35..1766aca 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -75,13 +75,16 @@ W_SRC(0, PIPELINE_FORMAT, 2, 2, media_src_conf, 2) # Media Source Buffers to SRC, make them big enough to deal with 2 * rate. W_BUFFER(0, COMP_BUFFER_SIZE(4, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_HOST_MEM_CAP) W_BUFFER(1,COMP_BUFFER_SIZE(4, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_COMP_MEM_CAP) # Buffer B2 is on fixed rate sink side of SRC. Set it 1.5 * rate. W_BUFFER(2, COMP_BUFFER_SIZE(3, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_COMP_MEM_CAP) # # Pipeline Graph diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4 index dc55dd2..96d7ee7 100644 --- a/topology/sof/pipe-src-capture.m4 +++ b/topology/sof/pipe-src-capture.m4 @@ -37,9 +37,11 @@ W_SRC(0, PIPELINE_FORMAT, 4, 4, media_src_conf, 2) # Capture Buffers W_BUFFER(0, COMP_BUFFER_SIZE(4, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_HOST_MEM_CAP) W_BUFFER(1, COMP_BUFFER_SIZE(4, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_DAI_MEM_CAP) # # DAI definitions @@ -56,7 +58,7 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, # # Pipeline Graph # -# host PCM_P --> B0 --> SRC 0 --> B1 --> sink DAI0 +# host PCM_P <-- B0 <-- SRC 0 <-- B1 <-- sink DAI0 SectionGraph."pipe-pass-src-capture-PIPELINE_ID" { index STR(PIPELINE_ID) diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4 index d037543..a6141c9 100644 --- a/topology/sof/pipe-src-playback.m4 +++ b/topology/sof/pipe-src-playback.m4 @@ -37,9 +37,11 @@ W_SRC(0, PIPELINE_FORMAT, 4, 4, media_src_conf, 2) # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(4, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_HOST_MEM_CAP) W_BUFFER(1, COMP_BUFFER_SIZE(4, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_DAI_MEM_CAP) # # DAI definitions diff --git a/topology/sof/pipe-tone.m4 b/topology/sof/pipe-tone.m4 index e04a1b9..a8064ab 100644 --- a/topology/sof/pipe-tone.m4 +++ b/topology/sof/pipe-tone.m4 @@ -54,9 +54,11 @@ W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, KCONTROLS("Tone Volume PIPELINE_ID")) # Low Latency Buffers W_BUFFER(0,COMP_BUFFER_SIZE(2, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_COMP_MEM_CAP) W_BUFFER(1, COMP_BUFFER_SIZE(2, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_COMP_MEM_CAP) # diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 58e5393..2fd6b98 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -51,9 +51,11 @@ W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, KCONTROLS("Master Capture Volume")) # Capture Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_HOST_MEM_CAP) W_BUFFER(1, COMP_BUFFER_SIZE(2, - COMP_SAMPLE_SIZE(DAI_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(DAI_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_DAI_MEM_CAP) # # DAI definitions diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 8aa02fb..9431177 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -77,9 +77,11 @@ W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, KCONTROLS("Master Playback Volume Switch", "M # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, - COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_HOST_MEM_CAP) W_BUFFER(1, COMP_BUFFER_SIZE(2, - COMP_SAMPLE_SIZE(DAI_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) + COMP_SAMPLE_SIZE(DAI_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES), + PLATFORM_DAI_MEM_CAP) # # DAI definitions diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4 index 704effc..6b966b3 100644 --- a/topology/sof/tokens.m4 +++ b/topology/sof/tokens.m4 @@ -11,6 +11,7 @@ SectionVendorTokens."sof_buffer_tokens" { SOF_TKN_BUF_SIZE "100" + SOF_TKN_BUF_CAPS "101" } SectionVendorTokens."sof_dai_tokens" { diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 047ef6b..9022d1c 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -8,7 +8,7 @@ set -e # M4 preprocessor flags -M4_FLAGS="-I ../ -I ../m4" +M4_FLAGS="-I ../ -I ../m4 -I ../common" # Simple component test cases # can be used on components with 1 sink and 1 source. -- 2.14.1

1 1

[Sound-open-firmware] [PATCH 1/5] topology: create m4 wrapper for mixer control section
by Ranjani Sridharan 05 Mar '18

05 Mar '18

This patch adds m4 wrapper for mixercontrol section in pipeline definition Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- topology/m4/local.m4 | 55 +++++++++++++++++++++-- topology/sof/pipe-low-latency-capture.m4 | 36 ++++----------- topology/sof/pipe-low-latency-playback.m4 | 73 +++++++------------------------ topology/sof/pipe-pcm-media.m4 | 37 ++++------------ topology/sof/pipe-tone.m4 | 73 +++++++------------------------ topology/sof/pipe-volume-capture.m4 | 35 ++++----------- topology/sof/pipe-volume-playback.m4 | 70 +++++++---------------------- 7 files changed, 127 insertions(+), 252 deletions(-) diff --git a/topology/m4/local.m4 b/topology/m4/local.m4 index a340ec3..4521314 100644 --- a/topology/m4/local.m4 +++ b/topology/m4/local.m4 @@ -7,9 +7,13 @@ define(`STR', `"'$1`"') define(`argn', `ifelse(`$1', 1, ``$2'', `argn(decr(`$1'), shift(shift($@)))')') -define(`KCONTROLS', `pushdef(`i', $#) pushdef(`j', `1') KCONTROL_LOOP($@)') -define(`KCONTROL_LOOP', `argn(j,$@) - ifelse(i,`1', `', `define(`i', decr(i)) define(`j', incr(j)) $0($@)')') +define(`KCONTROLS', `pushdef(`i', $#)pushdef(`j', `1')KCONTROL_LOOP($@)popdef(i)popdef(j)') +define(`KCONTROL_LOOP',`argn(j,$@) + ifelse(i,`1', `',`define(`i', decr(i))define(`j', incr(j))$0($@)')') + +define(`MIXERCONTROLS', `pushdef(`i', $#)pushdef(`j', `1')MIXERCONTROL_LOOP($@)popdef(i)popdef(j)') +define(`MIXERCONTROL_LOOP',`argn(j,$@) + ifelse(i,`1', `',`define(`i', decr(i))define(`j', incr(j))$0($@)')') dnl create direct DAPM/pipeline link between 2 widgets) define(`dapm', `"$1, , $2"') @@ -549,4 +553,49 @@ define(`PCM_DUPLEX_ADD', ` }' `}') +dnl KCONTROL_CHANNEL(name, reg, shift) +define(`KCONTROL_CHANNEL', +`channel.STR($1) {' +` reg STR($2)' +` shift STR($3)' +` }') + +dnl CONTROLMIXER_MAX(comment, value) +define(`CONTROLMIXER_MAX', +`#$1' +` max STR($2)') + +dnl CONTROLMIXER_TLV(comment, value) +define(`CONTROLMIXER_TLV', +`#$1' +` tlv STR($2)') + +dnl CONTROLMIXER_OPS(info, comment, get, put) +define(`CONTROLMIXER_OPS', +`ops."ctl" {' +` info STR($1)' +` #$2' +` get STR($3)' +` put STR($4)' +` }') + +dnl C_CONTROLMIXER(name, index, ops, max, invert, tlv, KCONTROL_CHANNELS) +define(`C_CONTROLMIXER', +`SectionControlMixer.STR($1) {' +`' +` # control belongs to this index group' +` index STR($2)' +`' +` #$7' +` $8' +` # control uses bespoke driver get/put/info ID' +` $3' +`' +` $4' +` invert STR($5)' +` $6' +`}') + divert(0) dnl + + diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index 2602ebd..a82dee1 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -10,34 +10,14 @@ include(`local.m4') # # Controls # - -SectionControlMixer.STR(PCM PCM_ID Capture Volume) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "0" - shift "0" - } - channel."FR" { - reg "0" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # TLV 40 steps from -90dB to +20dB for 3dB - max "40" - invert "false" - tlv "vtlv_m90s3" -} +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(PCM PCM_ID Capture Volume, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 40), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 0, 0), KCONTROL_CHANNEL(FR, 0, 1))) # # Components and Buffers diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index ebb14ec..3b8d6aa 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -25,62 +25,23 @@ include(`local.m4') # # Controls # - -SectionControlMixer.STR(PCM PCM_ID Playback Volume) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "0" - shift "0" - } - channel."FR" { - reg "0" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # TLV 32 steps from -90dB to +6dB for 3dB - max "32" - invert "false" - tlv "vtlv_m90s3" -} - -SectionControlMixer.STR(Master Playback Volume) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # TLV 32 steps from -90dB to +6dB for 3dB - max "32" - invert "false" - tlv "vtlv_m90s3" -} +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(PCM PCM_ID Playback Volume, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 32), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 0, 0), KCONTROL_CHANNEL(FR, 0, 1))) + +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 32), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) # # Components and Buffers diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index 526ae35..65dc62d 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -13,35 +13,14 @@ include(`local.m4') # # Controls # - -SectionControlMixer.STR(PCM PCM_ID Playback Volume) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # TLV 32 steps from -90dB to +6dB for 3dB - max "32" - invert "false" - tlv "vtlv_m90s3" -} - +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(PCM PCM_ID Playback Volume, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 32), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) # # SRC Configuration diff --git a/topology/sof/pipe-tone.m4 b/topology/sof/pipe-tone.m4 index 8f92680..b735146 100644 --- a/topology/sof/pipe-tone.m4 +++ b/topology/sof/pipe-tone.m4 @@ -14,62 +14,23 @@ include(`local.m4') # Controls # -SectionControlMixer.STR(Tone Volume PIPELINE_ID) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - # 256 binds the mixer control to volume get/put handlers - get "256" - put "256" - } - - # TLV 32 steps from -90dB to +6dB for 3dB - max "32" - invert "false" - tlv "vtlv_m90s3" -} - -SectionControlMixer.STR(Tone Switch PIPELINE_ID) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "2" - shift "0" - } - channel."FR" { - reg "2" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - # 256 binds the mixer control to volume get/put handlers - get "256" - put "256" - } - - # max 1 indicates switch type mixer control - max "1" - invert "false" -} +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(Tone Volume PIPELINE_ID, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 32), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(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, + 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, + , + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 2, 0), KCONTROL_CHANNEL(FR, 2, 1))) # # Components and Buffers diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 58e5393..1cde24e 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -10,33 +10,14 @@ include(`local.m4') # # Controls # -SectionControlMixer.STR(Master Capture Volume) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # TLV 32 steps from -90dB to +6dB for 3dB - max "32" - invert "false" - tlv "vtlv_m90s3" -} +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(Master Capture Volume, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 32), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) # # Components and Buffers diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 8aa02fb..a6b5a1d 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -10,60 +10,24 @@ include(`local.m4') # # Controls # -SectionControlMixer.STR(Master Playback Volume) { +# Volume Mixer control with max value of 32 +C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(, 32), + false, + CONTROLMIXER_TLV(TLV 32 steps from -90dB to +6dB for 3dB, vtlv_m90s3), + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) + +# Volume Mixer Switch control with max value of 1 +C_CONTROLMIXER(Master Playback Volume Switch, PIPELINE_ID, + CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_MAX(max value 1 indicates switch type control, 1), + false, + , + Channel register and shift for Front Left/Right, + MIXERCONTROLS(KCONTROL_CHANNEL(FL, 1, 0), KCONTROL_CHANNEL(FR, 1, 1))) - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # TLV 32 steps from -90dB to +6dB for 3dB - max "32" - invert "false" - tlv "vtlv_m90s3" -} - -SectionControlMixer.STR(Master Playback Volume Switch) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # Volume mute on/off - max "1" - invert "false" -} # # Components and Buffers # -- 2.14.1

1 4

[Sound-open-firmware] [PATCH 1/2] topology: add kcontrol for tone
by Ranjani Sridharan 04 Mar '18

04 Mar '18

This patch adds the changes required to support kcontrols for tone components in topology Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Tested with: Minnowboard Turbot rt5651 SOF master: 28cb21b578759cdaa884d440d7d79b2c44e716a4 SOF-Tool master: a02abb799405d0e4ad0d6bb46eacf6fbe958c06e https://github.com/plbossart/sound/tree/topic/sof-v4.14: 9513a73b981bc1917705671ec54402a7e21672eb --- --- topology/m4/local.m4 | 5 ++++- topology/sof/pipe-tone.m4 | 31 ++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/topology/m4/local.m4 b/topology/m4/local.m4 index 29b8b29..a340ec3 100644 --- a/topology/m4/local.m4 +++ b/topology/m4/local.m4 @@ -227,7 +227,7 @@ define(`W_MIXER', dnl Tone name) define(`N_TONE', `TONE'PIPELINE_ID`.'$1) -dnl W_TONE(name, format, periods_sink, periods_source, preload) +dnl W_TONE(name, format, periods_sink, periods_source, preload, kcontrols) define(`W_TONE', `SectionVendorTuples."'N_TONE($1)`_tuples_w" {' ` tokens "sof_comp_tokens"' @@ -257,6 +257,9 @@ define(`W_TONE', ` "'N_TONE($1)`_data_w"' ` "'N_TONE($1)`_data_str"' ` ]' +` mixer [' + $6 +` ]' `}') dnl DAI name) diff --git a/topology/sof/pipe-tone.m4 b/topology/sof/pipe-tone.m4 index e04a1b9..8f92680 100644 --- a/topology/sof/pipe-tone.m4 +++ b/topology/sof/pipe-tone.m4 @@ -32,6 +32,7 @@ SectionControlMixer.STR(Tone Volume PIPELINE_ID) { # control uses bespoke driver get/put/info ID 0 ops."ctl" { info "volsw" + # 256 binds the mixer control to volume get/put handlers get "256" put "256" } @@ -42,12 +43,40 @@ SectionControlMixer.STR(Tone Volume PIPELINE_ID) { tlv "vtlv_m90s3" } +SectionControlMixer.STR(Tone Switch PIPELINE_ID) { + + # control belongs to this index group + index STR(PIPELINE_ID) + + # Channel register and shift for Front Left/Right + channel."FL" { + reg "2" + shift "0" + } + channel."FR" { + reg "2" + shift "1" + } + + # control uses bespoke driver get/put/info ID 0 + ops."ctl" { + info "volsw" + # 256 binds the mixer control to volume get/put handlers + get "256" + put "256" + } + + # max 1 indicates switch type mixer control + max "1" + invert "false" +} + # # Components and Buffers # # "Tone 0" has 2 sink period and 0 source periods -W_TONE(0, PIPELINE_FORMAT, 2, 0, 0) +W_TONE(0, PIPELINE_FORMAT, 2, 0, 0, KCONTROLS("Tone Switch PIPELINE_ID")) # "Tone Volume" has 2 sink period and 2 source periods W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, KCONTROLS("Tone Volume PIPELINE_ID")) -- 2.14.1

1 1

[Sound-open-firmware] Please make sure to run checkpatch --codespell --strict before submitting patches
by Li, Jocelyn 03 Mar '18

03 Mar '18

Please make sure to run checkpatch --codespell -strict and fix the warnings before submitting patches. Thanks, Jocelyn

1 0

[Sound-open-firmware] [PATCH] Remove "void*" pointer of parse_page_descriptors().
by yan.wang＠linux.intel.com 02 Mar '18

02 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> Compiler cannot check the real type of "void*" pointer. It is easy to cause pointer conversion error. So use the pointer of element list of struct dma_sg_elem instead of void* pointer. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/ipc/intel-ipc.c | 106 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 29 deletions(-) diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 04e8c1b..373cc26 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -158,24 +158,13 @@ out: * page table entry and adding each elem to a list in struct dma_sg_config. */ static int parse_page_descriptors(struct intel_ipc_data *iipc, - struct sof_ipc_host_buffer *ring, void *data, uint32_t is_trace) + struct sof_ipc_host_buffer *ring, struct list_item *elem_list, + uint32_t is_src) { - struct comp_dev* cd = NULL; - struct sof_ipc_comp_host *host = NULL; - struct dma_trace_data *d = NULL; - struct dma_sg_elem elem; int i; - int err; uint32_t idx; uint32_t phy_addr; - - elem.size = HOST_PAGE_SIZE; - if (is_trace) - d = (struct dma_trace_data *)data; - else { - cd = (struct comp_dev *)data; - host = (struct sof_ipc_comp_host *)&cd->comp; - } + struct dma_sg_elem *e; /* the ring size may be not multiple of the page size, the last * page may be not full used. The used size should be in range @@ -189,7 +178,6 @@ static int parse_page_descriptors(struct intel_ipc_data *iipc, } for (i = 0; i < ring->pages; i++) { - idx = (((i << 2) + i)) >> 1; phy_addr = iipc->page_table[idx] | (iipc->page_table[idx + 1] << 8) | (iipc->page_table[idx + 2] << 16); @@ -200,23 +188,23 @@ static int parse_page_descriptors(struct intel_ipc_data *iipc, phy_addr <<= 12; phy_addr &= 0xfffff000; - if (!is_trace && host->direction == SOF_IPC_STREAM_PLAYBACK) - elem.src = phy_addr; + /* allocate new host DMA elem and add it to our list */ + e = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*e)); + if (!e) + return -ENOMEM; + + if (is_src) + e->src = phy_addr; else - elem.dest = phy_addr; + e->dest = phy_addr; /* the last page may be not full used */ if (i == (ring->pages - 1)) - elem.size = ring->size - HOST_PAGE_SIZE * i; - - if (is_trace) - err = dma_trace_host_buffer(d, &elem, ring->size); + e->size = ring->size - HOST_PAGE_SIZE * i; else - err = comp_host_buffer(cd, &elem, ring->size); - if (err < 0) { - trace_ipc_error("ePb"); - return err; - } + e->size = HOST_PAGE_SIZE; + + list_item_append(&e->list, elem_list); } return 0; @@ -232,6 +220,12 @@ static int ipc_stream_pcm_params(uint32_t stream) { #ifdef CONFIG_HOST_PTABLE struct intel_ipc_data *iipc = ipc_get_drvdata(_ipc); + struct sof_ipc_comp_host *host = NULL; + uint32_t is_src; + struct list_item elem_list; + struct dma_sg_elem *elem; + struct list_item *plist; + uint32_t ring_size; #endif struct sof_ipc_pcm_params *pcm_params = _ipc->comp_data; struct sof_ipc_pcm_params_reply reply; @@ -269,12 +263,30 @@ static int ipc_stream_pcm_params(uint32_t stream) } /* Parse host tables */ + host = (struct sof_ipc_comp_host *)&cd->comp; + is_src = (host->direction == SOF_IPC_STREAM_PLAYBACK); + ring_size = pcm_params->params.buffer.size; + list_init(&elem_list); + err = parse_page_descriptors(iipc, &pcm_params->params.buffer, - pcm_dev->cd, 0); + &elem_list, is_src); if (err < 0) { trace_ipc_error("eAP"); goto error; } + + list_for_item(plist, &elem_list) { + elem = container_of(plist, struct dma_sg_elem, list); + + err = comp_host_buffer(cd, elem, ring_size); + if (err < 0) { + trace_ipc_error("ePb"); + goto error; + } + + list_item_del(&elem->list); + rfree(elem); + } #endif /* configure pipeline audio params */ @@ -302,6 +314,14 @@ static int ipc_stream_pcm_params(uint32_t stream) return 1; error: +#ifdef CONFIG_HOST_PTABLE + list_for_item(plist, &elem_list) { + elem = container_of(plist, struct dma_sg_elem, list); + list_item_del(&elem->list); + rfree(elem); + } +#endif + err = pipeline_reset(pcm_dev->cd->pipeline, pcm_dev->cd); if (err < 0) trace_ipc_error("eA!"); @@ -602,6 +622,10 @@ static int ipc_dma_trace_config(uint32_t header) #ifdef CONFIG_HOST_PTABLE struct intel_ipc_data *iipc = ipc_get_drvdata(_ipc); struct sof_ipc_dma_trace_params *params = _ipc->comp_data; + struct list_item elem_list; + struct dma_sg_elem *elem; + struct list_item *plist; + uint32_t ring_size; #endif struct sof_ipc_reply reply; int err; @@ -618,12 +642,28 @@ static int ipc_dma_trace_config(uint32_t header) trace_ipc("DAg"); /* Parse host tables */ + ring_size = params->buffer.size; + list_init(&elem_list); + err = parse_page_descriptors(iipc, &params->buffer, - _ipc->dmat, 1); + &elem_list, 0); if (err < 0) { trace_ipc_error("ePP"); goto error; } + + list_for_item(plist, &elem_list) { + elem = container_of(plist, struct dma_sg_elem, list); + + err = dma_trace_host_buffer(_ipc->dmat, elem, ring_size); + if (err < 0) { + trace_ipc_error("ePb"); + goto error; + } + + list_item_del(&elem->list); + rfree(elem); + } #endif trace_ipc("DAp"); @@ -639,6 +679,14 @@ static int ipc_dma_trace_config(uint32_t header) return 0; error: +#ifdef CONFIG_HOST_PTABLE + list_for_item(plist, &elem_list) { + elem = container_of(plist, struct dma_sg_elem, list); + list_item_del(&elem->list); + rfree(elem); + } +#endif + if (err < 0) trace_ipc_error("eA!"); return -EINVAL; -- 2.14.3

2 2

[Sound-open-firmware] [PATCH 1/2] apl: Add text size in module info
by Xiuli Pan 02 Mar '18

02 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add total text size we used in memory mapping into module info to help rimage build the right FW binary. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 GP-MRB nocodec SOF master: 1693b66bb1d804ded975767cc1e5911e6ff9c93c SOF-Tool master: a02abb799405d0e4ad0d6bb46eacf6fbe958c06e https://github.com/plbossart/sound/tree/topic/sof-v4.14: 9513a73b981bc1917705671ec54402a7e21672eb --- src/include/uapi/manifest.h | 1 + src/platform/apollolake/base_module.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/include/uapi/manifest.h b/src/include/uapi/manifest.h index ace9883..e83725b 100644 --- a/src/include/uapi/manifest.h +++ b/src/include/uapi/manifest.h @@ -102,6 +102,7 @@ struct sof_man_module { struct sof_man_module_type type; uint8_t hash[SOF_MAN_MOD_SHA256_LEN]; uint32_t entry_point; + uint32_t text_size; uint16_t cfg_offset; uint16_t cfg_count; uint32_t affinity_mask; diff --git a/src/platform/apollolake/base_module.c b/src/platform/apollolake/base_module.c index 2f4a6ee..56633c5 100644 --- a/src/platform/apollolake/base_module.c +++ b/src/platform/apollolake/base_module.c @@ -46,6 +46,7 @@ struct sof_man_module apl_manifest = { .domain_ll = 1, }, .affinity_mask = 3, + .text_size = REEF_TEXT_SIZE + L2_VECTOR_SIZE, }; /* not used, but stops linker complaining */ -- 2.7.4

3 4

[Sound-open-firmware] [PATCH V3 1/3] platform: add sof_ipc_window for byt, hsw and bdw
by Xiuli Pan 02 Mar '18

02 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add sof_ipc_window for all platforms, and add IPC send after boot compelted. Also remove the deprecated ready window. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 GP-MRB nocodec SOF master: 1693b66bb1d804ded975767cc1e5911e6ff9c93c SOF-Tool master: a02abb799405d0e4ad0d6bb46eacf6fbe958c06e https://github.com/plbossart/sound/tree/topic/sof-v4.14: 9513a73b981bc1917705671ec54402a7e21672eb --- src/platform/baytrail/platform.c | 45 ++++++++++++++++++++++++++++++++++++---- src/platform/haswell/platform.c | 45 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 82 insertions(+), 8 deletions(-) diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index 4709fcd..2c4bfee 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -59,10 +59,6 @@ static const struct sof_ipc_fw_ready ready = { .size = sizeof(struct sof_ipc_fw_ready), }, /* dspbox is for DSP initiated IPC, hostbox is for host initiated IPC */ - .dspbox_offset = MAILBOX_HOST_OFFSET + MAILBOX_DSPBOX_OFFSET, - .hostbox_offset = MAILBOX_HOST_OFFSET + MAILBOX_HOSTBOX_OFFSET, - .dspbox_size = MAILBOX_DSPBOX_SIZE, - .hostbox_size = MAILBOX_HOSTBOX_SIZE, .version = { .build = REEF_BUILD, .minor = REEF_MINOR, @@ -74,6 +70,45 @@ static const struct sof_ipc_fw_ready ready = { /* TODO: add capabilities */ }; +#define NUM_BYT_WINDOWS 4 +static const struct sof_ipc_window sram_window = { + .ext_hdr = { + .hdr.cmd = SOF_IPC_FW_READY, + .hdr.size = sizeof(struct sof_ipc_window) + + sizeof(struct sof_ipc_window_elem) * NUM_BYT_WINDOWS, + .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, + }, +}; + static struct work_queue_timesource platform_generic_queue = { .timer = { .id = TIMER3, /* external timer */ @@ -93,6 +128,8 @@ int platform_boot_complete(uint32_t boot_message) uint64_t outbox = MAILBOX_HOST_OFFSET >> 3; mailbox_dspbox_write(0, &ready, sizeof(ready)); + mailbox_dspbox_write(sizeof(ready), &sram_window, + sram_window.ext_hdr.hdr.size); /* now interrupt host to tell it we are done booting */ shim_write(SHIM_IPCDL, SOF_IPC_FW_READY | outbox); diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index 5f56a05..97b38af 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -58,10 +58,6 @@ static const struct sof_ipc_fw_ready ready = { .size = sizeof(struct sof_ipc_fw_ready), }, /* dspbox is for DSP initiated IPC, hostbox is for host initiated IPC */ - .dspbox_offset = MAILBOX_HOST_OFFSET + MAILBOX_DSPBOX_OFFSET, - .hostbox_offset = MAILBOX_HOST_OFFSET + MAILBOX_HOSTBOX_OFFSET, - .dspbox_size = MAILBOX_DSPBOX_SIZE, - .hostbox_size = MAILBOX_HOSTBOX_SIZE, .version = { .build = REEF_BUILD, .minor = REEF_MINOR, @@ -73,6 +69,45 @@ static const struct sof_ipc_fw_ready ready = { /* TODO: add capabilities */ }; +#define NUM_HSW_WINDOWS 4 +static const struct sof_ipc_window sram_window = { + .ext_hdr = { + .hdr.cmd = SOF_IPC_FW_READY, + .hdr.size = sizeof(struct sof_ipc_window) + + sizeof(struct sof_ipc_window_elem) * NUM_HSW_WINDOWS, + .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, + }, +}; + static struct work_queue_timesource platform_generic_queue = { .timer = { .id = TIMER2, /* external timer using SSP */ @@ -92,6 +127,8 @@ int platform_boot_complete(uint32_t boot_message) uint32_t outbox = MAILBOX_HOST_OFFSET >> 3; mailbox_dspbox_write(0, &ready, sizeof(ready)); + mailbox_dspbox_write(sizeof(ready), &sram_window, + sram_window.ext_hdr.hdr.size); /* now interrupt host to tell it we are done booting */ shim_write(SHIM_IPCD, outbox | SHIM_IPCD_BUSY); -- 2.7.4

1 2

[Sound-open-firmware] [PATCH_V3] cnl: dma: fix playback failed at second time
by Rander Wang 02 Mar '18

02 Mar '18

Stop dma at the end of playback, or next time dma is not available for playback --- V3: fix typo in comments Signed-off-by: Rander Wang <rander.wang(a)intel.com> --- src/drivers/dw-dma.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index be19e12..15d608c 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1103,6 +1103,12 @@ static void dw_dma_irq_handler(void *data) p->chan[i].cb(p->chan[i].cb_data, DMA_IRQ_TYPE_BLOCK, &next); } + + if (next.size == DMA_RELOAD_END) { + trace_dma("LSo"); + /* disable channel, finished */ + dw_write(dma, DW_DMA_CHAN_EN, CHAN_DISABLE(i)); + } #endif /* end of a transfer */ if ((status_tfr & mask) && -- 2.14.1

2 1

[Sound-open-firmware] [PATCH_V2] cnl: dma: fix playback failed at second time
by Rander Wang 02 Mar '18

02 Mar '18

Stop dma at the end of playback, or next time dma is not avialable for playback --- V2: fix typo in comments Signed-off-by: Rander Wang <rander.wang(a)intel.com> --- src/drivers/dw-dma.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index be19e12..15d608c 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1103,6 +1103,12 @@ static void dw_dma_irq_handler(void *data) p->chan[i].cb(p->chan[i].cb_data, DMA_IRQ_TYPE_BLOCK, &next); } + + if (next.size == DMA_RELOAD_END) { + trace_dma("LSo"); + /* disable channel, finished */ + dw_write(dma, DW_DMA_CHAN_EN, CHAN_DISABLE(i)); + } #endif /* end of a transfer */ if ((status_tfr & mask) && -- 2.14.1

4 3

[Sound-open-firmware] [PATCH] cnl: dma: fix playback failed at second time
by Rander Wang 02 Mar '18

02 Mar '18

Stop dma when stream is end, or next time dma is not avilable to playback Signed-off-by: Rander Wang <rander.wang(a)intel.com> --- src/drivers/dw-dma.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index be19e12..15d608c 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1103,6 +1103,12 @@ static void dw_dma_irq_handler(void *data) p->chan[i].cb(p->chan[i].cb_data, DMA_IRQ_TYPE_BLOCK, &next); } + + if (next.size == DMA_RELOAD_END) { + trace_dma("LSo"); + /* disable channel, finished */ + dw_write(dma, DW_DMA_CHAN_EN, CHAN_DISABLE(i)); + } #endif /* end of a transfer */ if ((status_tfr & mask) && -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] rmbox: show error/xrun logs in red for easy identification
by Ranjani Sridharan 01 Mar '18

01 Mar '18

This patch adds changes to rmbox to make it easier to spot errors/xruns in a long trace Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- rmbox/rmbox.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/rmbox/rmbox.c b/rmbox/rmbox.c index b872694..9403cc7 100644 --- a/rmbox/rmbox.c +++ b/rmbox/rmbox.c @@ -21,6 +21,9 @@ #include <string.h> #include <ctype.h> +#define KNRM "\x1B[0m" +#define KRED "\x1B[31m" + // TODO: include all this stuff #define TRACE_CLASS_IRQ (1 << 24) @@ -200,8 +203,19 @@ static void show_trace(uint64_t val, uint64_t addr, uint64_t *timestamp, double return; } - printf("%s %c%c%c\n", trace, + switch ((char)(val >> 16)) { + case 'e': + case 'E': + case 'x': + case 'X': + printf("%s%s %c%c%c%s\n", KRED, trace, + (char)(val >> 16), (char)(val >> 8), (char)val, KNRM); + break; + default: + printf("%s %c%c%c\n", trace, (char)(val >> 16), (char)(val >> 8), (char)val); + break; + } } static int trace_read(const char *in_file, const char *out_file, double clk, -- 2.14.1

2 1

[Sound-open-firmware] How to create topologies
by Mustafa, Muhammad 01 Mar '18

01 Mar '18

Hi, Is there any documentation on how to create topology on SOF? Regards, Mustafa Intel Deutschland GmbH Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Christian Lamprechter Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928

2 1

[Sound-open-firmware] [PATCH] memory: allocator: Remove RFLAGS_NONE/USED and use caps
by Liam Girdwood 01 Mar '18

01 Mar '18

Dont use RFLAGS_NONE, but use the new memory capabilities flags instead. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/buffer.c | 4 ++-- src/audio/component.c | 2 +- src/audio/dai.c | 10 ++++++---- src/audio/eq_fir.c | 8 ++++---- src/audio/eq_iir.c | 8 ++++---- src/audio/host.c | 14 +++++++------- src/audio/mixer.c | 4 ++-- src/audio/pipeline.c | 5 +++-- src/audio/src.c | 7 ++++--- src/audio/tone.c | 4 ++-- src/audio/volume.c | 4 ++-- src/drivers/apl-ssp.c | 2 +- src/drivers/dw-dma.c | 10 ++++++---- src/drivers/hda-dma.c | 2 +- src/drivers/ssp.c | 2 +- src/include/reef/alloc.h | 8 +------- src/include/uapi/ipc.h | 2 +- src/ipc/apl-ipc.c | 5 +++-- src/ipc/byt-ipc.c | 5 +++-- src/ipc/cnl-ipc.c | 5 +++-- src/ipc/hsw-ipc.c | 5 +++-- src/ipc/ipc.c | 13 ++++++++----- src/ipc/pmc-ipc.c | 3 ++- src/lib/agent.c | 2 +- src/lib/alloc.c | 12 ++++++------ src/lib/dma-trace.c | 7 ++++--- src/lib/interrupt.c | 3 ++- src/lib/schedule.c | 2 +- src/lib/work.c | 2 +- src/platform/apollolake/clk.c | 2 +- src/platform/baytrail/clk.c | 2 +- src/platform/cannonlake/clk.c | 3 ++- src/platform/haswell/clk.c | 2 +- 33 files changed, 90 insertions(+), 79 deletions(-) diff --git a/src/audio/buffer.c b/src/audio/buffer.c index 6ae7d92..360ad6b 100644 --- a/src/audio/buffer.c +++ b/src/audio/buffer.c @@ -60,13 +60,13 @@ struct comp_buffer *buffer_new(struct sof_ipc_buffer *desc) } /* allocate new buffer */ - buffer = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*buffer)); + buffer = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*buffer)); if (buffer == NULL) { trace_buffer_error("ebN"); return NULL; } - buffer->addr = rballoc(RZONE_RUNTIME, RFLAGS_NONE, desc->size); + buffer->addr = rballoc(RZONE_RUNTIME, desc->caps, desc->size); if (buffer->addr == NULL) { rfree(buffer); trace_buffer_error("ebm"); diff --git a/src/audio/component.c b/src/audio/component.c index 54a7da8..f27f350 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -189,7 +189,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) void sys_comp_init(void) { - cd = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*cd)); + cd = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*cd)); list_init(&cd->list); spinlock_init(&cd->lock); } diff --git a/src/audio/dai.c b/src/audio/dai.c index 713ab4e..061af5e 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -184,7 +184,7 @@ static struct comp_dev *dai_new(struct sof_ipc_comp *comp) trace_dai("new"); - dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + dev = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, COMP_SIZE(struct sof_ipc_comp_dai)); if (dev == NULL) return NULL; @@ -192,7 +192,7 @@ static struct comp_dev *dai_new(struct sof_ipc_comp *comp) dai = (struct sof_ipc_comp_dai *)&dev->comp; memcpy(dai, ipc_dai, sizeof(struct sof_ipc_comp_dai)); - dd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*dd)); + dd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*dd)); if (dd == NULL) { rfree(dev); return NULL; @@ -289,7 +289,8 @@ static int dai_playback_params(struct comp_dev *dev) /* set up cyclic list of DMA elems */ for (i = 0; i < source_config->periods_sink; i++) { - elem = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*elem)); + elem = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, + sizeof(*elem)); if (elem == NULL) goto err_unwind; @@ -356,7 +357,8 @@ static int dai_capture_params(struct comp_dev *dev) /* set up cyclic list of DMA elems */ for (i = 0; i < sink_config->periods_source; i++) { - elem = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*elem)); + elem = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, + sizeof(*elem)); if (elem == NULL) goto err_unwind; diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index a723cf0..b6ec58f 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -205,7 +205,7 @@ static int eq_fir_setup(struct fir_state_32x16 fir[], } /* Allocate all FIR channels data in a big chunk and clear it */ - fir_data = rballoc(RZONE_SYS, RFLAGS_NONE, + fir_data = rballoc(RZONE_SYS, SOF_MEM_CAPS_RAM, length_sum * sizeof(int32_t)); if (fir_data == NULL) return -ENOMEM; @@ -253,7 +253,7 @@ static struct comp_dev *eq_fir_new(struct sof_ipc_comp *comp) trace_eq("new"); - dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + dev = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, COMP_SIZE(struct sof_ipc_comp_eq_fir)); if (dev == NULL) return NULL; @@ -261,7 +261,7 @@ static struct comp_dev *eq_fir_new(struct sof_ipc_comp *comp) eq_fir = (struct sof_ipc_comp_eq_fir *) &dev->comp; memcpy(eq_fir, ipc_eq_fir, sizeof(struct sof_ipc_comp_eq_fir)); - cd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); + cd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*cd)); if (cd == NULL) { rfree(dev); return NULL; @@ -401,7 +401,7 @@ static int fir_cmd_set_data(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdat if ((bs > SOF_EQ_FIR_MAX_SIZE) || (bs < 1)) return -EINVAL; - cd->config = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, bs); + cd->config = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, bs); if (cd->config == NULL) return -EINVAL; diff --git a/src/audio/eq_iir.c b/src/audio/eq_iir.c index eb464af..2a1dd59 100644 --- a/src/audio/eq_iir.c +++ b/src/audio/eq_iir.c @@ -211,7 +211,7 @@ static int eq_iir_setup(struct iir_state_df2t iir[], } /* Allocate all IIR channels data in a big chunk and clear it */ - iir_delay = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, size_sum); + iir_delay = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, size_sum); if (iir_delay == NULL) return -ENOMEM; @@ -256,14 +256,14 @@ static struct comp_dev *eq_iir_new(struct sof_ipc_comp *comp) trace_eq_iir("new"); - dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + dev = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, COMP_SIZE(struct sof_ipc_comp_eq_iir)); if (dev == NULL) return NULL; memcpy(&dev->comp, comp, sizeof(struct sof_ipc_comp_eq_iir)); - cd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); + cd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*cd)); if (cd == NULL) { rfree(dev); return NULL; @@ -397,7 +397,7 @@ static int iir_cmd_set_data(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdat return -EINVAL; /* Allocate and make a copy of the blob and setup IIR */ - cd->config = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, bs); + cd->config = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, bs); if (cd->config == NULL) return -EINVAL; diff --git a/src/audio/host.c b/src/audio/host.c index 6d60902..a76e340 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -244,7 +244,7 @@ static int create_local_elems(struct comp_dev *dev) /* TODO: simplify elem storage by using an array */ for (i = 0; i < hd->period_count; i++) { /* allocate new host DMA elem and add it to our list */ - e = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*e)); + e = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*e)); if (e == NULL) goto unwind; @@ -396,7 +396,7 @@ static int create_local_elems(struct comp_dev *dev) /* TODO: simplify elem storage by using an array */ for (i = 0; i < hd->period_count; i++) { /* allocate new host DMA elem and add it to our list */ - e = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*e)); + e = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*e)); if (e == NULL) goto unwind; @@ -422,7 +422,7 @@ static int create_local_elems(struct comp_dev *dev) continue; /* allocate new host DMA elem and add it to our list */ - ec = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*ec)); + ec = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*ec)); if (!ec) goto unwind; @@ -500,7 +500,7 @@ static struct comp_dev *host_new(struct sof_ipc_comp *comp) trace_host("new"); - dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + dev = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, COMP_SIZE(struct sof_ipc_comp_host)); if (dev == NULL) return NULL; @@ -508,13 +508,13 @@ static struct comp_dev *host_new(struct sof_ipc_comp *comp) host = (struct sof_ipc_comp_host *)&dev->comp; memcpy(host, ipc_host, sizeof(struct sof_ipc_comp_host)); - hd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*hd)); + hd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*hd)); if (hd == NULL) { rfree(dev); return NULL; } - elem = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*elem)); + elem = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*elem)); if (elem == NULL) { rfree(dev); rfree(hd); @@ -776,7 +776,7 @@ static int host_buffer(struct comp_dev *dev, struct dma_sg_elem *elem, struct dma_sg_elem *e; /* allocate new host DMA elem and add it to our list */ - e = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*e)); + e = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*e)); if (e == NULL) return -ENOMEM; diff --git a/src/audio/mixer.c b/src/audio/mixer.c index e3611d4..abc8881 100644 --- a/src/audio/mixer.c +++ b/src/audio/mixer.c @@ -87,7 +87,7 @@ static struct comp_dev *mixer_new(struct sof_ipc_comp *comp) struct mixer_data *md; trace_mixer("new"); - dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + dev = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, COMP_SIZE(struct sof_ipc_comp_mixer)); if (dev == NULL) return NULL; @@ -95,7 +95,7 @@ static struct comp_dev *mixer_new(struct sof_ipc_comp *comp) mixer = (struct sof_ipc_comp_mixer *)&dev->comp; memcpy(mixer, ipc_mixer, sizeof(struct sof_ipc_comp_mixer)); - md = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*md)); + md = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*md)); if (md == NULL) { rfree(dev); return NULL; diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 94d91b5..728b64d 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -240,7 +240,7 @@ struct pipeline *pipeline_new(struct sof_ipc_pipe_new *pipe_desc, trace_pipe("new"); /* allocate new pipeline */ - p = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*p)); + p = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*p)); if (p == NULL) { trace_pipe_error("ePN"); return NULL; @@ -1146,7 +1146,8 @@ int pipeline_init(void) { trace_pipe("PIn"); - pipe_data = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*pipe_data)); + pipe_data = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, + sizeof(*pipe_data)); spinlock_init(&pipe_data->lock); return 0; diff --git a/src/audio/src.c b/src/audio/src.c index d494d96..c7ac649 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -274,7 +274,7 @@ static struct comp_dev *src_new(struct sof_ipc_comp *comp) return NULL; } - dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + dev = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, COMP_SIZE(struct sof_ipc_comp_src)); if (dev == NULL) return NULL; @@ -282,7 +282,7 @@ static struct comp_dev *src_new(struct sof_ipc_comp *comp) src = (struct sof_ipc_comp_src *) &dev->comp; memcpy(src, ipc_src, sizeof(struct sof_ipc_comp_src)); - cd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); + cd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*cd)); if (cd == NULL) { rfree(dev); return NULL; @@ -386,7 +386,8 @@ static int src_params(struct comp_dev *dev) if (cd->delay_lines != NULL) rfree(cd->delay_lines); - cd->delay_lines = rballoc(RZONE_RUNTIME, RFLAGS_NONE, delay_lines_size); + cd->delay_lines = rballoc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, + delay_lines_size); if (cd->delay_lines == NULL) { trace_src_error("sr3"); trace_value(delay_lines_size); diff --git a/src/audio/tone.c b/src/audio/tone.c index 581f87e..5308af0 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -405,7 +405,7 @@ static struct comp_dev *tone_new(struct sof_ipc_comp *comp) trace_tone("new"); - dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + dev = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, COMP_SIZE(struct sof_ipc_comp_tone)); if (dev == NULL) return NULL; @@ -413,7 +413,7 @@ static struct comp_dev *tone_new(struct sof_ipc_comp *comp) tone = (struct sof_ipc_comp_tone *) &dev->comp; memcpy(tone, ipc_tone, sizeof(struct sof_ipc_comp_tone)); - cd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); + cd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*cd)); if (cd == NULL) { rfree(dev); return NULL; diff --git a/src/audio/volume.c b/src/audio/volume.c index 8e54607..ee9b361 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -364,7 +364,7 @@ static struct comp_dev *volume_new(struct sof_ipc_comp *comp) trace_volume("new"); - dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + dev = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, COMP_SIZE(struct sof_ipc_comp_volume)); if (dev == NULL) return NULL; @@ -372,7 +372,7 @@ static struct comp_dev *volume_new(struct sof_ipc_comp *comp) vol = (struct sof_ipc_comp_volume *)&dev->comp; memcpy(vol, ipc_vol, sizeof(struct sof_ipc_comp_volume)); - cd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); + cd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*cd)); if (cd == NULL) { rfree(dev); return NULL; diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index f0faba9..a726f3c 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -523,7 +523,7 @@ static int ssp_probe(struct dai *dai) struct ssp_pdata *ssp; /* allocate private data */ - ssp = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*ssp)); + ssp = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*ssp)); dai_set_drvdata(dai, ssp); spinlock_init(&ssp->lock); diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index be19e12..b47da0e 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -552,7 +552,8 @@ static int dw_dma_set_config(struct dma *dma, int channel, /* allocate descriptors for channel */ if (p->chan[channel].lli) rfree(p->chan[channel].lli); - p->chan[channel].lli = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + p->chan[channel].lli = rzalloc(RZONE_RUNTIME, + SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, sizeof(struct dw_lli2) * p->chan[channel].desc_count); if (p->chan[channel].lli == NULL) { trace_dma_error("eD1"); @@ -997,7 +998,7 @@ static int dw_dma_probe(struct dma *dma) int i; /* allocate private data */ - dw_pdata = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*dw_pdata)); + dw_pdata = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*dw_pdata)); dma_set_drvdata(dma, dw_pdata); spinlock_init(&dma->lock); @@ -1010,7 +1011,7 @@ static int dw_dma_probe(struct dma *dma) dw_pdata->chan[i].channel = i; dw_pdata->chan[i].status = COMP_STATE_INIT; - dma_int[i] = rzalloc(RZONE_SYS, RFLAGS_NONE, + dma_int[i] = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(struct dma_int)); dma_int[i]->dma = dma; @@ -1150,7 +1151,8 @@ static int dw_dma_probe(struct dma *dma) #endif { /* allocate private data */ - dw_pdata = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*dw_pdata)); + dw_pdata = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + sizeof(*dw_pdata)); dma_set_drvdata(dmac, dw_pdata); spinlock_init(&dmac->lock); diff --git a/src/drivers/hda-dma.c b/src/drivers/hda-dma.c index 6526b74..87221a8 100644 --- a/src/drivers/hda-dma.c +++ b/src/drivers/hda-dma.c @@ -391,7 +391,7 @@ static int hda_dma_probe(struct dma *dma) int i; /* allocate private data */ - hda_pdata = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*hda_pdata)); + hda_pdata = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*hda_pdata)); dma_set_drvdata(dma, hda_pdata); spinlock_init(&dma->lock); diff --git a/src/drivers/ssp.c b/src/drivers/ssp.c index 0ed570c..4b195ec 100644 --- a/src/drivers/ssp.c +++ b/src/drivers/ssp.c @@ -586,7 +586,7 @@ static int ssp_probe(struct dai *dai) struct ssp_pdata *ssp; /* allocate private data */ - ssp = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*ssp)); + ssp = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*ssp)); dai_set_drvdata(dai, ssp); spinlock_init(&ssp->lock); diff --git a/src/include/reef/alloc.h b/src/include/reef/alloc.h index 6b61b04..a2b0c9b 100644 --- a/src/include/reef/alloc.h +++ b/src/include/reef/alloc.h @@ -57,12 +57,6 @@ struct reef; #define RZONE_RUNTIME 1 #define RZONE_BUFFER 2 -/* - * Heap allocation memory flags. - */ -#define RFLAGS_NONE 0 -#define RFLAGS_USED 1 - struct mm_info { uint32_t used; uint32_t free; @@ -70,7 +64,7 @@ struct mm_info { struct block_hdr { uint16_t size; /* size in blocks for continuous allocation */ - uint16_t flags; /* usage flags for page */ + uint16_t used; /* usage flags for page */ } __attribute__ ((packed)); struct block_map { diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index dec8abd..0c34013 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -572,7 +572,7 @@ struct sof_ipc_comp { struct sof_ipc_buffer { struct sof_ipc_comp comp; uint32_t size; /* buffer size in bytes */ - uint32_t type; /* SOF_MEM_CAPS_ */ + uint32_t caps; /* SOF_MEM_CAPS_ */ } __attribute__((packed)); diff --git a/src/ipc/apl-ipc.c b/src/ipc/apl-ipc.c index 167423b..4b8ee6b 100644 --- a/src/ipc/apl-ipc.c +++ b/src/ipc/apl-ipc.c @@ -182,7 +182,8 @@ int platform_ipc_init(struct ipc *ipc) _ipc = ipc; /* init ipc data */ - iipc = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(struct intel_ipc_data)); + iipc = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + sizeof(struct intel_ipc_data)); ipc_set_drvdata(_ipc, iipc); _ipc->dsp_msg = NULL; list_init(&ipc->empty_list); @@ -192,7 +193,7 @@ int platform_ipc_init(struct ipc *ipc) list_item_prepend(&ipc->message[i].list, &ipc->empty_list); /* allocate page table buffer */ - iipc->page_table = rballoc(RZONE_SYS, RFLAGS_NONE, + iipc->page_table = rballoc(RZONE_SYS, SOF_MEM_CAPS_RAM, HOST_PAGE_SIZE); if (iipc->page_table) bzero(iipc->page_table, HOST_PAGE_SIZE); diff --git a/src/ipc/byt-ipc.c b/src/ipc/byt-ipc.c index 91d8f1b..3ab6319 100644 --- a/src/ipc/byt-ipc.c +++ b/src/ipc/byt-ipc.c @@ -208,7 +208,8 @@ int platform_ipc_init(struct ipc *ipc) _ipc = ipc; /* init ipc data */ - iipc = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(struct intel_ipc_data)); + iipc = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + sizeof(struct intel_ipc_data)); ipc_set_drvdata(_ipc, iipc); _ipc->dsp_msg = NULL; list_init(&ipc->empty_list); @@ -219,7 +220,7 @@ int platform_ipc_init(struct ipc *ipc) list_item_prepend(&ipc->message[i].list, &ipc->empty_list); /* allocate page table buffer */ - iipc->page_table = rzalloc(RZONE_SYS, RFLAGS_NONE, + iipc->page_table = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, PLATFORM_PAGE_TABLE_SIZE); if (iipc->page_table) bzero(iipc->page_table, PLATFORM_PAGE_TABLE_SIZE); diff --git a/src/ipc/cnl-ipc.c b/src/ipc/cnl-ipc.c index 0fcc5be..15687fc 100644 --- a/src/ipc/cnl-ipc.c +++ b/src/ipc/cnl-ipc.c @@ -182,7 +182,8 @@ int platform_ipc_init(struct ipc *ipc) _ipc = ipc; /* init ipc data */ - iipc = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(struct intel_ipc_data)); + iipc = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + sizeof(struct intel_ipc_data)); ipc_set_drvdata(_ipc, iipc); _ipc->dsp_msg = NULL; list_init(&ipc->empty_list); @@ -192,7 +193,7 @@ int platform_ipc_init(struct ipc *ipc) list_item_prepend(&ipc->message[i].list, &ipc->empty_list); /* allocate page table buffer */ - iipc->page_table = rballoc(RZONE_SYS, RFLAGS_NONE, + iipc->page_table = rballoc(RZONE_SYS, SOF_MEM_CAPS_RAM, HOST_PAGE_SIZE); if (iipc->page_table) bzero(iipc->page_table, HOST_PAGE_SIZE); diff --git a/src/ipc/hsw-ipc.c b/src/ipc/hsw-ipc.c index 5f350c1..5bfdf93 100644 --- a/src/ipc/hsw-ipc.c +++ b/src/ipc/hsw-ipc.c @@ -208,7 +208,8 @@ int platform_ipc_init(struct ipc *ipc) _ipc = ipc; /* init ipc data */ - iipc = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(struct intel_ipc_data)); + iipc = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + sizeof(struct intel_ipc_data)); ipc_set_drvdata(_ipc, iipc); _ipc->dsp_msg = NULL; list_init(&ipc->empty_list); @@ -219,7 +220,7 @@ int platform_ipc_init(struct ipc *ipc) list_item_prepend(&ipc->message[i].list, &ipc->empty_list); /* allocate page table buffer */ - iipc->page_table = rzalloc(RZONE_SYS, RFLAGS_NONE, + iipc->page_table = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, PLATFORM_PAGE_TABLE_SIZE); if (iipc->page_table) bzero(iipc->page_table, PLATFORM_PAGE_TABLE_SIZE); diff --git a/src/ipc/ipc.c b/src/ipc/ipc.c index b753efd..4aebfb7 100644 --- a/src/ipc/ipc.c +++ b/src/ipc/ipc.c @@ -99,7 +99,8 @@ int ipc_comp_new(struct ipc *ipc, struct sof_ipc_comp *comp) } /* allocate the IPC component container */ - icd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(struct ipc_comp_dev)); + icd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, + sizeof(struct ipc_comp_dev)); if (icd == NULL) { trace_ipc_error("eCm"); rfree(cd); @@ -152,7 +153,8 @@ int ipc_buffer_new(struct ipc *ipc, struct sof_ipc_buffer *desc) return -ENOMEM; } - ibd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(struct ipc_comp_dev)); + ibd = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, + sizeof(struct ipc_comp_dev)); if (ibd == NULL) { rfree(buffer); return -ENOMEM; @@ -256,7 +258,7 @@ int ipc_pipeline_new(struct ipc *ipc, } /* allocate the IPC pipeline container */ - ipc_pipe = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + ipc_pipe = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(struct ipc_comp_dev)); if (ipc_pipe == NULL) { pipeline_free(pipe); @@ -348,8 +350,9 @@ int ipc_init(struct reef *reef) trace_ipc("IPI"); /* init ipc data */ - reef->ipc = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*reef->ipc)); - reef->ipc->comp_data = rzalloc(RZONE_SYS, RFLAGS_NONE, SOF_IPC_MSG_MAX_SIZE); + reef->ipc = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*reef->ipc)); + reef->ipc->comp_data = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + SOF_IPC_MSG_MAX_SIZE); reef->ipc->dmat = reef->dmat; list_init(&reef->ipc->comp_list); diff --git a/src/ipc/pmc-ipc.c b/src/ipc/pmc-ipc.c index fdb8d4b..b99e368 100644 --- a/src/ipc/pmc-ipc.c +++ b/src/ipc/pmc-ipc.c @@ -168,7 +168,8 @@ int platform_ipc_pmc_init(void) uint32_t imrlpesc; /* init ipc data */ - _pmc = rmalloc(RZONE_SYS, RFLAGS_NONE, sizeof(struct intel_ipc_pmc_data)); + _pmc = rmalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + sizeof(struct intel_ipc_pmc_data)); /* configure interrupt */ interrupt_register(IRQ_NUM_EXT_PMC, irq_handler, NULL); diff --git a/src/lib/agent.c b/src/lib/agent.c index 0a1ad42..2c61cb1 100644 --- a/src/lib/agent.c +++ b/src/lib/agent.c @@ -83,7 +83,7 @@ void sa_init(struct reef *reef) trace_sa("ini"); - sa = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*sa)); + sa = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*sa)); reef->sa = sa; /* set default tick timout */ diff --git a/src/lib/alloc.c b/src/lib/alloc.c index bbc32a3..6221d26 100644 --- a/src/lib/alloc.c +++ b/src/lib/alloc.c @@ -132,7 +132,7 @@ static void *alloc_block(struct mm_heap *heap, int level, map->free_count--; ptr = (void *)(map->base + map->first_free * map->block_size); hdr->size = 1; - hdr->flags = RFLAGS_USED; + hdr->used = 1; heap->info.used += map->block_size; heap->info.free -= map->block_size; @@ -141,7 +141,7 @@ static void *alloc_block(struct mm_heap *heap, int level, hdr = &map->block[i]; - if (hdr->flags == 0) { + if (hdr->used == 0) { map->first_free = i; break; } @@ -180,7 +180,7 @@ static void *alloc_cont_blocks(struct mm_heap *heap, int level, hdr = &map->block[current]; /* is block used */ - if (hdr->flags == RFLAGS_USED) + if (hdr->used) break; } @@ -205,7 +205,7 @@ found: /* allocate each block */ for (current = start; current < end; current++) { hdr = &map->block[current]; - hdr->flags = RFLAGS_USED; + hdr->used = 1; } /* do we need to find a new first free block ? */ @@ -216,7 +216,7 @@ found: hdr = &map->block[i]; - if (hdr->flags == 0) { + if (hdr->used == 0) { map->first_free = i; break; } @@ -330,7 +330,7 @@ found: for (i = block; i < block + hdr->size; i++) { hdr = &block_map->block[i]; hdr->size = 0; - hdr->flags = 0; + hdr->used = 0; block_map->free_count++; heap->info.used -= block_map->block_size; heap->info.free += block_map->block_size; diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index c72c55b..211f34f 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -128,11 +128,12 @@ int dma_trace_init_early(struct reef *reef) { struct dma_trace_buf *buffer; - trace_data = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*trace_data)); + trace_data = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*trace_data)); buffer = &trace_data->dmatb; /* allocate new buffer */ - buffer->addr = rballoc(RZONE_RUNTIME, RFLAGS_NONE, DMA_TRACE_LOCAL_SIZE); + buffer->addr = rballoc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, + DMA_TRACE_LOCAL_SIZE); if (buffer->addr == NULL) { trace_buffer_error("ebm"); return -ENOMEM; @@ -179,7 +180,7 @@ int dma_trace_host_buffer(struct dma_trace_data *d, struct dma_sg_elem *elem, struct dma_sg_elem *e; /* allocate new host DMA elem and add it to our list */ - e = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*e)); + e = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, sizeof(*e)); if (e == NULL) return -ENOMEM; diff --git a/src/lib/interrupt.c b/src/lib/interrupt.c index 4516cf3..32b6235 100644 --- a/src/lib/interrupt.c +++ b/src/lib/interrupt.c @@ -56,7 +56,8 @@ int irq_register_child(struct irq_parent *parent, int irq, /* init child */ parent->child[REEF_IRQ_BIT(irq)] = - rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(struct irq_child)); + rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + sizeof(struct irq_child)); parent->child[REEF_IRQ_BIT(irq)]->enabled = 0; parent->child[REEF_IRQ_BIT(irq)]->handler = handler; parent->child[REEF_IRQ_BIT(irq)]->handler_arg = arg; diff --git a/src/lib/schedule.c b/src/lib/schedule.c index bfbb1b9..7728419 100644 --- a/src/lib/schedule.c +++ b/src/lib/schedule.c @@ -372,7 +372,7 @@ int scheduler_init(struct reef *reef) { trace_pipe("ScI"); - sch = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*sch)); + sch = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*sch)); list_init(&sch->list); spinlock_init(&sch->lock); sch->clock = PLATFORM_SCHED_CLOCK; diff --git a/src/lib/work.c b/src/lib/work.c index 18d743c..eb7b223 100644 --- a/src/lib/work.c +++ b/src/lib/work.c @@ -444,7 +444,7 @@ struct work_queue *work_new_queue(struct work_queue_timesource *ts) struct work_queue *queue; /* init work queue */ - queue = rmalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*queue_)); + queue = rmalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*queue_)); list_init(&queue->work); spinlock_init(&queue->lock); diff --git a/src/platform/apollolake/clk.c b/src/platform/apollolake/clk.c index 72d2e9f..32d3236 100644 --- a/src/platform/apollolake/clk.c +++ b/src/platform/apollolake/clk.c @@ -197,7 +197,7 @@ uint64_t clock_time_elapsed(int clock, uint64_t previous, uint64_t *current) void init_platform_clocks(void) { - clk_pdata = rmalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*clk_pdata)); + clk_pdata = rmalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*clk_pdata)); spinlock_init(&clk_pdata->clk[0].lock); spinlock_init(&clk_pdata->clk[1].lock); diff --git a/src/platform/baytrail/clk.c b/src/platform/baytrail/clk.c index 99e1bfd..fc1cd9d 100644 --- a/src/platform/baytrail/clk.c +++ b/src/platform/baytrail/clk.c @@ -260,7 +260,7 @@ uint64_t clock_time_elapsed(int clock, uint64_t previous, uint64_t *current) void init_platform_clocks(void) { - clk_pdata = rmalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*clk_pdata)); + clk_pdata = rmalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*clk_pdata)); spinlock_init(&clk_pdata->clk[0].lock); spinlock_init(&clk_pdata->clk[1].lock); diff --git a/src/platform/cannonlake/clk.c b/src/platform/cannonlake/clk.c index dcfe4b3..f27e691 100644 --- a/src/platform/cannonlake/clk.c +++ b/src/platform/cannonlake/clk.c @@ -191,7 +191,8 @@ uint64_t clock_time_elapsed(int clock, uint64_t previous, uint64_t *current) void init_platform_clocks(void) { - clk_pdata = rmalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*clk_pdata)); + clk_pdata = rmalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, + sizeof(*clk_pdata)); spinlock_init(&clk_pdata->clk[0].lock); spinlock_init(&clk_pdata->clk[1].lock); diff --git a/src/platform/haswell/clk.c b/src/platform/haswell/clk.c index 76d18d1..8a724a8 100644 --- a/src/platform/haswell/clk.c +++ b/src/platform/haswell/clk.c @@ -195,7 +195,7 @@ uint64_t clock_time_elapsed(int clock, uint64_t previous, uint64_t *current) void init_platform_clocks(void) { - clk_pdata = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*clk_pdata)); + clk_pdata = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*clk_pdata)); spinlock_init(&clk_pdata->clk[0].lock); spinlock_init(&clk_pdata->clk[1].lock); -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] Fix pointer of struct dma_trace_data.
by yan.wang＠linux.intel.com 01 Mar '18

01 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> Liam's previous patch modify the structure variable from instance to pointer. So it is unnecessary to use "&". This parameter of parse_page_descriptors() is "void*", so complier doesn't find this error. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/ipc/intel-ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 5e14653..04e8c1b 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -619,7 +619,7 @@ static int ipc_dma_trace_config(uint32_t header) /* Parse host tables */ err = parse_page_descriptors(iipc, &params->buffer, - &_ipc->dmat, 1); + _ipc->dmat, 1); if (err < 0) { trace_ipc_error("ePP"); goto error; -- 2.14.3

3 2

[Sound-open-firmware] [PATCH] memory: allocator: Add support for different memory types and mappings
by Liam Girdwood 01 Mar '18

01 Mar '18

Currently memory heap pools are statically defined in the allocator core and don't define the capabilities of the memory in each pool. This patch adds support for different memory capabilities so that users can allocate memory that complies with any capability requirements for requested memory. The patch also moves the memory heap pool mappings to platform specific code so that platforms can define their own mappings, support multiple mappings and can move the mappings into different physical memory areas. mappings Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/eq_fir.c | 3 +- src/include/reef/alloc.h | 50 ++- src/include/uapi/ipc.h | 12 + src/lib/alloc.c | 383 +++++++++------------ src/platform/apollolake/Makefile.am | 3 +- src/platform/apollolake/include/platform/memory.h | 12 +- .../apollolake/include/platform/platform.h | 6 + src/platform/apollolake/memory.c | 119 +++++++ src/platform/baytrail/Makefile.am | 3 +- src/platform/baytrail/include/platform/memory.h | 7 +- src/platform/baytrail/memory.c | 89 +++++ src/platform/cannonlake/Makefile.am | 3 +- src/platform/cannonlake/include/platform/memory.h | 15 +- src/platform/cannonlake/memory.c | 119 +++++++ src/platform/haswell/Makefile.am | 3 +- src/platform/haswell/include/platform/memory.h | 7 +- src/platform/haswell/memory.c | 89 +++++ 17 files changed, 668 insertions(+), 255 deletions(-) create mode 100644 src/platform/apollolake/memory.c create mode 100644 src/platform/baytrail/memory.c create mode 100644 src/platform/cannonlake/memory.c create mode 100644 src/platform/haswell/memory.c diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index 2dfa11c..a723cf0 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -149,8 +149,7 @@ static void eq_fir_free_delaylines(struct fir_state_32x16 fir[]) } if (data != NULL) - rbfree(data); - + rfree(data); } static int eq_fir_setup(struct fir_state_32x16 fir[], diff --git a/src/include/reef/alloc.h b/src/include/reef/alloc.h index 982af90..6b61b04 100644 --- a/src/include/reef/alloc.h +++ b/src/include/reef/alloc.h @@ -35,6 +35,7 @@ #include <string.h> #include <stdint.h> #include <reef/dma.h> +#include <platform/memory.h> struct reef; @@ -61,23 +62,58 @@ struct reef; */ #define RFLAGS_NONE 0 #define RFLAGS_USED 1 -#define RFLAGS_ATOMIC 2 /* allocation with IRQs off */ -#define RFLAGS_DMA 4 /* DMA-able memory */ -#define RFLAGS_POWER 8 /* low power memory */ struct mm_info { uint32_t used; uint32_t free; }; +struct block_hdr { + uint16_t size; /* size in blocks for continuous allocation */ + uint16_t flags; /* usage flags for page */ +} __attribute__ ((packed)); + +struct block_map { + uint16_t block_size; /* size of block in bytes */ + uint16_t count; /* number of blocks in map */ + uint16_t free_count; /* number of free blocks */ + uint16_t first_free; /* index of first free block */ + struct block_hdr *block; /* base block header */ + uint32_t base; /* base address of space */ +} __attribute__ ((packed)); + +#define BLOCK_DEF(sz, cnt, hdr) \ + {.block_size = sz, .count = cnt, .free_count = cnt, .block = hdr} + +struct mm_heap { + uint32_t blocks; + struct block_map *map; + uint32_t heap; + uint32_t size; + uint32_t caps; + struct mm_info info; +}; + +/* heap block memory map */ +struct mm { + /* system heap - used during init cannot be freed */ + struct mm_heap system; + /* general heap for components */ + struct mm_heap runtime[PLATFORM_HEAP_RUNTIME]; + /* general component buffer heap */ + struct mm_heap buffer[PLATFORM_HEAP_BUFFER]; + + struct mm_info total; + spinlock_t lock; /* all allocs and frees are atomic */ +}; + /* heap allocation and free */ -void *rmalloc(int zone, int flags, size_t bytes); -void *rzalloc(int zone, int flags, size_t bytes); +void *rmalloc(int zone, uint32_t caps, size_t bytes); +void *rzalloc(int zone, uint32_t caps, size_t bytes); void rfree(void *ptr); /* heap allocation and free for buffers on 1k boundary */ -void *rballoc(int zone, int flags, size_t bytes); -void rbfree(void *ptr); +void *rballoc(int zone, uint32_t flags, size_t bytes); /* utility */ void bzero(void *s, size_t n); diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 87b01e3..dec8abd 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -143,6 +143,17 @@ #define SOF_IPC_PANIC_STACK (SOF_IPC_PANIC_MAGIC | 8) #define SOF_IPC_PANIC_IDLE (SOF_IPC_PANIC_MAGIC | 9) +/* + * SOF memory capabilities, add new ones at the end + */ +#define SOF_MEM_CAPS_RAM (1 << 0) +#define SOF_MEM_CAPS_ROM (1 << 1) +#define SOF_MEM_CAPS_EXT (1 << 2) /* external */ +#define SOF_MEM_CAPS_LP (1 << 3) /* low power */ +#define SOF_MEM_CAPS_HP (1 << 4) /* high performance */ +#define SOF_MEM_CAPS_DMA (1 << 5) /* DMA'able */ +#define SOF_MEM_CAPS_CACHE (1 << 6) /* cacheable */ + /* * Command Header - Header for all IPC. Identifies IPC message. * The size can be greater than the structure size and that means there is @@ -561,6 +572,7 @@ struct sof_ipc_comp { struct sof_ipc_buffer { struct sof_ipc_comp comp; uint32_t size; /* buffer size in bytes */ + uint32_t type; /* SOF_MEM_CAPS_ */ } __attribute__((packed)); diff --git a/src/lib/alloc.c b/src/lib/alloc.c index 803b7af..bbc32a3 100644 --- a/src/lib/alloc.c +++ b/src/lib/alloc.c @@ -55,6 +55,8 @@ #define trace_mem_error(__e) trace_error(TRACE_CLASS_MEM, __e) +extern struct mm memmap; + /* We have 3 memory pools * * 1) System memory pool does not have a map and it's size is fixed at build @@ -67,115 +69,6 @@ * module removal or calls to rfree(). Saved as part of PM context. */ -struct block_hdr { - uint16_t size; /* size in blocks of this continuous allocation */ - uint16_t flags; /* usage flags for page */ -} __attribute__ ((packed)); - -struct block_map { - uint16_t block_size; /* size of block in bytes */ - uint16_t count; /* number of blocks in map */ - uint16_t free_count; /* number of free blocks */ - uint16_t first_free; /* index of first free block */ - struct block_hdr *block; /* base block header */ - uint32_t base; /* base address of space */ -} __attribute__ ((packed)); - -#define BLOCK_DEF(sz, cnt, hdr) \ - {.block_size = sz, .count = cnt, .free_count = cnt, .block = hdr} - -/* Heap blocks for modules */ -//static struct block_hdr mod_block8[HEAP_RT_COUNT8]; -static struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; - -/* Heap memory map for modules */ -static struct block_map rt_heap_map[] = { -/* BLOCK_DEF(8, HEAP_RT_COUNT8, mod_block8), */ - BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), - BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), - BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), - BLOCK_DEF(128, HEAP_RT_COUNT128, mod_block128), - BLOCK_DEF(256, HEAP_RT_COUNT256, mod_block256), - BLOCK_DEF(512, HEAP_RT_COUNT512, mod_block512), - BLOCK_DEF(1024, HEAP_RT_COUNT1024, mod_block1024), -}; - -/* Heap blocks for buffers */ -static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; - -/* Heap memory map for buffers */ -static struct block_map buf_heap_map[] = { - BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), -}; - -#if (HEAP_DMA_BUFFER_SIZE > 0) -/* Heap memory map for DMA buffers - only used for HW with special DMA memories */ -static struct block_map dma_buf_heap_map[] = { - BLOCK_DEF(HEAP_DMA_BUFFER_BLOCK_SIZE, HEAP_DMA_BUFFER_COUNT, buf_block), -}; -#endif - -struct mm_heap { - uint32_t blocks; - struct block_map *map; - uint32_t heap; - uint32_t size; - struct mm_info info; -}; - -/* heap block memory map */ -struct mm { - struct mm_heap runtime; /* general heap for components */ - struct mm_heap system; /* system heap - used during init cannot be freed */ - struct mm_heap buffer; /* general component buffer heap */ -#if (HEAP_DMA_BUFFER_SIZE > 0) - struct mm_heap dma; /* general component DMA buffer heap */ -#endif - struct mm_info total; - spinlock_t lock; /* all allocs and frees are atomic */ -}; - -struct mm memmap = { - .system = { - .heap = HEAP_SYSTEM_BASE, - .size = HEAP_SYSTEM_SIZE, - .info = {.free = HEAP_SYSTEM_SIZE,}, - }, - - .runtime = { - .blocks = ARRAY_SIZE(rt_heap_map), - .map = rt_heap_map, - .heap = HEAP_RUNTIME_BASE, - .size = HEAP_RUNTIME_SIZE, - .info = {.free = HEAP_RUNTIME_SIZE,}, - }, - - .buffer = { - .blocks = ARRAY_SIZE(buf_heap_map), - .map = buf_heap_map, - .heap = HEAP_BUFFER_BASE, - .size = HEAP_BUFFER_SIZE, - .info = {.free = HEAP_BUFFER_SIZE,}, - }, - -#if (HEAP_DMA_BUFFER_SIZE > 0) - .dma = { - .blocks = ARRAY_SIZE(dma_buf_heap_map), - .map = dma_buf_heap_map, - .heap = HEAP_DMA_BUFFER_BASE, - .size = HEAP_DMA_BUFFER_SIZE, - .info = {.free = HEAP_DMA_BUFFER_SIZE,}, - }, -#endif - .total = {.free = HEAP_SYSTEM_SIZE + HEAP_RUNTIME_SIZE + - HEAP_BUFFER_SIZE + HEAP_DMA_BUFFER_SIZE,}, -}; /* total size of block */ static inline uint32_t block_get_size(struct block_map *map) @@ -228,7 +121,8 @@ static void *rmalloc_sys(size_t bytes) } /* allocate single block */ -static void *alloc_block(struct mm_heap *heap, int level, int bflags) +static void *alloc_block(struct mm_heap *heap, int level, + uint32_t caps) { struct block_map *map = &heap->map[level]; struct block_hdr *hdr = &map->block[map->first_free]; @@ -238,7 +132,7 @@ static void *alloc_block(struct mm_heap *heap, int level, int bflags) map->free_count--; ptr = (void *)(map->base + map->first_free * map->block_size); hdr->size = 1; - hdr->flags = RFLAGS_USED | bflags; + hdr->flags = RFLAGS_USED; heap->info.used += map->block_size; heap->info.free -= map->block_size; @@ -261,8 +155,8 @@ static void *alloc_block(struct mm_heap *heap, int level, int bflags) } /* allocates continuous blocks */ -static void *alloc_cont_blocks(struct mm_heap *heap, int level, int bflags, - size_t bytes) +static void *alloc_cont_blocks(struct mm_heap *heap, int level, + uint32_t caps, size_t bytes) { struct block_map *map = &heap->map[level]; struct block_hdr *hdr = &map->block[map->first_free]; @@ -311,7 +205,7 @@ found: /* allocate each block */ for (current = start; current < end; current++) { hdr = &map->block[current]; - hdr->flags = RFLAGS_USED | bflags; + hdr->flags = RFLAGS_USED; } /* do we need to find a new first free block ? */ @@ -336,43 +230,87 @@ found: return ptr; } +static struct mm_heap *get_heap_from_ptr(void *ptr) +{ + struct mm_heap *heap; + int i; + + /* find mm_heap that ptr belongs to */ + for (i = 0; i < PLATFORM_HEAP_RUNTIME; i++) { + heap = &memmap.runtime[i]; + + if ((uint32_t)ptr >= heap->heap && + (uint32_t)ptr < heap->heap + heap->size) + return heap; + } + + for (i = 0; i < PLATFORM_HEAP_BUFFER; i++) { + heap = &memmap.buffer[i]; + + if ((uint32_t)ptr >= heap->heap && + (uint32_t)ptr < heap->heap + heap->size) + return heap; + } + + return NULL; +} + +static struct mm_heap *get_runtime_heap_from_caps(uint32_t caps) +{ + struct mm_heap *heap; + uint32_t mask; + int i; + + /* find first heap that support type */ + for (i = 0; i < PLATFORM_HEAP_RUNTIME; i++) { + heap = &memmap.runtime[i]; + mask = heap->caps & caps; + if (mask == caps) + return heap; + } + + return NULL; +} + +static struct mm_heap *get_buffer_heap_from_caps(uint32_t caps) +{ + struct mm_heap *heap; + uint32_t mask; + int i; + + /* find first heap that support type */ + for (i = 0; i < PLATFORM_HEAP_BUFFER; i++) { + heap = &memmap.buffer[i]; + mask = heap->caps & caps; + if (mask == caps) + return heap; + } + + return NULL; +} + /* free block(s) */ -static void free_block(struct mm_heap *heap, void *ptr) +static void free_block(void *ptr) { - struct mm_heap * mm_heap; - struct block_map * block_map; + struct mm_heap *heap; + struct block_map *block_map; struct block_hdr *hdr; int i; int block; - int array_size; /* sanity check */ if (ptr == NULL) return; - /* find mm_heap that ptr belongs to */ - if ((uint32_t)ptr >= memmap.runtime.heap && - (uint32_t)ptr < memmap.runtime.heap + memmap.runtime.size) { - mm_heap = &memmap.runtime; - array_size = ARRAY_SIZE(rt_heap_map); - } else if ((uint32_t)ptr >= memmap.buffer.heap && - (uint32_t)ptr < memmap.buffer.heap + memmap.buffer.size) { - mm_heap = &memmap.buffer; - array_size = ARRAY_SIZE(buf_heap_map); -#if (HEAP_DMA_BUFFER_SIZE > 0) - } else if ((uint32_t)ptr >= memmap.dma.heap && - (uint32_t)ptr < memmap.dma.heap + memmap.dma.size) { - mm_heap = &memmap.dma; - array_size = ARRAY_SIZE(dma_buf_heap_map); -#endif - } else + heap = get_heap_from_ptr(ptr); + if (heap == NULL) return; /* find block that ptr belongs to */ - for (i = 0; i < array_size - 1; i ++) { + for (i = 0; i < heap->blocks - 1; i++) { /* is ptr in this block */ - if ((uint32_t)ptr < mm_heap->map[i + 1].base) + if ((uint32_t)ptr < heap->map[i + 1].base) goto found; } @@ -382,7 +320,7 @@ static void free_block(struct mm_heap *heap, void *ptr) found: /* the block i is it */ - block_map = &mm_heap->map[i]; + block_map = &heap->map[i]; /* calculate block header */ block = ((uint32_t)ptr - block_map->base) / block_map->block_size; @@ -398,7 +336,7 @@ found: heap->info.free += block_map->block_size; } - /* set first free */ + /* set first free block */ if (block < block_map->first_free) block_map->first_free = block; @@ -408,31 +346,37 @@ found: } /* allocate single block for runtime */ -static void *rmalloc_runtime(int bflags, size_t bytes) +static void *rmalloc_runtime(uint32_t caps, size_t bytes) { + struct mm_heap *heap; int i; - for (i = 0; i < ARRAY_SIZE(rt_heap_map); i ++) { + heap = get_runtime_heap_from_caps(caps); + if (heap == NULL) + goto error; + + for (i = 0; i < heap->blocks; i++) { /* is block big enough */ - if (rt_heap_map[i].block_size < bytes) + if (heap->map[i].block_size < bytes) continue; /* does block have free space */ - if (rt_heap_map[i].free_count == 0) + if (heap->map[i].free_count == 0) continue; /* free block space exists */ - return alloc_block(&memmap.runtime, i, bflags); + return alloc_block(heap, i, caps); } +error: trace_mem_error("eMm"); trace_value(bytes); - trace_value(bflags); + trace_value(caps); return NULL; } -void *rmalloc(int zone, int bflags, size_t bytes) +void *rmalloc(int zone, uint32_t caps, size_t bytes) { uint32_t flags; void *ptr = NULL; @@ -444,7 +388,7 @@ void *rmalloc(int zone, int bflags, size_t bytes) ptr = rmalloc_sys(bytes); break; case RZONE_RUNTIME: - ptr = rmalloc_runtime(bflags, bytes); + ptr = rmalloc_runtime(caps, bytes); break; default: trace_mem_error("eMz"); @@ -455,11 +399,11 @@ void *rmalloc(int zone, int bflags, size_t bytes) return ptr; } -void *rzalloc(int zone, int bflags, size_t bytes) +void *rzalloc(int zone, uint32_t caps, size_t bytes) { void *ptr = NULL; - ptr = rmalloc(zone, bflags, bytes); + ptr = rmalloc(zone, caps, bytes); if (ptr != NULL) { bzero(ptr, bytes); } @@ -467,61 +411,54 @@ void *rzalloc(int zone, int bflags, size_t bytes) return ptr; } -/* allocates continuous buffer on 1k boundary */ -void *rballoc(int zone, int bflags, size_t bytes) +/* allocates continuous buffers */ +void *rballoc(int zone, uint32_t caps, size_t bytes) { - struct block_map * block_map = buf_heap_map; - struct mm_heap * mm_heap = &memmap.buffer; + struct mm_heap *heap; int i; - int array_size = ARRAY_SIZE(buf_heap_map); uint32_t flags; void *ptr = NULL; -#if (HEAP_DMA_BUFFER_SIZE > 0) - if (bflags & RFLAGS_DMA) { - mm_heap = &memmap.dma; - block_map = dma_buf_heap_map; - array_size = ARRAY_SIZE(dma_buf_heap_map); - } -#endif spin_lock_irq(&memmap.lock, flags); + heap = get_buffer_heap_from_caps(caps); + if (heap == NULL) + goto out; + /* will request fit in single block */ - for (i = 0; i < array_size; i++) { + for (i = 0; i < heap->blocks; i++) { /* is block big enough */ - if (block_map[i].block_size < bytes) + if (heap->map[i].block_size < bytes) continue; /* does block have free space */ - if (block_map[i].free_count == 0) + if (heap->map[i].free_count == 0) continue; /* allocate block */ - ptr = alloc_block(mm_heap, i, bflags); + ptr = alloc_block(heap, i, caps); goto out; } /* request spans > 1 block */ /* only 1 choice for block size */ - if (array_size == 1) { - ptr = alloc_cont_blocks(mm_heap, 0, bflags, bytes); + if (heap->blocks == 1) { + ptr = alloc_cont_blocks(heap, 0, caps, bytes); goto out; } else { /* find best block size for request */ - for (i = 0; i < array_size; i++) { + for (i = 0; i < heap->blocks; i++) { /* allocate is block size smaller than request */ - if (block_map[i].block_size < bytes) - alloc_cont_blocks(mm_heap, i, bflags, - bytes); + if (heap->map[i].block_size < bytes) + alloc_cont_blocks(heap, i, caps, bytes); } } - ptr = alloc_cont_blocks(mm_heap, array_size - 1, - bflags, bytes); + ptr = alloc_cont_blocks(heap, heap->blocks - 1, caps, bytes); out: spin_unlock_irq(&memmap.lock, flags); @@ -533,38 +470,42 @@ void rfree(void *ptr) uint32_t flags; spin_lock_irq(&memmap.lock, flags); - free_block(&memmap.runtime, ptr); - spin_unlock_irq(&memmap.lock, flags); -} - -void rbfree(void *ptr) -{ - uint32_t flags; - - spin_lock_irq(&memmap.lock, flags); - free_block(&memmap.buffer, ptr); + free_block(ptr); spin_unlock_irq(&memmap.lock, flags); } uint32_t mm_pm_context_size(void) { - uint32_t size; + uint32_t size = 0; + int i; /* calc context size for each area */ - size = memmap.buffer.info.used; - size += memmap.runtime.info.used; + for (i = 0; i < PLATFORM_HEAP_BUFFER; i++) + size += memmap.buffer[i].info.used; + for (i = 0; i < PLATFORM_HEAP_RUNTIME; i++) + size += memmap.runtime[i].info.used; size += memmap.system.info.used; /* add memory maps */ - size += heap_get_size(&memmap.buffer); - size += heap_get_size(&memmap.runtime); + for (i = 0; i < PLATFORM_HEAP_BUFFER; i++) + size += heap_get_size(&memmap.buffer[i]); + for (i = 0; i < PLATFORM_HEAP_RUNTIME; i++) + size += heap_get_size(&memmap.runtime[i]); size += heap_get_size(&memmap.system); /* recalc totals */ - memmap.total.free = memmap.buffer.info.free + - memmap.runtime.info.free + memmap.system.info.free; - memmap.total.used = memmap.buffer.info.used + - memmap.runtime.info.used + memmap.system.info.used; + memmap.total.free = memmap.system.info.free; + memmap.total.used = memmap.system.info.used; + + for (i = 0; i < PLATFORM_HEAP_BUFFER; i++) { + memmap.total.free += memmap.buffer[i].info.free; + memmap.total.used += memmap.buffer[i].info.used; + } + + for (i = 0; i < PLATFORM_HEAP_RUNTIME; i++) { + memmap.total.free = memmap.runtime[i].info.free; + memmap.total.used = memmap.runtime[i].info.used; + } return size; } @@ -643,9 +584,12 @@ int mm_pm_context_restore(struct dma_copy *dc, struct dma_sg_config *sg) /* initialise map */ void init_heap(struct reef *reef) { + struct mm_heap *heap; struct block_map *next_map; struct block_map *current_map; int i; + int j; + int k; /* sanity check for malformed images or loader issues */ if (memmap.system.heap != HEAP_SYSTEM_BASE) @@ -654,37 +598,40 @@ void init_heap(struct reef *reef) spinlock_init(&memmap.lock); /* initialise buffer map */ - current_map = &buf_heap_map[0]; - current_map->base = memmap.buffer.heap; - - for (i = 1; i < ARRAY_SIZE(buf_heap_map); i++) { - next_map = &buf_heap_map[i]; - next_map->base = current_map->base + - current_map->block_size * current_map->count; - current_map = &buf_heap_map[i]; + for (i = 0; i < PLATFORM_HEAP_BUFFER; i++) { + heap = &memmap.buffer[i]; + + for (j = 0; j < heap->blocks; j++) { + + current_map = &heap->map[j]; + current_map->base = heap->heap; + + for (k = 1; k < heap->blocks; k++) { + next_map = &heap->map[k]; + next_map->base = current_map->base + + current_map->block_size * + current_map->count; + current_map = &heap->map[k]; + } + } } /* initialise runtime map */ - current_map = &rt_heap_map[0]; - current_map->base = memmap.runtime.heap; - - for (i = 1; i < ARRAY_SIZE(rt_heap_map); i++) { - next_map = &rt_heap_map[i]; - next_map->base = current_map->base + - current_map->block_size * current_map->count; - current_map = &rt_heap_map[i]; - } + for (i = 0; i < PLATFORM_HEAP_RUNTIME; i++) { + heap = &memmap.runtime[i]; -#if (HEAP_DMA_BUFFER_SIZE > 0) - /* initialise DMA map */ - current_map = &dma_buf_heap_map[0]; - current_map->base = memmap.dma.heap; + for (j = 0; j < heap->blocks; j++) { - for (i = 1; i < ARRAY_SIZE(dma_buf_heap_map); i++) { - next_map = &dma_buf_heap_map[i]; - next_map->base = current_map->base + - current_map->block_size * current_map->count; - current_map = &dma_buf_heap_map[i]; + current_map = &heap->map[j]; + current_map->base = heap->heap; + + for (k = 1; k < heap->blocks; k++) { + next_map = &heap->map[k]; + next_map->base = current_map->base + + current_map->block_size * + current_map->count; + current_map = &heap->map[k]; + } + } } -#endif } diff --git a/src/platform/apollolake/Makefile.am b/src/platform/apollolake/Makefile.am index d4fe06a..7e776e3 100644 --- a/src/platform/apollolake/Makefile.am +++ b/src/platform/apollolake/Makefile.am @@ -8,7 +8,8 @@ libplatform_a_SOURCES = \ dma.c \ clk.c \ timer.c \ - interrupt.c + interrupt.c \ + memory.c libplatform_a_CFLAGS = \ $(ARCH_CFLAGS) \ diff --git a/src/platform/apollolake/include/platform/memory.h b/src/platform/apollolake/include/platform/memory.h index b4fae8e..b633637 100644 --- a/src/platform/apollolake/include/platform/memory.h +++ b/src/platform/apollolake/include/platform/memory.h @@ -174,7 +174,7 @@ #define REEF_DATA_SIZE 0x18000 /* bss data */ -#define REEF_BSS_DATA_SIZE 0x2000 +#define REEF_BSS_DATA_SIZE 0x2800 /* Heap configuration */ #define HEAP_SYSTEM_BASE \ @@ -262,12 +262,6 @@ #define HP_SRAM_WIN3_BASE SRAM_TRACE_BASE #define HP_SRAM_WIN3_SIZE SRAM_TRACE_SIZE -/* DMA buffer heap is the HP physical memory on Broxton */ -#define HEAP_DMA_BUFFER_BASE HP_SRAM_BASE -#define HEAP_DMA_BUFFER_SIZE HEAP_HP_BUFFER_SIZE -#define HEAP_DMA_BUFFER_BLOCK_SIZE HEAP_HP_BUFFER_BLOCK_SIZE -#define HEAP_DMA_BUFFER_COUNT HEAP_HP_BUFFER_COUNT - /* HP SRAM Heap */ #define HEAP_HP_BUFFER_BASE HP_SRAM_BASE #define HEAP_HP_BUFFER_SIZE \ @@ -283,7 +277,7 @@ (HEAP_HP_BUFFER_SIZE / HEAP_HP_BUFFER_BLOCK_SIZE) /* - * The LP SRAM Heap and Stack on Apololake are organised like this :- + * The LP SRAM Heap and Stack on Apollolake are organised like this :- * * +--------------------------------------------------------------------------+ * | Offset | Region | Size | @@ -341,6 +335,8 @@ #define HEAP_LP_BUFFER_COUNT \ (HEAP_LP_BUFFER_SIZE / HEAP_LP_BUFFER_BLOCK_SIZE) +#define PLATFORM_HEAP_RUNTIME 1 +#define PLATFORM_HEAP_BUFFER 3 /* Stack configuration */ #define REEF_LP_STACK_SIZE 0x1000 diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index 8e18d53..995efca 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -103,6 +103,12 @@ struct reef; /* DSP should be idle in this time frame */ #define PLATFORM_IDLE_TIME 750000 +/* platform has DMA memory type */ +#define PLATFORM_MEM_HAS_DMA + +/* platform has low power memory type */ +#define PLATFORM_MEM_HAS_LP_RAM + /* Platform defined panic code */ #define platform_panic(__x) \ sw_reg_write(SRAM_REG_FW_STATUS, (0xdead000 | __x) & 0x3fffffff) diff --git a/src/platform/apollolake/memory.c b/src/platform/apollolake/memory.c new file mode 100644 index 0000000..aa3dfaa --- /dev/null +++ b/src/platform/apollolake/memory.c @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2018, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + */ + +#include <reef/alloc.h> + +/* Heap blocks for modules */ +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; + +/* Heap memory map for modules */ +static struct block_map rt_heap_map[] = { + BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), + BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), + BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), + BLOCK_DEF(128, HEAP_RT_COUNT128, mod_block128), + BLOCK_DEF(256, HEAP_RT_COUNT256, mod_block256), + BLOCK_DEF(512, HEAP_RT_COUNT512, mod_block512), + BLOCK_DEF(1024, HEAP_RT_COUNT1024, mod_block1024), +}; + +/* Heap blocks for buffers */ +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr hp_buf_block[HEAP_HP_BUFFER_COUNT]; +static struct block_hdr lp_buf_block[HEAP_LP_BUFFER_COUNT]; + +/* Heap memory map for buffers */ +static struct block_map buf_heap_map[] = { + BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), +}; + +static struct block_map hp_buf_heap_map[] = { + BLOCK_DEF(HEAP_HP_BUFFER_BLOCK_SIZE, HEAP_HP_BUFFER_COUNT, + hp_buf_block), +}; + +static struct block_map lp_buf_heap_map[] = { + BLOCK_DEF(HEAP_LP_BUFFER_BLOCK_SIZE, HEAP_LP_BUFFER_COUNT, + lp_buf_block), +}; + +struct mm memmap = { + .system = { + .heap = HEAP_SYSTEM_BASE, + .size = HEAP_SYSTEM_SIZE, + .info = {.free = HEAP_SYSTEM_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_EXT | + SOF_MEM_CAPS_CACHE, + }, + .runtime[0] = { + .blocks = ARRAY_SIZE(rt_heap_map), + .map = rt_heap_map, + .heap = HEAP_RUNTIME_BASE, + .size = HEAP_RUNTIME_SIZE, + .info = {.free = HEAP_RUNTIME_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_EXT | + SOF_MEM_CAPS_CACHE, + }, + .buffer[0] = { + .blocks = ARRAY_SIZE(buf_heap_map), + .map = buf_heap_map, + .heap = HEAP_BUFFER_BASE, + .size = HEAP_BUFFER_SIZE, + .info = {.free = HEAP_BUFFER_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_EXT | + SOF_MEM_CAPS_CACHE, + }, + .buffer[1] = { + .blocks = ARRAY_SIZE(hp_buf_heap_map), + .map = hp_buf_heap_map, + .heap = HEAP_HP_BUFFER_BASE, + .size = HEAP_HP_BUFFER_SIZE, + .info = {.free = HEAP_HP_BUFFER_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_HP | + SOF_MEM_CAPS_CACHE | SOF_MEM_CAPS_DMA, + }, + .buffer[2] = { + .blocks = ARRAY_SIZE(lp_buf_heap_map), + .map = lp_buf_heap_map, + .heap = HEAP_LP_BUFFER_BASE, + .size = HEAP_LP_BUFFER_SIZE, + .info = {.free = HEAP_LP_BUFFER_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_LP | + SOF_MEM_CAPS_CACHE | SOF_MEM_CAPS_DMA, + }, + .total = {.free = HEAP_SYSTEM_SIZE + HEAP_RUNTIME_SIZE + + HEAP_HP_BUFFER_SIZE + HEAP_LP_BUFFER_SIZE,}, +}; diff --git a/src/platform/baytrail/Makefile.am b/src/platform/baytrail/Makefile.am index 05b1235..571a957 100644 --- a/src/platform/baytrail/Makefile.am +++ b/src/platform/baytrail/Makefile.am @@ -9,7 +9,8 @@ libplatform_a_SOURCES = \ dai.c \ dma.c \ clk.c \ - timer.c + timer.c \ + memory.c libplatform_a_CFLAGS = \ $(ARCH_CFLAGS) \ diff --git a/src/platform/baytrail/include/platform/memory.h b/src/platform/baytrail/include/platform/memory.h index 082592c..5bf7141 100644 --- a/src/platform/baytrail/include/platform/memory.h +++ b/src/platform/baytrail/include/platform/memory.h @@ -129,11 +129,8 @@ #define HEAP_BUFFER_BLOCK_SIZE 0x180 #define HEAP_BUFFER_COUNT (HEAP_BUFFER_SIZE / HEAP_BUFFER_BLOCK_SIZE) -/* DMA buffer heap is the same physical memory as buffer heap on baytrail */ -#define HEAP_DMA_BUFFER_BASE 0 -#define HEAP_DMA_BUFFER_SIZE 0 -#define HEAP_DMA_BUFFER_BLOCK_SIZE 0 -#define HEAP_DMA_BUFFER_COUNT 0 +#define PLATFORM_HEAP_RUNTIME 1 +#define PLATFORM_HEAP_BUFFER 1 /* Stack configuration */ #define REEF_STACK_SIZE 0x1000 diff --git a/src/platform/baytrail/memory.c b/src/platform/baytrail/memory.c new file mode 100644 index 0000000..12e7399 --- /dev/null +++ b/src/platform/baytrail/memory.c @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2018, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + */ + +#include <reef/alloc.h> + +/* Heap blocks for modules */ +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; + +/* Heap memory map for modules */ +static struct block_map rt_heap_map[] = { + BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), + BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), + BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), + BLOCK_DEF(128, HEAP_RT_COUNT128, mod_block128), + BLOCK_DEF(256, HEAP_RT_COUNT256, mod_block256), + BLOCK_DEF(512, HEAP_RT_COUNT512, mod_block512), + BLOCK_DEF(1024, HEAP_RT_COUNT1024, mod_block1024), +}; + +/* Heap blocks for buffers */ +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; + +/* Heap memory map for buffers */ +static struct block_map buf_heap_map[] = { + BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), +}; + +struct mm memmap = { + .system = { + .heap = HEAP_SYSTEM_BASE, + .size = HEAP_SYSTEM_SIZE, + .info = {.free = HEAP_SYSTEM_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_CACHE | + SOF_MEM_CAPS_DMA, + }, + .runtime[0] = { + .blocks = ARRAY_SIZE(rt_heap_map), + .map = rt_heap_map, + .heap = HEAP_RUNTIME_BASE, + .size = HEAP_RUNTIME_SIZE, + .info = {.free = HEAP_RUNTIME_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_CACHE | + SOF_MEM_CAPS_DMA, + }, + .buffer[0] = { + .blocks = ARRAY_SIZE(buf_heap_map), + .map = buf_heap_map, + .heap = HEAP_BUFFER_BASE, + .size = HEAP_BUFFER_SIZE, + .info = {.free = HEAP_BUFFER_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_CACHE | + SOF_MEM_CAPS_DMA, + }, + .total = {.free = HEAP_SYSTEM_SIZE + HEAP_RUNTIME_SIZE + + HEAP_BUFFER_SIZE,}, +}; diff --git a/src/platform/cannonlake/Makefile.am b/src/platform/cannonlake/Makefile.am index 9f3d591..2e9019d 100644 --- a/src/platform/cannonlake/Makefile.am +++ b/src/platform/cannonlake/Makefile.am @@ -8,7 +8,8 @@ libplatform_a_SOURCES = \ dma.c \ clk.c \ timer.c \ - interrupt.c + interrupt.c \ + memory.c libplatform_a_CFLAGS = \ $(ARCH_CFLAGS) \ diff --git a/src/platform/cannonlake/include/platform/memory.h b/src/platform/cannonlake/include/platform/memory.h index 7e7af82..a341b4f 100644 --- a/src/platform/cannonlake/include/platform/memory.h +++ b/src/platform/cannonlake/include/platform/memory.h @@ -219,11 +219,11 @@ #define HP_SRAM_WIN3_BASE SRAM_TRACE_BASE #define HP_SRAM_WIN3_SIZE SRAM_TRACE_SIZE -#define HEAP_DMA_BUFFER_BASE (SRAM_TRACE_BASE + SRAM_TRACE_SIZE) -#define HEAP_DMA_BUFFER_SIZE 0x20000 -#define HEAP_DMA_BUFFER_BLOCK_SIZE 0x180 -#define HEAP_DMA_BUFFER_COUNT \ - (HEAP_DMA_BUFFER_SIZE / HEAP_DMA_BUFFER_BLOCK_SIZE) +#define HEAP_HP_BUFFER_BASE (SRAM_TRACE_BASE + SRAM_TRACE_SIZE) +#define HEAP_HP_BUFFER_SIZE 0x20000 +#define HEAP_HP_BUFFER_BLOCK_SIZE 0x180 +#define HEAP_HP_BUFFER_COUNT \ + (HEAP_HP_BUFFER_SIZE / HEAP_HP_BUFFER_BLOCK_SIZE) #define REEF_TEXT_BASE (REEF_TEXT_START + REEF_TEXT_START_SIZE) #define REEF_TEXT_SIZE 0x18000 @@ -315,6 +315,9 @@ #define HEAP_LP_BUFFER_COUNT (HEAP_LP_BUFFER_SIZE / HEAP_LP_BUFFER_BLOCK_SIZE) +#define PLATFORM_HEAP_RUNTIME 1 +#define PLATFORM_HEAP_BUFFER 3 + /* Stack configuration */ #define REEF_LP_STACK_SIZE 0x1000 #define REEF_LP_STACK_BASE (LP_SRAM_BASE + LP_SRAM_SIZE) @@ -335,7 +338,7 @@ #define REEF_MEM_RO_SIZE 0x8 -/* boot loadee in IMR */ +/* boot loader in IMR */ #define IMR_BOOT_LDR_TEXT_ENTRY_BASE 0xB0038000 #define IMR_BOOT_LDR_TEXT_ENTRY_SIZE 0x40 #define IMR_BOOT_LDR_LIT_BASE (IMR_BOOT_LDR_TEXT_ENTRY_BASE + IMR_BOOT_LDR_TEXT_ENTRY_SIZE) diff --git a/src/platform/cannonlake/memory.c b/src/platform/cannonlake/memory.c new file mode 100644 index 0000000..16fa600 --- /dev/null +++ b/src/platform/cannonlake/memory.c @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2018, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + */ + +#include <reef/alloc.h> + +/* Heap blocks for modules */ +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; + +/* Heap memory map for modules */ +static struct block_map rt_heap_map[] = { + BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), + BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), + BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), + BLOCK_DEF(128, HEAP_RT_COUNT128, mod_block128), + BLOCK_DEF(256, HEAP_RT_COUNT256, mod_block256), + BLOCK_DEF(512, HEAP_RT_COUNT512, mod_block512), + BLOCK_DEF(1024, HEAP_RT_COUNT1024, mod_block1024), +}; + +/* Heap blocks for buffers */ +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr hp_buf_block[HEAP_HP_BUFFER_COUNT]; +static struct block_hdr lp_buf_block[HEAP_LP_BUFFER_COUNT]; + +/* Heap memory map for buffers */ +static struct block_map buf_heap_map[] = { + BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), +}; + +static struct block_map hp_buf_heap_map[] = { + BLOCK_DEF(HEAP_HP_BUFFER_BLOCK_SIZE, HEAP_HP_BUFFER_COUNT, + hp_buf_block), +}; + +static struct block_map lp_buf_heap_map[] = { + BLOCK_DEF(HEAP_LP_BUFFER_BLOCK_SIZE, HEAP_LP_BUFFER_COUNT, + lp_buf_block), +}; + +struct mm memmap = { + .system = { + .heap = HEAP_SYSTEM_BASE, + .size = HEAP_SYSTEM_SIZE, + .info = {.free = HEAP_SYSTEM_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_CACHE | + SOF_MEM_CAPS_HP | SOF_MEM_CAPS_DMA, + }, + .runtime[0] = { + .blocks = ARRAY_SIZE(rt_heap_map), + .map = rt_heap_map, + .heap = HEAP_RUNTIME_BASE, + .size = HEAP_RUNTIME_SIZE, + .info = {.free = HEAP_RUNTIME_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_CACHE | + SOF_MEM_CAPS_HP | SOF_MEM_CAPS_DMA, + }, + .buffer[0] = { + .blocks = ARRAY_SIZE(buf_heap_map), + .map = buf_heap_map, + .heap = HEAP_BUFFER_BASE, + .size = HEAP_BUFFER_SIZE, + .info = {.free = HEAP_BUFFER_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_CACHE | + SOF_MEM_CAPS_HP | SOF_MEM_CAPS_DMA, + }, + .buffer[1] = { + .blocks = ARRAY_SIZE(hp_buf_heap_map), + .map = hp_buf_heap_map, + .heap = HEAP_HP_BUFFER_BASE, + .size = HEAP_HP_BUFFER_SIZE, + .info = {.free = HEAP_HP_BUFFER_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_HP | + SOF_MEM_CAPS_CACHE | SOF_MEM_CAPS_DMA, + }, + .buffer[2] = { + .blocks = ARRAY_SIZE(lp_buf_heap_map), + .map = lp_buf_heap_map, + .heap = HEAP_LP_BUFFER_BASE, + .size = HEAP_LP_BUFFER_SIZE, + .info = {.free = HEAP_LP_BUFFER_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_LP | + SOF_MEM_CAPS_CACHE | SOF_MEM_CAPS_DMA, + }, + .total = {.free = HEAP_SYSTEM_SIZE + HEAP_RUNTIME_SIZE + + HEAP_BUFFER_SIZE,}, +}; diff --git a/src/platform/haswell/Makefile.am b/src/platform/haswell/Makefile.am index bf9d40a..c132f53 100644 --- a/src/platform/haswell/Makefile.am +++ b/src/platform/haswell/Makefile.am @@ -7,7 +7,8 @@ libplatform_a_SOURCES = \ dai.c \ dma.c \ clk.c \ - timer.c + timer.c \ + memory.c libplatform_a_CFLAGS = \ $(ARCH_CFLAGS) \ diff --git a/src/platform/haswell/include/platform/memory.h b/src/platform/haswell/include/platform/memory.h index 83d11a5..f04ef97 100644 --- a/src/platform/haswell/include/platform/memory.h +++ b/src/platform/haswell/include/platform/memory.h @@ -124,11 +124,8 @@ #define HEAP_BUFFER_BLOCK_SIZE 0x180 #define HEAP_BUFFER_COUNT (HEAP_BUFFER_SIZE / HEAP_BUFFER_BLOCK_SIZE) -/* DMA buffer heap is the same physical memory as buffer heap on baytrail */ -#define HEAP_DMA_BUFFER_BASE 0 -#define HEAP_DMA_BUFFER_SIZE 0 -#define HEAP_DMA_BUFFER_BLOCK_SIZE 0 -#define HEAP_DMA_BUFFER_COUNT 0 +#define PLATFORM_HEAP_RUNTIME 1 +#define PLATFORM_HEAP_BUFFER 1 /* Stack configuration */ #define REEF_STACK_SIZE 0x1000 diff --git a/src/platform/haswell/memory.c b/src/platform/haswell/memory.c new file mode 100644 index 0000000..12e7399 --- /dev/null +++ b/src/platform/haswell/memory.c @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2018, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + */ + +#include <reef/alloc.h> + +/* Heap blocks for modules */ +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; + +/* Heap memory map for modules */ +static struct block_map rt_heap_map[] = { + BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), + BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), + BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), + BLOCK_DEF(128, HEAP_RT_COUNT128, mod_block128), + BLOCK_DEF(256, HEAP_RT_COUNT256, mod_block256), + BLOCK_DEF(512, HEAP_RT_COUNT512, mod_block512), + BLOCK_DEF(1024, HEAP_RT_COUNT1024, mod_block1024), +}; + +/* Heap blocks for buffers */ +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; + +/* Heap memory map for buffers */ +static struct block_map buf_heap_map[] = { + BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), +}; + +struct mm memmap = { + .system = { + .heap = HEAP_SYSTEM_BASE, + .size = HEAP_SYSTEM_SIZE, + .info = {.free = HEAP_SYSTEM_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_CACHE | + SOF_MEM_CAPS_DMA, + }, + .runtime[0] = { + .blocks = ARRAY_SIZE(rt_heap_map), + .map = rt_heap_map, + .heap = HEAP_RUNTIME_BASE, + .size = HEAP_RUNTIME_SIZE, + .info = {.free = HEAP_RUNTIME_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_CACHE | + SOF_MEM_CAPS_DMA, + }, + .buffer[0] = { + .blocks = ARRAY_SIZE(buf_heap_map), + .map = buf_heap_map, + .heap = HEAP_BUFFER_BASE, + .size = HEAP_BUFFER_SIZE, + .info = {.free = HEAP_BUFFER_SIZE,}, + .caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_CACHE | + SOF_MEM_CAPS_DMA, + }, + .total = {.free = HEAP_SYSTEM_SIZE + HEAP_RUNTIME_SIZE + + HEAP_BUFFER_SIZE,}, +}; -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] cnl: gp-dma: fix gp-dma dead loop issue
by Rander Wang 01 Mar '18

01 Mar '18

In irq function, two dma would be checked which one is the interrupted one, so get it after check. Signed-off-by: Rander Wang <rander.wang(a)intel.com> --- src/drivers/dw-dma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index be19e12..6fd46e0 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1034,7 +1034,7 @@ static int dw_dma_probe(struct dma *dma) static void dw_dma_irq_handler(void *data) { struct dma *dma = (struct dma *)data; - struct dma_pdata *p = dma_get_drvdata(dma); + struct dma_pdata *p; struct dma_sg_elem next; uint32_t status_tfr = 0; uint32_t status_block = 0; @@ -1058,6 +1058,7 @@ static void dw_dma_irq_handler(void *data) } tracev_dma("DIr"); + p = dma_get_drvdata(dma); /* get the source of our IRQ. */ status_block = dw_read(dma, DW_STATUS_BLOCK); -- 2.14.1

3 3