May 2021 - Alsa-devel - mailman.alsa-project.org

[PATCH AUTOSEL 5.12 17/63] ALSA: sb8: Add a comment note regarding an unused pointer
by Sasha Levin 24 May '21

24 May '21

From: Atul Gopinathan <atulgopinathan(a)gmail.com> [ Upstream commit a28591f61b60fac820c6de59826ffa710e5e314e ] The field "fm_res" of "struct snd_sb8" is never used/dereferenced throughout the sb8.c code. Therefore there is no need for any null value check after the "request_region()". Add a comment note to make developers know about this and prevent any "NULL check" patches on this part of code. Cc: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Atul Gopinathan <atulgopinathan(a)gmail.com> Link: https://lore.kernel.org/r/20210503115736.2104747-36-gregkh@linuxfoundation.… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/isa/sb/sb8.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c index 6c9d534ce8b6..e17b58437e66 100644 --- a/sound/isa/sb/sb8.c +++ b/sound/isa/sb/sb8.c @@ -93,7 +93,11 @@ static int snd_sb8_probe(struct device *pdev, unsigned int dev) acard = card->private_data; card->private_free = snd_sb8_free; - /* block the 0x388 port to avoid PnP conflicts */ + /* + * Block the 0x388 port to avoid PnP conflicts. + * No need to check this value after request_region, + * as we never do anything with it. + */ acard->fm_res = request_region(0x388, 4, "SoundBlaster FM"); if (!acard->fm_res) { err = -EBUSY; -- 2.30.2

1 0

[PATCH AUTOSEL 5.12 16/63] Revert "ALSA: gus: add a check of the status of snd_ctl_add"
by Sasha Levin 24 May '21

24 May '21

From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> [ Upstream commit 1dacca7fa1ebea47d38d20cd2df37094805d2649 ] This reverts commit 0f25e000cb4398081748e54f62a902098aa79ec1. Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not. Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change. The original commit did nothing if there was an error, except to print out a message, which is pointless. So remove the commit as it gives a "false sense of doing something". Cc: Kangjie Lu <kjlu(a)umn.edu> Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Link: https://lore.kernel.org/r/20210503115736.2104747-33-gregkh@linuxfoundation.… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/isa/gus/gus_main.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c index afc088f0377c..b7518122a10d 100644 --- a/sound/isa/gus/gus_main.c +++ b/sound/isa/gus/gus_main.c @@ -77,17 +77,8 @@ static const struct snd_kcontrol_new snd_gus_joystick_control = { static void snd_gus_init_control(struct snd_gus_card *gus) { - int ret; - - if (!gus->ace_flag) { - ret = - snd_ctl_add(gus->card, - snd_ctl_new1(&snd_gus_joystick_control, - gus)); - if (ret) - snd_printk(KERN_ERR "gus: snd_ctl_add failed: %d\n", - ret); - } + if (!gus->ace_flag) + snd_ctl_add(gus->card, snd_ctl_new1(&snd_gus_joystick_control, gus)); } /* -- 2.30.2

1 0

[PATCH AUTOSEL 5.12 05/63] Revert "ALSA: sb: fix a missing check of snd_ctl_add"
by Sasha Levin 24 May '21

24 May '21

From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> [ Upstream commit 4b059ce1f4b368208c2310925f49be77f15e527b ] This reverts commit beae77170c60aa786f3e4599c18ead2854d8694d. Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not. Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It is safe to ignore this error as the mixer element is optional, and the driver is very legacy. Cc: Aditya Pakki <pakki001(a)umn.edu> Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Link: https://lore.kernel.org/r/20210503115736.2104747-8-gregkh@linuxfoundation.o… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/isa/sb/sb16_main.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c index 38dc1fde25f3..aa4870531023 100644 --- a/sound/isa/sb/sb16_main.c +++ b/sound/isa/sb/sb16_main.c @@ -846,14 +846,10 @@ int snd_sb16dsp_pcm(struct snd_sb *chip, int device) snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb16_playback_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb16_capture_ops); - if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) { - err = snd_ctl_add(card, snd_ctl_new1( - &snd_sb16_dma_control, chip)); - if (err) - return err; - } else { + if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) + snd_ctl_add(card, snd_ctl_new1(&snd_sb16_dma_control, chip)); + else pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX; - } snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, card->dev, 64*1024, 128*1024); -- 2.30.2

1 0

[PATCH -next] ASoC: imx-card: Make some symbols static
by Wei Yongjun 24 May '21

24 May '21

The sparse tool complains as follows: sound/soc/fsl/imx-card.c:121:27: warning: symbol 'ak4458_fs_mul' was not declared. Should it be static? sound/soc/fsl/imx-card.c:138:31: warning: symbol 'ak4458_tdm_fs_mul' was not declared. Should it be static? sound/soc/fsl/imx-card.c:149:27: warning: symbol 'ak4497_fs_mul' was not declared. Should it be static? sound/soc/fsl/imx-card.c:166:27: warning: symbol 'ak5558_fs_mul' was not declared. Should it be static? sound/soc/fsl/imx-card.c:180:31: warning: symbol 'ak5558_tdm_fs_mul' was not declared. Should it be static? Those symbols are not used outside of imx-card.c, so marks them static. Fixes: aa736700f42f ("ASoC: imx-card: Add imx-card machine driver") Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- sound/soc/fsl/imx-card.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c index ab424735bbfe..58fd0639a069 100644 --- a/sound/soc/fsl/imx-card.c +++ b/sound/soc/fsl/imx-card.c @@ -118,7 +118,7 @@ struct imx_card_data { u32 asrc_format; }; -struct imx_akcodec_fs_mul ak4458_fs_mul[] = { +static struct imx_akcodec_fs_mul ak4458_fs_mul[] = { /* Normal, < 32kHz */ { .rmin = 8000, .rmax = 24000, .wmin = 1024, .wmax = 1024, }, /* Normal, 32kHz */ @@ -135,7 +135,7 @@ struct imx_akcodec_fs_mul ak4458_fs_mul[] = { { .rmin = 705600, .rmax = 768000, .wmin = 16, .wmax = 64, }, }; -struct imx_akcodec_tdm_fs_mul ak4458_tdm_fs_mul[] = { +static struct imx_akcodec_tdm_fs_mul ak4458_tdm_fs_mul[] = { /* * Table 13 - Audio Interface Format * For TDM mode, MCLK should is set to @@ -146,7 +146,7 @@ struct imx_akcodec_tdm_fs_mul ak4458_tdm_fs_mul[] = { { .min = 512, .max = 512, .mul = 1024 }, /* TDM512 */ }; -struct imx_akcodec_fs_mul ak4497_fs_mul[] = { +static struct imx_akcodec_fs_mul ak4497_fs_mul[] = { /** * Table 7 - mapping multiplier and speed mode * Tables 8 & 9 - mapping speed mode and LRCK fs @@ -163,7 +163,7 @@ struct imx_akcodec_fs_mul ak4497_fs_mul[] = { * Auto MCLK selection based on LRCK for Normal Mode * (Table 4 from datasheet) */ -struct imx_akcodec_fs_mul ak5558_fs_mul[] = { +static struct imx_akcodec_fs_mul ak5558_fs_mul[] = { { .rmin = 8000, .rmax = 32000, .wmin = 1024, .wmax = 1024, }, { .rmin = 44100, .rmax = 48000, .wmin = 512, .wmax = 512, }, { .rmin = 88200, .rmax = 96000, .wmin = 256, .wmax = 256, }, @@ -177,7 +177,7 @@ struct imx_akcodec_fs_mul ak5558_fs_mul[] = { * because of SAI we also add the restriction: MCLK >= 2 * BCLK * (Table 9 from datasheet) */ -struct imx_akcodec_tdm_fs_mul ak5558_tdm_fs_mul[] = { +static struct imx_akcodec_tdm_fs_mul ak5558_tdm_fs_mul[] = { { .min = 128, .max = 128, .mul = 256 }, { .min = 256, .max = 256, .mul = 512 }, { .min = 512, .max = 512, .mul = 1024 },

1 0

[PATCH v3 0/7] PinePhone BT audio bringup
by Samuel Holland 24 May '21

24 May '21

This series uses the additional DAIs added to the sun8i-codec driver to add hardware routing for BT SCO (headset) audio on the PinePhone. The BT audio connection is represented by the "dummy" bt-sco codec. The connection to the Quectel EG-25G modem via AIF2 works as well, but I do not include it here because there is no appropriate codec driver in tree. We have been using an out-of-tree "dummy" codec driver for the modem similar to bt-sco, and I'm not sure if such a driver would be desired upstream. Changes from v2: - Also accept #sound-dai-cells in the binding. Since dt-core.yaml already sets the type of this property, it is not possible to use oneOf, nor make a specific value deprecated. Changes from v1: - Fixed DT binding example to follow new binding Arnaud Ferraris (1): arm64: dts: allwinner: pinephone: Set audio card name Samuel Holland (6): ASoC: dt-bindings: sun8i-codec: Increase #sound-dai-cells ARM: dts: sun8i-a33: Allow using multiple codec DAIs arm64: dts: allwinner: a64: Allow using multiple codec DAIs arm64: dts: allwinner: a64: Add pinmux nodes for AIF2/AIF3 arm64: dts: allwinner: a64: Allow multiple DAI links arm64: dts: allwinner: pinephone: Add support for Bluetooth audio .../sound/allwinner,sun8i-a33-codec.yaml | 8 +++- arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- .../dts/allwinner/sun50i-a64-pinephone.dtsi | 25 +++++++++++++ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 37 ++++++++++++++----- 4 files changed, 60 insertions(+), 14 deletions(-) -- 2.26.3

4 13

[PATCH] ASoC: core: Fix Null-point-dereference in fmt_single_name()
by Kefeng Wang 24 May '21

24 May '21

Check the return value of devm_kstrdup() in case of Null-point-dereference. Fixes: 45dd9943fce0 ("ASoC: core: remove artificial component and DAI name constraint") Cc: Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> --- sound/soc/soc-core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1c0904acb935..a76974ccfce1 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2225,6 +2225,8 @@ static char *fmt_single_name(struct device *dev, int *id) return NULL; name = devm_kstrdup(dev, devname, GFP_KERNEL); + if (!name) + return NULL; /* are we a "%s.%d" name (platform and SPI components) */ found = strstr(name, dev->driver->name); -- 2.26.2

2 1

[RFC PATCH 1/2] ASoC: dt-bindings: codecs: Add bindings for nxp, tfa989x
by Stephan Gerhold 24 May '21

24 May '21

NXP/Goodix TFA989X (TFA1) amplifiers are controlled via an I2C bus. Add simple device tree bindings that describe how to set them up in the device tree. Right now only nxp,tfa9895 is supported but this will be extended to at least nxp,tfa9897 in the near future. Signed-off-by: Stephan Gerhold <stephan(a)gerhold.net> --- .../bindings/sound/nxp,tfa989x.yaml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml diff --git a/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml b/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml new file mode 100644 index 000000000000..45db5776550c --- /dev/null +++ b/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/nxp,tfa989x.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NXP/Goodix TFA989X (TFA1) Audio Amplifiers + +maintainers: + - Stephan Gerhold <stephan(a)gerhold.net> + +properties: + compatible: + enum: + - nxp,tfa9895 + + reg: + maxItems: 1 + + '#sound-dai-cells': + const: 0 + + sound-name-prefix: + $ref: /schemas/types.yaml#/definitions/string + description: + Used as prefix for sink/source names of the component. Must be a + unique string among multiple instances of the same component. + +required: + - compatible + - reg + - '#sound-dai-cells' + +additionalProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + audio-codec@34 { + compatible = "nxp,tfa9895"; + reg = <0x34>; + sound-name-prefix = "Speaker Left"; + #sound-dai-cells = <0>; + }; + audio-codec@36 { + compatible = "nxp,tfa9895"; + reg = <0x36>; + sound-name-prefix = "Speaker Right"; + #sound-dai-cells = <0>; + }; + }; -- 2.31.1

3 3

[PATCH -next] ASoC: tlv320aic26: use DEVICE_ATTR_RW macro
by YueHaibing 24 May '21

24 May '21

Use DEVICE_ATTR_RW() helper instead of plain DEVICE_ATTR(), which makes the code a bit shorter and easier to read. Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/codecs/tlv320aic26.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index c7baef8948d4..077415a57225 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -261,8 +261,8 @@ static const struct snd_kcontrol_new aic26_snd_controls[] = { * SPI device portion of driver: sysfs files for debugging */ -static ssize_t aic26_keyclick_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t keyclick_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct aic26 *aic26 = dev_get_drvdata(dev); int val, amp, freq, len; @@ -276,9 +276,9 @@ static ssize_t aic26_keyclick_show(struct device *dev, } /* Any write to the keyclick attribute will trigger the keyclick event */ -static ssize_t aic26_keyclick_set(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t keyclick_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct aic26 *aic26 = dev_get_drvdata(dev); @@ -288,7 +288,7 @@ static ssize_t aic26_keyclick_set(struct device *dev, return count; } -static DEVICE_ATTR(keyclick, 0644, aic26_keyclick_show, aic26_keyclick_set); +static DEVICE_ATTR_RW(keyclick); /* --------------------------------------------------------------------- * SoC CODEC portion of driver: probe and release routines -- 2.17.1

1 0

usb: u_audio: Notifying gadget audio device about starting/stopping capture/playback on the host
by Pavel Hofman 24 May '21

24 May '21

Hi, I am trying to notify the user-space code running on USB audio gadget that the USB host has started/stopped capture/playback. For stopping action, I am enclosing a patch snippet. I used snd_pcm_stop code when alsa SPDIF receivers detect a change in the stream https://github.com/torvalds/linux/blob/master/sound/i2c/other/ak4117.c#L505 When testing the code, aplay/arecord ends, sox just reports alsa device warning and does not stop. IMO that is the desired outcome - the snd_pcm_read/write methods returned errors when capture/playback on the host side stopped. For starting the capture/playback on the host, perhaps some snd_ctl_notify on some dedicated alsa control could be used, notifying the user space application that it can open the gadget audio device? The patch below does not compile on upstream kernel as it uses changes not included in upstream yet (explicit feedback EP, samplerate switching), but I am just discussing principles and options now. Thank you very much for your opinion and recommendations. With regards, Pavel. diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c index 45367d650c5a..c6cdb844fec1 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -565,6 +565,7 @@ int u_audio_start_capture(struct g_audio *audio_dev) struct uac_params *params = &audio_dev->params; int req_len, i; + dev_dbg(dev, "starting capture with rate %d\n", params->c_srate_active); ep = audio_dev->out_ep; prm = &uac->c_prm; config_ep_by_speed(gadget, &audio_dev->func, ep); @@ -635,6 +636,23 @@ EXPORT_SYMBOL_GPL(u_audio_start_capture); void u_audio_stop_capture(struct g_audio *audio_dev) { struct snd_uac_chip *uac = audio_dev->uac; + unsigned long _flags; + struct snd_pcm_substream *substream; + struct uac_rtd_params *prm; + + dev_dbg(uac->card->dev, "stopping capture\n"); + prm = &uac->c_prm; + if (prm) { + substream = prm->ss; + if (substream) { + dev_dbg(uac->card->dev, "stopping capture substream\n"); + snd_pcm_stream_lock_irqsave(substream, _flags); + if (snd_pcm_running(substream)) { + snd_pcm_stop(substream, SNDRV_PCM_STATE_DRAINING); + } + snd_pcm_stream_unlock_irqrestore(substream, _flags); + } + } if (audio_dev->in_ep_fback) free_ep_fback(&uac->c_prm, audio_dev->in_ep_fback); @@ -655,7 +673,7 @@ int u_audio_start_playback(struct g_audio *audio_dev) const struct usb_endpoint_descriptor *ep_desc; int req_len, i; - dev_dbg(dev, "start playback with rate %d\n", params->p_srate_active); + dev_dbg(dev, "starting playback with rate %d\n", params->p_srate_active); ep = audio_dev->in_ep; prm = &uac->p_prm; config_ep_by_speed(gadget, &audio_dev->func, ep); @@ -715,6 +733,23 @@ EXPORT_SYMBOL_GPL(u_audio_start_playback); void u_audio_stop_playback(struct g_audio *audio_dev) { struct snd_uac_chip *uac = audio_dev->uac; + unsigned long _flags; + struct snd_pcm_substream *substream; + struct uac_rtd_params *prm; + + dev_dbg(uac->card->dev, "stopping playback\n"); + prm = &uac->p_prm; + if (prm) { + substream = prm->ss; + if (substream) { + dev_dbg(uac->card->dev, "stopping playback substream\n"); + snd_pcm_stream_lock_irqsave(substream, _flags); + if (snd_pcm_running(substream)) { + snd_pcm_stop(substream, SNDRV_PCM_STATE_DRAINING); + } + snd_pcm_stream_unlock_irqrestore(substream, _flags); + } + } free_ep(&uac->p_prm, audio_dev->in_ep); }

1 1

Add UCMs for Google Asus Nexus 7 and Acer Iconia A500
by GitHub pull_request - reopened 24 May '21

24 May '21

alsa-project/alsa-ucm-conf pull request #92 was reopened from digetx: @perexg As was discussed previouly at https://www.spinics.net/lists/alsa-devel/msg126382.html I'm opening PR with the UCMs for Nexus 7 and A500. Both these devices are supported by the mainline Linux kernel. You're right that Tegra ASoC driver doesn't set card's name properly. In particular I found that we need to set the card's `driver_name` to `tegra`, then UCM get a proper lookup path. I rebased UCMs on top of the recent alsa-ucm-conf master and switched Nexus 7 UCM to use generic RT5640 UCM. Everything works great once the card name of the kernel driver is corrected. I'll send the kernel patches ASAP for review. Nexus 7 alsa-info: https://alsa-project.org/db/?f=0a29f1dab39ec5b33e01215dee42dbfd1dbbf08e A500 alsa-info: https://alsa-project.org/db/?f=bde4f7938a39b1d26904b414969fc811e726242f The alsa-info is taken using the updated kernel ASoC driver. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/92 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/92.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0