April 2020 - Alsa-devel - mailman.alsa-project.org

[PATCH 0/2] ASoC: rsnd: Fixes for multichannel HDMI audio output
by Matthias Blankertz 17 Apr '20

17 Apr '20

This fixes two issues in the snd-soc-rcar driver blocking multichannel HDMI audio out: The parent SSI in a multi-SSI configuration is not correctly set up and started, and the SSI->HDMI channel mapping is wrong. With these patches, the following device tree snippet can be used on an r8a7795-based platform (Salvator-X) to enable multichannel HDMI audio on HDMI0: rsnd_port1: port@1 { rsnd_endpoint1: endpoint { remote-endpoint = <&dw_hdmi0_snd_in>; dai-format = "i2s"; bitclock-master = <&rsnd_endpoint1>; frame-master = <&rsnd_endpoint1>; playback = <&ssi0 &ssi1 &ssi2 &ssi9>; }; }; With a capable receiver attached, all of 2ch (stereo), 6ch (e.g. 5.1) and 8ch audio output should work. Matthias Blankertz (2): ASoC: rsnd: Fix parent SSI start/stop in multi-SSI mode ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode sound/soc/sh/rcar/ssi.c | 8 ++++---- sound/soc/sh/rcar/ssiu.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) base-commit: 7111951b8d4973bda27ff663f2cf18b663d15b48 -- 2.26.0

3 6

Question about snd_soc_card_register()
by Sridharan, Ranjani 17 Apr '20

17 Apr '20

Hi Takashi, While working on implementing the probes features in SOF using a separate card for the probe DAI links, I noticed that calling snd_soc_register_card() results in incrementing the usage_count for the device that registers the card by 2 and it is not decremented until the card is freed. Is this the expected behaviour? Typically, we register a separate platform device for the Intel machines which in turn register the card and none of them ever enable runtime PM. So this has no impact on the parent device's runtime PM status. I'd like to avoid creating a separate platform device just to register the card if possible while also enabling runtime PM . But when I do this today, the device cannot enter runtime suspend at all. Could you please shed some light on this? Thanks, Ranjani

3 6

Re: next/master bisection: baseline.dmesg.alert on meson-sm1-sei610
by Mark Brown 17 Apr '20

17 Apr '20

On Fri, Apr 17, 2020 at 02:53:36AM -0700, kernelci.org bot wrote: > next/master bisection: baseline.dmesg.alert on meson-sm1-sei610 > Summary: > Start: a3ca59b9af21e Add linux-next specific files for 20200416 > Plain log: https://storage.kernelci.org//next/master/next-20200416/arm64/defconfig+CON… > HTML log: https://storage.kernelci.org//next/master/next-20200416/arm64/defconfig+CON… > Result: 9b5db059366ae ASoC: soc-pcm: dpcm: Only allow playback/capture if supported This change to check the playback and capture constraints is also causing issues on at least Meson - I'm a bit worried that this is also causing oopses here, not just audio problems so copying in Morimoto-san too. We should fix the things that are broken by this change since it's a thing we should be able to rely on and do enforce for non-DPCm links but I'm wondering if we should revert for 5.7 and reapply for 5.8. Including complete report so people have it. > Checks: > revert: PASS > verify: PASS > Parameters: > Tree: next > URL: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git > Branch: master > Target: meson-sm1-sei610 > CPU arch: arm64 > Lab: lab-baylibre > Compiler: gcc-8 > Config: defconfig+CONFIG_RANDOMIZE_BASE=y > Test case: baseline.dmesg.alert > > Breaking commit found: > > ------------------------------------------------------------------------------- > commit 9b5db059366ae2087e07892b5fc108f81f4ec189 > Author: Stephan Gerhold <stephan(a)gerhold.net> > Date: Wed Apr 15 12:49:28 2020 +0200 > > ASoC: soc-pcm: dpcm: Only allow playback/capture if supported > > At the moment, PCM devices for DPCM are only created based on the > dpcm_playback/capture parameters of the DAI link, without considering > if the CPU/FE DAI is actually capable of playback/capture. > > Normally the dpcm_playback/capture parameter should match the > capabilities of the CPU DAI. However, there is no way to set that > parameter from the device tree (e.g. with simple-audio-card or > qcom sound cards). dpcm_playback/capture are always both set to 1. > > This causes problems when the CPU DAI does only support playback > or capture. Attemting to open that PCM device with an unsupported > stream type then results in a null pointer dereference: > > Unable to handle kernel NULL pointer dereference at virtual address 0000000000000128 > Internal error: Oops: 96000044 [#1] PREEMPT SMP > CPU: 3 PID: 1582 Comm: arecord Not tainted 5.7.0-rc1 > pc : invalidate_paths_ep+0x30/0xe0 > lr : snd_soc_dapm_dai_get_connected_widgets+0x170/0x1a8 > Call trace: > invalidate_paths_ep+0x30/0xe0 > snd_soc_dapm_dai_get_connected_widgets+0x170/0x1a8 > dpcm_path_get+0x38/0xd0 > dpcm_fe_dai_open+0x70/0x920 > snd_pcm_open_substream+0x564/0x840 > snd_pcm_open+0xfc/0x228 > snd_pcm_capture_open+0x4c/0x78 > snd_open+0xac/0x1a8 > ... > > ... because the DAI playback/capture_widget is not set in that case. > > We could add checks there to fix the problem (maybe we should > anyway), but much easier is to not expose the device as > playback/capture in the first place. Attemting to use that > device would always fail later anyway. > > Add checks for snd_soc_dai_stream_valid() to the DPCM case > to avoid exposing playback/capture if it is not supported. > > Signed-off-by: Stephan Gerhold <stephan(a)gerhold.net> > Link: https://lore.kernel.org/r/20200415104928.86091-1-stephan@gerhold.net > Signed-off-by: Mark Brown <broonie(a)kernel.org> > > diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c > index 289aebc155293..1f302de440525 100644 > --- a/sound/soc/soc-pcm.c > +++ b/sound/soc/soc-pcm.c > @@ -2911,8 +2911,17 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) > int i; > > if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) { > - playback = rtd->dai_link->dpcm_playback; > - capture = rtd->dai_link->dpcm_capture; > + cpu_dai = asoc_rtd_to_cpu(rtd, 0); > + if (rtd->num_cpus > 1) { > + dev_err(rtd->dev, > + "DPCM doesn't support Multi CPU yet\n"); > + return -EINVAL; > + } > + > + playback = rtd->dai_link->dpcm_playback && > + snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_PLAYBACK); > + capture = rtd->dai_link->dpcm_capture && > + snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_CAPTURE); > } else { > /* Adapt stream for codec2codec links */ > int cpu_capture = rtd->dai_link->params ? > ------------------------------------------------------------------------------- > > > Git bisection log: > > ------------------------------------------------------------------------------- > git bisect start > # good: [87b0f983f66f23762921129fd35966eddc3f2dae] net: mscc: ocelot: fix untagged packet drops when enslaving to vlan aware bridge > git bisect good 87b0f983f66f23762921129fd35966eddc3f2dae > # bad: [a3ca59b9af21e68069555ffff1ad89bd2a7c40fc] Add linux-next specific files for 20200416 > git bisect bad a3ca59b9af21e68069555ffff1ad89bd2a7c40fc > # bad: [feb09551bfe34ccf0ba462188a1aee651be0f2c3] Merge remote-tracking branch 'i2c/i2c/for-next' > git bisect bad feb09551bfe34ccf0ba462188a1aee651be0f2c3 > # good: [a4721ced760684d1776bf31f7925aa41bb3f4846] Merge v5.7-rc1 into drm-misc-fixes > git bisect good a4721ced760684d1776bf31f7925aa41bb3f4846 > # bad: [e75043c693af6a10c9e2087adeef243cf05ce3bd] Merge remote-tracking branch 'rockchip/for-next' > git bisect bad e75043c693af6a10c9e2087adeef243cf05ce3bd > # bad: [08a315860a1b462fef5969d2e6ab4cdab26df8e3] Merge remote-tracking branch 'arm-soc/for-next' > git bisect bad 08a315860a1b462fef5969d2e6ab4cdab26df8e3 > # bad: [80dbfa57508c36c2b3798b387ef3eb92954b9c09] Merge remote-tracking branch 'slave-dma-fixes/fixes' > git bisect bad 80dbfa57508c36c2b3798b387ef3eb92954b9c09 > # good: [a723380c6f0a3723db72da6c6097b32b23f5564c] Merge remote-tracking branch 'sound-current/for-linus' > git bisect good a723380c6f0a3723db72da6c6097b32b23f5564c > # bad: [5bd70440cb0a6f5c6a84019bb2aa93ab8310a5cd] ASoC: soc-dai: revert all changes to DAI startup/shutdown sequence > git bisect bad 5bd70440cb0a6f5c6a84019bb2aa93ab8310a5cd > # good: [4d1a015a203c0249e3332ea217a38ec978118daa] ASoC: convert rockchip spdif bindings to yaml > git bisect good 4d1a015a203c0249e3332ea217a38ec978118daa > # good: [0f2a3b02274c02eb97697c4d89c019d1d21ac225] ASoC: wsa881x: mark read_only_wordlength flag > git bisect good 0f2a3b02274c02eb97697c4d89c019d1d21ac225 > # good: [aa7812737f2877e192d57626cbe8825cc7cf6de9] ASoC: sgtl5000: Fix VAG power-on handling > git bisect good aa7812737f2877e192d57626cbe8825cc7cf6de9 > # bad: [0c824ec094b5cda766c80d88c2036e28c24a4cb1] ASoC: q6dsp6: q6afe-dai: add missing channels to MI2S DAIs > git bisect bad 0c824ec094b5cda766c80d88c2036e28c24a4cb1 > # bad: [9b5db059366ae2087e07892b5fc108f81f4ec189] ASoC: soc-pcm: dpcm: Only allow playback/capture if supported > git bisect bad 9b5db059366ae2087e07892b5fc108f81f4ec189 > # first bad commit: [9b5db059366ae2087e07892b5fc108f81f4ec189] ASoC: soc-pcm: dpcm: Only allow playback/capture if supported > -------------------------------------------------------------------------------

3 4

[PATCH] ASoC: Intel: atom: remove unused 'sst_mix_voip_controls'
by Jason Yan 17 Apr '20

17 Apr '20

Fix the following gcc warning: sound/soc/intel/atom/sst-atom-controls.c:710:30: warning: ‘sst_mix_voip_controls’ defined but not used [-Wunused-const-variable=] SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_voip_controls); ^ Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Jason Yan <yanaijie(a)huawei.com> --- sound/soc/intel/atom/sst-atom-controls.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c index 69f3af4524ab..541f0059ba7a 100644 --- a/sound/soc/intel/atom/sst-atom-controls.c +++ b/sound/soc/intel/atom/sst-atom-controls.c @@ -707,7 +707,6 @@ SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_pcm2_controls); SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_sprot_l0_controls); SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_media_l1_controls); SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_media_l2_controls); -SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_voip_controls); SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_codec0_controls); SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_codec1_controls); SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_modem_controls); -- 2.21.1

2 1

[PATCH v2] ASoC: bdw-rt5650: remove 3-channel capture support
by Brent Lu 17 Apr '20

17 Apr '20

Implement a constrain to exclude 3-channel capture since only 2 and 4 channel capture are supported on the platform. Signed-off-by: Brent Lu <brent.lu(a)intel.com> --- sound/soc/intel/boards/bdw-rt5650.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c index af2f502..eedbdad 100644 --- a/sound/soc/intel/boards/bdw-rt5650.c +++ b/sound/soc/intel/boards/bdw-rt5650.c @@ -83,6 +83,36 @@ static struct snd_soc_jack_pin mic_jack_pin = { .mask = SND_JACK_MICROPHONE, }; +static const unsigned int channels[] = { + 2, 4, +}; + +static const struct snd_pcm_hw_constraint_list constraints_channels = { + .count = ARRAY_SIZE(channels), + .list = channels, + .mask = 0, +}; + +static int bdw_fe_startup(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + + /* + * On this platform for PCM device we support, + * 2 or 4 channel capture + */ + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_CHANNELS, + &constraints_channels); + + return 0; +} + +static const struct snd_soc_ops bdw_rt5650_fe_ops = { + .startup = bdw_fe_startup, +}; + static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { @@ -234,6 +264,7 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { .name = "System PCM", .stream_name = "System Playback", .dynamic = 1, + .ops = &bdw_rt5650_fe_ops, #if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) .init = bdw_rt5650_rtd_init, #endif -- 2.7.4

4 6

[PATCH alsa-lib] conf: USB-Audio: Fix S/PDIF output of ASUS Xonar AE
by Ivan Mironov 17 Apr '20

17 Apr '20

ASUS Xonar AE is a PCI-Express card containing USB controller: USB controller [0c03]: ASMedia Technology Inc. ASM1042A USB 3.0 Host Controller [1b21:1142] and the actual USB sound card: ID 0b05:180f ASUSTek Computer, Inc. XONAR SOUND CARD As other Xonar USB sound cards, it uses second device for digital output. Signed-off-by: Ivan Mironov <mironov.ivan(a)gmail.com> diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index 89811086db1d..3f4c421b7e2c 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -40,6 +40,7 @@ USB-Audio.pcm.iec958_device { "USB Sound Blaster HD" 1 "Xonar U7" 1 "ASUS XONAR U5" 1 + "XONAR SOUND CARD" 1 # The below don't have digital in/out, so prevent them from being opened. "Andrea PureAudio USB-SA Headset" 999 -- 2.25.1

2 1

alsa / dma: Sound stops playing after xrun
by Martin Fuzzey 17 Apr '20

17 Apr '20

Hi all, I am seeing a sound problem leading to no more sound after an XRUN . I see more or less what is happening and have a work around but am not entirely sure of the correct solution. The problem occurs on an i.MX6DL using mainline kernel 5.4 with the fsl_ssi driver and a SGTL5000 audio codec connected over I2S. The userspace is Android 8 using tinnyhal + tinyalsa. This uses ioctl to push samples rather than mmap. The scenario is: 1) A buffer underrun occurs, causing -EPIPE to be returned to userspace. 2) Userpsapce (the tinyalsa component) does a pcm_prepare() to recover (which completes OK). 3) Userspace starts sending data again and then, when the start threshold is exceeded this kernel log is generated fsl-ssi-dai 2028000.ssi: Timeout waiting TX FIFO filling 4) From this point on no more sound is played, further writes timeout after 10s and return -EIO. My analsysis is as follows: When the underrun occurs snd_dmaengine_pcm_trigger(SNDRV_PCM_TRIGGER_STOP) is performed which does dmaengine_terminate_async() When the stream is restarted snd_dmaengine_pcm_trigger(SNDRV_PCM_TRIGGER_START does dmaengine_submit() dma_async_issue_pending() Because dmaengine_terminate_async() is asynchronus it sometimes completes after the dmaengine_submit(), causing the new DMA request to be cancelled before it has started. This results in the "Timeout waiting TX FIFO filling" message (in fsl_ssi_config_enable()) because it enables the SSI and expects data to be transfered to the FIFO by DMA. The message is only a warning, (void function with no error return) So without DMA running the buffer quicky fills up, resulting in all future writes timeouting waiting for buffer space. Where I'm not sure is if this is an ALSA bug or a bug in the i.MX6 SDMA controller driver. IE is it OK to do dmaengine_terminate_async() and later dmaengine_submit() on the same DMA channel without waiting for the terminate to complete? My workaround is to wait for the terminate to complete before returning -EPIPE (just after releasing the lock which prevents sleeping earlier). Ie this: diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 2236b5e..b03dac3 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -18,6 +18,9 @@ #include <sound/pcm_params.h> #include <sound/timer.h> +#include <linux/dmaengine.h> +#include <sound/dmaengine_pcm.h> + #include "pcm_local.h" #ifdef CONFIG_SND_PCM_XRUN_DEBUG @@ -2239,6 +2242,10 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream, } } _end_unlock: + /* MF: Workaround for broken sound after XRUN. */ + if (err == -EPIPE) + dmaengine_synchronize(snd_dmaengine_pcm_get_chan(substream)); + runtime->twake = 0; if (xfer > 0 && err >= 0) snd_pcm_update_state(substream, runtime); Regards, Martin

1 0

[PATCH] slimbus: ngd: remove redundant assignment
by Srinivas Kandagatla 17 Apr '20

17 Apr '20

remove redundant assignment, as this is already done fewlines lines before. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- drivers/slimbus/qcom-ngd-ctrl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 7426b5884218..743ee7b4e63f 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1365,7 +1365,6 @@ static int of_qcom_slim_ngd_register(struct device *parent, platform_device_add(ngd->pdev); ngd->base = ctrl->base + ngd->id * data->offset + (ngd->id - 1) * data->size; - ctrl->ngd = ngd; return 0; } -- 2.21.0

1 0

[PATCH] slimbus: ngd: get drvdata from correct device
by Srinivas Kandagatla 17 Apr '20

17 Apr '20

Get drvdata directly from parent instead of ngd dev, as ngd dev can probe defer and previously set drvdata will become null. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- drivers/slimbus/qcom-ngd-ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index fc2575fef51b..7426b5884218 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1361,7 +1361,6 @@ static int of_qcom_slim_ngd_register(struct device *parent, ngd->pdev->driver_override = QCOM_SLIM_NGD_DRV_NAME; ngd->pdev->dev.of_node = node; ctrl->ngd = ngd; - platform_set_drvdata(ngd->pdev, ctrl); platform_device_add(ngd->pdev); ngd->base = ctrl->base + ngd->id * data->offset + @@ -1376,12 +1375,13 @@ static int of_qcom_slim_ngd_register(struct device *parent, static int qcom_slim_ngd_probe(struct platform_device *pdev) { - struct qcom_slim_ngd_ctrl *ctrl = platform_get_drvdata(pdev); struct device *dev = &pdev->dev; + struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev->parent); int ret; ctrl->ctrl.dev = dev; + platform_set_drvdata(pdev, ctrl); pm_runtime_use_autosuspend(dev); pm_runtime_set_autosuspend_delay(dev, QCOM_SLIM_NGD_AUTOSUSPEND); pm_runtime_set_suspended(dev); -- 2.21.0

1 0

[PATCH v2] slimbus: core: Set fwnode for a device when setting of_node
by Saravana Kannan 17 Apr '20

17 Apr '20

When setting the of_node for a newly created device, also set the fwnode. This allows fw_devlink feature to work for slimbus devices. Signed-off-by: Saravana Kannan <saravanak(a)google.com> --- drivers/slimbus/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c index 526e3215d8fe..44228a5b246d 100644 --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c @@ -163,8 +163,10 @@ static int slim_add_device(struct slim_controller *ctrl, INIT_LIST_HEAD(&sbdev->stream_list); spin_lock_init(&sbdev->stream_list_lock); - if (node) + if (node) { sbdev->dev.of_node = of_node_get(node); + sbdev->dev.fwnode = of_fwnode_handle(node); + } dev_set_name(&sbdev->dev, "%x:%x:%x:%x", sbdev->e_addr.manf_id, -- 2.25.1.696.g5e7596f4ac-goog

3 3