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

[alsa-devel] [PATCH 0/3] ASoC: Intel: add sof_pcm512x machine driver
by Pierre-Louis Bossart 30 Jan '20

30 Jan '20

This is an overdue upstream contribution for a platform used by nearly all SOF developers at Intel as well as the SOF CI. While I was the initial author in 2018, these patches were updated and improved by Xiuli Pan, Ranjani Sridharan, Kai Vehmanen and Guennadi Liakhovetski who worked on the last clean-ups. Thanks y'all. Full disclosure on the Cherrytrail/Up support: the board will only be detected with specific pin-configurations that are not handled by the mainline kernel just yet. Pierre-Louis Bossart (3): ASoC: Intel: sof_pcm512x: add support for SOF platforms with pcm512x ASoC: Intel: BXT: switch pcm512x based boards to sof_pcm512x ASoC: Intel: CHT: add support for pcm512x boards sound/soc/intel/boards/Kconfig | 14 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/sof_pcm512x.c | 428 ++++++++++++++++++ .../intel/common/soc-acpi-intel-bxt-match.c | 2 +- .../intel/common/soc-acpi-intel-cht-match.c | 7 + 5 files changed, 452 insertions(+), 1 deletion(-) create mode 100644 sound/soc/intel/boards/sof_pcm512x.c -- 2.20.1

2 7

[alsa-devel] [RESEND PATCH] ASoC: atmel: fix atmel_ssc_set_audio link failure
by Codrin Ciubotariu 30 Jan '20

30 Jan '20

From: Arnd Bergmann <arnd(a)arndb.de> The ssc audio driver can call into both pdc and dma backends. With the latest rework, the logic to do this in a safe way avoiding link errors was removed, bringing back link errors that were fixed long ago in commit 061981ff8cc8 ("ASoC: atmel: properly select dma driver state") such as sound/soc/atmel/atmel_ssc_dai.o: In function `atmel_ssc_set_audio': atmel_ssc_dai.c:(.text+0xac): undefined reference to `atmel_pcm_pdc_platform_register' Fix it this time using Makefile hacks and a comment to prevent this from accidentally getting removed again rather than Kconfig hacks. Fixes: 18291410557f ("ASoC: atmel: enable SOC_SSC_PDC and SOC_SSC_DMA in Kconfig") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- This patch applies fine to me on asoc/for-next, so this is just a resend. sound/soc/atmel/Kconfig | 4 ++-- sound/soc/atmel/Makefile | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index d1dc8e6366dc..71f2d42188c4 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -10,11 +10,11 @@ config SND_ATMEL_SOC if SND_ATMEL_SOC config SND_ATMEL_SOC_PDC - tristate + bool depends on HAS_DMA config SND_ATMEL_SOC_DMA - tristate + bool select SND_SOC_GENERIC_DMAENGINE_PCM config SND_ATMEL_SOC_SSC diff --git a/sound/soc/atmel/Makefile b/sound/soc/atmel/Makefile index 1f6890ed3738..c7d2989791be 100644 --- a/sound/soc/atmel/Makefile +++ b/sound/soc/atmel/Makefile @@ -6,8 +6,14 @@ snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o snd-soc-atmel-i2s-objs := atmel-i2s.o snd-soc-mchp-i2s-mcc-objs := mchp-i2s-mcc.o -obj-$(CONFIG_SND_ATMEL_SOC_PDC) += snd-soc-atmel-pcm-pdc.o -obj-$(CONFIG_SND_ATMEL_SOC_DMA) += snd-soc-atmel-pcm-dma.o +# pdc and dma need to both be built-in if any user of +# ssc is built-in. +ifdef CONFIG_SND_ATMEL_SOC_PDC +obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel-pcm-pdc.o +endif +ifdef CONFIG_SND_ATMEL_SOC_DMA +obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel-pcm-dma.o +endif obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o obj-$(CONFIG_SND_ATMEL_SOC_I2S) += snd-soc-atmel-i2s.o obj-$(CONFIG_SND_MCHP_SOC_I2S_MCC) += snd-soc-mchp-i2s-mcc.o -- 2.20.1

2 1

[alsa-devel] Managing resources of DSP from arm core side
by Daniel Baluta 30 Jan '20

30 Jan '20

Hi Peter, Liam mentioned that at some point (when working for OMAP) you might have had the same challenge I'm facing now. I'm trying to figure out how to properly manage resources needed by the IPs configured by DSP. On i.MX8 we the following scenario: - Application processor (arm64) exposes an ALSA sound card to applications - DSP (Hifi4) does the processing DSP has direct access to DAI registers but it doesn't have (easily) access to other resources like: pinctrl, power-domain, clocks, etc. I was wondering how did you tackled this for OMAP? I have already created a dummy CPU DAI on Linux that it will take care of this [1]. It is a part of a Back End link like this (simplified view): links[i].cpus->name = "dummy_dai"; links[i].platforms->name = "dsp"; links[i].codecs->name = "cs42888"; links[i].no_pcm = 1; It works pretty well for basic playback / capture. thanks, Daniel. [1] https://marc.info/?l=alsa-devel&m=158022296519597&w=2

2 2

[alsa-devel] [PATCH v2] dmaengine: Fix return value for dma_requrest_chan() in case of failure
by Marek Szyprowski 30 Jan '20

30 Jan '20

Commit 71723a96b8b1 ("dmaengine: Create symlinks between DMA channels and slaves") changed the dma_request_chan() function flow in such a way that it always returns EPROBE_DEFER in case of channels that cannot be found. This break the operation of the devices which have optional DMA channels as it puts their drivers in endless deferred probe loop. Fix this by propagating the proper error value. Fixes: 71723a96b8b1 ("dmaengine: Create symlinks between DMA channels and slaves") Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> --- drivers/dma/dmaengine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index f3ef4edd4de1..7b1cefc3213a 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -759,7 +759,7 @@ struct dma_chan *dma_request_chan(struct device *dev, const char *name) if (!IS_ERR_OR_NULL(chan)) goto found; - return ERR_PTR(-EPROBE_DEFER); + return chan ? chan : ERR_PTR(-EPROBE_DEFER); found: chan->slave = dev; -- 2.17.1

3 2

[alsa-devel] [PATCH] ALSA: uapi: Fix sparse warning
by Ranjani Sridharan 29 Jan '20

29 Jan '20

Fix the following sparse warning generated due to 64-bit compat type having fields defined explicitly with __32: sound/soc/sof/sof-audio.c:46:31: warning: incorrect type in assignment (different base types) sound/soc/sof/sof-audio.c:46:31: expected restricted snd_pcm_state_t [usertype] state sound/soc/sof/sof-audio.c:46:31: got signed int [usertype] state Reported-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Suggested-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- include/uapi/sound/asound.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 30ebb2a42983..535a7229e1d9 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -564,13 +564,13 @@ typedef char __pad_after_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)]; #endif struct __snd_pcm_mmap_status64 { - __s32 state; /* RO: state - SNDRV_PCM_STATE_XXXX */ + snd_pcm_state_t state; /* RO: state - SNDRV_PCM_STATE_XXXX */ __u32 pad1; /* Needed for 64 bit alignment */ __pad_before_uframe __pad1; snd_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */ __pad_after_uframe __pad2; struct __snd_timespec64 tstamp; /* Timestamp */ - __s32 suspended_state; /* RO: suspended stream state */ + snd_pcm_state_t suspended_state;/* RO: suspended stream state */ __u32 pad3; /* Needed for 64 bit alignment */ struct __snd_timespec64 audio_tstamp; /* sample counter or wall clock */ }; -- 2.17.1

2 1

[alsa-devel] Question about the correct license to use with debugfs in SOF
by Sridharan, Ranjani 29 Jan '20

29 Jan '20

Hi Greg, Can I please bother you with you quick question about the right license to use for the debug.c file in the SOF directory? Currently, it is dual licensed with GPLv2.0 and BSD. But Pierre brought up a concern about this conflicting with all the exports in the file being GPLv2.0. Should this be fixed to change the license to GPLv2.0 only? Appreciate your help in this regard. Thanks, Ranjani

3 4

[alsa-devel] [PATCH] dmaengine: Fix return value for dma_requrest_chan() in case of failure
by Marek Szyprowski 29 Jan '20

29 Jan '20

Commit 71723a96b8b1 ("dmaengine: Create symlinks between DMA channels and slaves") changed the dma_request_chan() function flow in such a way that it always returns EPROBE_DEFER in case of channels that cannot be found. This break the operation of the devices which have optional DMA channels as it puts their drivers in endless deferred probe loop. Fix this by propagating the proper error value. Fixes: 71723a96b8b1 ("dmaengine: Create symlinks between DMA channels and slaves") Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> --- drivers/dma/dmaengine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index f3ef4edd4de1..27b64a665347 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -759,7 +759,7 @@ struct dma_chan *dma_request_chan(struct device *dev, const char *name) if (!IS_ERR_OR_NULL(chan)) goto found; - return ERR_PTR(-EPROBE_DEFER); + return chan; found: chan->slave = dev; -- 2.17.1

2 1

Re: [alsa-devel] next/master boot: 148 boots: 10 failed, 136 passed with 2 untried/unknown (next-20200129)
by Mark Brown 29 Jan '20

29 Jan '20

On Wed, Jan 29, 2020 at 07:54:18AM -0800, kernelci.org bot wrote: Today's -next fails to boot on Odroid X2 and XU3 with exynos_defconfig or multi_v7_defconfig with SMP=n. It appears to get stuck in a loop probing the I2S secondary DAI for some reason: 12:07:05.997409 <6>[ 6.421596] exynos-bus: new bus device registered: soc:bus_mscl ( 84000 KHz ~ 666000 KHz) 12:07:05.997653 <4>[ 6.429763] samsung-i2s 3830000.i2s-sec: DMA channels sourced from device 3830000.i2s 12:07:06.006838 <4>[ 6.439652] samsung-i2s 3830000.i2s-sec: DMA channels sourced from device 3830000.i2s 12:07:06.015764 <4>[ 6.448666] samsung-i2s 3830000.i2s-sec: DMA channels sourced from device 3830000.i2s and so on ad infinitum. Vanilla multi_v7_defconfig is fine and just displays a saingle copy of that log message. Full logs and other details here: https://kernelci.org/boot/id/5e3176467f121dbdef2824fc/ https://kernelci.org/boot/id/5e317b7322dcdaa3e5282500/ https://kernelci.org/boot/id/5e317c0f6bfd765fb42824f1/ https://kernelci.org/boot/id/5e317517be8559c7542824f1/ I don't *think* it's an audio issue as mainline seems fine and all the ASoC changes have already landed in mainline for this merge window.

2 1

[alsa-devel] [PATCH] ASoC: amd: Fix simultaneous playback and capture
by Akshu Agrawal 29 Jan '20

29 Jan '20

Stopping of one stream is killing the other stream when they are running simultaneously. This is because, IER register is cleared which disables I2S and overrides any other block enables. Clearing IER register only when all streams on a channel are disabled, fixes the issue. Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> --- sound/soc/amd/raven/acp3x-i2s.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 8619ed5f08ef..c40422fe0001 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -234,30 +234,32 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, switch (rtd->i2s_instance) { case I2S_BT_INSTANCE: reg_val = mmACP_BTTDM_ITER; - ier_val = mmACP_BTTDM_IER; break; case I2S_SP_INSTANCE: default: reg_val = mmACP_I2STDM_ITER; - ier_val = mmACP_I2STDM_IER; } } else { switch (rtd->i2s_instance) { case I2S_BT_INSTANCE: reg_val = mmACP_BTTDM_IRER; - ier_val = mmACP_BTTDM_IER; break; case I2S_SP_INSTANCE: default: reg_val = mmACP_I2STDM_IRER; - ier_val = mmACP_I2STDM_IER; } } val = rv_readl(rtd->acp3x_base + reg_val); val = val & ~BIT(0); rv_writel(val, rtd->acp3x_base + reg_val); - rv_writel(0, rtd->acp3x_base + ier_val); + + if (!(rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER) & BIT(0)) && + !(rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER) & BIT(0))) + rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); + if (!(rv_readl(rtd->acp3x_base + mmACP_I2STDM_ITER) & BIT(0)) && + !(rv_readl(rtd->acp3x_base + mmACP_I2STDM_IRER) & BIT(0))) + rv_writel(0, rtd->acp3x_base + mmACP_I2STDM_IER); ret = 0; break; default: -- 2.21.0

2 1

[alsa-devel] [PATCH 0/4] ASoC: realtek sdw: Add __maybe_unused to PM callbacks
by Takashi Iwai 29 Jan '20

29 Jan '20

Hi, the trivial compile warnings were caught by my build test after pulling Mark's tree. Here are the fixes. Takashi === Takashi Iwai (4): ASoC: rt1308-sdw: Add __maybe_unused to PM callbacks ASoC: rt700: Add __maybe_unused to PM callbacks ASoC: rt711: Add __maybe_unused to PM callbacks ASoC: rt715: Add __maybe_unused to PM callbacks sound/soc/codecs/rt1308-sdw.c | 4 ++-- sound/soc/codecs/rt700-sdw.c | 4 ++-- sound/soc/codecs/rt711-sdw.c | 4 ++-- sound/soc/codecs/rt715-sdw.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) -- 2.16.4

2 8