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

[Sound-open-firmware] [PATCH 1/2] scripts: xtensa-build-all.sh. Fix bash error.
by Liam Girdwood 19 Jun '18

19 Jun '18

make[1]: Leaving directory '/home/lrg/source/reef/sof.git' ./scripts/xtensa-build-all.sh: line 123: [: ==: unary operator expected Fix, set variable to "none" if xcc not found. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- scripts/xtensa-build-all.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index c1147d8..d873d7e 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -116,6 +116,8 @@ do if [ -d $XTENSA_TOOLS_DIR ] then XCC="xt-xcc" + else + XCC="none" fi fi -- 2.17.1

2 5

[Sound-open-firmware] [RFC PATCH 0/6] Hostless pipeline updates
by Ranjani Sridharan 14 Jun '18

14 Jun '18

This set of patches make changes to the tone component, pipeline and generic component to support hostless pipelines. The changes to component and pipeline are mainly to avoid errors when the user repeatedly triggers the pipeline on/off. Ranjani Sridharan (6): ipc: skip host page table set up for hostless tone pipeline tone: add command handler to return tone state and compute tone sample rate pipeline: ignore request for pipeline_prepare() if the pipeline is running comp: ignore state set request when the old state is unchanged ipc: add sample_rate member to ipc tone comp def tone: set sample rate from topology src/audio/component.c | 19 +++++++++++ src/audio/pipeline.c | 5 +++ src/audio/tone.c | 26 ++++++++++++++- src/include/uapi/ipc.h | 1 + src/ipc/handler.c | 76 +++++++++++++++++++++++++++++++++++++++++- 5 files changed, 125 insertions(+), 2 deletions(-) -- 2.17.1

3 13

[Sound-open-firmware] [PATCH] dmic: fix size while copying DMIC params
by Ranjani Sridharan 14 Jun '18

14 Jun '18

The size argument for memcpy should be sizeof struct sof_ipc_dai_dmic_params. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/drivers/dmic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/dmic.c b/src/drivers/dmic.c index b66769c..97ca8b2 100644 --- a/src/drivers/dmic.c +++ b/src/drivers/dmic.c @@ -1032,8 +1032,8 @@ static int dmic_set_config(struct dai *dai, struct sof_ipc_dai_config *config) * sizeof(struct sof_ipc_dai_dmic_pdm_ctrl); prm = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, size); - /* copy the command DAI config params and DMIC params */ - memcpy(prm, &config->dmic, sizeof(struct sof_ipc_dai_config)); + /* copy the DMIC params */ + memcpy(prm, &config->dmic, sizeof(struct sof_ipc_dai_dmic_params)); /* copy the pdm controller params from ipc */ for (i = 0; i < DMIC_HW_CONTROLLERS; i++) { -- 2.17.1

2 1

[Sound-open-firmware] [PATCH 1/2] ipc: add parameters validation
by Liam Girdwood 14 Jun '18

14 Jun '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> This patch adds parameters validation for ipc. It uses generic macros. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/ipc/handler.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/src/ipc/handler.c b/src/ipc/handler.c index 581ce9e..a83ef69 100644 --- a/src/ipc/handler.c +++ b/src/ipc/handler.c @@ -62,6 +62,9 @@ #define iGS(x) ((x >> SOF_GLB_TYPE_SHIFT) & 0xf) #define iCS(x) ((x >> SOF_CMD_TYPE_SHIFT) & 0xfff) +#define IPC_INVALID_SIZE(ipc) \ + (sizeof(*(ipc)) != ipc->hdr.size) + /* IPC context - shared with platform IPC driver */ struct ipc *_ipc; @@ -106,12 +109,18 @@ static int ipc_stream_pcm_params(uint32_t stream) trace_ipc("SAl"); + /* sanity check size */ + if (IPC_INVALID_SIZE(pcm_params)) { + trace_ipc_error("eAS"); + return -EINVAL; + } + /* get the pcm_dev */ pcm_dev = ipc_get_comp(_ipc, pcm_params->comp_id); if (pcm_dev == NULL) { trace_ipc_error("eAC"); trace_error_value(pcm_params->comp_id); - return -EINVAL; + return -ENODEV; } /* sanity check comp */ @@ -214,6 +223,12 @@ static int ipc_stream_pcm_free(uint32_t header) trace_ipc("SFr"); + /* sanity check size */ + if (IPC_INVALID_SIZE(free_req)) { + trace_ipc_error("eFs"); + return -EINVAL; + } + /* get the pcm_dev */ pcm_dev = ipc_get_comp(_ipc, free_req->comp_id); if (pcm_dev == NULL) { @@ -243,6 +258,12 @@ static int ipc_stream_position(uint32_t header) memset(&posn, 0, sizeof(posn)); + /* sanity check size */ + if (IPC_INVALID_SIZE(stream)) { + trace_ipc_error("ePs"); + return -EINVAL; + } + /* get the pcm_dev */ pcm_dev = ipc_get_comp(_ipc, stream->comp_id); if (pcm_dev == NULL) { @@ -314,6 +335,12 @@ static int ipc_stream_trigger(uint32_t header) trace_ipc("tri"); + /* sanity check size */ + if (IPC_INVALID_SIZE(stream)) { + trace_ipc_error("eRs"); + return -EINVAL; + } + /* get the pcm_dev */ pcm_dev = ipc_get_comp(_ipc, stream->comp_id); if (pcm_dev == NULL) { @@ -525,6 +552,12 @@ static int ipc_dma_trace_config(uint32_t header) trace_ipc("DA1"); + /* sanity check size */ + if (IPC_INVALID_SIZE(params)) { + trace_ipc_error("DAs"); + return -EINVAL; + } + #ifdef CONFIG_HOST_PTABLE list_init(&elem_list); @@ -734,6 +767,12 @@ static int ipc_glb_tplg_pipe_new(uint32_t header) trace_ipc("Ipn"); + /* sanity check size */ + if (IPC_INVALID_SIZE(ipc_pipeline)) { + trace_ipc_error("Ips"); + return -EINVAL; + } + ret = ipc_pipeline_new(_ipc, ipc_pipeline); if (ret < 0) { trace_ipc_error("pn1"); @@ -764,6 +803,12 @@ static int ipc_glb_tplg_comp_connect(uint32_t header) trace_ipc("Icn"); + /* sanity check size */ + if (IPC_INVALID_SIZE(connect)) { + trace_ipc_error("Ics"); + return -EINVAL; + } + return ipc_comp_connect(_ipc, connect); } @@ -774,6 +819,12 @@ static int ipc_glb_tplg_free(uint32_t header, trace_ipc("Tcf"); + /* sanity check size */ + if (IPC_INVALID_SIZE(ipc_free)) { + trace_ipc_error("Tcs"); + return -EINVAL; + } + /* free the object */ free_func(_ipc, ipc_free->id); -- 2.17.1

1 2

[Sound-open-firmware] [PATCH] scripts: use xt-xcc for compiling if available
by Xiuli Pan 14 Jun '18

14 Jun '18

From: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Check ENV XTENSA_TOOLS_ROOT to determain which compiler to use, and set the PATH and other ENV needed for xt-xcc. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- scripts/xtensa-build-all.sh | 54 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index 198ab8d..c1147d8 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -58,41 +58,79 @@ else PATH=$pwd/local/bin:$PATH fi +OLDPATH=$PATH + # build platform for j in ${PLATFORMS[@]} do if [ $j == "byt" ] then PLATFORM="baytrail" - ROOT="xtensa-byt-elf" + XTENSA_CORE="Intel_HiFiEP" + ROOT="$pwd/../xtensa-root/xtensa-byt-elf" + HOST="xtensa-byt-elf" + XTENSA_TOOLS_VERSION="RD-2012.5-linux" fi if [ $j == "cht" ] then PLATFORM="cherrytrail" - ROOT="xtensa-byt-elf" + XTENSA_CORE="CHT_audio_hifiep" + ROOT="$pwd/../xtensa-root/xtensa-byt-elf" + HOST="xtensa-byt-elf" + XTENSA_TOOLS_VERSION="RD-2012.5-linux" fi if [ $j == "bdw" ] then PLATFORM="broadwell" - ROOT="xtensa-hsw-elf" + ROOT="$pwd/../xtensa-root/xtensa-hsw-elf" + HOST="xtensa-hsw-elf" fi if [ $j == "hsw" ] then PLATFORM="haswell" - ROOT="xtensa-hsw-elf" + ROOT="$pwd/../xtensa-root/xtensa-hsw-elf" + HOST="xtensa-hsw-elf" fi if [ $j == "apl" ] then PLATFORM="apollolake" - ROOT="xtensa-bxt-elf" + XTENSA_CORE="X4H3I16w2D48w3a_2017_8" + ROOT="$pwd/../xtensa-root/xtensa-bxt-elf" + HOST="xtensa-bxt-elf" + XTENSA_TOOLS_VERSION="RG-2017.8-linux" fi if [ $j == "cnl" ] then PLATFORM="cannonlake" - ROOT="xtensa-cnl-elf" + XTENSA_CORE="X6H3CNL_2016_4_linux" + ROOT="$pwd/../xtensa-root/xtensa-cnl-elf" + HOST="xtensa-cnl-elf" + XTENSA_TOOLS_VERSION="RF-2016.4-linux" + fi + if [ $XTENSA_TOOLS_ROOT ] + then + XTENSA_TOOLS_DIR="$XTENSA_TOOLS_ROOT/install/tools/$XTENSA_TOOLS_VERSION" + XTENSA_BUILDS_DIR="$XTENSA_TOOLS_ROOT/install/builds/$XTENSA_TOOLS_VERSION" + + # make sure the required version of xtensa tools is installed + if [ -d $XTENSA_TOOLS_DIR ] + then + XCC="xt-xcc" + fi fi - PATH=$pwd/../xtensa-root/$ROOT/bin:$PATH - ./configure --with-arch=xtensa --with-platform=$PLATFORM --with-root-dir=$pwd/../xtensa-root/$ROOT --host=$ROOT + + # update ROOT directory for xt-xcc + if [ $XCC == "xt-xcc" ] + then + ROOT="$XTENSA_BUILDS_DIR/$XTENSA_CORE/xtensa-elf" + XTENSA_SYSTEM=$XTENSA_BUILDS_DIR/$XTENSA_CORE/config + PATH=$XTENSA_TOOLS_DIR/XtensaTools/bin:$OLDPATH + else + PATH=$pwd/../$HOST/bin:$OLDPATH + fi + + ./configure --with-arch=xtensa --with-platform=$PLATFORM --with-root-dir=$ROOT --host=$HOST CC=$XCC --with-dsp-core=$XTENSA_CORE + make clean make make bin -- 2.7.4

2 3

[Sound-open-firmware] Request to create a tag for https://github.com/01org/osadsp-crosstool-ng
by Wang, Long1 14 Jun '18

14 Jun '18

Hi osadsp-crosstool-ng maintainers, Could you create a tag for https://github.com/01org/osadsp-crosstool-ng? Then github may generate its tarball automatically. It's useful for our clearlinux integration. Best Regards & Thanks, Wang, Long

4 13

[Sound-open-firmware] [PATCH] [SQUASHME] ASoC: core: Make sure FE override adds sof- prefix once.
by Liam Girdwood 14 Jun '18

14 Jun '18

sof-prefix must only be added once. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- include/sound/soc.h | 1 + sound/soc/soc-core.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 5684044b0f2a..e0a0a59b2852 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1021,6 +1021,7 @@ struct snd_soc_card { struct mutex dapm_mutex; bool instantiated; + bool topology_shortname_created; int (*probe)(struct snd_soc_card *card); int (*late_probe)(struct snd_soc_card *card); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0ee228933845..3fe1ed1f323e 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1873,6 +1873,7 @@ EXPORT_SYMBOL_GPL(snd_soc_set_dmi_name); static void soc_check_tplg_fes(struct snd_soc_card *card) { struct snd_soc_component *component; + const struct snd_soc_component_driver *comp_drv; struct snd_soc_dai_link *dai_link; int i; @@ -1922,12 +1923,19 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) } /* Inform userspace we are using alternate topology */ - if (component->driver->topology_name_prefix && - card->name != card->topology_shortname) { + if (component->driver->topology_name_prefix) { - snprintf(card->topology_shortname, 32, "%s-%s", - component->driver->topology_name_prefix, - card->name); + /* topology shortname created ? */ + if (!card->topology_shortname_created) { + comp_drv = component->driver; + + snprintf(card->topology_shortname, 32, "%s-%s", + comp_drv->topology_name_prefix, + card->name); + card->topology_shortname_created = true; + } + + /* use topology shortname */ card->name = card->topology_shortname; } } -- 2.17.1

1 1

[Sound-open-firmware] [RFC PATCH 0/4] Tone topology related changes
by Ranjani Sridharan 14 Jun '18

14 Jun '18

This patchset adds some changes to the tone pipeline generation. Main changes are to add a couple of test tone pipelines for APL and set the tone sample rate in topology. Ranjani Sridharan (4): topology: use switch IO handler for tone switch topology: add test tone pipelines for APL topology: add SAMPLE_RATE token for tone comp and include it in the tone comp definition topology: modify test pipeline to include tone sample_rate token argument topology/m4/pipeline.m4 | 4 +++- topology/m4/tone.m4 | 11 +++++++++-- topology/sof/pipe-tone.m4 | 4 ++-- topology/sof/tokens.m4 | 5 +++++ topology/test/test-tone-playback.m4 | 2 +- topology/test/tplg-build.sh | 3 +++ 6 files changed, 23 insertions(+), 6 deletions(-) -- 2.17.1

2 5

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

14 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add a status to track dai lbm. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Work with patch set: SOF-Kernel: 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 for ssp loopback mode ASoC: SOF: uapi: ipc: Add lbm in sof_ipc_dai_config ASoC: SOF: topology: Add topology handler for dai config loopback mode ASoC: SOF: add headers for lbm control callback functions ASoC: SOF: add lbm kcontrol callback functions ASoC: SOF: topology: add SSP lbm kcontrol switch create function SOF: dai: add lbm status for dai ipc: dai: add loopback mode handler for dai SOF-Tools: topology: Add SOF_TKN_DAI_LBM for ssp loopback mode topology: m4: Add option for loopback mode in DAI config topology: test: Add loopback topology test & santity test with: Mininow max rt5651 and UP2 Hifiberry PRO and CNL nocodec SOF master: 792bd414ee5629f72b1e24619510d6936eac28ce SOF-Tool master: bd7dc88231f31d385340310cef467f211a739eeb https://github.com/plbossart/sound/tree/topic/sof-v4.14: 1e0f50565669815dd7daa19021b3b04a90487431 --- src/include/sof/dai.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/include/sof/dai.h b/src/include/sof/dai.h index e3bce1d..8f4c69e 100644 --- a/src/include/sof/dai.h +++ b/src/include/sof/dai.h @@ -98,6 +98,7 @@ struct dai_plat_data { struct dai { uint32_t type; uint32_t index; + uint32_t lbm; struct dai_plat_data plat_data; const struct dai_ops *ops; void *private; -- 2.7.4

4 8

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

13 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add token SOF_TKN_DAI_LBM for SSP loopback mode. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Work with patch set: SOF-Kernel: 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 for ssp loopback mode ASoC: SOF: uapi: ipc: Add lbm in sof_ipc_dai_config ASoC: SOF: topology: Add topology handler for dai config loopback mode ASoC: SOF: add headers for lbm control callback functions ASoC: SOF: add lbm kcontrol callback functions ASoC: SOF: topology: add SSP lbm kcontrol switch create function SOF: dai: add lbm status for dai ipc: dai: add loopback mode handler for dai SOF-Tools: topology: Add SOF_TKN_DAI_LBM for ssp loopback mode topology: m4: Add option for loopback mode in DAI config topology: test: Add loopback topology test & santity test with: Mininow max rt5651 and UP2 Hifiberry PRO and CNL nocodec SOF master: 792bd414ee5629f72b1e24619510d6936eac28ce SOF-Tool master: bd7dc88231f31d385340310cef467f211a739eeb https://github.com/plbossart/sound/tree/topic/sof-v4.14: 1e0f50565669815dd7daa19021b3b04a90487431 --- topology/sof/tokens.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4 index f0b3428..f2a07e4 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 "157" } SectionVendorTokens."sof_sched_tokens" { -- 2.7.4

5 8

[Sound-open-firmware] The issue of XRUN happened in Kernel and PANIC in firmware
by zhigangw 13 Jun '18

13 Jun '18

Hello All: When we use the "aplay" tool to play the audio wave file, a XRUN (under-run) would happen. It is high possibility on my APL-GPMRB platform (100%). Which is detected by Linux kernel in snd_pcm_update_state() function. This means the "hw_ptr" reaches "appl_ptr". From the log, before XRUN happened, the "hw_ptr" is updated by DSP side (through the IPC) without any problem. The "appl_ptr" is updated with about 8ms interval, but in some case, the "appl_ptr" is not updated in time. The "appl_ptr" is updated by main thread (in __snd_pcm_lib_xfer() function). Then the XRUN happens! Below is the call-stack of the "aplay" tool. The *safe_read()* function reads the audio data into local buffer from wave file. I add the timestamp log before and after this function. Usually the delta time should be very small (less than 1ms). But sometimes, the safe_read() will take more than 50ms! Note: It reads the audio data successfully at last. In this time, the underrun issue will be detected by kernel. playback_go() *safe_read()* pcm_write() writei_func() snd_pcm_writei() _snd_pcm_writei() pcm->fast_ops->writei() snd_pcm_hw_writei() ioctl(fd, SNDRV_PCM_IOCTL_WRITEI_FRAMES, &xferi) When the XRUN is detected by kernel, the recover process will start. the kernel will send STOP command to DSP by IPC, then send the START command to DSP. During the recover process, our DSP will hits panic!!! This possibility is very high on my platform (100%). Summary: 1) From the dump data of the DSP(when panic happens), DSP panic happened in the wait_for_completion_timeout() function. When it is waken up by other interrupt (slept by waiti instruction), it hits crash when loading a data into register. I checked there is no stack-overflow in this time. I do not understand the log: Exception Cause: LoadStorePIFDataErrorCause, Synchronous PIF data error during LoadStore access. Do you have any idea? 2) For the "aplay" tool's issue. the safe_read() function wastes too much time sometimes. I have no idea how to debug this issue. or we should report this issue to any other team? thanks br ~zhigang

3 3

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

13 Jun '18

add the 8-channel feature for the capture function on apl-gpmrb. 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: 1e0f50565669815dd7daa19021b3b04a90487431 sof master: b0affc18c3068225e766190aa81cad1ddb082457 soft master: 2cc3ad2a9287e8354ae9f7dc5161d7f4d4539949 Pass the regression test already: Minnowboard Turbo UP^2 CNL-RVP --- src/audio/volume.c | 359 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 359 insertions(+) diff --git a/src/audio/volume.c b/src/audio/volume.c index d0b690b..7c2044a 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -515,6 +515,356 @@ static void vol_s24_to_s24_4ch(struct comp_dev *dev, struct comp_buffer *sink, } } +/* 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, 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 * 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, 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 * 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, 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 * 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, 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 * 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, 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 * 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, 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 * 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, 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 * 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, 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 * 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, 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 * 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)); + } +} + /* 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_2ch}, @@ -535,6 +885,15 @@ static 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}, + {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}, }; /* synchronise host mmap() volume with real value */ -- 2.17.1

4 4

[Sound-open-firmware] [PATCH] dma: fix comment for num_channels_busy
by Ranjani Sridharan 13 Jun '18

13 Jun '18

Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/include/sof/dma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/sof/dma.h b/src/include/sof/dma.h index e0424b2..b8d3974 100644 --- a/src/include/sof/dma.h +++ b/src/include/sof/dma.h @@ -144,7 +144,7 @@ struct dma { struct dma_plat_data plat_data; spinlock_t lock; const struct dma_ops *ops; - atomic_t num_channels_busy; /* number of channels draining */ + atomic_t num_channels_busy; /* number of busy channels */ void *private; }; -- 2.17.1

2 1

[Sound-open-firmware] SOF build problem
by Ranjani Sridharan 13 Jun '18

13 Jun '18

Hi All, I've got some errors while building SOF (master). Is anyone else having the same issue? Thanks, Ranjani ranjani@ranjani-desktop:~/reef/sound-open-firmware$ ./scripts/xtensa- build-all.sh apl libtoolize: putting auxiliary files in '.'. libtoolize: copying file './ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'. libtoolize: copying file 'm4/libtool.m4' libtoolize: copying file 'm4/ltoptions.m4' libtoolize: copying file 'm4/ltsugar.m4' libtoolize: copying file 'm4/ltversion.m4' libtoolize: copying file 'm4/lt~obsolete.m4' configure.ac:139: error: possibly undefined macro: AC_MSG_WARN If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:309: installing './compile' configure.ac:6: installing './missing' rimage/Makefile.am: installing './depcomp' test/cmocka/Makefile.am:19: warning: 'CFLAGS' is a user variable, you should not override it; test/cmocka/Makefile.am:19: use 'AM_CFLAGS' instead test/cmocka/Makefile.am:20: warning: 'LDFLAGS' is a user variable, you should not override it; test/cmocka/Makefile.am:20: use 'AM_LDFLAGS' instead checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether UID '1000' is supported by ustar format... yes checking whether GID '1000' is supported by ustar format... yes checking how to create a ustar tar archive... gnutar checking whether to enable maintainer-specific portions of Makefiles... yes checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu ./configure: line 3340: syntax error near unexpected token `cmocka,' ./configure: line 3340: ` PKG_CHECK_EXISTS(cmock a,'

3 3

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

13 Jun '18

add the 8-channel feature for the capture function on apl-gpmrb. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> Reviewed-by: Keyon Jie <yang.jie(a)linux.intel.com> --- v2: add the CONFIG_APOLLOLAKE for specific platform, to avoid the dat size too big. --- Test with: apl-gpmrb with tdf8532 codec linux topic/sof-dev: 1e0f50565669815dd7daa19021b3b04a90487431 sof master: b0affc18c3068225e766190aa81cad1ddb082457 soft master: 2cc3ad2a9287e8354ae9f7dc5161d7f4d4539949 Pass the regression test already: Minnowboard Turbo UP^2 CNL-RVP --- src/audio/volume.c | 363 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 363 insertions(+) diff --git a/src/audio/volume.c b/src/audio/volume.c index d0b690b..5395a28 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -515,6 +515,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, 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 * 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, 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 * 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, 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 * 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, 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 * 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, 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 * 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, 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 * 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, 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 * 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, 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 * 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, 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 * 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 + /* 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_2ch}, @@ -535,6 +887,17 @@ static 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 }; /* synchronise host mmap() volume with real value */ -- 2.17.1

1 0

[Sound-open-firmware] [PATCH] pipeline: remove dmac id and dmac chan from static pipeline host and dai defs
by Ranjani Sridharan 13 Jun '18

13 Jun '18

dmac id and dmac chan no longer come from topology. So remove them. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/pipeline_static.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/audio/pipeline_static.c b/src/audio/pipeline_static.c index cf71a36..f13a4c5 100644 --- a/src/audio/pipeline_static.c +++ b/src/audio/pipeline_static.c @@ -86,11 +86,11 @@ #define SPIPE_COMP(cid, ctype, csize) \ {.id = cid, .type = ctype, .hdr.size = sizeof(struct csize)} #define SPIPE_HOST(scomp, hno_irq, hdmac, hchan, hconfig) \ - {.comp = scomp, .no_irq = hno_irq, .dmac_id = hdmac,\ - .dmac_chan = hchan, .dmac_config = hconfig} + {.comp = scomp, .no_irq = hno_irq, \ + .dmac_config = hconfig} #define SPIPE_DAI(scomp, ddai_type, ddai_idx, ddmac, dchan, dconfig) \ - {.comp = scomp, .type = ddai_type, .index = ddai_idx, .dmac_id = ddmac,\ - .dmac_chan = dchan, .dmac_config = dconfig} + {.comp = scomp, .type = ddai_type, .index = ddai_idx, \ + .dmac_config = dconfig} #define SPIPE_VOL(scomp, vmin, vmax) \ {.comp = scomp, .min_value = vmin, .max_value = vmax} #define SPIPE_MIX(scomp) {.comp = scomp} -- 2.17.1

1 0

[Sound-open-firmware] [PATCH] ipc: remove dmac id and dmac chan members from host and dai ipc comp def
by Ranjani Sridharan 13 Jun '18

13 Jun '18

The new dma_get() API does not use the dmac id and dmac chan info from topology anymore. So remove these members from the host/dai ipc comp def. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/include/uapi/ipc.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 88de113..8895ff3 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -657,8 +657,6 @@ struct sof_ipc_comp_host { struct sof_ipc_comp_config config; enum sof_ipc_stream_direction direction; uint32_t no_irq; /* don't send periodic IRQ to host/DSP */ - uint32_t dmac_id; - uint32_t dmac_chan; uint32_t dmac_config; /* DMA engine specific */ } __attribute__((packed)); @@ -669,8 +667,6 @@ struct sof_ipc_comp_dai { enum sof_ipc_stream_direction direction; uint32_t index; enum sof_ipc_dai_type type; - uint32_t dmac_id; - uint32_t dmac_chan; uint32_t dmac_config; /* DMA engine specific */ } __attribute__((packed)); -- 2.17.1

1 0

[Sound-open-firmware] [PATCH] topology: remove DMAC ID/DMAC_CHANNEL from PIPELINE/PCM/DAI definitions
by Ranjani Sridharan 12 Jun '18

12 Jun '18

The firmware no longer uses the DMAC ID and channel info from topology. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- topology/dsps/bdw.m4 | 15 --------- topology/dsps/bxt.m4 | 15 --------- topology/dsps/byt.m4 | 15 --------- topology/dsps/cht.m4 | 15 --------- topology/dsps/cnl.m4 | 15 --------- topology/dsps/hsw.m4 | 15 --------- topology/m4/dai.m4 | 6 ++-- topology/m4/pcm.m4 | 38 +++++------------------ topology/m4/pipeline.m4 | 22 +++++-------- topology/sof-apl-nocodec.m4 | 9 ++---- topology/sof-apl-tdf8532.m4 | 30 ++++++------------ topology/sof-bdw-rt286.m4 | 9 ++---- topology/sof-bdw-rt5640.m4 | 9 ++---- topology/sof-byt-da7213.m4 | 9 ++---- topology/sof-byt-nocodec.m4 | 9 ++---- topology/sof-byt-rt5640.m4 | 9 ++---- topology/sof-byt-rt5645.m4 | 9 ++---- topology/sof-byt-rt5651.m4 | 9 ++---- topology/sof-cht-max98090.m4 | 9 ++---- topology/sof-cht-nocodec.m4 | 9 ++---- topology/sof-cnl-rt274.m4 | 6 ++-- topology/sof-hsw-rt5640.m4 | 9 ++---- topology/sof/pipe-dai-capture.m4 | 2 +- topology/sof/pipe-dai-playback.m4 | 2 +- topology/sof/pipe-low-latency-capture.m4 | 4 +-- topology/sof/pipe-low-latency-playback.m4 | 4 +-- topology/sof/pipe-passthrough-capture.m4 | 4 +-- topology/sof/pipe-passthrough-playback.m4 | 4 +-- topology/sof/pipe-pcm-media.m4 | 4 +-- topology/sof/pipe-src-capture.m4 | 4 +-- topology/sof/pipe-src-playback.m4 | 4 +-- topology/sof/pipe-volume-capture.m4 | 4 +-- topology/sof/pipe-volume-playback.m4 | 4 +-- topology/sof/tokens.m4 | 4 --- topology/test/test-all.m4 | 6 ++-- topology/test/test-capture.m4 | 3 +- topology/test/test-playback.m4 | 3 +- 37 files changed, 86 insertions(+), 261 deletions(-) diff --git a/topology/dsps/bdw.m4 b/topology/dsps/bdw.m4 index c2bf04e..1af6699 100644 --- a/topology/dsps/bdw.m4 +++ b/topology/dsps/bdw.m4 @@ -25,21 +25,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens) -# DAI0 platform playback configuration -W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "0"')) - -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_CHAN "1"')) - -W_DATA(dai0c_plat_conf, dai0c_plat_tokens) - -# PCM platform configuration -W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN PIPELINE_DMAC_CHAN')) - -W_DATA(pcm_plat_conf, pcm_plat_tokens) - # DAI schedule Configuration - scheduled by IRQ W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF_TKN_SCHED_MIPS "5000"')) diff --git a/topology/dsps/bxt.m4 b/topology/dsps/bxt.m4 index 472fa88..7626513 100644 --- a/topology/dsps/bxt.m4 +++ b/topology/dsps/bxt.m4 @@ -28,21 +28,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens) -# DAI0 platform playback configuration -W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "0"')) - -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 "0"', `SOF_TKN_DAI_DMAC_CHAN "1"')) - -W_DATA(dai0c_plat_conf, dai0c_plat_tokens) - -# PCM platform configuration -W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN PIPELINE_DMAC_CHAN')) - -W_DATA(pcm_plat_conf, pcm_plat_tokens) - # DAI schedule Configuration - scheduled by IRQ W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF_TKN_SCHED_MIPS "5000"')) diff --git a/topology/dsps/byt.m4 b/topology/dsps/byt.m4 index d1d4886..a25d993 100644 --- a/topology/dsps/byt.m4 +++ b/topology/dsps/byt.m4 @@ -25,21 +25,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens) -# DAI0 platform playback configuration -W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "0"')) - -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_CHAN "1"')) - -W_DATA(dai0c_plat_conf, dai0c_plat_tokens) - -# PCM platform configuration -W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN PIPELINE_DMAC_CHAN')) - -W_DATA(pcm_plat_conf, pcm_plat_tokens) - # DAI schedule Configuration - scheduled by IRQ W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF_TKN_SCHED_MIPS "5000"')) diff --git a/topology/dsps/cht.m4 b/topology/dsps/cht.m4 index 4ed114f..b6317cd 100644 --- a/topology/dsps/cht.m4 +++ b/topology/dsps/cht.m4 @@ -25,21 +25,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens) -# DAI0 platform playback configuration -W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "0"')) - -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_CHAN "1"')) - -W_DATA(dai0c_plat_conf, dai0c_plat_tokens) - -# PCM platform configuration -W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN PIPELINE_DMAC_CHAN')) - -W_DATA(pcm_plat_conf, pcm_plat_tokens) - # DAI schedule Configuration - scheduled by IRQ W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF_TKN_SCHED_MIPS "5000"')) diff --git a/topology/dsps/cnl.m4 b/topology/dsps/cnl.m4 index 41ece94..96bf6de 100644 --- a/topology/dsps/cnl.m4 +++ b/topology/dsps/cnl.m4 @@ -29,21 +29,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens) -# DAI0 platform playback configuration -W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "0"')) - -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_CHAN "1"')) - -W_DATA(dai0c_plat_conf, dai0c_plat_tokens) - -# PCM platform configuration -W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN PIPELINE_DMAC_CHAN')) - -W_DATA(pcm_plat_conf, pcm_plat_tokens) - # DAI schedule Configuration - scheduled by IRQ W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF_TKN_SCHED_MIPS "5000"')) diff --git a/topology/dsps/hsw.m4 b/topology/dsps/hsw.m4 index 754fc41..c096732 100644 --- a/topology/dsps/hsw.m4 +++ b/topology/dsps/hsw.m4 @@ -25,21 +25,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens) -# DAI0 platform playback configuration -W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "0"')) - -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_CHAN "1"')) - -W_DATA(dai0c_plat_conf, dai0c_plat_tokens) - -# PCM platform configuration -W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN PIPELINE_DMAC_CHAN')) - -W_DATA(pcm_plat_conf, pcm_plat_tokens) - # DAI schedule Configuration - scheduled by IRQ W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF_TKN_SCHED_MIPS "5000"')) diff --git a/topology/m4/dai.m4 b/topology/m4/dai.m4 index a349a3c..bd67413 100644 --- a/topology/m4/dai.m4 +++ b/topology/m4/dai.m4 @@ -7,7 +7,7 @@ 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, dai_link, format, periods_sink, periods_source, preload, data) +dnl W_DAI_OUT(type, index, dai_link, format, periods_sink, periods_source, preload) define(`W_DAI_OUT', `SectionVendorTuples."'N_DAI_OUT($2)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' @@ -57,11 +57,10 @@ define(`W_DAI_OUT', ` "'N_DAI_OUT($2)`_data_w_comp"' ` "'N_DAI_OUT($2)`_data_str"' ` "'N_DAI_OUT($2)`_data_comp_str"' -` "'$8`"' ` ]' `}') -dnl W_DAI_IN(type, index, dai_link, format, periods_sink, periods_source, preload, data) +dnl W_DAI_IN(type, index, dai_link, format, periods_sink, periods_source, preload) define(`W_DAI_IN', `SectionVendorTuples."'N_DAI_IN($2)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' @@ -111,7 +110,6 @@ define(`W_DAI_IN', ` "'N_DAI_IN($2)`_data_w_comp"' ` "'N_DAI_IN($2)`_data_str"' ` "'N_DAI_IN($2)`_data_comp_str"' -` "'$8`"' ` ]' `}') diff --git a/topology/m4/pcm.m4 b/topology/m4/pcm.m4 index 40a3b17..51775fb 100644 --- a/topology/m4/pcm.m4 +++ b/topology/m4/pcm.m4 @@ -6,72 +6,50 @@ dnl PCM name) define(`N_PCMP', `PCM'$1`P') define(`N_PCMC', `PCM'$1`C') -dnl W_PCM_PLAYBACK(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload) +dnl W_PCM_PLAYBACK(pcm, stream, 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($5) -` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6) -` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) +` 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_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($3) -` SOF_TKN_PCM_DMAC_CHAN' STR($4) -` }' -`}' -`SectionData."'N_PCMP($1)`_data" {' -` tuples "'N_PCMP($1)`_tuples"' -`}' `SectionWidget."'N_PCMP($1)`" {' ` index "'PIPELINE_ID`"' ` type "aif_in"' ` no_pm "true"' ` stream_name "'$2` '$1`"' ` data [' -` "'N_PCMP($1)`_data"' ` "'N_PCMP($1)`_data_w_comp"' ` ]' `}') -dnl W_PCM_CAPTURE(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload) +dnl W_PCM_CAPTURE(pcm, stream, 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($5) -` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6) -` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) +` 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_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($3) -` SOF_TKN_PCM_DMAC_CHAN' STR($4) -` }' -`}' -`SectionData."'N_PCMC($1)`_data" {' -` tuples "'N_PCMC($1)`_tuples"' -`}' `SectionWidget."'N_PCMC($1)`" {' ` index "'PIPELINE_ID`"' ` type "aif_out"' ` no_pm "true"' ` stream_name "'$2` '$1`"' ` data [' -` "'N_PCMC($1)`_data"' ` "'N_PCMC($1)`_data_w_comp"' ` ]' `}') diff --git a/topology/m4/pipeline.m4 b/topology/m4/pipeline.m4 index 7a91439..0cfe486 100644 --- a/topology/m4/pipeline.m4 +++ b/topology/m4/pipeline.m4 @@ -33,7 +33,7 @@ define(`W_PIPELINE', dnl PIPELINE_PCM_ADD(pipeline, dnl pipe id, pcm, max channels, format, -dnl frames, deadline, priority, core, dmac, dmac_chan) +dnl frames, deadline, priority, core) define(`PIPELINE_PCM_ADD', `undefine(`PCM_ID')' `undefine(`PIPELINE_ID')' @@ -43,8 +43,6 @@ define(`PIPELINE_PCM_ADD', `undefine(`SCHEDULE_DEADLINE')' `undefine(`SCHEDULE_PRIORITY')' `undefine(`SCHEDULE_CORE')' -`undefine(`PIPELINE_DMAC')' -`undefine(`PIPELINE_DMAC_CHAN')' `define(`PIPELINE_ID', $2)' `define(`PCM_ID', $3)' `define(`PIPELINE_CHANNELS', $4)' @@ -53,14 +51,12 @@ define(`PIPELINE_PCM_ADD', `define(`SCHEDULE_DEADLINE', $7)' `define(`SCHEDULE_PRIORITY', $8)' `define(`SCHEDULE_CORE', $9)' -`define(`PIPELINE_DMAC', $10)' -`define(`PIPELINE_DMAC_CHAN', $11)' `include($1)' ) dnl PIPELINE_PCM_DAI_ADD(pipeline, dnl pipe id, pcm, max channels, format, -dnl frames, deadline, priority, core, dmac, dmac_chan, +dnl frames, deadline, priority, core, dnl dai type, dai_index, dai format, periods) define(`PIPELINE_PCM_DAI_ADD', `undefine(`PCM_ID')' @@ -71,8 +67,6 @@ define(`PIPELINE_PCM_DAI_ADD', `undefine(`SCHEDULE_DEADLINE')' `undefine(`SCHEDULE_PRIORITY')' `undefine(`SCHEDULE_CORE')' -`undefine(`PIPELINE_DMAC')' -`undefine(`PIPELINE_DMAC_CHAN')' `undefine(`DAI_TYPE')' `undefine(`DAI_INDEX')' `undefine(`DAI_FORMAT')' @@ -85,13 +79,11 @@ define(`PIPELINE_PCM_DAI_ADD', `define(`SCHEDULE_DEADLINE', $7)' `define(`SCHEDULE_PRIORITY', $8)' `define(`SCHEDULE_CORE', $9)' -`define(`PIPELINE_DMAC', $10)' -`define(`PIPELINE_DMAC_CHAN', $11)' -`define(`DAI_TYPE', STR($12))' -`define(`DAI_INDEX', STR($13))' -`define(`DAI_FORMAT', $14)' -`define(`DAI_PERIODS', $15)' -`define(`DAI_NAME', $12$13)' +`define(`DAI_TYPE', STR($10))' +`define(`DAI_INDEX', STR($11))' +`define(`DAI_FORMAT', $12)' +`define(`DAI_PERIODS', $13)' +`define(`DAI_NAME', $10$11)' `include($1)' ) diff --git a/topology/sof-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4 index ac3ee75..32a3b86 100644 --- a/topology/sof-apl-nocodec.m4 +++ b/topology/sof-apl-nocodec.m4 @@ -30,24 +30,21 @@ include(`dsps/bxt.m4') # 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_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) + 48, 1000, 0, 0) # 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) # 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) # 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/sof-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4 index 776f8d5..a0b44e2 100644 --- a/topology/sof-apl-tdf8532.m4 +++ b/topology/sof-apl-tdf8532.m4 @@ -33,73 +33,63 @@ include(`dsps/bxt.m4') # 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) + 48, 1000, 0, 0, SSP, 4, s32le, 2) # Low Latency playback pipeline 2 on PCM 1 using max 8 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, 8, s32le, - 48, 1000, 0, 0, 0, 1, SSP, 2, s32le, 2) + 48, 1000, 0, 0, SSP, 2, s32le, 2) # Low Latency capture pipeline 3 on PCM 1 using max 8 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, 8, s32le, - 48, 1000, 0, 0, 0, 1, SSP, 2, s32le, 2) + 48, 1000, 0, 0, SSP, 2, s32le, 2) # Low Latency playback pipeline 4 on PCM 2 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, 4, 2, 2, s16le, - 48, 1000, 0, 0, 0, 1, SSP, 0, s16le, 2) + 48, 1000, 0, 0, SSP, 0, s16le, 2) # Low Latency capture pipeline 5 on PCM 2 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-capture.m4, 5, 2, 2, s16le, - 48, 1000, 0, 0, 0, 1, SSP, 0, s16le, 2) + 48, 1000, 0, 0, SSP, 0, s16le, 2) # Low Latency capture pipeline 6 on PCM 3 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-capture.m4, 6, 3, 2, s16le, - 48, 1000, 0, 0, 0, 1, SSP, 1, s16le, 2) + 48, 1000, 0, 0, SSP, 1, s16le, 2) # Low Latency playback pipeline 7 on PCM 4 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, 7, 4, 2, s16le, - 48, 1000, 0, 0, 0, 1, SSP, 3, s16le, 2) + 48, 1000, 0, 0, SSP, 3, s16le, 2) # Low Latency capture pipeline 8 on PCM 4 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-capture.m4, 8, 4, 2, s16le, - 48, 1000, 0, 0, 0, 1, SSP, 3, s16le, 2) + 48, 1000, 0, 0, SSP, 3, s16le, 2) # Low Latency playback pipeline 9 on PCM 5 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, 9, 5, 2, s16le, - 48, 1000, 0, 0, 0, 1, SSP, 5, s16le, 2) + 48, 1000, 0, 0, SSP, 5, s16le, 2) # Low Latency capture pipeline 10 on PCM 5 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-capture.m4, 10, 5, 2, s16le, - 48, 1000, 0, 0, 0, 1, SSP, 5, s16le, 2) + 48, 1000, 0, 0, SSP, 5, s16le, 2) # diff --git a/topology/sof-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4 index 6d09e2e..d1ef535 100644 --- a/topology/sof-bdw-rt286.m4 +++ b/topology/sof-bdw-rt286.m4 @@ -30,24 +30,21 @@ include(`dsps/bdw.m4') # 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_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 1, 1) + 48, 1000, 0, 0) # 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, 1, 2) + 48, 1000, 0, 0) # 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, 1, 3) + 96, 2000, 1, 0) # 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/sof-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4 index 2f9badb..258ecc4 100644 --- a/topology/sof-bdw-rt5640.m4 +++ b/topology/sof-bdw-rt5640.m4 @@ -30,24 +30,21 @@ include(`dsps/bdw.m4') # 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_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 1, 1) + 48, 1000, 0, 0) # 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, 1, 2) + 48, 1000, 0, 0) # 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, 1, 3) + 96, 2000, 1, 0) # 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/sof-byt-da7213.m4 b/topology/sof-byt-da7213.m4 index 090b034..a89e51b 100644 --- a/topology/sof-byt-da7213.m4 +++ b/topology/sof-byt-da7213.m4 @@ -30,24 +30,21 @@ include(`dsps/byt.m4') # 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_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) + 48, 1000, 0, 0) # 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) # 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) # 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/sof-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4 index 9bed36e..b305d27 100644 --- a/topology/sof-byt-nocodec.m4 +++ b/topology/sof-byt-nocodec.m4 @@ -30,24 +30,21 @@ include(`dsps/byt.m4') # 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_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) + 48, 1000, 0, 0) # 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) # 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) # 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/sof-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4 index f852616..aafa10f 100644 --- a/topology/sof-byt-rt5640.m4 +++ b/topology/sof-byt-rt5640.m4 @@ -30,24 +30,21 @@ include(`dsps/byt.m4') # 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_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) + 48, 1000, 0, 0) # 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) # 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) # 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/sof-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4 index 7d8eee5..415bc0a 100644 --- a/topology/sof-byt-rt5645.m4 +++ b/topology/sof-byt-rt5645.m4 @@ -30,24 +30,21 @@ include(`dsps/byt.m4') # 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_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) + 48, 1000, 0, 0) # 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) # 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) # 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/sof-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4 index 894602a..14e45c0 100644 --- a/topology/sof-byt-rt5651.m4 +++ b/topology/sof-byt-rt5651.m4 @@ -30,24 +30,21 @@ include(`dsps/byt.m4') # 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_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) + 48, 1000, 0, 0) # 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) # 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) # 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/sof-cht-max98090.m4 b/topology/sof-cht-max98090.m4 index 2d5192a..e02056c 100644 --- a/topology/sof-cht-max98090.m4 +++ b/topology/sof-cht-max98090.m4 @@ -30,24 +30,21 @@ include(`dsps/cht.m4') # 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_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) + 48, 1000, 0, 0) # 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) # 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) # 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/sof-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4 index 68abf37..f56a7a5 100644 --- a/topology/sof-cht-nocodec.m4 +++ b/topology/sof-cht-nocodec.m4 @@ -30,24 +30,21 @@ include(`dsps/cht.m4') # 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_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) + 48, 1000, 0, 0) # 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) # 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) # 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/sof-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4 index 25a4913..a805f9e 100644 --- a/topology/sof-cnl-rt274.m4 +++ b/topology/sof-cnl-rt274.m4 @@ -26,17 +26,15 @@ include(`dsps/cnl.m4') # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le. # 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, s24le, - 48, 1000, 0, 0, 0, 1, SSP, 0, s24le, 2) + 48, 1000, 0, 0, SSP, 0, s24le, 2) # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. # 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, 2, s24le, - 48, 1000, 0, 0, 0, 1, SSP, 0, s24le, 2) + 48, 1000, 0, 0, SSP, 0, s24le, 2) # # DAI configuration diff --git a/topology/sof-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4 index 22d79d5..c99f39b 100644 --- a/topology/sof-hsw-rt5640.m4 +++ b/topology/sof-hsw-rt5640.m4 @@ -30,24 +30,21 @@ include(`dsps/hsw.m4') # 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_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, - 48, 1000, 0, 0, 1, 1) + 48, 1000, 0, 0) # 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, 1, 2) + 48, 1000, 0, 0) # 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, 1, 3) + 192, 4000, 1, 0) # 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/sof/pipe-dai-capture.m4 b/topology/sof/pipe-dai-capture.m4 index 3f16f87..c69d586 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_BE, DAI_FORMAT, 2, 0, 0, dai0c_plat_conf) +W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 2, 0, 0) # # DAI pipeline - always use 0 for DAIs diff --git a/topology/sof/pipe-dai-playback.m4 b/topology/sof/pipe-dai-playback.m4 index 2397875..804b180 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_BE, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf) +W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2) # # DAI pipeline - always use 0 for DAIs diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index 39be2bc..39c2cce 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -27,9 +27,9 @@ C_CONTROLMIXER(PCM PCM_ID Capture Volume, PIPELINE_ID, # Components and Buffers # -# Host "Low Latency Capture" PCM uses pipeline DMAC and channel +# Host "Low Latency Capture" PCM # with 0 sink and 2 source periods -W_PCM_CAPTURE(PCM_ID, Low Latency Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 0) +W_PCM_CAPTURE(PCM_ID, Low Latency Capture, 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 PIPELINE_ID")) diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index b40b793..8cfe5e4 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -52,9 +52,9 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, # Components and Buffers # -# Host "Low latency Playback" PCM uses pipeline DMAC and channel +# Host "Low latency Playback" PCM # with 2 sink and 0 source periods -W_PCM_PLAYBACK(PCM_ID, Low Latency Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Low Latency Playback, 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 PIPELINE_ID")) diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4 index c6850f9..1dc695c 100644 --- a/topology/sof/pipe-passthrough-capture.m4 +++ b/topology/sof/pipe-passthrough-capture.m4 @@ -15,9 +15,9 @@ include(`pipeline.m4') # Components and Buffers # -# Host "Passthrough Capture" PCM uses pipeline DMAC and channel +# Host "Passthrough Capture" PCM # with 0 sink and 2 source periods -W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, 0, 2, 2) # Capture Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index e2cd645..c7c1237 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -15,9 +15,9 @@ include(`pipeline.m4') # Components and Buffers # -# Host "Passthrough Playback" PCM uses pipeline DMAC and channel +# Host "Passthrough Playback" PCM # with 2 sink and 0 source periods -W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, 2, 0, 2) # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index 7f68977..b526e43 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -40,9 +40,9 @@ W_DATA(media_src_conf, media_src_tokens) # Components and Buffers # -# Host "Low latency Playback" PCM uses pipeline DMAC and channel +# Host "Low latency Playback" PCM # with 2 sink and 0 source periods -W_PCM_PLAYBACK(PCM_ID, Media Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Media Playback, 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 PIPELINE_ID")) diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4 index 6211d33..e0a68e4 100644 --- a/topology/sof/pipe-src-capture.m4 +++ b/topology/sof/pipe-src-capture.m4 @@ -16,9 +16,9 @@ include(`pipeline.m4') # Components and Buffers # -# Host "Passthrough Capture" PCM uses pipeline DMAC and channel +# Host "Passthrough Capture" PCM # with 4 sink and 0 source periods -W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, 4, 0, 2) # # SRC Configuration diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4 index 119ee2c..1699198 100644 --- a/topology/sof/pipe-src-playback.m4 +++ b/topology/sof/pipe-src-playback.m4 @@ -16,9 +16,9 @@ include(`pipeline.m4') # Components and Buffers # -# Host "Passthrough Playback" PCM uses pipeline DMAC and channel +# Host "Passthrough Playback" PCM # with 4 sink and 0 source periods -W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, 4, 0, 2) # # SRC Configuration diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 6b768e3..820b745 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -29,9 +29,9 @@ C_CONTROLMIXER(Master Capture Volume, PIPELINE_ID, # Components and Buffers # -# Host "Passthrough Capture" PCM uses pipeline DMAC and channel +# Host "Passthrough Capture" PCM # with 0 sink and 2 source periods -W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, 0, 2, 2) # "Volume" has 2 source and 2 sink periods W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Capture Volume PIPELINE_ID")) diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index f3203f7..4ebd02d 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -29,9 +29,9 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, # Components and Buffers # -# Host "Passthrough Playback" PCM uses pipeline DMAC and channel +# Host "Passthrough Playback" PCM # with 2 sink and 0 source periods -W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, 2, 0, 2) # "Volume" has 2 source and 2 sink periods W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Playback Volume PIPELINE_ID")) diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4 index d1230d8..f0b3428 100644 --- a/topology/sof/tokens.m4 +++ b/topology/sof/tokens.m4 @@ -15,8 +15,6 @@ SectionVendorTokens."sof_buffer_tokens" { } SectionVendorTokens."sof_dai_tokens" { - SOF_TKN_DAI_DMAC "151" - SOF_TKN_DAI_DMAC_CHAN "152" SOF_TKN_DAI_DMAC_CONFIG "153" SOF_TKN_DAI_TYPE "154" SOF_TKN_DAI_INDEX "155" @@ -43,8 +41,6 @@ SectionVendorTokens."sof_src_tokens" { } SectionVendorTokens."sof_pcm_tokens" { - SOF_TKN_PCM_DMAC "351" - SOF_TKN_PCM_DMAC_CHAN "352" SOF_TKN_PCM_DMAC_CONFIG "353" } diff --git a/topology/test/test-all.m4 b/topology/test/test-all.m4 index 383a397..2a4dae4 100644 --- a/topology/test/test-all.m4 +++ b/topology/test/test-all.m4 @@ -39,21 +39,19 @@ include(`dsps/byt.m4') # Passthrough playback pipeline 1 on PCM 0 using max 2 channels of s24le. # 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-TEST_PIPE_NAME-playback.m4, 1, 0, 2, TEST_PIPE_FORMAT, - 48, 1000, 0, 0, 0, 1, + 48, 1000, 0, 0, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2) # Passthrough playback pipeline 2 on PCM 0 using max 2 channels of s24le. # 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-TEST_PIPE_NAME-capture.m4, 2, 0, 2, TEST_PIPE_FORMAT, - 48, 1000, 0, 0, 0, 1, + 48, 1000, 0, 0, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2) # diff --git a/topology/test/test-capture.m4 b/topology/test/test-capture.m4 index bed59c4..7e5ca86 100644 --- a/topology/test/test-capture.m4 +++ b/topology/test/test-capture.m4 @@ -39,11 +39,10 @@ include(`dsps/byt.m4') # Passthrough playback pipeline 2 on PCM 0 using max 2 channels of s24le. # 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-TEST_PIPE_NAME-capture.m4, 2, 0, 2, TEST_PIPE_FORMAT, - 48, 1000, 0, 0, 0, 1, + 48, 1000, 0, 0, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2) # diff --git a/topology/test/test-playback.m4 b/topology/test/test-playback.m4 index b0f3fec..ade8a8e 100644 --- a/topology/test/test-playback.m4 +++ b/topology/test/test-playback.m4 @@ -39,11 +39,10 @@ include(`dsps/byt.m4') # Passthrough playback pipeline 1 on PCM 0 using max 2 channels of s24le. # 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-TEST_PIPE_NAME-playback.m4, 1, 0, 2, TEST_PIPE_FORMAT, - 48, 1000, 0, 0, 0, 1, + 48, 1000, 0, 0, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2) # # DAI configuration -- 2.17.1

1 0

[Sound-open-firmware] SOF sof_ipc_fw_version format
by Wittbrodt, WojciechX 12 Jun '18

12 Jun '18

Hi, I have a question about SOF_FW\src\include\uapi\ipc.h sof_ipc_fw_version struct. struct sof_ipc_fw_version { uint16_t major; uint16_t minor; uint16_t build; uint8_t date[12]; uint8_t time[10]; uint8_t tag[6]; } __attribute__((packed)); First of all, what is tag, how is it used and how do we read it? Also for date and time fields, what are the used formats for date and time and how should we retrieve them from the arrays? -------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited.

2 1

[Sound-open-firmware] [PATCH] scripts: docker: remove sudo command
by Xiuli Pan 12 Jun '18

12 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> miss some sudo command, remove all sudo command. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- scripts/docker_build/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/docker_build/Dockerfile b/scripts/docker_build/Dockerfile index 9c6ce85..a623cda 100644 --- a/scripts/docker_build/Dockerfile +++ b/scripts/docker_build/Dockerfile @@ -68,14 +68,16 @@ ENV HOME /home/sof USER sof RUN cd /home/sof && git clone https://github.com/01org/osadsp-crosstool-ng.git /home/sof/ct-ng.git && \ -cd ct-ng.git && ./bootstrap && ./configure --prefix=`pwd` && \ + mkdir -p /home/sof/work/ && \ + cd ct-ng.git && ./bootstrap && ./configure --prefix=`pwd` && \ make && make install && \ for arch in byt hsw bxt cnl; do \ ./ct-ng xtensa-${arch}-elf && \ - ./ct-ng build ; \ + sed -i 's#${CT_TOP_DIR}\/builds#\/home\/sof\/work#g' .config && \ + ./ct-ng build && \ + ./ct-ng distclean ; \ done && \ - mkdir -p /home/sof/work/ && \ - cp -r builds/xtensa-*-elf /home/sof/work/ && cd /home/sof/ && sudo rm -rf ct-ng.git + cd /home/sof/ && rm -rf ct-ng.git ENV PATH="/home/sof/work/xtensa-byt-elf/bin:${PATH}" ENV PATH="/home/sof/work/xtensa-hsw-elf/bin:${PATH}" @@ -91,7 +93,7 @@ RUN cd /home/sof && git clone https://github.com/jcmvbkbc/newlib-xtensa.git newl make install && \ make distclean; \ done && \ - cd /home/sof/ && sudo rm -rf newlib-xtensa.git + cd /home/sof/ && rm -rf newlib-xtensa.git # Create direcroties for the host machines sof/soft directories to be mounted. -- 2.7.4

3 2

[Sound-open-firmware] [PATCH] platform: extract common API from platform headers.
by Liam Girdwood 12 Jun '18

12 Jun '18

From: Marcin Maka <marcin.maka(a)linux.intel.com> Common platform API separated to avoid duplicated declarations and group public functions to be implemented by every platform. Signed-off-by: Marcin Maka <marcin.maka(a)linux.intel.com> --- src/include/sof/panic.h | 4 +- src/include/sof/platform.h | 60 +++++++++++++++++++ .../apollolake/include/platform/platform.h | 15 ++--- .../baytrail/include/platform/platform.h | 16 ++--- .../cannonlake/include/platform/platform.h | 16 ++--- .../haswell/include/platform/platform.h | 16 ++--- 6 files changed, 83 insertions(+), 44 deletions(-) create mode 100644 src/include/sof/platform.h diff --git a/src/include/sof/panic.h b/src/include/sof/panic.h index 3efb659..7c19939 100644 --- a/src/include/sof/panic.h +++ b/src/include/sof/panic.h @@ -58,9 +58,7 @@ static inline void panic_rewind(uint32_t p, uint32_t stack_rewind_frames) p = dump_stack(p, ext_offset, stack_rewind_frames, count * sizeof(uint32_t)); - /* TODO: send IPC oops message to host */ - - /* panic */ + /* panic - send IPC oops message to host */ platform_panic(p); /* flush last trace messages */ diff --git a/src/include/sof/platform.h b/src/include/sof/platform.h new file mode 100644 index 0000000..8b228ee --- /dev/null +++ b/src/include/sof/platform.h @@ -0,0 +1,60 @@ +/* + * 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: Marcin Maka <marcin.maka(a)linux.intel.com> + */ + +#ifndef __INCLUDE_SOF_PLATFORM_H__ +#define __INCLUDE_SOF_PLATFORM_H__ + +#include <sof/sof.h> + +/* + * APIs declared here are defined for every platform. + */ + +/** + * \brief Platform specific implementation of the On Boot Complete handler. + * \param[in] boot_message Boot status code. + * \return 0 if successful, error code otherwise. + */ +int platform_boot_complete(uint32_t boot_message); + +/** + * \brief Platform initialization entry, called during FW initialization. + * \param[in] sof Context. + * \return 0 if successful, error code otherwise. + */ +int platform_init(struct sof *sof); + +/** + * \brief Called by the panic handler. + * \param[in] p Panic cause, one of SOF_IPC_PANIC_... codes. + */ +static inline void platform_panic(uint32_t p); + +#endif diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index 6d51752..1321f1f 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -33,6 +33,7 @@ #ifndef __PLATFORM_PLATFORM_H__ #define __PLATFORM_PLATFORM_H__ +#include <sof/platform.h> #include <platform/platcfg.h> #include <platform/shim.h> #include <platform/interrupt.h> @@ -120,11 +121,11 @@ struct sof; #define PLATFORM_NUM_SSP 6 /* Platform defined panic code */ -#define platform_panic(__x) { \ - mailbox_sw_reg_write(SRAM_REG_FW_STATUS, \ - (0xdead000 | (__x)) & 0x3fffffff); \ - ipc_write(IPC_DIPCIE, MAILBOX_EXCEPTION_OFFSET + 2 * 0x20000); \ - ipc_write(IPC_DIPCI, 0x80000000 | ((0xdead000 | (__x)) & 0x3fffffff)); \ +static inline void platform_panic(uint32_t p) +{ + mailbox_sw_reg_write(SRAM_REG_FW_STATUS, p & 0x3fffffff); + ipc_write(IPC_DIPCIE, MAILBOX_EXCEPTION_OFFSET + 2 * 0x20000); + ipc_write(IPC_DIPCI, 0x80000000 | (p & 0x3fffffff)); } /* Platform defined trace code */ @@ -137,10 +138,6 @@ extern struct timer *platform_timer; * APIs declared here are defined for every platform and IPC mechanism. */ -int platform_boot_complete(uint32_t boot_message); - -int platform_init(struct sof *sof); - int platform_ssp_set_mn(uint32_t ssp_port, uint32_t source, uint32_t rate, uint32_t bclk_fs); diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 6a7ebc9..1defe27 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -33,6 +33,7 @@ #ifndef __PLATFORM_PLATFORM_H__ #define __PLATFORM_PLATFORM_H__ +#include <sof/platform.h> #include <platform/shim.h> #include <platform/interrupt.h> #include <uapi/ipc.h> @@ -102,20 +103,13 @@ struct sof; #define PLATFORM_IDLE_TIME 750000 /* Platform defined panic code */ -#define platform_panic(__x) { \ - shim_write(SHIM_IPCDL, (0xdead000 | (__x & 0xfff))); \ - shim_write(SHIM_IPCDH, (SHIM_IPCDH_BUSY | MAILBOX_EXCEPTION_OFFSET)); \ +static inline void platform_panic(uint32_t p) +{ + shim_write(SHIM_IPCDL, p); + shim_write(SHIM_IPCDH, (SHIM_IPCDH_BUSY | MAILBOX_EXCEPTION_OFFSET)); } /* Platform defined trace code */ #define platform_trace_point(__x) \ shim_write(SHIM_IPCXL, (__x & 0x3fffffff)) -/* - * APIs declared here are defined for every platform and IPC mechanism. - */ - -int platform_boot_complete(uint32_t boot_message); - -int platform_init(struct sof *sof); - #endif diff --git a/src/platform/cannonlake/include/platform/platform.h b/src/platform/cannonlake/include/platform/platform.h index 88614ab..c7d4a82 100644 --- a/src/platform/cannonlake/include/platform/platform.h +++ b/src/platform/cannonlake/include/platform/platform.h @@ -34,6 +34,7 @@ #ifndef __PLATFORM_PLATFORM_H__ #define __PLATFORM_PLATFORM_H__ +#include <sof/platform.h> #include <platform/platcfg.h> #include <platform/shim.h> #include <platform/interrupt.h> @@ -117,12 +118,11 @@ struct sof; #define PLATFORM_IDLE_TIME 750000 /* Platform defined trace code */ -#define platform_panic(__x) { \ - mailbox_sw_reg_write(SRAM_REG_FW_STATUS, \ - (0xdead000 | (__x)) & 0x3fffffff); \ - ipc_write(IPC_DIPCIDD, MAILBOX_EXCEPTION_OFFSET + 2 * 0x20000); \ - ipc_write(IPC_DIPCIDR, 0x80000000 | \ - ((0xdead000 | (__x)) & 0x3fffffff)); \ +static inline void platform_panic(uint32_t p) +{ + mailbox_sw_reg_write(SRAM_REG_FW_STATUS, p & 0x3fffffff); + ipc_write(IPC_DIPCIDD, MAILBOX_EXCEPTION_OFFSET + 2 * 0x20000); + ipc_write(IPC_DIPCIDR, 0x80000000 | (p & 0x3fffffff)); } /* Platform defined trace code */ @@ -135,10 +135,6 @@ extern struct timer *platform_timer; * APIs declared here are defined for every platform and IPC mechanism. */ -int platform_boot_complete(uint32_t boot_message); - -int platform_init(struct sof *sof); - int platform_ssp_set_mn(uint32_t ssp_port, uint32_t source, uint32_t rate, uint32_t bclk_fs); diff --git a/src/platform/haswell/include/platform/platform.h b/src/platform/haswell/include/platform/platform.h index d30f329..b3d0609 100644 --- a/src/platform/haswell/include/platform/platform.h +++ b/src/platform/haswell/include/platform/platform.h @@ -32,6 +32,7 @@ #ifndef __PLATFORM_PLATFORM_H__ #define __PLATFORM_PLATFORM_H__ +#include <sof/platform.h> #include <platform/shim.h> #include <platform/interrupt.h> #include <uapi/ipc.h> @@ -101,20 +102,13 @@ struct sof; #define PLATFORM_IDLE_TIME 750000 /* Platform defined panic code */ -#define platform_panic(__x) { \ - shim_write(SHIM_IPCX, MAILBOX_EXCEPTION_OFFSET & 0x3fffffff); \ - shim_write(SHIM_IPCD, (SHIM_IPCD_BUSY | 0xdead000 | __x)); \ +static inline void platform_panic(uint32_t p) +{ + shim_write(SHIM_IPCX, MAILBOX_EXCEPTION_OFFSET & 0x3fffffff); + shim_write(SHIM_IPCD, (SHIM_IPCD_BUSY | p)) } /* Platform defined trace code */ #define platform_trace_point(__x) \ shim_write(SHIM_IPCX, ((__x) & 0x3fffffff)) -/* - * APIs declared here are defined for every platform and IPC mechanism. - */ - -int platform_boot_complete(uint32_t boot_message); - -int platform_init(struct sof *sof); - #endif -- 2.17.0

8 15

[Sound-open-firmware] [PATCH v4 0/5] New API for dma_get()
by Ranjani Sridharan 12 Jun '18

12 Jun '18

This set of patches proposes a new API for dma_get() that procures a DMAC based on the requested copy dir, caps, dev type and flags indicating shared/exclusive access. It also updates the existing user of dma_get() to use the new API based on the specific usage. The API uses the number of channels draning in each DMAC to balance the load between the platform DMAC's for users requesting shared access privilege. This provides a primitive level of QoS and prevents overloading any DMAC. The platform DMAC definitions have also been updated to include information about copy capabilities supported and the type of DMA. Test Results: 1. Minnowboard Turbot w 5651: Passed all feature tests 2. Up Squared Board w Hifiberry DAC+: Passed all playback feature tests v4 changes: 1. Modified platform DMAC definition with copy cap, copy dir dev types supported 2. Modified dma_get() API to request DMAC based on above criteria Ranjani Sridharan (5): platform: dma: move dmac initialization dma: update platform DMAC definitions with the supported dev types, dir and capabilities dma: introduce parameter to store the number of channels draining dma: Introduce new API for dma_get() dma:trace: dma_copy_new() does not need DMAC ID anymore src/arch/xtensa/Makefile.am | 1 + src/audio/dai.c | 7 +- src/audio/host.c | 14 +-- src/drivers/dw-dma.c | 13 ++- src/drivers/hda-dma.c | 10 ++- src/host/common_test.c | 2 +- src/include/sof/dma.h | 43 ++++++--- src/ipc/apl-ipc.c | 8 +- src/ipc/byt-ipc.c | 9 +- src/ipc/cnl-ipc.c | 8 +- src/ipc/dma-copy.c | 10 ++- src/ipc/hsw-ipc.c | 9 +- src/lib/Makefile.am | 11 ++- src/lib/dma-trace.c | 2 +- src/lib/dma.c | 89 +++++++++++++++++++ src/platform/apollolake/dma.c | 39 ++++++-- .../apollolake/include/platform/dma.h | 5 ++ .../apollolake/include/platform/platform.h | 3 - src/platform/apollolake/platform.c | 22 +---- src/platform/baytrail/dma.c | 34 +++++-- src/platform/baytrail/include/platform/dma.h | 9 ++ .../baytrail/include/platform/platform.h | 3 - src/platform/baytrail/platform.c | 23 +---- src/platform/cannonlake/dma.c | 39 ++++++-- .../cannonlake/include/platform/dma.h | 6 ++ .../cannonlake/include/platform/platform.h | 3 - src/platform/cannonlake/platform.c | 23 +---- src/platform/haswell/dma.c | 40 +++++++-- src/platform/haswell/include/platform/dma.h | 5 ++ .../haswell/include/platform/platform.h | 3 - src/platform/haswell/platform.c | 21 +---- 31 files changed, 362 insertions(+), 152 deletions(-) create mode 100644 src/lib/dma.c -- 2.17.1

2 6

[Sound-open-firmware] [PATCH 3/3] test: unit tests for list.h Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
by Liam Girdwood 11 Jun '18

11 Jun '18

From: Janusz Jankowski <janusz.jankowski(a)linux.intel.com> --- test/cmocka/Makefile.am | 23 +++ test/cmocka/src/list/list_init.c | 70 +++++++ test/cmocka/src/list/list_is_empty.c | 74 ++++++++ test/cmocka/src/list/list_item.c | 68 +++++++ test/cmocka/src/list/list_item_append.c | 148 +++++++++++++++ test/cmocka/src/list/list_item_del.c | 221 +++++++++++++++++++++++ test/cmocka/src/list/list_item_is_last.c | 134 ++++++++++++++ test/cmocka/src/list/list_item_prepend.c | 147 +++++++++++++++ 8 files changed, 885 insertions(+) create mode 100644 test/cmocka/src/list/list_init.c create mode 100644 test/cmocka/src/list/list_is_empty.c create mode 100644 test/cmocka/src/list/list_item.c create mode 100644 test/cmocka/src/list/list_item_append.c create mode 100644 test/cmocka/src/list/list_item_del.c create mode 100644 test/cmocka/src/list/list_item_is_last.c create mode 100644 test/cmocka/src/list/list_item_prepend.c diff --git a/test/cmocka/Makefile.am b/test/cmocka/Makefile.am index 97890e6..565fb80 100644 --- a/test/cmocka/Makefile.am +++ b/test/cmocka/Makefile.am @@ -21,6 +21,29 @@ LDFLAGS := $(filter-out -nostdlib,$(LDFLAGS)) LDADD = -lcmocka +# list tests + +check_PROGRAMS += list_init +list_init_SOURCES = src/list/list_init.c + +check_PROGRAMS += list_is_empty +list_is_empty_SOURCES = src/list/list_is_empty.c + +check_PROGRAMS += list_item_append +list_item_append_SOURCES = src/list/list_item_append.c + +check_PROGRAMS += list_item_del +list_item_del_SOURCES = src/list/list_item_del.c + +check_PROGRAMS += list_item_is_last +list_item_is_last_SOURCES = src/list/list_item_is_last.c + +check_PROGRAMS += list_item_prepend +list_item_prepend_SOURCES = src/list/list_item_prepend.c + +check_PROGRAMS += list_item +list_item_SOURCES = src/list/list_item.c + # math/numbers tests check_PROGRAMS += gcd diff --git a/test/cmocka/src/list/list_init.c b/test/cmocka/src/list/list_init.c new file mode 100644 index 0000000..5bd6f3e --- /dev/null +++ b/test/cmocka/src/list/list_init.c @@ -0,0 +1,70 @@ +/* + * 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: Janusz Jankowski <janusz.jankowski(a)linux.intel.com> + */ + +#include <sof/list.h> + +#include <stdarg.h> +#include <stddef.h> +#include <setjmp.h> +#include <cmocka.h> + +static void test_list_list_init_prev_equal_to_root(void **state) +{ + (void) state; /* unused */ + + struct list_item list = {.prev = NULL, .next = NULL}; + + list_init(&list); + + assert_ptr_equal(&list, list.prev); +} + +static void test_list_list_init_next_equal_to_root(void **state) +{ + (void) state; /* unused */ + + struct list_item list = {.prev = NULL, .next = NULL}; + + list_init(&list); + + assert_ptr_equal(&list, list.next); +} + +int main(void) +{ + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_list_list_init_prev_equal_to_root), + cmocka_unit_test(test_list_list_init_next_equal_to_root), + }; + + cmocka_set_message_output(CM_OUTPUT_TAP); + + return cmocka_run_group_tests(tests, NULL, NULL); +} diff --git a/test/cmocka/src/list/list_is_empty.c b/test/cmocka/src/list/list_is_empty.c new file mode 100644 index 0000000..95aff3e --- /dev/null +++ b/test/cmocka/src/list/list_is_empty.c @@ -0,0 +1,74 @@ +/* + * 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: Janusz Jankowski <janusz.jankowski(a)linux.intel.com> + */ + +#include <sof/list.h> + +#include <stdlib.h> +#include <stdarg.h> +#include <stddef.h> +#include <setjmp.h> +#include <cmocka.h> + +static void test_list_list_is_empty_when_empty_then_true(void **state) +{ + (void) state; /* unused */ + + struct list_item list; + + list_init(&list); + + assert_true(list_is_empty(&list)); +} + +static void test_list_list_is_empty_when_not_empty_then_false(void **state) +{ + (void) state; /* unused */ + + struct list_item list, item; + + list_init(&list); + list_init(&item); + + list_item_append(&item, &list); + + assert_false(list_is_empty(&list)); +} + +int main(void) +{ + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_list_list_is_empty_when_empty_then_true), + cmocka_unit_test(test_list_list_is_empty_when_not_empty_then_false), + }; + + cmocka_set_message_output(CM_OUTPUT_TAP); + + return cmocka_run_group_tests(tests, NULL, NULL); +} diff --git a/test/cmocka/src/list/list_item.c b/test/cmocka/src/list/list_item.c new file mode 100644 index 0000000..5a62f24 --- /dev/null +++ b/test/cmocka/src/list/list_item.c @@ -0,0 +1,68 @@ +/* + * 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: Janusz Jankowski <janusz.jankowski(a)linux.intel.com> + */ + +#include <sof/list.h> + +#include <stdlib.h> +#include <stdarg.h> +#include <stddef.h> +#include <setjmp.h> +#include <cmocka.h> + +struct test_list_container { + void *field1; + struct list_item list; + void *field2; +}; + +static void test_list_list_item_when_valid_offset_then_ptr_equal(void **state) +{ + (void) state; /* unused */ + + struct test_list_container container; + + list_init(&(container.list)); + + struct test_list_container *result_container = list_item( + &(container.list), struct test_list_container, list); + + assert_ptr_equal(result_container, &container); +} + +int main(void) +{ + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_list_list_item_when_valid_offset_then_ptr_equal), + }; + + cmocka_set_message_output(CM_OUTPUT_TAP); + + return cmocka_run_group_tests(tests, NULL, NULL); +} diff --git a/test/cmocka/src/list/list_item_append.c b/test/cmocka/src/list/list_item_append.c new file mode 100644 index 0000000..4fd4c66 --- /dev/null +++ b/test/cmocka/src/list/list_item_append.c @@ -0,0 +1,148 @@ +/* + * 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: Janusz Jankowski <janusz.jankowski(a)linux.intel.com> + */ + +#include <sof/list.h> + +#include <stdlib.h> +#include <stdarg.h> +#include <stddef.h> +#include <setjmp.h> +#include <cmocka.h> + +struct test_data { + struct list_item *head; + struct list_item *tail_minus_1; + struct list_item *tail; +}; + +static int setup(void **state) +{ + struct test_data *data = malloc(sizeof(struct test_data)); + + if (data == NULL) + return -1; + + data->head = malloc(sizeof(struct list_item)); + data->tail_minus_1 = malloc(sizeof(struct list_item)); + data->tail = malloc(sizeof(struct list_item)); + + if (data->head == NULL + || data->tail_minus_1 == NULL + || data->tail == NULL) { + free(data->head); + free(data->tail_minus_1); + free(data->tail); + + free(data); + + return -1; + } + + list_init(data->head); + list_init(data->tail_minus_1); + list_init(data->tail); + + list_item_append(data->tail_minus_1, data->head); + list_item_append(data->tail, data->head); + + *state = data; + return 0; +} + +static int teardown(void **state) +{ + struct test_data *data = *state; + + free(data->head); + free(data->tail_minus_1); + free(data->tail); + + free(data); + return 0; +} + +static void test_list_list_item_append_head_prev_is_tail(void **state) +{ + struct test_data *data = *state; + + assert_ptr_equal(data->head->prev, data->tail); +} + +static void test_list_list_item_append_head_next_is_tail_minus_1(void **state) +{ + struct test_data *data = *state; + + assert_ptr_equal(data->head->next, data->tail_minus_1); +} + +static void test_list_list_item_append_tail_minus_1_prev_is_head(void **state) +{ + struct test_data *data = *state; + + assert_ptr_equal(data->tail_minus_1->prev, data->head); +} + +static void test_list_list_item_append_tail_minus_1_next_is_tail(void **state) +{ + struct test_data *data = *state; + + assert_ptr_equal(data->tail_minus_1->next, data->tail); +} + +static void test_list_list_item_append_tail_prev_is_tail_minus_1(void **state) +{ + struct test_data *data = *state; + + assert_ptr_equal(data->tail->prev, data->tail_minus_1); +} + +static void test_list_list_item_append_tail_next_is_head(void **state) +{ + struct test_data *data = *state; + + assert_ptr_equal(data->tail->next, data->head); +} + +int main(void) +{ + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_list_list_item_append_head_prev_is_tail), + cmocka_unit_test(test_list_list_item_append_head_next_is_tail_minus_1), + cmocka_unit_test(test_list_list_item_append_tail_minus_1_prev_is_head), + cmocka_unit_test(test_list_list_item_append_tail_minus_1_next_is_tail), + cmocka_unit_test(test_list_list_item_append_tail_prev_is_tail_minus_1), + cmocka_unit_test(test_list_list_item_append_tail_next_is_head), + }; + + cmocka_set_message_output(CM_OUTPUT_TAP); + + return cmocka_run_group_tests(tests, setup, teardown); +} + diff --git a/test/cmocka/src/list/list_item_del.c b/test/cmocka/src/list/list_item_del.c new file mode 100644 index 0000000..dfe6e6d --- /dev/null +++ b/test/cmocka/src/list/list_item_del.c @@ -0,0 +1,221 @@ +/* + * 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: Janusz Jankowski <janusz.jankowski(a)linux.intel.com> + */ + +#include <sof/list.h> + +#include <stdlib.h> +#include <stdarg.h> +#include <stddef.h> +#include <setjmp.h> +#include <cmocka.h> + +struct test_data { + struct list_item *head; + struct list_item *tail_minus_1; + struct list_item *tail; +}; + +static int setup(void **state) +{ + struct test_data *data = malloc(sizeof(struct test_data)); + + if (data == NULL) + return -1; + + data->head = malloc(sizeof(struct list_item)); + data->tail_minus_1 = malloc(sizeof(struct list_item)); + data->tail = malloc(sizeof(struct list_item)); + + if (data->head == NULL + || data->tail_minus_1 == NULL + || data->tail == NULL) { + free(data->head); + free(data->tail_minus_1); + free(data->tail); + + free(data); + + return -1; + } + + list_init(data->head); + list_init(data->tail_minus_1); + list_init(data->tail); + + list_item_append(data->tail_minus_1, data->head); + list_item_append(data->tail, data->head); + + *state = data; + return 0; +} + +static int teardown(void **state) +{ + struct test_data *data = *state; + + free(data->head); + free(data->tail_minus_1); + free(data->tail); + + free(data); + return 0; +} + +static void test_list_list_item_del_when_delete_head_then_tail_minus_1_prev_is_tail(void **state) +{ + struct test_data *data = *state; + + list_item_del(data->head); + + assert_ptr_equal(data->tail_minus_1->prev, data->tail); +} + +static void test_list_list_item_del_when_delete_head_then_tail_minus_1_next_is_tail(void **state) +{ + struct test_data *data = *state; + + list_item_del(data->head); + + assert_ptr_equal(data->tail_minus_1->next, data->tail); +} + +static void test_list_list_item_del_when_delete_head_then_tail_prev_is_tail_minus_1(void **state) +{ + struct test_data *data = *state; + + list_item_del(data->head); + + assert_ptr_equal(data->tail->prev, data->tail_minus_1); +} + +static void test_list_list_item_del_when_delete_head_then_tail_next_is_tail_minus_1(void **state) +{ + struct test_data *data = *state; + + list_item_del(data->head); + + assert_ptr_equal(data->tail->next, data->tail_minus_1); +} + +static void test_list_list_item_del_when_delete_tail_minus_1_then_head_prev_is_tail(void **state) +{ + struct test_data *data = *state; + + list_item_del(data->tail_minus_1); + + assert_ptr_equal(data->head->prev, data->tail); +} + +static void test_list_list_item_del_when_delete_tail_minus_1_then_head_next_is_tail(void **state) +{ + struct test_data *data = *state; + + list_item_del(data->tail_minus_1); + + assert_ptr_equal(data->head->next, data->tail); +} + +static void test_list_list_item_del_when_delete_tail_minus_1_then_tail_prev_is_head(void **state) +{ + struct test_data *data = *state; + + list_item_del(data->tail_minus_1); + + assert_ptr_equal(data->tail->prev, data->head); +} + +static void test_list_list_item_del_when_delete_tail_minus_1_then_tail_next_is_head(void **state) +{ + struct test_data *data = *state; + + list_item_del(data->tail_minus_1); + + assert_ptr_equal(data->tail->next, data->head); +} + +static void test_list_list_item_del_when_delete_tail_then_head_prev_is_tail_minus_1(void **state) +{ + struct test_data *data = *state; + + list_item_del(data->tail); + + assert_ptr_equal(data->head->prev, data->tail_minus_1); +} + +static void test_list_list_item_del_when_delete_tail_then_head_next_is_tail_minus_1(void **state) +{ + struct test_data *data = *state; + + list_item_del(data->tail); + + assert_ptr_equal(data->head->next, data->tail_minus_1); +} + +static void test_list_list_item_del_when_delete_tail_then_tail_minus_1_prev_is_head(void **state) +{ + struct test_data *data = *state; + + list_item_del(data->tail); + + assert_ptr_equal(data->tail_minus_1->prev, data->head); +} + +static void test_list_list_item_del_when_delete_tail_then_tail_minus_1_next_is_head(void **state) +{ + struct test_data *data = *state; + + list_item_del(data->tail); + + assert_ptr_equal(data->tail_minus_1->next, data->head); +} + +int main(void) +{ + const struct CMUnitTest tests[] = { + cmocka_unit_test_setup_teardown(test_list_list_item_del_when_delete_head_then_tail_minus_1_prev_is_tail, setup, teardown), + cmocka_unit_test_setup_teardown(test_list_list_item_del_when_delete_head_then_tail_minus_1_next_is_tail, setup, teardown), + cmocka_unit_test_setup_teardown(test_list_list_item_del_when_delete_head_then_tail_prev_is_tail_minus_1, setup, teardown), + cmocka_unit_test_setup_teardown(test_list_list_item_del_when_delete_head_then_tail_next_is_tail_minus_1, setup, teardown), + + cmocka_unit_test_setup_teardown(test_list_list_item_del_when_delete_tail_minus_1_then_head_prev_is_tail, setup, teardown), + cmocka_unit_test_setup_teardown(test_list_list_item_del_when_delete_tail_minus_1_then_head_next_is_tail, setup, teardown), + cmocka_unit_test_setup_teardown(test_list_list_item_del_when_delete_tail_minus_1_then_tail_prev_is_head, setup, teardown), + cmocka_unit_test_setup_teardown(test_list_list_item_del_when_delete_tail_minus_1_then_tail_next_is_head, setup, teardown), + + cmocka_unit_test_setup_teardown(test_list_list_item_del_when_delete_tail_then_head_prev_is_tail_minus_1, setup, teardown), + cmocka_unit_test_setup_teardown(test_list_list_item_del_when_delete_tail_then_head_next_is_tail_minus_1, setup, teardown), + cmocka_unit_test_setup_teardown(test_list_list_item_del_when_delete_tail_then_tail_minus_1_prev_is_head, setup, teardown), + cmocka_unit_test_setup_teardown(test_list_list_item_del_when_delete_tail_then_tail_minus_1_next_is_head, setup, teardown), + }; + + cmocka_set_message_output(CM_OUTPUT_TAP); + + return cmocka_run_group_tests(tests, NULL, NULL); +} diff --git a/test/cmocka/src/list/list_item_is_last.c b/test/cmocka/src/list/list_item_is_last.c new file mode 100644 index 0000000..2e6bd0f --- /dev/null +++ b/test/cmocka/src/list/list_item_is_last.c @@ -0,0 +1,134 @@ +/* + * 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: Janusz Jankowski <janusz.jankowski(a)linux.intel.com> + */ + +#include <sof/list.h> + +#include <stdlib.h> +#include <stdarg.h> +#include <stddef.h> +#include <setjmp.h> +#include <cmocka.h> + +struct test_data { + struct list_item *head; + struct list_item *tail_minus_1; + struct list_item *tail; +}; + +static int setup(void **state) +{ + struct test_data *data = malloc(sizeof(struct test_data)); + + if (data == NULL) + return -1; + + data->head = malloc(sizeof(struct list_item)); + data->tail_minus_1 = malloc(sizeof(struct list_item)); + data->tail = malloc(sizeof(struct list_item)); + + if (data->head == NULL + || data->tail_minus_1 == NULL + || data->tail == NULL) { + free(data->head); + free(data->tail_minus_1); + free(data->tail); + + free(data); + + return -1; + } + + list_init(data->head); + list_init(data->tail_minus_1); + list_init(data->tail); + + list_item_append(data->tail_minus_1, data->head); + list_item_append(data->tail, data->head); + + *state = data; + return 0; +} + +static int teardown(void **state) +{ + struct test_data *data = *state; + + free(data->head); + free(data->tail_minus_1); + free(data->tail); + + free(data); + return 0; +} + +static void test_list_list_item_is_last_when_head_then_false(void **state) +{ + struct test_data *data = *state; + + assert_false(list_item_is_last(data->head, data->head)); +} + +static void test_list_list_item_is_last_when_tail_minus_1_then_false(void **state) +{ + struct test_data *data = *state; + + assert_false(list_item_is_last(data->tail_minus_1, data->head)); +} + +static void test_list_list_item_is_last_when_tail_then_true(void **state) +{ + struct test_data *data = *state; + + assert_true(list_item_is_last(data->tail, data->head)); +} + +static void test_list_list_item_is_last_when_not_in_list_then_false(void **state) +{ + struct list_item other_list; + struct test_data *data = *state; + + list_init(&other_list); + + assert_false(list_item_is_last(&other_list, data->head)); +} + +int main(void) +{ + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_list_list_item_is_last_when_head_then_false), + cmocka_unit_test(test_list_list_item_is_last_when_tail_minus_1_then_false), + cmocka_unit_test(test_list_list_item_is_last_when_tail_then_true), + cmocka_unit_test(test_list_list_item_is_last_when_not_in_list_then_false), + }; + + cmocka_set_message_output(CM_OUTPUT_TAP); + + return cmocka_run_group_tests(tests, setup, teardown); +} diff --git a/test/cmocka/src/list/list_item_prepend.c b/test/cmocka/src/list/list_item_prepend.c new file mode 100644 index 0000000..75c1e76 --- /dev/null +++ b/test/cmocka/src/list/list_item_prepend.c @@ -0,0 +1,147 @@ +/* + * 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: Janusz Jankowski <janusz.jankowski(a)linux.intel.com> + */ + +#include <sof/list.h> + +#include <stdlib.h> +#include <stdarg.h> +#include <stddef.h> +#include <setjmp.h> +#include <cmocka.h> + +struct test_data { + struct list_item *head; + struct list_item *tail_minus_1; + struct list_item *tail; +}; + +static int setup(void **state) +{ + struct test_data *data = malloc(sizeof(struct test_data)); + + if (data == NULL) + return -1; + + data->head = malloc(sizeof(struct list_item)); + data->tail_minus_1 = malloc(sizeof(struct list_item)); + data->tail = malloc(sizeof(struct list_item)); + + if (data->head == NULL + || data->tail_minus_1 == NULL + || data->tail == NULL) { + free(data->head); + free(data->tail_minus_1); + free(data->tail); + + free(data); + + return -1; + } + + list_init(data->head); + list_init(data->tail_minus_1); + list_init(data->tail); + + list_item_prepend(data->tail, data->head); + list_item_prepend(data->tail_minus_1, data->head); + + *state = data; + return 0; +} + +static int teardown(void **state) +{ + struct test_data *data = *state; + + free(data->head); + free(data->tail_minus_1); + free(data->tail); + + free(data); + return 0; +} + +static void test_list_list_item_prepend_head_prev_is_tail(void **state) +{ + struct test_data *data = *state; + + assert_ptr_equal(data->head->prev, data->tail); +} + +static void test_list_list_item_prepend_head_next_is_tail_minus_1(void **state) +{ + struct test_data *data = *state; + + assert_ptr_equal(data->head->next, data->tail_minus_1); +} + +static void test_list_list_item_prepend_tail_minus_1_prev_is_head(void **state) +{ + struct test_data *data = *state; + + assert_ptr_equal(data->tail_minus_1->prev, data->head); +} + +static void test_list_list_item_prepend_tail_minus_1_next_is_tail(void **state) +{ + struct test_data *data = *state; + + assert_ptr_equal(data->tail_minus_1->next, data->tail); +} + +static void test_list_list_item_prepend_tail_prev_is_tail_minus_1(void **state) +{ + struct test_data *data = *state; + + assert_ptr_equal(data->tail->prev, data->tail_minus_1); +} + +static void test_list_list_item_prepend_tail_next_is_head(void **state) +{ + struct test_data *data = *state; + + assert_ptr_equal(data->tail->next, data->head); +} + +int main(void) +{ + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_list_list_item_prepend_head_prev_is_tail), + cmocka_unit_test(test_list_list_item_prepend_head_next_is_tail_minus_1), + cmocka_unit_test(test_list_list_item_prepend_tail_minus_1_prev_is_head), + cmocka_unit_test(test_list_list_item_prepend_tail_minus_1_next_is_tail), + cmocka_unit_test(test_list_list_item_prepend_tail_prev_is_tail_minus_1), + cmocka_unit_test(test_list_list_item_prepend_tail_next_is_head), + }; + + cmocka_set_message_output(CM_OUTPUT_TAP); + + return cmocka_run_group_tests(tests, setup, teardown); +} -- 2.17.0

1 1

[Sound-open-firmware] [PATCH 2/3] wait: add wait_delay routine
by Liam Girdwood 11 Jun '18

11 Jun '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> This patch adds wait_delay routine, which will wait for specified minimum number of clocks. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/include/sof/wait.h | 12 ++++++++++++ src/platform/apollolake/include/platform/platform.h | 3 +++ src/platform/baytrail/include/platform/platform.h | 3 +++ src/platform/cannonlake/include/platform/platform.h | 3 +++ src/platform/haswell/include/platform/platform.h | 3 +++ 5 files changed, 24 insertions(+) diff --git a/src/include/sof/wait.h b/src/include/sof/wait.h index b7725b8..feb8b29 100644 --- a/src/include/sof/wait.h +++ b/src/include/sof/wait.h @@ -145,4 +145,16 @@ static inline int wait_for_completion_timeout(completion_t *comp) } } +/** + * \brief Waits at least passed number of clocks. + * \param[in] number_of_clks Minimum number of clocks to wait. + */ +static inline void wait_delay(uint64_t number_of_clks) +{ + uint64_t current = platform_timer_get(platform_timer); + + while ((platform_timer_get(platform_timer) - current) < number_of_clks) + idelay(PLATFORM_DEFAULT_DELAY); +} + #endif diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index 1321f1f..ff40b1c 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -120,6 +120,9 @@ struct sof; /* number of SSP ports in platform */ #define PLATFORM_NUM_SSP 6 +/* DSP default delay in cycles */ +#define PLATFORM_DEFAULT_DELAY 12 + /* Platform defined panic code */ static inline void platform_panic(uint32_t p) { diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 1defe27..0d1664c 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -102,6 +102,9 @@ struct sof; /* DSP should be idle in this time frame */ #define PLATFORM_IDLE_TIME 750000 +/* DSP default delay in cycles */ +#define PLATFORM_DEFAULT_DELAY 12 + /* Platform defined panic code */ static inline void platform_panic(uint32_t p) { diff --git a/src/platform/cannonlake/include/platform/platform.h b/src/platform/cannonlake/include/platform/platform.h index c7d4a82..cf045c0 100644 --- a/src/platform/cannonlake/include/platform/platform.h +++ b/src/platform/cannonlake/include/platform/platform.h @@ -117,6 +117,9 @@ struct sof; /* DSP should be idle in this time frame */ #define PLATFORM_IDLE_TIME 750000 +/* DSP default delay in cycles */ +#define PLATFORM_DEFAULT_DELAY 12 + /* Platform defined trace code */ static inline void platform_panic(uint32_t p) { diff --git a/src/platform/haswell/include/platform/platform.h b/src/platform/haswell/include/platform/platform.h index c5d8187..af628ee 100644 --- a/src/platform/haswell/include/platform/platform.h +++ b/src/platform/haswell/include/platform/platform.h @@ -101,6 +101,9 @@ struct sof; /* DSP should be idle in this time frame */ #define PLATFORM_IDLE_TIME 750000 +/* DSP default delay in cycles */ +#define PLATFORM_DEFAULT_DELAY 12 + /* Platform defined panic code */ static inline void platform_panic(uint32_t p) { -- 2.17.0

1 0

[Sound-open-firmware] [PATCH 1/3] scripts: docker: simplify docker build
by Xiuli Pan 11 Jun '18

11 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Merege commands to reduce layers and remove some useless layers. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- scripts/README.docker | 2 ++ scripts/docker_build/Dockerfile | 24 ++++++------------------ 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/scripts/README.docker b/scripts/README.docker index e2f189f..468ae25 100644 --- a/scripts/README.docker +++ b/scripts/README.docker @@ -22,6 +22,8 @@ cd scripts/docker_build After the container is built, it can be used to run the scripts. To build for baytrail: +./scripts/docker-run.sh ./scripts/xtensa-build-all.sh -l byt +or (may need password test0000 for rimage install) ./scripts/docker-run.sh ./scripts/xtensa-build-all.sh byt To rebuild the topology in soft.git: diff --git a/scripts/docker_build/Dockerfile b/scripts/docker_build/Dockerfile index 8dede3c..cf55ab1 100644 --- a/scripts/docker_build/Dockerfile +++ b/scripts/docker_build/Dockerfile @@ -36,10 +36,8 @@ RUN apt-get -y update && \ gperf \ help2man \ libncurses5-dev \ - libncurses5-dev \ libssl-dev \ libtool \ - libtool \ libtool-bin \ pkg-config \ software-properties-common \ @@ -68,9 +66,9 @@ cd /root/alsa-build/alsa-lib && ./gitcompile && make install && \ cd /root/alsa-build/alsa-utils && ./gitcompile && make install && \ cd /root/ && rm -rf alsa-build -RUN useradd --create-home -d /home/sof -u $UID -G sudo sof -RUN echo "sof:test0000" | chpasswd -RUN adduser sof sudo +# Set up sof user +RUN useradd --create-home -d /home/sof -u $UID -G sudo sof && \ +echo "sof:test0000" | chpasswd && adduser sof sudo ENV HOME /home/sof # pull all sof repositories that are needed @@ -118,21 +116,11 @@ RUN for arch in byt hsw bxt cnl; do \ make distclean; \ done -USER sof -WORKDIR /home/sof/sof.git -RUN ./autogen.sh -RUN ./configure --enable-rimage -RUN make -USER root -RUN make install # Create direcroties for the host machines sof/soft directories to be mounted. -USER sof -RUN mkdir -p /home/sof/work/sof -RUN mkdir -p /home/sof/work/soft +RUN mkdir -p /home/sof/work/sof.git && \ + mkdir -p /home/sof/work/soft.git + USER sof WORKDIR /home/sof/work/sof.git/ - -# Default to building all. -CMD ./scripts/xtensa-build-all.sh -- 2.7.4

2 3