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

[alsa-devel] [PATCH] ASoC: dmaengine_pcm: Consider DMA cache caused delay in pointer callback
by Peter Ujfalusi 10 Feb '20

10 Feb '20

Some DMA engines can have big FIFOs which adds to the latency. The DMAengine framework can report the FIFO utilization in bytes. Use this information for the delay reporting. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- Hi, 5.6-rc1 now have support for reporting the DMA cached data. With this patch we can include it to the delay calculation. The first DMA driver which reports this is the TI K3 UDMA driver. Regards, Peter sound/core/pcm_dmaengine.c | 6 ++++++ sound/soc/soc-pcm.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index 5749a8a49784..4f1395fd0160 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c @@ -247,9 +247,15 @@ snd_pcm_uframes_t snd_dmaengine_pcm_pointer(struct snd_pcm_substream *substream) status = dmaengine_tx_status(prtd->dma_chan, prtd->cookie, &state); if (status == DMA_IN_PROGRESS || status == DMA_PAUSED) { + struct snd_pcm_runtime *runtime = substream->runtime; + int sample_bits = snd_pcm_format_physical_width(runtime->format); + buf_size = snd_pcm_lib_buffer_bytes(substream); if (state.residue > 0 && state.residue <= buf_size) pos = buf_size - state.residue; + + sample_bits *= runtime->channels; + runtime->delay = state.in_flight_bytes / (sample_bits / 8); } return bytes_to_frames(substream->runtime, pos); diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index ff1b7c7078e5..58ef508d70a3 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1151,7 +1151,7 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream) } delay += codec_delay; - runtime->delay = delay; + runtime->delay += delay; return offset; } -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

3 6

[alsa-devel] [PATCH 1/3] ALSA: hda: do not override bus codec_mask in link_get()
by Kai Vehmanen 10 Feb '20

10 Feb '20

snd_hdac_ext_bus_link_get() does not work correctly in case there are multiple codecs on the bus. It unconditionally resets the bus->codec_mask value. As per documentation in hdaudio.h and existing use in client code, this field should be used to store bit flag of detected codecs on the bus. By overwriting value of the codec_mask, information on all detected codecs is lost. No current user of hdac is impacted, but use of bus->codec_mask is planned in future patches for SOF. Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/hda/ext/hdac_ext_controller.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/hda/ext/hdac_ext_controller.c b/sound/hda/ext/hdac_ext_controller.c index cfab60d88c92..09ff209df4a3 100644 --- a/sound/hda/ext/hdac_ext_controller.c +++ b/sound/hda/ext/hdac_ext_controller.c @@ -254,6 +254,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_down_all); int snd_hdac_ext_bus_link_get(struct hdac_bus *bus, struct hdac_ext_link *link) { + unsigned long codec_mask; int ret = 0; mutex_lock(&bus->lock); @@ -280,9 +281,11 @@ int snd_hdac_ext_bus_link_get(struct hdac_bus *bus, * HDA spec section 4.3 - Codec Discovery */ udelay(521); - bus->codec_mask = snd_hdac_chip_readw(bus, STATESTS); - dev_dbg(bus->dev, "codec_mask = 0x%lx\n", bus->codec_mask); - snd_hdac_chip_writew(bus, STATESTS, bus->codec_mask); + codec_mask = snd_hdac_chip_readw(bus, STATESTS); + dev_dbg(bus->dev, "codec_mask = 0x%lx\n", codec_mask); + snd_hdac_chip_writew(bus, STATESTS, codec_mask); + if (!bus->codec_mask) + bus->codec_mask = codec_mask; } mutex_unlock(&bus->lock); -- 2.17.1

3 8

[alsa-devel] unsubscribe mounesh_sutar@mentor.com
by Sutar, Mounesh 10 Feb '20

10 Feb '20

unsubscribe mounesh_sutar(a)mentor.com

1 0

[alsa-devel] [PATCH 0/3] Clean up RK3328 audio codec GPIO control
by Robin Murphy 10 Feb '20

10 Feb '20

Hi all, Investigating the RK3328 GPIO_MUTE pin in the context of boards that use it to control a regulator has highlighted that the audio codec driver currently has some hard-coded implicit control of that pin. Fortunately those boards don't currently enable the audio codec, because it would be pretty terrible if playing audio changed the SD card I/O voltage. This is a first crack at making things better. Robin. Robin Murphy (3): ASoC: dt-bindings: Make RK3328 codec GPIO explicit ASoC: rockchip: Make RK3328 GPIO_MUTE control explicit arm64: dts: rockchip: Describe RK3328 GPIO_MUTE users .../bindings/sound/rockchip,rk3328-codec.txt | 7 ++++++- arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 1 + .../arm64/boot/dts/rockchip/rk3328-rock64.dts | 1 + sound/soc/codecs/rk3328_codec.c | 20 +++++-------------- 4 files changed, 13 insertions(+), 16 deletions(-) -- 2.17.1

3 9

[alsa-devel] [PATCH alsa-lib 0/3] Adaption of 5.6 kernel ABI changes
by Takashi Iwai 10 Feb '20

10 Feb '20

Hi, this is a patch to update ABI headers copied from 5.6 kernel, which contains a couple of deprecation and the corresponding code changes. Takashi === Takashi Iwai (3): control: Remove access to the deprecated dimen fields topology: Drop SNDRV_CTL_ELEM_ACCESS_TIMESTAMP access uapi: Sync with 5.6 kernel ABI include/sound/uapi/asequencer.h | 12 +- include/sound/uapi/asoc.h | 9 +- include/sound/uapi/asound.h | 319 ++++++++++++++++++++++++++-------------- include/sound/uapi/emu10k1.h | 12 +- include/sound/uapi/hdsp.h | 4 + include/sound/uapi/hdspm.h | 4 + include/sound/uapi/sb16_csp.h | 6 +- src/control/control.c | 24 ++- src/topology/ctl.c | 1 - 9 files changed, 255 insertions(+), 136 deletions(-) -- 2.16.4

1 3

[alsa-devel] [PATCH 0/3] ASoC: SOF: VirtIO: preparatory patches
by Guennadi Liakhovetski 10 Feb '20

10 Feb '20

This is the first set of patches for the SOF virtualisation work. We send these patches first because they touch the ASoC core. 2 of them are mostly cosmetic with no functional changes, but patch 2/3 might cause some discussions. Please review and comment. Thanks Guennadi Guennadi Liakhovetski (3): ASoC: (cosmetic) simplify dpcm_prune_paths() ASoC: add function parameters to enable forced path pruning ASoC: export DPCM runtime update functions include/sound/soc-dpcm.h | 30 +++++++++-- sound/soc/soc-compress.c | 2 +- sound/soc/soc-dapm.c | 8 +-- sound/soc/soc-pcm.c | 126 ++++++++++++++++++++++++++++++----------------- 4 files changed, 112 insertions(+), 54 deletions(-) -- 1.9.3

2 5

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

10 Feb '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> Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com> --- Added my signed-off because I sent the patch, no other changes. 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] [PATCH] ASoC: ti: davinci-mcasp: remove redundant assignment to variable ret
by Colin King 10 Feb '20

10 Feb '20

From: Colin Ian King <colin.king(a)canonical.com> The assignment to ret is redundant as it is not used in the error return path and hence can be removed. Addresses-Coverity: ("Unused value") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/ti/davinci-mcasp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index e1e937eb1dc1..450c394b2882 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -1764,10 +1764,8 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of( } else if (match) { pdata = devm_kmemdup(&pdev->dev, match->data, sizeof(*pdata), GFP_KERNEL); - if (!pdata) { - ret = -ENOMEM; + if (!pdata) return pdata; - } } else { /* control shouldn't reach here. something is wrong */ ret = -EINVAL; -- 2.25.0

2 1

[alsa-devel] Options for u_audio.c behavior when UAC2 host is disconnected/idle
by Pavel Hofman 10 Feb '20

10 Feb '20

Hi, I would like to discuss options to make the g_audio device more usable. Currently if the USB UAC2 function does not supply/consume any audio data (USB disconnected or the host side is not using the UAC2 gadget, the g_audio devices (both capture and playback) are waiting, leading eventually to an error. This makes using the feature rather inconvenient. Possible options (certainly more are available) 1) The alsa devices will be openable at any time and when the UAC2 is not producing/consuming, the alsa devices will be generating zeros/dropping samples. Dropping samples would be similar to the snd-aloop behavior. 2) Opening the alsa devices will fail when the UAC2 is not actively running, and the pcm stream will be closed when UAC2 stops being active. This is similar to how SPDIF receivers are coded in alsa drivers - if change in the incoming SPDIF stream is detected (no samples, different sample rate), the pcm stream is closed https://github.com/torvalds/linux/blob/master/sound/i2c/other/ak4117.c#L504 It is up to the application to handle the error/close. The behavior could be configurable via some params, if needed. Thanks a lot for any suggestions and recommendations. Best regards, Pavel. P.S.: I posted the same message to linux-usb mailing list, with no response. I think this issue is more alsa-related, hence re-posting to alsa-devel. Or should I keep both mailing lists posted? Thanks for understanding.

1 0

[alsa-devel] [PATCH] ALSA: info: remove redundant assignment to variable c
by Colin King 10 Feb '20

10 Feb '20

From: Colin Ian King <colin.king(a)canonical.com> Variable c is being assigned with the value -1 that is never read, it is assigned a new value in a following while-loop. The assignment is redundant and can be removed. Addresses-Coverity: ("Unused value") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/core/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/info.c b/sound/core/info.c index ca87ae4c30ba..8c6bc5241df5 100644 --- a/sound/core/info.c +++ b/sound/core/info.c @@ -604,7 +604,7 @@ int snd_info_card_free(struct snd_card *card) */ int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len) { - int c = -1; + int c; if (snd_BUG_ON(!buffer || !buffer->buffer)) return 1; -- 2.25.0

2 1