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

[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