October 2024 - Alsa-devel - mailman.alsa-project.org

[GIT PULL] ASoC fixes for v6.12-rc1
by Mark Brown 03 Oct '24

03 Oct '24

The following changes since commit 9852d85ec9d492ebef56dc5f229416c925758edc: Linux 6.12-rc1 (2024-09-29 15:06:19 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.12-rc1 for you to fetch changes up to eb1df4bbf53c29babf68fcb36e80d9c62a345257: qrb4210-rb2: add HDMI audio playback support (2024-10-02 18:38:11 +0100) ---------------------------------------------------------------- ASoC: Fixes for v6.12 A bunch of fixes here that came in during the merge window and the first week of release, plus some new quirks and device IDs. There's nothing major here, it's a bit bigger than it might've been due to there being no fixes sent during the merge window due to your vacation. ---------------------------------------------------------------- Alexey Klimov (3): ASoC: codecs: lpass-rx-macro: add missing CDC_RX_BCL_VBAT_RF_PROC2 to default regs values ASoC: dt-bindings: qcom,sm8250: add qrb4210-rb2-sndcard ASoC: qcom: sm8250: add qrb4210-rb2-sndcard compatible string Andrei Simion (1): ASoC: atmel: mchp-pdmc: Skip ALSA restoration if substream runtime is uninitialized Bard Liao (1): ASoC: Intel: soc-acpi-intel-rpl-match: add missing empty item Charles Han (1): ASoC: intel: sof_sdw: Add check devm_kasprintf() returned value Charles Keepax (1): ASoC: Intel: soc-acpi: arl: Fix some missing empty terminators David Lawrence Glanzman (1): ASoC: amd: yc: Add quirk for HP Dragonfly pro one Hui Wang (1): ASoC: imx-card: Set card.owner to avoid a warning calltrace if SND=m Mark Brown (3): Merge existing fixes from asoc/for-6.12 into new branch ASoC: Intel: soc-acpi: Fix missing empty terminators qrb4210-rb2: add HDMI audio playback support Miquel Raynal (1): ASoC: dt-bindings: davinci-mcasp: Fix interrupts property Ricardo Rivera-Matos (1): ASoC: cs35l45: Corrects cs35l45_get_clk_freq_id function data type Shengjiu Wang (1): ASoC: fsl_sai: Enable 'FIFO continue on error' FCONT bit Tang Bin (1): ASoC: topology: Fix incorrect addressing assignments Vijendar Mukunda (1): ASoC: amd: acp: don't set card long_name Wolfram Sang (1): ASoC: dt-bindings: renesas,rsnd: correct reg-names for R-Car Gen1 .../devicetree/bindings/sound/davinci-mcasp-audio.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,sm8250.yaml | 1 + Documentation/devicetree/bindings/sound/renesas,rsnd.yaml | 2 +- sound/soc/amd/acp/acp-sdw-sof-mach.c | 5 ----- sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ sound/soc/atmel/mchp-pdmc.c | 3 +++ sound/soc/codecs/cs35l45-tables.c | 2 +- sound/soc/codecs/cs35l45.h | 2 +- sound/soc/codecs/lpass-rx-macro.c | 2 +- sound/soc/fsl/fsl_sai.c | 5 ++++- sound/soc/fsl/fsl_sai.h | 1 + sound/soc/fsl/imx-card.c | 1 + sound/soc/intel/boards/sof_sdw.c | 12 ++++++++++++ sound/soc/intel/common/soc-acpi-intel-arl-match.c | 2 ++ sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 1 + sound/soc/qcom/sm8250.c | 1 + sound/soc/soc-topology.c | 4 ++-- 17 files changed, 40 insertions(+), 13 deletions(-)

2 1

[PATCH] ASoC: intel: sof_sdw: Add check devm_kasprintf() returned value
by Charles Han 02 Oct '24

02 Oct '24

devm_kasprintf() can return a NULL pointer on failure but this returned value is not checked. Fixes: b359760d95ee ("ASoC: intel: sof_sdw: Add simple DAI link creation helper") Signed-off-by: Charles Han <hanchunchao(a)inspur.com> --- sound/soc/intel/boards/sof_sdw.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index d258728d64cf..26917f6f15cf 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -919,6 +919,9 @@ static int create_ssp_dailinks(struct snd_soc_card *card, char *cpu_dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", i); char *codec_name = devm_kasprintf(dev, GFP_KERNEL, "i2c-%s:0%d", ssp_info->acpi_id, j++); + if (!name || !cpu_dai_name || !codec_name) + return -ENOMEM; + int playback = ssp_info->dais[0].direction[SNDRV_PCM_STREAM_PLAYBACK]; int capture = ssp_info->dais[0].direction[SNDRV_PCM_STREAM_CAPTURE]; @@ -985,6 +988,9 @@ static int create_hdmi_dailinks(struct snd_soc_card *card, for (i = 0; i < hdmi_num; i++) { char *name = devm_kasprintf(dev, GFP_KERNEL, "iDisp%d", i + 1); char *cpu_dai_name = devm_kasprintf(dev, GFP_KERNEL, "iDisp%d Pin", i + 1); + if (!name || !cpu_dai_name) + return -ENOMEM; + char *codec_name, *codec_dai_name; if (intel_ctx->hdmi.idisp_codec) { @@ -996,6 +1002,9 @@ static int create_hdmi_dailinks(struct snd_soc_card *card, codec_dai_name = "snd-soc-dummy-dai"; } + if (!codec_dai_name) + return -ENOMEM; + ret = asoc_sdw_init_simple_dai_link(dev, *dai_links, be_id, name, 1, 0, // HDMI only supports playback cpu_dai_name, platform_component->name, @@ -1019,6 +1028,9 @@ static int create_bt_dailinks(struct snd_soc_card *card, SOF_BT_OFFLOAD_SSP_SHIFT; char *name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port); char *cpu_dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", port); + if (!name || !cpu_dai_name) + return -ENOMEM; + int ret; ret = asoc_sdw_init_simple_dai_link(dev, *dai_links, be_id, name, -- 2.31.1

3 2

[PATCH] ASoC: imx-card: Set card.owner to avoid a warning calltrace if SND=m
by Hui Wang 02 Oct '24

02 Oct '24

In most Linux distribution kernels, the SND is set to m, in such a case, when booting the kernel on i.MX8MP EVK board, there is a warning calltrace like below: Call trace: snd_card_init+0x484/0x4cc [snd] snd_card_new+0x70/0xa8 [snd] snd_soc_bind_card+0x310/0xbd0 [snd_soc_core] snd_soc_register_card+0xf0/0x108 [snd_soc_core] devm_snd_soc_register_card+0x4c/0xa4 [snd_soc_core] That is because the card.owner is not set, a warning calltrace is raised in the snd_card_init() due to it. Fixes: aa736700f42f ("ASoC: imx-card: Add imx-card machine driver") Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/soc/fsl/imx-card.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c index 98b37dd2b901..a7215bad6484 100644 --- a/sound/soc/fsl/imx-card.c +++ b/sound/soc/fsl/imx-card.c @@ -710,6 +710,7 @@ static int imx_card_probe(struct platform_device *pdev) data->plat_data = plat_data; data->card.dev = &pdev->dev; + data->card.owner = THIS_MODULE; dev_set_drvdata(&pdev->dev, &data->card); snd_soc_card_set_drvdata(&data->card, data); -- 2.34.1

2 1

[PATCH] ASoC: qcom: Fix NULL Dereference in asoc_qcom_lpass_cpu_platform_probe()
by Gax-c 02 Oct '24

02 Oct '24

A devm_kzalloc() in asoc_qcom_lpass_cpu_platform_probe() could possibly return NULL pointer. NULL Pointer Dereference may be triggerred without addtional check. Add a NULL check for the returned pointer. Fixes: b5022a36d28f ("ASoC: qcom: lpass: Use regmap_field for i2sctl and dmactl registers") Signed-off-by: Zichen Xie <zichenxie0106(a)gmail.com> Cc: stable(a)vger.kernel.org Reported-by: Zichen Xie <zichenxie0106(a)gmail.com> --- sound/soc/qcom/lpass-cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 5a47f661e0c6..242bc16da36d 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -1242,6 +1242,8 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) /* Allocation for i2sctl regmap fields */ drvdata->i2sctl = devm_kzalloc(&pdev->dev, sizeof(struct lpaif_i2sctl), GFP_KERNEL); + if (!drvdata->i2sctl) + return -ENOMEM; /* Initialize bitfields for dai I2SCTL register */ ret = lpass_cpu_init_i2sctl_bitfields(dev, drvdata->i2sctl, -- 2.25.1

3 2

[RFC PATCH v3 0/6] ASoC: fsl: add memory to memory function for ASRC
by Shengjiu Wang 02 Oct '24

02 Oct '24

This function is base on the accelerator implementation for compress API: https://patchwork.kernel.org/project/alsa-devel/patch/20240731083843.59911-… Audio signal processing also has the requirement for memory to memory similar as Video. This asrc memory to memory (memory ->asrc->memory) case is a non real time use case. User fills the input buffer to the asrc module, after conversion, then asrc sends back the output buffer to user. So it is not a traditional ALSA playback and capture case. Because we had implemented the "memory -> asrc ->i2s device-> codec" use case in ALSA. Now the "memory->asrc->memory" needs to reuse the code in asrc driver, so the patch 1 and patch 2 is for refining the code to make it can be shared by the "memory->asrc->memory" driver. Other change is to add memory to memory support for two kinds of i.MX ASRC modules. changes in v3: - use Jaroslav's suggestion for header file compress_params.h (PATCH 01) - remove the ASRC_OUTPUT_FORMAT/ASRC_OUTPUT_RATE definition - remove ASRC_RATIO_MOD in this version because it uses .set_metadata() Will wait Jaroslav's update or other better method in the future. - Address some comments from Pierre. changes in v2: - Remove the changes in compress API - drop the SNDRV_COMPRESS_SRC_RATIO_MOD - drop the SND_AUDIOCODEC_SRC and struct snd_dec_src - define private metadata key value ASRC_OUTPUT_FORMAT/ASRC_OUTPUT_RATE/ASRC_RATIO_MOD Shengjiu Wang (6): ALSA: compress: Add output rate and output format support ASoC: fsl_asrc: define functions for memory to memory usage ASoC: fsl_easrc: define functions for memory to memory usage ASoC: fsl_asrc_m2m: Add memory to memory function ASoC: fsl_asrc: register m2m platform device ASoC: fsl_easrc: register m2m platform device include/uapi/sound/compress_params.h | 23 +- sound/soc/fsl/Kconfig | 1 + sound/soc/fsl/Makefile | 2 +- sound/soc/fsl/fsl_asrc.c | 179 ++++++- sound/soc/fsl/fsl_asrc.h | 2 + sound/soc/fsl/fsl_asrc_common.h | 70 +++ sound/soc/fsl/fsl_asrc_m2m.c | 727 +++++++++++++++++++++++++++ sound/soc/fsl/fsl_easrc.c | 261 +++++++++- sound/soc/fsl/fsl_easrc.h | 4 + 9 files changed, 1260 insertions(+), 9 deletions(-) create mode 100644 sound/soc/fsl/fsl_asrc_m2m.c -- 2.34.1

3 9

[RESEND PATCH v4] MAINTAINERS: update entries in TEXAS INSTRUMENTS LOW/MIDDLE-POWER AUDIO AMPLIFIER (ASoC/HDA) DRIVERS and add entries for haptic driver
by Shenghao Ding 02 Oct '24

02 Oct '24

Due to internal re-org, Kevin is no longer mnaintaining audio driver. Due to job change, drop entries for the audio converter and add entries for both haptics drivers and middle-power audio amplifier drivers. Add audio converter, set the Status as Supported. So far, the Software maintainer has not been confirmed. Once the maintainer was confimred, the guy will update his mail into audio converter section. Signed-off-by: Shenghao Ding <shenghao-ding(a)ti.com> --- v4: - Add Touch Screen support v3: - Add Audio converter section - Set the section of LOW/MIDDLE-POWER AUDIO AMPLIFIER as Supported v2: - Add the detailed information of the maintained drivers. --- MAINTAINERS | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index c27f3190737f..689cc1ae70b5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22897,25 +22897,43 @@ S: Maintained F: Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml F: sound/soc/ti/ -TEXAS INSTRUMENTS AUDIO (ASoC/HDA) DRIVERS +TEXAS INSTRUMENTS LOW/MIDDLE-POWER AUDIO AMPLIFIER (ASoC/HDA) & HAPTICS DRIVERS M: Shenghao Ding <shenghao-ding(a)ti.com> -M: Kevin Lu <kevin-lu(a)ti.com> M: Baojun Xu <baojun.xu(a)ti.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) -S: Maintained +S: Supported +F: Documentation/devicetree/bindings/input/ti,drv260x.yaml +F: Documentation/devicetree/bindings/input/ti,drv266x.yaml F: Documentation/devicetree/bindings/sound/tas2552.txt +F: Documentation/devicetree/bindings/sound/tas5720.txt F: Documentation/devicetree/bindings/sound/ti,tas2562.yaml F: Documentation/devicetree/bindings/sound/ti,tas2770.yaml +F: Documentation/devicetree/bindings/sound/ti,tas2781.yaml F: Documentation/devicetree/bindings/sound/ti,tas27xx.yaml -F: Documentation/devicetree/bindings/sound/ti,tpa6130a2.yaml +F: Documentation/devicetree/bindings/sound/ti,tas5086.txt +F: Documentation/devicetree/bindings/sound/ti,tas57xx.yaml +F: Documentation/devicetree/bindings/sound/ti,tas5805m.yaml +F: Documentation/devicetree/bindings/sound/tpa6130a2.txt +F: drivers/input/misc/drv2*.c +F: include/sound/tas2*.h +F: include/sound/tas5086.h +F: include/sound/tpa6130a2-plat.h +F: sound/pci/hda/tas2781_hda_i2c.c +F: sound/soc/codecs/tas2*.* +F: sound/soc/codecs/tas5*.* +F: sound/soc/codecs/tpa6130a2.* + +TEXAS INSTRUMENTS AUDIO Converter (ASoC) and Touch Screen DRIVERS +L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) +S: Maintained F: Documentation/devicetree/bindings/sound/ti,pcm1681.yaml F: Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml +F: Documentation/devicetree/bindings/sound/ti,pcm6240.yaml F: Documentation/devicetree/bindings/sound/ti,tlv320*.yaml F: Documentation/devicetree/bindings/sound/ti,tlv320adcx140.yaml -F: include/sound/tas2*.h +F: Documentation/devicetree/bindings/sound/tlv320aic31xx.txt +F: drivers/input/touchscreen/tsc2*.* F: include/sound/tlv320*.h -F: include/sound/tpa6130a2-plat.h -F: sound/pci/hda/tas2781_hda_i2c.c F: sound/soc/codecs/pcm1681.c F: sound/soc/codecs/pcm1789*.* F: sound/soc/codecs/pcm179x*.* @@ -22925,9 +22943,8 @@ F: sound/soc/codecs/pcm3060*.* F: sound/soc/codecs/pcm3168a*.* F: sound/soc/codecs/pcm5102a.c F: sound/soc/codecs/pcm512x*.* -F: sound/soc/codecs/tas2*.* +F: sound/soc/codecs/pcm6240.* F: sound/soc/codecs/tlv320*.* -F: sound/soc/codecs/tpa6130a2.* TEXAS INSTRUMENTS DMA DRIVERS M: Peter Ujfalusi <peter.ujfalusi(a)gmail.com> -- 2.34.1

2 1

[PATCH] ASoC: qcom: Fix NULL Dereference in asoc_qcom_lpass_cpu_platform_probe()
by Gax-c 01 Oct '24

01 Oct '24

A devm_kzalloc() in asoc_qcom_lpass_cpu_platform_probe() could possibly return NULL pointer. NULL Pointer Dereference may be triggerred without addtional check. Add a NULL check for the returned pointer. Fixes: b5022a36d28f ("ASoC: qcom: lpass: Use regmap_field for i2sctl and dmactl registers") Signed-off-by: Zichen Xie <zichenxie0106(a)gmail.com> Reported-by: Zichen Xie <zichenxie0106(a)gmail.com> Reported-by: Zijie Zhao <zzjas98(a)gmail.com> Reported-by: Chenyuan Yang <chenyuan0y(a)gmail.com> --- sound/soc/qcom/lpass-cpu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 5a47f661e0c6..a8e56f47f237 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -1243,6 +1243,9 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) drvdata->i2sctl = devm_kzalloc(&pdev->dev, sizeof(struct lpaif_i2sctl), GFP_KERNEL); + if (!drvdata->i2sctl) + return -ENOMEM; + /* Initialize bitfields for dai I2SCTL register */ ret = lpass_cpu_init_i2sctl_bitfields(dev, drvdata->i2sctl, drvdata->lpaif_map); -- 2.25.1

2 1

[PATCH] Fix possible NULL Pointer Dereference in 'asoc_qcom_lpass_cpu_platform_probe'
by Gax-c 01 Oct '24

01 Oct '24

A 'devm_kzalloc' in 'asoc_qcom_lpass_cpu_platform_probe' could possibly return NULL pointer. NULL Pointer Dereference may be triggerred in 'asoc_qcom_lpass_cpu_platform_probe' without addtional check. Add a null check for the returned pointer. Fixes: b5022a36d28f ("ASoC: qcom: lpass: Use regmap_field for i2sctl and dmactl registers") Signed-off-by: Zichen Xie <zichenxie0106(a)gmail.com> Reported-by: Zichen Xie <zichenxie0106(a)gmail.com> Reported-by: Zijie Zhao <zzjas98(a)gmail.com> Reported-by: Chenyuan Yang <chenyuan0y(a)gmail.com> --- sound/soc/qcom/lpass-cpu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 5a47f661e0c6..a8e56f47f237 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -1243,6 +1243,9 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) drvdata->i2sctl = devm_kzalloc(&pdev->dev, sizeof(struct lpaif_i2sctl), GFP_KERNEL); + if (!drvdata->i2sctl) + return -ENOMEM; + /* Initialize bitfields for dai I2SCTL register */ ret = lpass_cpu_init_i2sctl_bitfields(dev, drvdata->i2sctl, drvdata->lpaif_map); -- 2.25.1

5 7

[PATCH 0/3] ASoC: fsl_micfil: fix and improvement
by Shengjiu Wang 01 Oct '24

01 Oct '24

Fix the usage of regmap_write_bits(). Move mclk clock enablement to late stage. Enable the micfil error interrupt. Shengjiu Wang (3): ASoC: fsl_micfil: fix regmap_write_bits usage ASoC: fsl_micfil: Add mclk enable flag ASoC: fsl_micfil: Enable micfil error interrupt sound/soc/fsl/fsl_micfil.c | 49 ++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 10 deletions(-) -- 2.34.1

3 5

[PATCH -next 0/5] sound/soc: fix some macro definitions and usages
by Hongbo Li 01 Oct '24

01 Oct '24

Many variable in macro are not used as we used macro_check script to detect and mamually check, let us address these issues. Hongbo Li (5): sound/soc: fix macro definition on TWL4030_OUTPUT_PGA sound/soc remove unused substream in macro soc_component_mark_pop sound/soc remove unused substream in macro soc_dai_mark_pop sound/soc remove unused substream in macro soc_link_mark_pop sound/soc: fix macro definition on STM_SAI_HAS_EXT_SYNC sound/soc/codecs/twl4030.c | 12 ++++++------ sound/soc/soc-component.c | 14 +++++++------- sound/soc/soc-dai.c | 10 +++++----- sound/soc/soc-link.c | 10 +++++----- sound/soc/stm/stm32_sai_sub.c | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) -- 2.34.1

2 7