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

[Sound-open-firmware] .m4 File Request Help Needed
by Nahulanthran, Sanjeev 30 Jun '18

30 Jun '18

Hi there, Writing this e-mail to request for SOF support in providing a .m4 file with 48kHz, TDM8, and MCLK enabled - used for Cirrus Logic CS42435. This is required as we need it as a reference to make our own modifications to enable the same configuration for another device (amplifier) that we have. Thanks and Regards, Sanjeev Software Engineer

3 2

[Sound-open-firmware] Loading external library
by Daniel Baluta 27 Jun '18

27 Jun '18

Hi, Does SOF firmware/driver supports loading a library and executing code from it? e.g Loading binary for a codec and use it to decode a file. thanks, Daniel.

3 8

Re: [Sound-open-firmware] Request to create a tag for https://github.com/01org/osadsp-crosstool-ng
by Liam Girdwood 27 Jun '18

27 Jun '18

On Thu, 2018-06-14 at 15:44 +0000, Wang, Long1 wrote: > -----Original Message----- > From: Liam Girdwood [mailto:liam.r.girdwood@linux.intel.com] > Sent: Thursday, June 14, 2018 11:33 PM > To: Wang, Long1 <long1.wang(a)intel.com>; Pan, Xiuli <xiuli.pan(a)linux.intel.com> > ; Keyon Jie <yang.jie(a)linux.intel.com>; sound-open-firmware(a)alsa-project.org > Cc: Li, Jocelyn <jocelyn.li(a)linux.intel.com> > Subject: Re: [Sound-open-firmware] Request to create a tag for https://github. > com/01org/osadsp-crosstool-ng > > On Thu, 2018-06-14 at 15:25 +0000, Wang, Long1 wrote: > > OK. There are configure files as below. Is there missing for > > config-byt- gcc7.3-gdb7.11.2-binutils2.30? This one is a typo, use the configs below. > > config-apl-gcc7.3-gdb7.12.1 > > config-byt-gcc7.3-gdb7.12.1 > > config-cnl-gcc7.3-gdb7.12.1 > > config-hsw-gcc7.3-gdb7.12.1 > > No, why do you ask ? Liam

2 9

[Sound-open-firmware] Topology/Driver mismatch with latest SOFT patches
by Ranjani Sridharan 27 Jun '18

27 Jun '18

Hi All, Some of the latest topology commits are missing the corresponding driver updates. Please reset your local SOFT branch to commit id: 308cf3d to avoid errors. Sorry for the inconvenience. Thakns, Ranjani

1 0

[Sound-open-firmware] [PATCH v2] [RFC]platform: calculate the percentage of cpu cycle
by Wu Zhigang 27 Jun '18

27 Jun '18

calculate the percentage of cpu cyle based on the CCOUNT register. which can tell the percentage of cpu cycle usage. It is the rough calculation. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> --- src/audio/dai.c | 22 ++++++++++++++++++++++ src/include/sof/wait.h | 8 ++++++++ src/tasks/audio.c | 10 ++++++++++ 3 files changed, 40 insertions(+) diff --git a/src/audio/dai.c b/src/audio/dai.c index f6f16d7..11b20c5 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -43,11 +43,14 @@ #include <sof/audio/component.h> #include <sof/audio/pipeline.h> #include <platform/dma.h> +#include <platform/clk.h> #include <arch/cache.h> #define DAI_PLAYBACK_STREAM 0 #define DAI_CAPTURE_STREAM 1 +#define CPU_CYCLE_PER_MS (CLK_DEFAULT_CPU_HZ / 1000) + /* tracing */ #define trace_dai(__e) trace_event(TRACE_CLASS_DAI, __e) #define trace_dai_error(__e) trace_error(TRACE_CLASS_DAI, __e) @@ -72,6 +75,22 @@ struct dai_data { uint64_t wallclock; /* wall clock at stream start */ }; +static void calc_cpu_usage(struct pipeline *p) +{ + uint32_t delta = 0; + + delta = global_cycle; + global_cycle = 0; + if (delta > CPU_CYCLE_PER_MS) + delta = CPU_CYCLE_PER_MS; + delta = (delta * 100) / CPU_CYCLE_PER_MS; + + trace_dai_error("PcT"); + + /* the percentage of the cpu usage in 1ms */ + trace_error_value(100 - delta); +} + /* 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) { @@ -81,6 +100,9 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) tracev_dai("irq"); + if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK) + calc_cpu_usage(dev->pipeline); + /* stop dma copy for pause/stop/xrun */ if (dev->state != COMP_STATE_ACTIVE || dd->xrun) { diff --git a/src/include/sof/wait.h b/src/include/sof/wait.h index feb8b29..4baa8de 100644 --- a/src/include/sof/wait.h +++ b/src/include/sof/wait.h @@ -43,6 +43,7 @@ #include <sof/trace.h> #include <sof/lock.h> #include <platform/interrupt.h> +#include <xtensa/hal.h> #if DEBUG_LOCKS #define wait_atomic_check \ @@ -157,4 +158,11 @@ static inline void wait_delay(uint64_t number_of_clks) idelay(PLATFORM_DEFAULT_DELAY); } +uint32_t global_cycle; + +static inline uint32_t platform_get_cpu_count(void) +{ + return xthal_get_ccount(); +} + #endif diff --git a/src/tasks/audio.c b/src/tasks/audio.c index 5beae08..1a79808 100644 --- a/src/tasks/audio.c +++ b/src/tasks/audio.c @@ -51,6 +51,9 @@ struct audio_data { struct pipeline *p; }; +uint32_t global_cycle; +static uint32_t c1, c2; + int do_task(struct sof *sof) { #ifdef STATIC_PIPE @@ -78,13 +81,20 @@ int do_task(struct sof *sof) /* let host know DSP boot is complete */ platform_boot_complete(0); + global_cycle = 0; + /* main audio IPC processing loop */ while (1) { + c1 = platform_get_cpu_count(); + /* sleep until next IPC or DMA */ sa_enter_idle(sof); wait_for_interrupt(0); + c2 = platform_get_cpu_count(); + global_cycle += c2 - c1; + /* now process any IPC messages from host */ ipc_process_msg_queue(); -- 2.17.1

3 2

[Sound-open-firmware] thesof/crosstool-NG: Request to change makefile to regard common tool as dependencies
by Wang, Long1 25 Jun '18

25 Jun '18

Hi Liam, Here I worked out a spec file to fit thesof/crosstool-NG in Clear Linux building environment. It worked by adding below tar-balls and some changes. But except for the crosstool-ng and xtensa-overlay, the others are common tool not real source. Could you change the make file to regard those common tool as dependencies? Source0 : https://github.com/thesofproject/crosstool-ng/archive/sof-v1.2-gcc8.1.tar.gz Source1 : https://github.com/thesofproject/xtensa-overlay/archive/sof-v1.2-gcc8.1.zip Source20 : https://ftpmirror.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz Source21 : https://ftpmirror.gnu.org/gnu/automake/automake-1.16.1.tar.xz Source22 : https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz Source23 : http://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.xz Source24 : http://isl.gforge.inria.fr/isl-0.19.tar.xz Source25 : http://www.multiprecision.org/downloads/mpc-1.0.3.tar.gz Source26 : http://downloads.sourceforge.net/project/expat/expat/2.2.5/expat-2.2.5.tar.… Source27 : https://ftpmirror.gnu.org/gnu/ncurses/ncurses-6.0.tar.gz Source28 : https://ftpmirror.gnu.org/gnu/binutils/binutils-2.30.tar.xz Source29 : https://ftpmirror.gnu.org/gnu/gcc/gcc-8.1.0/gcc-8.1.0.tar.xz Source30 : https://ftpmirror.gnu.org/gnu/gdb/gdb-8.1.tar.xz Best Regards & Thanks, Wang, Long

2 3

[Sound-open-firmware] [PATCH] [RFC]platform: calculate the percentage of cpu cycle
by Wu Zhigang 25 Jun '18

25 Jun '18

calculate the percentage of cpu cyle based on the CCOUNT register. which can tell the percentage of cpu cycle usage. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> --- src/audio/dai.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/audio/dai.c b/src/audio/dai.c index 99749d1..7811e38 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -72,6 +72,21 @@ struct dai_data { uint64_t wallclock; /* wall clock at stream start */ }; +/* for apollolake, it is 400MHz per 1s */ +#define CPU_CYCLE_PER_MS 400000 + +static void calc_mcps(struct pipeline *p) +{ + uint32_t cpu_cycle = 0; + uint32_t deta = 0; + + __asm__ __volatile__ ("rsr %0, CCOUNT" : "=a" (cpu_cycle) : : "memory"); + deta = cpu_cycle - p->cpu_cycle; + p->cpu_cycle = cpu_cycle; + deta = (deta * 100) / CPU_CYCLE_PER_MS; + trace_error_value(deta); /* the percentage of the cpu cycle in 1ms */ +} + /* 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) { @@ -81,6 +96,8 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) tracev_dai("irq"); + calc_mcps(dev->pipeline); + /* stop dma copy for pause/stop/xrun */ if (dev->state != COMP_STATE_ACTIVE || dd->xrun) { -- 2.17.1

5 11

[Sound-open-firmware] [PATCH v2 1/3] topology: use switch IO handler for tone switch
by Ranjani Sridharan 24 Jun '18

24 Jun '18

Use the bespoke switch IO handler in the driver for the tone switch kcontrol. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- topology/sof/pipe-tone.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/sof/pipe-tone.m4 b/topology/sof/pipe-tone.m4 index 53cef5a..fc5eb00 100644 --- a/topology/sof/pipe-tone.m4 +++ b/topology/sof/pipe-tone.m4 @@ -30,7 +30,7 @@ C_CONTROLMIXER(Tone Volume, PIPELINE_ID, # Switch type Mixer Control with max value of 1 C_CONTROLMIXER(Tone Switch, PIPELINE_ID, - CONTROLMIXER_OPS(volsw, 256 binds the mixer control to volume get/put handlers, 256, 256), + CONTROLMIXER_OPS(volsw, 259 binds the mixer control to switch get/put handlers, 259, 259), CONTROLMIXER_MAX(max 1 indicates switch type control, 1), false, , -- 2.17.1

1 2

[Sound-open-firmware] [PATCH v2 0/6] Tone pipeline related patches
by Ranjani Sridharan 24 Jun '18

24 Jun '18

This patches includes some changes to enable the hostless tone pipeline. The main changes are: 1. skip host page table for hostless pipelines 2. read tone sample_rate from topology 3. Fix period bytes calculation 4. change tone default frequency/gain to adhere to AES17 requirements Ranjani Sridharan (6): ipc: skip host page table set up for hostless tone pipeline tone: add get command handler to return tone state ipc: add sample_rate member to ipc tone comp def tone: set sample rate from topology tone: fix calculation for period_bytes tone: fix default frequency and gain to match AES17 requirement src/audio/tone.c | 43 +++++++++++++++++++----- src/include/uapi/ipc.h | 1 + src/ipc/handler.c | 76 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 110 insertions(+), 10 deletions(-) -- 2.17.1

1 6

[Sound-open-firmware] Audio playback error with commit 7c281d3 on up squared
by Ranjani Sridharan 22 Jun '18

22 Jun '18

Hi All, Audio playback seems to be broken on my up squared due to the this commit: 7c281d3d894ce8e9b9ea5a6a314c5c9d8e631d3e. I get "unable to install hw_params" error when I start aplay. Please find attached the dmesg log below. Thanks, Ranjani [ 30.124183] sof-audio sof-audio: pfn i 15 idx 37 pfn 17dc7f [ 30.124203] sof-audio sof-audio: period_bytes:0x3f00 [ 30.124210] sof-audio sof-audio: stream_tag 1 [ 30.432301] sof-audio sof-audio: error: ipc timed out for 0x60010000 size 0x60 [ 30.432755] sof-audio sof-audio: status: fw entered - code 00000005 [ 30.433101] sof-audio sof-audio: error: runtime exception [ 30.433386] sof-audio sof-audio: error: trace point 00004000 [ 30.433684] sof-audio sof-audio: error: DSP Firmware Oops [ 30.433970] sof-audio sof-audio: error: Exception Cause: LoadStorePIFDataErrorCause, Synchronous PIF data error during LoadStore access [ 30.434600] sof-audio sof-audio: EXCCAUSE 0x0000000d EXCVADDR 0x00000040 PS 0x00070025 SAR 0x00000010 [ 30.435123] sof-audio sof-audio: EPC1 0xbe01afc0 EPC2 0xbe01afbd EPC3 0xbe010b5e EPC4 0x00000000 [ 30.435645] sof-audio sof-audio: EPC5 0xbe01afbd EPC6 0x00000000 EPC7 0x00000000 DEPC 0x00000000 [ 30.436168] sof-audio sof-audio: EPS2 0x00060120 EPS3 0x00060520 EPS4 0x00000000 EPS5 0x00060120 [ 30.436691] sof-audio sof-audio: EPS6 0x00000000 EPS7 0x00000000 INTENABL 0x000101d8 INTERRU 0x00000222 [ 30.437214] sof-audio sof-audio: stack dump from 0xbe07ff40 [ 30.437509] sof-audio sof-audio: 0xbe07ff40: 0xbe01afc0 0x00000000 0x00000010 0x00000000 [ 30.437951] sof-audio sof-audio: 0xbe07ff44: 0xbe044024 0x00000000 0x00000008 0x00000000 [ 30.438372] sof-audio sof-audio: 0xbe07ff48: 0x0000000d 0x00000000 0xbe020ae9 0xbe020aef [ 30.438794] sof-audio sof-audio: 0xbe07ff4c: 0xbe010b5b 0x00000000 0xbe046aa4 0x00000000 [ 30.439216] sof-audio sof-audio: 0xbe07ff50: 0x00000001 0x00000000 0x00000002 0x00000000 [ 30.439638] sof-audio sof-audio: 0xbe07ff54: 0x7e0104c6 0x00000000 0x00004000 0x00000000 [ 30.440059] sof-audio sof-audio: 0xbe07ff58: 0x00000008 0x00000000 0xbe041d64 0xbe051800 [ 30.440482] sof-audio sof-audio: 0xbe07ff5c: 0x00000000 0x00000000 0x01000000 0x00000000 [ 30.440903] sof-audio sof-audio: error: waking up any trace sleepers [ 30.441289] sof-audio sof-audio: error: got wrong posn offset 0xffffffff for PCM -110 [ 30.441714] sof-audio sof-audio: ASoC: sof-audio hw params failed: -110 [ 30.442367] sof-audio sof-audio: pcm: free stream 0 dir 0 [ 30.752315] sof-audio sof-audio: error: ipc timed out for 0x60030000 size 0xc [ 30.752752] sof-audio sof-audio: status: fw entered - code 00000005 [ 30.753098] sof-audio sof-audio: error: runtime exception [ 30.753384] sof-audio sof-audio: error: trace point 00004000 [ 30.753683] sof-audio sof-audio: error: DSP Firmware Oops [ 30.753968] sof-audio sof-audio: error: Exception Cause: LoadStorePIFDataErrorCause, Synchronous PIF data error during LoadStore access [ 30.754617] sof-audio sof-audio: EXCCAUSE 0x0000000d EXCVADDR 0x00000040 PS 0x00070025 SAR 0x00000010 [ 30.755141] sof-audio sof-audio: EPC1 0xbe01afc0 EPC2 0xbe01afbd EPC3 0xbe010b5e EPC4 0x00000000 [ 30.755664] sof-audio sof-audio: EPC5 0xbe01afbd EPC6 0x00000000 EPC7 0x00000000 DEPC 0x00000000 [ 30.756187] sof-audio sof-audio: EPS2 0x00060120 EPS3 0x00060520 EPS4 0x00000000 EPS5 0x00060120 [ 30.756711] sof-audio sof-audio: EPS6 0x00000000 EPS7 0x00000000 INTENABL 0x000101d8 INTERRU 0x00000222 [ 30.757234] sof-audio sof-audio: stack dump from 0xbe07ff40 [ 30.757529] sof-audio sof-audio: 0xbe07ff40: 0xbe01afc0 0x00000000 0x00000010 0x00000000 [ 30.757951] sof-audio sof-audio: 0xbe07ff44: 0xbe044024 0x00000000 0x00000008 0x00000000 [ 30.758373] sof-audio sof-audio: 0xbe07ff48: 0x0000000d 0x00000000 0xbe020ae9 0xbe020aef [ 30.758795] sof-audio sof-audio: 0xbe07ff4c: 0xbe010b5b 0x00000000 0xbe046aa4 0x00000000 [ 30.759217] sof-audio sof-audio: 0xbe07ff50: 0x00000001 0x00000000 0x00000002 0x00000000 [ 30.759639] sof-audio sof-audio: 0xbe07ff54: 0x7e0104c6 0x00000000 0x00004000 0x00000000 [ 30.760061] sof-audio sof-audio: 0xbe07ff58: 0x00000008 0x00000000 0xbe041d64 0xbe051800 [ 30.760484] sof-audio sof-audio: 0xbe07ff5c: 0x00000000 0x00000000 0x01000000 0x00000000 [ 30.760906] sof-audio sof-audio: error: waking up any trace sleepers [ 30.761550] sof-audio sof-audio: pcm: close stream 0 dir 0

5 5

[Sound-open-firmware] [PATCH] scripts: xtensa-build: fix ROOT var alais for BXT/APL gcc
by Xiuli Pan 22 Jun '18

22 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Need to change ROOT as well as HOST target. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- scripts/xtensa-build-all.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index 9a0f3e4..abf4e87 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -95,7 +95,6 @@ do then PLATFORM="apollolake" XTENSA_CORE="X4H3I16w2D48w3a_2017_8" - ROOT="$pwd/../xtensa-root/xtensa-bxt-elf" # test APL compiler aliases and ignore set -e here type xtensa-bxt-elf-gcc > /dev/null 2>&1 && true @@ -105,6 +104,8 @@ do else HOST="xtensa-apl-elf" fi + + ROOT="$pwd/../xtensa-root/$HOST" XTENSA_TOOLS_VERSION="RG-2017.8-linux" fi if [ $j == "cnl" ] -- 2.7.4

2 1

[Sound-open-firmware] [PATCH 0/3] Add MCLK ID to SSP config
by Ranjani Sridharan 21 Jun '18

21 Jun '18

Some platforms expose more than one MCLK's. Add a MCLK_ID token to use in such cases. Please note that there arent any examples of MCLK ID other than 0 in any of the test topologies yet. But future platforms might have the need for it. Ranjani Sridharan (3): topology: add new token for SSP MCLK ID topology: modify ssp config definition to add the tuple for mclk id topology: replace SSP_SAMPLE_BITS() users with SSP_CONFIG_DATA() topology/m4/dai.m4 | 23 ++++++++++++++++++++--- topology/sof-apl-nocodec.m4 | 2 +- topology/sof-apl-tdf8532.m4 | 12 ++++++------ topology/sof-bdw-rt286.m4 | 2 +- topology/sof-bdw-rt5640.m4 | 2 +- topology/sof-byt-da7213.m4 | 2 +- topology/sof-byt-nocodec.m4 | 2 +- topology/sof-byt-rt5640.m4 | 2 +- topology/sof-byt-rt5645.m4 | 2 +- topology/sof-byt-rt5651.m4 | 2 +- topology/sof-cht-max98090.m4 | 2 +- topology/sof-cht-nocodec.m4 | 2 +- topology/sof-cnl-rt274.m4 | 2 +- topology/sof-hsw-rt5640.m4 | 2 +- topology/sof/tokens.m4 | 1 + topology/test/test-all.m4 | 2 +- topology/test/test-capture.m4 | 2 +- topology/test/test-playback.m4 | 2 +- topology/test/test-tone-playback.m4 | 2 +- 19 files changed, 43 insertions(+), 25 deletions(-) -- 2.17.1

3 6

[Sound-open-firmware] [PATCH 1/5] dai: add lbm status for dai ssp
by Xiuli Pan 21 Jun '18

21 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add a status to track dai ssp lbm. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Work with patch set: SOF-Kernel(6): ASoC: SOF: Add debug_mode flag in sof dev ASoC: SOF: debug: add debugmode debugfs for sof_dev debug_mode ASoC: SOF: uapi: topology: Add SOF_TKN_DAI_SSP_LBM for ssp loopback mode ASoC: SOF: add headers for lbm control callback functions ASoC: SOF: add lbm kcontrol callback functions ASoC: SOF: topology: Add topology handler for dai ssp loopback mode SOF(5): dai: add lbm status for dai ssp dai: add get_loopback_mode function DMIC: add empty get_loopback_mode function SSP: support for get/set_loopback_mode functions dai: add dai_cmd support for loopback mode switch SOF-Tools(3): topology: Add SOF_TKN_DAI_SSP_LBM for ssp loopback mode topology: m4: Add DAI_OUT_SSP_LOOPBACK marco for SSP LOOPBACK dai comp topology: test: Add loopback topology test & santity test with: Mininow max rt5651 and UP2 Hifiberry PRO and CNL nocodec SOF master: 48d2a1c551d7b3c8f76d44f3c04dd59a37ff6a8f SOF-Tool master: bd7dc88231f31d385340310cef467f211a739eeb https://github.com/plbossart/sound/tree/topic/sof-v4.14: 0d51a5ed28c5e97f09b59c4cafaddfb9d3b24b77 --- src/include/sof/ssp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/include/sof/ssp.h b/src/include/sof/ssp.h index fdcfcac..92db71f 100644 --- a/src/include/sof/ssp.h +++ b/src/include/sof/ssp.h @@ -231,6 +231,7 @@ struct ssp_pdata { uint32_t psp; spinlock_t lock; uint32_t state[2]; /* SSP_STATE_ for each direction */ + uint32_t lbm; completion_t drain_complete; struct sof_ipc_dai_config config; struct sof_ipc_dai_ssp_params params; -- 2.7.4

5 18

[Sound-open-firmware] [PATCH v2 1/2] platform: add trace code for debug
by Wu Zhigang 21 Jun '18

21 Jun '18

add the trace code for easy to debug the case: when the xrun happen in capture/playback working at the same time. we could confirm the xrun's direction easily. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> --- test with: apl-gpmrb with tdf8532 codec linux topic/sof-dev: 0d51a5ed28c5 sof master: 48d2a1c551d7 soft master: 2cc3ad2a9287 pass the regression test: Minnowboard Turbo UP^2 CNL-RVP --- src/audio/src.c | 4 ++++ src/audio/volume.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/audio/src.c b/src/audio/src.c index c19828a..3566976 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -800,10 +800,14 @@ static int src_copy(struct comp_dev *dev) */ if (source->avail < need_source) { trace_src_error("xru"); + trace_error_value(source->source->comp.id); + trace_error_value(sink->sink->comp.id); return -EIO; /* xrun */ } if (sink->free < need_sink) { trace_src_error("xro"); + trace_error_value(source->source->comp.id); + trace_error_value(sink->sink->comp.id); return -EIO; /* xrun */ } diff --git a/src/audio/volume.c b/src/audio/volume.c index 9e2968d..64c5d39 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -356,11 +356,15 @@ static int volume_copy(struct comp_dev *dev) */ if (source->avail < cd->source_period_bytes) { trace_volume_error("xru"); + trace_error_value(source->source->comp.id); + trace_error_value(sink->sink->comp.id); comp_underrun(dev, source, cd->source_period_bytes, 0); return -EIO; /* xrun */ } if (sink->free < cd->sink_period_bytes) { trace_volume_error("xro"); + trace_error_value(source->source->comp.id); + trace_error_value(sink->sink->comp.id); comp_overrun(dev, sink, cd->sink_period_bytes, 0); return -EIO; /* xrun */ } -- 2.17.1

2 2

[Sound-open-firmware] [PATCH v3 1/2] volume: support 8-channel feature
by Wu Zhigang 21 Jun '18

21 Jun '18

add the 8-channel feature for the capture function for apl-gpmrb platform. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> Reviewed-by: Keyon Jie <yang.jie(a)linux.intel.com> --- test with: apl-gpmrb with tdf8532 codec linux topic/sof-dev: 0d51a5ed28c5 sof master: 48d2a1c551d7 soft master: 2cc3ad2a9287 pass the regression test: Minnowboard Turbo UP^2 CNL-RVP --- src/audio/volume_generic.c | 367 +++++++++++++++++++++++++++++++++++++ 1 file changed, 367 insertions(+) diff --git a/src/audio/volume_generic.c b/src/audio/volume_generic.c index 200cf12..d07fd30 100644 --- a/src/audio/volume_generic.c +++ b/src/audio/volume_generic.c @@ -220,6 +220,7 @@ static void vol_s24_to_s24_2ch(struct comp_dev *dev, struct comp_buffer *sink, } } +#if PLATFORM_MAX_CHANNELS >= 4 /* volume scaling functions for 4-channel input */ /* copy and scale volume from 16 bit source buffer to 32 bit dest buffer */ @@ -465,6 +466,359 @@ static void vol_s24_to_s24_4ch(struct comp_dev *dev, struct comp_buffer *sink, Q_SHIFT_BITS_64(23, 16, 23)); } } +#endif + +#if PLATFORM_MAX_CHANNELS >= 8 +/* volume scaling functions for 8-channel input */ + +/* copy and scale volume from 16 bit source buffer to 32 bit dest buffer */ +static void vol_s16_to_s32_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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]; + dest[i + 4] = (int32_t)src[i + 4] * cd->volume[4]; + dest[i + 5] = (int32_t)src[i + 5] * cd->volume[5]; + dest[i + 6] = (int32_t)src[i + 6] * cd->volume[6]; + dest[i + 7] = (int32_t)src[i + 7] * cd->volume[7]; + } +} + +/* copy and scale volume from 32 bit source buffer to 16 bit dest buffer */ +static void vol_s32_to_s16_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = (int16_t)q_multsr_sat_32x32(src[i + 4], + cd->volume[4], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 5] = (int16_t)q_multsr_sat_32x32(src[i + 5], + cd->volume[5], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 6] = (int16_t)q_multsr_sat_32x32(src[i + 6], + cd->volume[6], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 7] = (int16_t)q_multsr_sat_32x32(src[i + 7], + cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = q_multsr_sat_32x32(src[i + 4], cd->volume[4], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 5] = q_multsr_sat_32x32(src[i + 5], cd->volume[5], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 6] = q_multsr_sat_32x32(src[i + 6], cd->volume[6], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 7] = q_multsr_sat_32x32(src[i + 7], cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = q_multsr_sat_16x16(src[i + 4], cd->volume[4], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 5] = q_multsr_sat_16x16(src[i + 5], cd->volume[5], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 6] = q_multsr_sat_16x16(src[i + 6], cd->volume[6], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 7] = q_multsr_sat_16x16(src[i + 7], cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = q_multsr_sat_32x32(src[i + 4], cd->volume[4], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 5] = q_multsr_sat_32x32(src[i + 5], cd->volume[5], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 6] = q_multsr_sat_32x32(src[i + 6], cd->volume[6], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 7] = q_multsr_sat_32x32(src[i + 7], cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + sample = sign_extend_s24(src[i + 4]); + dest[i + 4] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[4], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 5]); + dest[i + 5] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[5], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 6]); + dest[i + 6] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[6], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 7]); + dest[i + 7] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = q_multsr_sat_32x32(src[i + 4], cd->volume[4], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 5] = q_multsr_sat_32x32(src[i + 5], cd->volume[5], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 6] = q_multsr_sat_32x32(src[i + 6], cd->volume[6], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 7] = q_multsr_sat_32x32(src[i + 7], cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = q_multsr_sat_32x32(sign_extend_s24(src[i + 4]), + cd->volume[4], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 5] = q_multsr_sat_32x32(sign_extend_s24(src[i + 5]), + cd->volume[5], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 6] = q_multsr_sat_32x32(sign_extend_s24(src[i + 6]), + cd->volume[6], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 7] = q_multsr_sat_32x32(sign_extend_s24(src[i + 7]), + cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = q_multsr_sat_32x32(sign_extend_s24(src[i + 4]), + cd->volume[4], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 5] = q_multsr_sat_32x32(sign_extend_s24(src[i + 5]), + cd->volume[5], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 6] = q_multsr_sat_32x32(sign_extend_s24(src[i + 6]), + cd->volume[6], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 7] = q_multsr_sat_32x32(sign_extend_s24(src[i + 7]), + cd->volume[7], + Q_SHIFT_BITS_64(23, 16, 23)); + } +} +#endif const struct comp_func_map func_map[] = { {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S16_LE, 2, vol_s16_to_s16_2ch}, @@ -476,6 +830,7 @@ const struct comp_func_map func_map[] = { {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}, +#if PLATFORM_MAX_CHANNELS >= 4 {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}, @@ -485,6 +840,18 @@ const struct comp_func_map func_map[] = { {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}, +#endif +#if PLATFORM_MAX_CHANNELS >= 8 + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S16_LE, 8, vol_s16_to_s16_8ch}, + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S32_LE, 8, vol_s16_to_s32_8ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S16_LE, 8, vol_s32_to_s16_8ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S32_LE, 8, vol_s32_to_s32_8ch}, + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S24_4LE, 8, vol_s16_to_s24_8ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S16_LE, 8, vol_s24_to_s16_8ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S24_4LE, 8, vol_s32_to_s24_8ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S32_LE, 8, vol_s24_to_s32_8ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S24_4LE, 8, vol_s24_to_s24_8ch}, +#endif }; scale_vol vol_get_processing_function(struct comp_dev *dev) -- 2.17.1

4 5

[Sound-open-firmware] [PATCH] DMIC: Set DAI parameters from topology parameters instead of hardwired
by Seppo Ingalsuo 21 Jun '18

21 Jun '18

This patch enables the 1, 2, and 4ch topologies usage with S32_LE and S16_LE sample formats. The DMA burst length is also changed to maximum (8) to fully utilize the DMIC FIFO. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/dai.c | 36 +++++++++++++++++++++++++++++++++--- src/drivers/dmic.c | 2 +- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 21a3b80..7cef5a7 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -645,9 +645,39 @@ static int dai_config(struct comp_dev *dev, struct sof_ipc_dai_config *config) } break; case SOF_DAI_INTEL_DMIC: - /* TODO: No hardwired values here. */ - dd->config.burst_elems = 2; - dev->frame_bytes = 8; + /* The frame bytes setting follows only FIFO A setting in + * this DMIC driver version. + */ + trace_dai("did"); + + /* We can use always the largest burst length. */ + dd->config.burst_elems = 8; + + /* Set frame size in bytes to match the configuration. */ + if (config->dmic.num_pdm_active > 1) { + /* For two or more controllers capture from each + * controller must be stereo. + */ + dev->frame_bytes = 2 * config->dmic.num_pdm_active * + config->dmic.fifo_bits_a >> 3; + } else { + /* For one controller the capture can be mono or + * stereo. In mono configuration only one of mic A or B + * is enabled. + */ + if (config->dmic.pdm[0].enable_mic_a + + config->dmic.pdm[0].enable_mic_b == 1) + dev->frame_bytes = + config->dmic.fifo_bits_a >> 3; + else + dev->frame_bytes = 2 * + config->dmic.fifo_bits_a >> 3; + } + trace_value(config->dmic.fifo_bits_a); + trace_value(config->dmic.num_pdm_active); + trace_value(config->dmic.pdm[0].enable_mic_a); + trace_value(config->dmic.pdm[0].enable_mic_b); + trace_value(dev->frame_bytes); break; default: /* other types of DAIs not handled for now */ diff --git a/src/drivers/dmic.c b/src/drivers/dmic.c index 58d5e20..47c966d 100644 --- a/src/drivers/dmic.c +++ b/src/drivers/dmic.c @@ -828,7 +828,7 @@ static int configure_registers(struct dai *dai, struct dmic_configuration *cfg, int array_b = 0; int cic_mute = 1; int fir_mute = 1; - int bfth = 1; /* Should be 3 for 8 entries, 1 is 2 entries */ + int bfth = 3; /* Should be 3 for 8 entries, 1 is 2 entries */ int th = 0; /* Used with TIE=1 */ /* Normal start sequence */ -- 2.14.1

2 1

[Sound-open-firmware] [PATCH 01/10] math: Comment for the innerworkings of ceil_divide() Signed-off-by: Slawomir Blauciak <slawomir.blauciak@linux.intel.com>
by Liam Girdwood 21 Jun '18

21 Jun '18

From: Slawomir Blauciak <slawomir.blauciak(a)linux.intel.com> math: ceil_divide - Check the signs of the dividant and divisor before rounding Signed-off-by: Slawomir Blauciak <slawomir.blauciak(a)linux.intel.com> --- src/include/sof/math/numbers.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/include/sof/math/numbers.h b/src/include/sof/math/numbers.h index 5aacd8b..4ba812a 100644 --- a/src/include/sof/math/numbers.h +++ b/src/include/sof/math/numbers.h @@ -48,7 +48,15 @@ static inline int ceil_divide(int a, int b) int c; c = a / b; - if (c * b < a) + + /* First, we check whether the signs of the params are different. + * If they are, we already know the result is going to be negative and + * therefore, is going to be already rounded up (truncated). + * + * If the signs are the same, we check if there was any remainder in + * the division by multiplying the number back. + */ + if (!((a ^ b) & (1 << ((sizeof(int) * 8) - 1))) && c * b != a) c++; return c; -- 2.17.0

1 9

[Sound-open-firmware] [PATCH V2 1/3] topology: Add SOF_TKN_DAI_LBM_KCONTROL for ssp loopback mode kcontrol
by Xiuli Pan 21 Jun '18

21 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add token SOF_TKN_DAI_LBM_KCONTROL for SSP loopback mode kcontrol Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- V2: Rename token Work with patch set: SOF-Kernel(7): ASoC: SOF: Add debug_mode flag in sof dev ASoC: SOF: debug: add debugmode debugfs for sof_dev debug_mode ASoC: SOF: uapi: topology: Add SOF_TKN_DAI_LBM_KCONTROL for ssp loopback mode kcontrol ASoC: SOF: add headers for switch control callback functions ASoC: SOF: add switch kcontrol callback functions ASoC: SOF: topology: Add DAI TOKEN string bool parser ASoC: SOF: topology: Add topology handler for dai lbm kcontrol SOF(5): dai: add lbm status for dai ssp dai: add get_loopback_mode function DMIC: add empty get_loopback_mode function SSP: support for get/set_loopback_mode functions dai: add dai_cmd support for loopback mode switch SOF-Tools(3): topology: Add SOF_TKN_DAI_LBM_KCONTROL for ssp loopback mode kcontrol topology: m4: add dai lbm kcotnrol support topology: test: Add loopback topology test & santity test with: Mininow max rt5651 and UP2 Hifiberry PRO and CNL nocodec SOF master: 27795ece0ff9405795cef866fc28a7ab6db20d82 SOF-Tool master: bd7dc88231f31d385340310cef467f211a739eeb sof-dev: df15329163229fe3436ad914561430c20f778cf1 --- topology/sof/tokens.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4 index f0b3428..f17ed35 100644 --- a/topology/sof/tokens.m4 +++ b/topology/sof/tokens.m4 @@ -19,6 +19,7 @@ SectionVendorTokens."sof_dai_tokens" { SOF_TKN_DAI_TYPE "154" SOF_TKN_DAI_INDEX "155" SOF_TKN_DAI_SAMPLE_BITS "156" + SOF_TKN_DAI_LBM_KCONTROL "157" } SectionVendorTokens."sof_sched_tokens" { -- 2.7.4

4 5

[Sound-open-firmware] [PATCH 1/3] topology: Add SOF_TKN_DAI_SSP_LBM for ssp loopback mode
by Xiuli Pan 21 Jun '18

21 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add token SOF_TKN_DAI_SSP_LBM for SSP loopback mode. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Work with patch set: SOF-Kernel(6): ASoC: SOF: Add debug_mode flag in sof dev ASoC: SOF: debug: add debugmode debugfs for sof_dev debug_mode ASoC: SOF: uapi: topology: Add SOF_TKN_DAI_SSP_LBM for ssp loopback mode ASoC: SOF: add headers for lbm control callback functions ASoC: SOF: add lbm kcontrol callback functions ASoC: SOF: topology: Add topology handler for dai ssp loopback mode SOF(5): dai: add lbm status for dai ssp dai: add get_loopback_mode function DMIC: add empty get_loopback_mode function SSP: support for get/set_loopback_mode functions dai: add dai_cmd support for loopback mode switch SOF-Tools(3): topology: Add SOF_TKN_DAI_SSP_LBM for ssp loopback mode topology: m4: Add DAI_OUT_SSP_LOOPBACK marco for SSP LOOPBACK dai comp topology: test: Add loopback topology test & santity test with: Mininow max rt5651 and UP2 Hifiberry PRO and CNL nocodec SOF master: 48d2a1c551d7b3c8f76d44f3c04dd59a37ff6a8f SOF-Tool master: bd7dc88231f31d385340310cef467f211a739eeb https://github.com/plbossart/sound/tree/topic/sof-v4.14: 0d51a5ed28c5e97f09b59c4cafaddfb9d3b24b77 --- topology/sof/tokens.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4 index f0b3428..ad74893 100644 --- a/topology/sof/tokens.m4 +++ b/topology/sof/tokens.m4 @@ -19,6 +19,7 @@ SectionVendorTokens."sof_dai_tokens" { SOF_TKN_DAI_TYPE "154" SOF_TKN_DAI_INDEX "155" SOF_TKN_DAI_SAMPLE_BITS "156" + SOF_TKN_DAI_SSP_LBM "157" } SectionVendorTokens."sof_sched_tokens" { -- 2.7.4

4 13

[Sound-open-firmware] [PATCH] platform: add trace code for debug
by Wu Zhigang 21 Jun '18

21 Jun '18

1. add the trace code for easy to debug the case: when the xrun happen in capture/playback working at the same time. we could confirm the xrun's direction easily. 2. fix typo error in mixer. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> --- test with: apl-gpmrb with tdf8532 codec linux topic/sof-dev: 0d51a5ed28c5 sof master: 48d2a1c551d7 soft master: 2cc3ad2a9287 pass the regression test: Minnowboard Turbo UP^2 CNL-RVP --- src/audio/mixer.c | 2 +- src/audio/src.c | 4 ++++ src/audio/volume.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/audio/mixer.c b/src/audio/mixer.c index ac6b7f9..3ddea0a 100644 --- a/src/audio/mixer.c +++ b/src/audio/mixer.c @@ -255,7 +255,7 @@ static int mixer_copy(struct comp_dev *dev) comp_underrun(dev, sources[i], sources[i]->avail, md->period_bytes); } else if (res > 0) { - trace_mixer_error("xru"); + trace_mixer_error("xro"); comp_overrun(dev, sources[i], sink->free, md->period_bytes); } diff --git a/src/audio/src.c b/src/audio/src.c index c19828a..e641874 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -800,10 +800,14 @@ static int src_copy(struct comp_dev *dev) */ if (source->avail < need_source) { trace_src_error("xru"); + trace_error_value(source->source->comp.type); + trace_error_value(sink->sink->comp.type); return -EIO; /* xrun */ } if (sink->free < need_sink) { trace_src_error("xro"); + trace_error_value(source->source->comp.type); + trace_error_value(sink->sink->comp.type); return -EIO; /* xrun */ } diff --git a/src/audio/volume.c b/src/audio/volume.c index 9e2968d..a9efbaf 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -356,11 +356,15 @@ static int volume_copy(struct comp_dev *dev) */ if (source->avail < cd->source_period_bytes) { trace_volume_error("xru"); + trace_error_value(source->source->comp.type); + trace_error_value(sink->sink->comp.type); comp_underrun(dev, source, cd->source_period_bytes, 0); return -EIO; /* xrun */ } if (sink->free < cd->sink_period_bytes) { trace_volume_error("xro"); + trace_error_value(source->source->comp.type); + trace_error_value(sink->sink->comp.type); comp_overrun(dev, sink, cd->sink_period_bytes, 0); return -EIO; /* xrun */ } -- 2.17.1

3 4

[Sound-open-firmware] [PATCH 1/5] DMIC: Bug fix for IPM value calculation for HW version 2
by Seppo Ingalsuo 20 Jun '18

20 Jun '18

The IPM bit field should be set to the number of used stereo controllers. This patch fixes the issue that pdm[0] got counted twice. Signed-off-by: Sathish K. Kuttan <sathish.k.kuttan(a)intel.com> --- src/drivers/dmic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/dmic.c b/src/drivers/dmic.c index 97ca8b2..0f55474 100644 --- a/src/drivers/dmic.c +++ b/src/drivers/dmic.c @@ -714,7 +714,7 @@ static inline void source_ipm_helper(int source[], int *ipm, int stereo[], /* IPM bit field is set to count of active pdm controllers. */ *ipm = pdm[0]; - for (i = 0; i < dmic->num_pdm_active; i++) + for (i = 1; i < dmic->num_pdm_active; i++) *ipm += pdm[i]; } #endif -- 2.14.1

2 5

[Sound-open-firmware] [PATCH 1/2] configure: add OBJCOPY and OBJDUMP log
by Xiuli Pan 19 Jun '18

19 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Output OBJCOPY and OBJDUMP to check if we misuse them. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index c3e9fc4..65114f3 100644 --- a/configure.ac +++ b/configure.ac @@ -483,6 +483,8 @@ Install Prefix: ${prefix} PEM: ${PEM_KEY_PREFIX} Compiler: ${CC} +OBJCOPY: ${OBJCOPY} +OBJDUMP: ${OBJDUMP} CFLAGS: ${CFLAGS} LDFLAGS: ${LDFLAGS} ARCH_CFLAGS: ${ARCH_CFLAGS} -- 2.7.4

2 2

[Sound-open-firmware] [PATCH v2] volume: support 8-channel feature
by Wu Zhigang 19 Jun '18

19 Jun '18

add the 8-channel feature for the capture function for apl-gpmrb platform. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> Reviewed-by: Keyon Jie <yang.jie(a)linux.intel.com> --- v2: rebase the code and make patch. --- test with: apl-gpmrb with tdf8532 codec linux topic/sof-dev: commit 0d51a5ed28c5 sof master: commit 48d2a1c551d7 soft master: commit 2cc3ad2a9287 pass the regression test already: Minnowboard Turbo UP^2 CNL-RVP --- src/audio/volume_generic.c | 363 +++++++++++++++++++++++++++++++++++++ 1 file changed, 363 insertions(+) diff --git a/src/audio/volume_generic.c b/src/audio/volume_generic.c index 200cf12..fa23240 100644 --- a/src/audio/volume_generic.c +++ b/src/audio/volume_generic.c @@ -466,6 +466,358 @@ static void vol_s24_to_s24_4ch(struct comp_dev *dev, struct comp_buffer *sink, } } +#ifdef CONFIG_APOLLOLAKE +/* volume scaling functions for 8-channel input */ + +/* copy and scale volume from 16 bit source buffer to 32 bit dest buffer */ +static void vol_s16_to_s32_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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]; + dest[i + 4] = (int32_t)src[i + 4] * cd->volume[4]; + dest[i + 5] = (int32_t)src[i + 5] * cd->volume[5]; + dest[i + 6] = (int32_t)src[i + 6] * cd->volume[6]; + dest[i + 7] = (int32_t)src[i + 7] * cd->volume[7]; + } +} + +/* copy and scale volume from 32 bit source buffer to 16 bit dest buffer */ +static void vol_s32_to_s16_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = (int16_t)q_multsr_sat_32x32(src[i + 4], + cd->volume[4], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 5] = (int16_t)q_multsr_sat_32x32(src[i + 5], + cd->volume[5], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 6] = (int16_t)q_multsr_sat_32x32(src[i + 6], + cd->volume[6], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 7] = (int16_t)q_multsr_sat_32x32(src[i + 7], + cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = q_multsr_sat_32x32(src[i + 4], cd->volume[4], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 5] = q_multsr_sat_32x32(src[i + 5], cd->volume[5], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 6] = q_multsr_sat_32x32(src[i + 6], cd->volume[6], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 7] = q_multsr_sat_32x32(src[i + 7], cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = q_multsr_sat_16x16(src[i + 4], cd->volume[4], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 5] = q_multsr_sat_16x16(src[i + 5], cd->volume[5], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 6] = q_multsr_sat_16x16(src[i + 6], cd->volume[6], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 7] = q_multsr_sat_16x16(src[i + 7], cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = q_multsr_sat_32x32(src[i + 4], cd->volume[4], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 5] = q_multsr_sat_32x32(src[i + 5], cd->volume[5], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 6] = q_multsr_sat_32x32(src[i + 6], cd->volume[6], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 7] = q_multsr_sat_32x32(src[i + 7], cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + sample = sign_extend_s24(src[i + 4]); + dest[i + 4] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[4], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 5]); + dest[i + 5] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[5], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 6]); + dest[i + 6] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[6], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 7]); + dest[i + 7] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = q_multsr_sat_32x32(src[i + 4], cd->volume[4], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 5] = q_multsr_sat_32x32(src[i + 5], cd->volume[5], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 6] = q_multsr_sat_32x32(src[i + 6], cd->volume[6], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 7] = q_multsr_sat_32x32(src[i + 7], cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = q_multsr_sat_32x32(sign_extend_s24(src[i + 4]), + cd->volume[4], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 5] = q_multsr_sat_32x32(sign_extend_s24(src[i + 5]), + cd->volume[5], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 6] = q_multsr_sat_32x32(sign_extend_s24(src[i + 6]), + cd->volume[6], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 7] = q_multsr_sat_32x32(sign_extend_s24(src[i + 7]), + cd->volume[7], + 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_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + 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 < dev->frames * 8; i += 8) { + 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)); + dest[i + 4] = q_multsr_sat_32x32(sign_extend_s24(src[i + 4]), + cd->volume[4], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 5] = q_multsr_sat_32x32(sign_extend_s24(src[i + 5]), + cd->volume[5], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 6] = q_multsr_sat_32x32(sign_extend_s24(src[i + 6]), + cd->volume[6], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 7] = q_multsr_sat_32x32(sign_extend_s24(src[i + 7]), + cd->volume[7], + Q_SHIFT_BITS_64(23, 16, 23)); + } +} +#endif + const struct comp_func_map func_map[] = { {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}, @@ -485,6 +837,17 @@ const struct comp_func_map func_map[] = { {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}, +#ifdef CONFIG_APOLLOLAKE + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S16_LE, 8, vol_s16_to_s16_8ch}, + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S32_LE, 8, vol_s16_to_s32_8ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S16_LE, 8, vol_s32_to_s16_8ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S32_LE, 8, vol_s32_to_s32_8ch}, + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S24_4LE, 8, vol_s16_to_s24_8ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S16_LE, 8, vol_s24_to_s16_8ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S24_4LE, 8, vol_s32_to_s24_8ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S32_LE, 8, vol_s24_to_s32_8ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S24_4LE, 8, vol_s24_to_s24_8ch}, +#endif }; scale_vol vol_get_processing_function(struct comp_dev *dev) -- 2.17.1

4 3

[Sound-open-firmware] [PATCH 0/5] SSP fixes
by Pierre-Louis Bossart 19 Jun '18

19 Jun '18

This patchset adds corrections for APL and BYT. For APL, the first two patches add support for a 'mclk_id' needed for specific boards, in addition to allowing for independent dividers and sources for bclk and clkc. Follow-up patches will be needed to add a 'mclk_id' topology token and kernel support. For BYT, the patches add support for DSP_A/B modes as well as the slave mode (only CBM_CFM was tested), tested with Minnowboards and LogicPro. Comments welcome. Pierre-Louis Bossart (5): ssp: rename clk_id as mclk_id, remove dead code apl-ssp: fix MCLK and BCLK source selection byt-ssp: fixes for DSP modes byt-ssp: fix frame sync polarity for DSP modes byt-ssp: minor changes to test slave mode src/drivers/apl-ssp.c | 132 +++++++++++++++++++++++++++++++++---------------- src/drivers/byt-ssp.c | 49 +++++++----------- src/drivers/hsw-ssp.c | 25 ---------- src/include/sof/ssp.h | 5 ++ src/include/uapi/ipc.h | 2 +- 5 files changed, 112 insertions(+), 101 deletions(-) base-commit: f6f3ab0d55ee9a26235d3912851c72ffea34fca7 -- 2.14.1

2 6

[Sound-open-firmware] [PATCH] scripts: xtensa-build: fix alias detection for bxt/apl gcc
by Liam Girdwood 19 Jun '18

19 Jun '18

use bash builtin type instead of -x (requires full path) Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- scripts/xtensa-build-all.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index 62b94b2..100ba6a 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -96,7 +96,10 @@ do PLATFORM="apollolake" XTENSA_CORE="X4H3I16w2D48w3a_2017_8" ROOT="$pwd/../xtensa-root/xtensa-bxt-elf" - if [ -x xtensa-bxt-elf-gcc ] + + # test APL compiler aliases and ignore set -e here + type xtensa-bxt-elf-gcc > /dev/null 2>&1 && true + if [ $? == 0 ] then HOST="xtensa-bxt-elf" else -- 2.17.1

1 0