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

[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