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

[PATCH] ASoC: da7219: Fix an out-of-bound read in an error handling path
by Christophe JAILLET 24 Jun '21

24 Jun '21

If 'of_clk_add_hw_provider()' fails, the previous 'for' loop will have run completely and 'i' is know to be 'DA7219_DAI_NUM_CLKS'. In such a case, there will be an out-of-bounds access when using 'da7219->dai_clks_lookup[i]' and '&da7219->dai_clks_hw[i]'. To avoid that, add a new label, 'err_free_all', which set the expected value of 'i' in such a case. Fixes: 78013a1cf297 ("ASoC: da7219: Fix clock handling around codec level probe") Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- sound/soc/codecs/da7219.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index 13009d08b09a..1e8b491d1fd3 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -2204,12 +2204,14 @@ static int da7219_register_dai_clks(struct snd_soc_component *component) da7219->clk_hw_data); if (ret) { dev_err(dev, "Failed to register clock provider\n"); - goto err; + goto err_free_all; } } return 0; +err_free_all: + i = DA7219_DAI_NUM_CLKS - 1; err: do { if (da7219->dai_clks_lookup[i]) -- 2.30.2

2 2

1.2.5 now prefixing devices with "_ucm0001."
by GitHub issues - opened 23 Jun '21

23 Jun '21

alsa-project/alsa-ucm-conf issue #104 was opened from craftyguy: I'm using a ucm2 config that is not yet upstream (see [1]), and 1e6297b650114cb2e043be4c677118f971e31eb7 has caused devices to get renamed; they are now prefixed with `_ucm0001.`: alsaucm json output from 1.2.4: ``` ... "Verbs": { "HiFi": { "Comment": "Default", "Devices": { "Handset": { "Comment": "Handset", "ConflictingDevices": [ "Speaker", "Headphones" ], "Values": { "CaptureCTL": "hw:L5", "PlaybackCTL": "hw:L5", "PlaybackChannels": "2", "PlaybackPCM": "hw:L5,0", "PlaybackPriority": "100", "PlaybackSwitch": "name='Speaker Switch'", "PlaybackVolume": "name='Speaker Volume'" } }, ... ``` alsaucm json output from 1.2.5: ``` ... "Verbs": { "HiFi": { "Comment": "Default", "Devices": { "Handset": { "Comment": "Handset", "ConflictingDevices": [ "Speaker", "Headphones" ], "Values": { "CaptureCTL": "_ucm0001.hw:L5", "PlaybackCTL": "_ucm0001.hw:L5", "PlaybackChannels": "2", "PlaybackPCM": "_ucm0001.hw:L5,0", "PlaybackPriority": "100", "PlaybackSwitch": "name='Speaker Switch'", "PlaybackVolume": "name='Speaker Volume'" } }, ... ``` This breaks things [like pulseaudio config](https://source.puri.sm/Librem5/librem5-base/-/blob/pureos/byzantium/default/audio/pulse/librem5.pa) that expects specific device names. Was this renaming intentional? cc @agx 1. https://source.puri.sm/Librem5/librem5-base/-/tree/pureos/byzantium/default… Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/104 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 1/1] ASoC: fsl: remove unnecessary oom message
by Zhen Lei 23 Jun '21

23 Jun '21

Fixes scripts/checkpatch.pl warning: WARNING: Possible unnecessary 'out of memory' message Remove it can help us save a bit of memory. Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com> --- sound/soc/fsl/imx-audmix.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c index cbdc0a2c09c5..a364e2415de0 100644 --- a/sound/soc/fsl/imx-audmix.c +++ b/sound/soc/fsl/imx-audmix.c @@ -209,10 +209,8 @@ static int imx_audmix_probe(struct platform_device *pdev) /* for CPU/Codec/Platform x 2 */ dlc = devm_kcalloc(&pdev->dev, 6, sizeof(*dlc), GFP_KERNEL); - if (!dlc) { - dev_err(&pdev->dev, "failed to allocate dai_link\n"); + if (!dlc) return -ENOMEM; - } ret = of_parse_phandle_with_args(audmix_np, "dais", NULL, i, &args); -- 2.25.1

2 1

[PATCH -next 0/4] ASoC: tegra: Use devm_platform_get_and_ioremap_resource()
by Yang Yingliang 23 Jun '21

23 Jun '21

Use devm_platform_get_and_ioremap_resource() to simplify code. Yang Yingliang (4): ASoC: tegra20: i2s: Use devm_platform_get_and_ioremap_resource() ASoC: tegra20: spdif: Use devm_platform_get_and_ioremap_resource() ASoC: tegra: tegra210_admaif: Use devm_platform_get_and_ioremap_resource() ASoC: tegra30: ahub: Use devm_platform_get_and_ioremap_resource() sound/soc/tegra/tegra20_i2s.c | 3 +-- sound/soc/tegra/tegra20_spdif.c | 3 +-- sound/soc/tegra/tegra210_admaif.c | 4 +--- sound/soc/tegra/tegra30_ahub.c | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) -- 2.25.1

2 5

[PATCH v2 0/3] ASoC: tlv320aic32x4: Add support for TAS2505
by Claudius Heine 23 Jun '21

23 Jun '21

Hi, this is v2 from my patchset that add support for the TAS2505 to the tlv320aic32x4 driver. kind regards, Claudius Changes from v1: - clarified commit message of first patch, which add the type value to the struct - removed unnecessary code to put and get speaker volume - removed 'Gain' from 'HP Driver Playback Volume' control - fixed rebase issues Claudius Heine (3): ASoC: tlv320aic32x4: add type to device private data struct ASoC: tlv320aic32x4: add support for TAS2505 ASoC: tlv320aic32x4: dt-bindings: add TAS2505 to compatible .../bindings/sound/tlv320aic32x4.txt | 1 + sound/soc/codecs/tlv320aic32x4-i2c.c | 22 ++- sound/soc/codecs/tlv320aic32x4-spi.c | 23 ++- sound/soc/codecs/tlv320aic32x4.c | 139 +++++++++++++++++- sound/soc/codecs/tlv320aic32x4.h | 10 ++ 5 files changed, 186 insertions(+), 9 deletions(-) base-commit: 70585216fe7730d9fb5453d3e2804e149d0fe201 -- 2.32.0

2 4

[PATCH] ASoC: fsl_spdif: Fix unexpected interrupt after suspend
by Shengjiu Wang 23 Jun '21

23 Jun '21

When system enter suspend, the machine driver suspend callback function will be called, then the cpu driver trigger callback (SNDRV_PCM_TRIGGER_SUSPEND) be called, it would disable the interrupt. But the machine driver suspend and cpu dai driver suspend order maybe changed, the cpu dai driver's suspend callback is called before machine driver's suppend callback, then the interrupt is not cleared successfully in trigger callback. So need to clear interrupts in cpu dai driver's suspend callback to avoid such issue. Fixes: 9cb2b3796e08 ("ASoC: fsl_spdif: Add pm runtime function") Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_spdif.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index a9c6b930b04a..8ffb1a6048d6 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -1467,6 +1467,9 @@ static int fsl_spdif_runtime_suspend(struct device *dev) struct fsl_spdif_priv *spdif_priv = dev_get_drvdata(dev); int i; + /* Disable all the interrupts */ + regmap_update_bits(spdif_priv->regmap, REG_SPDIF_SIE, 0xffffff, 0); + regmap_read(spdif_priv->regmap, REG_SPDIF_SRPC, &spdif_priv->regcache_srpc); regcache_cache_only(spdif_priv->regmap, true); -- 2.27.0

3 2

UCM2 documentation
by GitHub issues - opened 23 Jun '21

23 Jun '21

alsa-project/alsa-ucm-conf issue #103 was opened from perexg: Add/improve the documentation for - directory tree layout - build-in string substitutions - runtime conditional configuration selection - mixer settings (boot -> use -> verb -> device) Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/103 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ASoC: snd-soc-dummy: add Device Tree support
by Judy Hsiao 23 Jun '21

23 Jun '21

Support for loading the snd-soc-dummy via DeviceTree. This is useful to create dummy codec devices where we need to have some DAI links without a real Codec. Signed-off-by: Judy Hsiao <judyhsiao(a)chromium.org> --- .../devicetree/bindings/sound/snd-soc-dummy.txt | 16 ++++++++++++++++ sound/soc/soc-utils.c | 11 +++++++++++ 2 files changed, 27 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/snd-soc-dummy.txt diff --git a/Documentation/devicetree/bindings/sound/snd-soc-dummy.txt b/Documentation/devicetree/bindings/sound/snd-soc-dummy.txt new file mode 100644 index 000000000000..7fa8c5751e62 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/snd-soc-dummy.txt @@ -0,0 +1,16 @@ +* snd-soc-dummy + +This node models the snd-soc-dummy. +This is useful to create dummy codec devices where we need to have +some DAI links without a real Codec. + +Required properties: +- compatible : "asoc,snd-soc-dummy" + + +Example: + +dummy_codec { + compatible = "asoc,snd-soc-dummy"; + #sound-dai-cells = <0>; +}; diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index 299b5d6ebfd1..def2cc687415 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -7,6 +7,8 @@ // Author: Mark Brown <broonie(a)opensource.wolfsonmicro.com> // Liam Girdwood <lrg(a)slimlogic.co.uk> +#include <linux/module.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/export.h> #include <sound/core.h> @@ -181,9 +183,18 @@ static int snd_soc_dummy_probe(struct platform_device *pdev) return ret; } +#ifdef CONFIG_OF +static const struct of_device_id soc_dummy_device_id[] = { + { .compatible = "asoc,snd-soc-dummy" }, + {} +}; +MODULE_DEVICE_TABLE(of, soc_dummy_device_id); +#endif + static struct platform_driver soc_dummy_driver = { .driver = { .name = "snd-soc-dummy", + .of_match_table = of_match_ptr(soc_dummy_device_id), }, .probe = snd_soc_dummy_probe, }; -- 2.31.0

2 4

[GIT PULL] HDMI codec improvements, v2
by Maxime Ripard 23 Jun '21

23 Jun '21

Hi, Here's a PR for the changes to hdmi-codec that need to be shared between drm-misc-next and ASoC. This is the second iteration, fixing a bisection issue with compilation Thanks! Maxime The following changes since commit 6efb943b8616ec53a5e444193dccf1af9ad627b5: Linux 5.13-rc1 (2021-05-09 14:17:44 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git tags/asoc-hdmi-codec-improvements-v2 for you to fetch changes up to 2fef64eec23a0840c97977b16dd8919afaffa876: ASoC: hdmi-codec: Add a prepare hook (2021-06-10 11:48:56 +0200) ---------------------------------------------------------------- Improvements to the hdmi-codec driver and ALSA infrastructure around it to support the HDMI Channel Mapping and IEC958 controls ---------------------------------------------------------------- Maxime Ripard (5): ALSA: doc: Clarify IEC958 controls iface ALSA: iec958: Split status creation and fill ASoC: hdmi-codec: Rework to support more controls ASoC: hdmi-codec: Add iec958 controls ASoC: hdmi-codec: Add a prepare hook .../sound/kernel-api/writing-an-alsa-driver.rst | 13 +- include/sound/hdmi-codec.h | 12 +- include/sound/pcm_iec958.h | 8 + sound/core/pcm_iec958.c | 176 +++++++++++++---- sound/soc/codecs/hdmi-codec.c | 219 +++++++++++++++++---- 5 files changed, 337 insertions(+), 91 deletions(-)

2 3

[PATCH v2 00/12] drm/vc4: hdmi: Enable Channel Mapping, IEC958, HBR Passthrough using hdmi-codec
by Maxime Ripard 23 Jun '21

23 Jun '21

Hi, hdmi-codec allows to have a lot of HDMI-audio related infrastructure in place, it's missing a few controls to be able to provide HBR passthrough. This series adds more infrastructure for the drivers, and leverages it in the vc4 HDMI controller driver. Thanks! Maxime Changes from v1: - Added an extra patch to clarify the iec958 controls iface policy - Added kerneldoc for the new iec958 PCM functions - s/EXPORT_SYMBOL/EXPORT_SYMBOL_GPL - Used the ALSA prefix where relevant - Rebased on drm-misc-next-2021-05-17 Dom Cobley (5): drm/vc4: hdmi: Set HD_CTL_WHOLSMP and HD_CTL_CHALIGN_SET drm/vc4: hdmi: Set HDMI_MAI_FMT drm/vc4: hdmi: Set VC4_HDMI_MAI_CONFIG_FORMAT_REVERSE drm/vc4: hdmi: Remove firmware logic for MAI threshold setting ARM: dts: bcm2711: Tune DMA parameters for HDMI audio Maxime Ripard (7): ALSA: doc: Clarify IEC958 controls iface ALSA: iec958: Split status creation and fill ASoC: hdmi-codec: Rework to support more controls ASoC: hdmi-codec: Add iec958 controls ASoC: hdmi-codec: Add a prepare hook drm/vc4: hdmi: Register HDMI codec drm/vc4: hdmi: Remove redundant variables .../kernel-api/writing-an-alsa-driver.rst | 13 +- arch/arm/boot/dts/bcm2711.dtsi | 4 +- drivers/gpu/drm/vc4/Kconfig | 1 + drivers/gpu/drm/vc4/vc4_hdmi.c | 322 ++++++++---------- drivers/gpu/drm/vc4/vc4_hdmi.h | 5 +- drivers/gpu/drm/vc4/vc4_regs.h | 30 ++ include/sound/hdmi-codec.h | 12 +- include/sound/pcm_iec958.h | 8 + sound/core/pcm_iec958.c | 176 +++++++--- sound/soc/codecs/hdmi-codec.c | 219 +++++++++--- 10 files changed, 508 insertions(+), 282 deletions(-) -- 2.31.1

6 32