November 2022 - Alsa-devel - mailman.alsa-project.org

[PATCH 1/2] ASoC: ops: Correct bounds check for second channel on SX controls
by Charles Keepax 25 Nov '22

25 Nov '22

Currently the check against the max value for the control is being applied after the value has had the minimum applied and been masked. But the max value simply indicates the number of volume levels on an SX control, and as such should just be applied on the raw value. Fixes: e9b397afabb8 ("ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/soc-ops.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 1970bda074d8a..55b009d3c6815 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -464,16 +464,15 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, ret = err; if (snd_soc_volsw_is_stereo(mc)) { - unsigned int val2; - - val_mask = mask << rshift; - val2 = (ucontrol->value.integer.value[1] + min) & mask; + unsigned int val2 = ucontrol->value.integer.value[1]; if (mc->platform_max && val2 > mc->platform_max) return -EINVAL; if (val2 > max) return -EINVAL; + val_mask = mask << rshift; + val2 = (val2 + min) & mask; val2 = val2 << rshift; err = snd_soc_component_update_bits(component, reg2, val_mask, -- 2.30.2

2 5

Unable to open hostless PCM device after introduction of commit - ASoC: Stop dummy from overriding hwparams
by Patrick Lai 25 Nov '22

25 Nov '22

Hi Amadeusz, On the product I am working on, a hostless PCM device is defined for purpose of activating CODEC driver to setup the path inside CODEC. So, CPU DAI and PCM Platform are defined to use dummy dai & DMA supplied by sound/soc/soc-utils.c. After upgrading to newer kernel, hostless PCM device failed to open. After doing a bit of digging, the root cause is that dummy_dma_hardware is not set in dummy_dma_open() due to new conditional check logic introduced in this commit - 6c504663ba2ee2abeaf5622e27082819326c1bd4. In order to fix problem I am encountering properly without regressing your scenario, I would like to get a better understanding of problem you were addressing. My understanding, from looking through other drivers under sound/soc, is that pcm hardware info is usually set by PCM platform/DMA drivers. For your scenario, do you have other component e.g CPU/CODEC DAI, set PCM hardware definition? I am not sure conditional check logic from 6c504663ba2ee2abeaf5622e27082819326c1bd4 guarantees that other component would be setting pcm hardware info. Appreciate if you can provide more insight to your scenario? Thanks Patrick

3 2

SOC_DOUBLE_R_SX_TLV controls broken in cs24l51 driver
by Guillermo Rodriguez Garcia 25 Nov '22

25 Nov '22

Hi all, I am using a dev board with a Cirrus Logic cs24l51 codec. This used to work fine prior to kernel version 5.x, however after 5.x it is not possible to set certain values for ALSA controls from userspace. I believe this is related to the input validation that is mentioned in this thread: https://lore.kernel.org/all/Yph8C3bRxcr6ogW7@sirena.org.uk/T/, and possibly in this commit: 4f1e50d6a9cf9c1b8c859d449b5031cacfa8404e ("ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx()") For the cs24l51, all the controls that fail are using the SOC_DOUBLE_R_SX_TLV macro. I have traced this to the checks in snd_soc_put_volsw_sx, specifically the (val > max - min) check: pr_warn("Max: %d, Min: %d, Value: %d", max, min, val); pr_warn("platform_max: %d", mc->platform_max); if (mc->platform_max && val > mc->platform_max) { return -EINVAL; } if (val > max - min){ pr_warn("(val > max - min) check failed"); return -EINVAL; } if (val < 0) return -EINVAL; According to the datasheet of the CS24L51, section 6.13, page 61, the PCMMIXX_VOL registers accept the following range of values: Binary Code / Volume Setting 001 1000 / +12.0 dB ··· ··· 000 0000 / 0 dB 111 1111 / -0.5 dB 111 1110 / -1.0 dB ··· ··· 001 1001 / -51.5 dB Minimum value is 0x19 (001 1001) corresponding to -51.5 dB, then there are 127 possible gain settings from -51.5 dB to +12.0 dB, in 0.5 dB steps. This is declared in the driver as follows: SOC_DOUBLE_R_SX_TLV("PCM Playback Volume", CS42L51_PCMA_VOL, CS42L51_PCMB_VOL, 0, 0x19, 0x7F, adc_pcm_tlv), 0x19 = min value 0x7F = number of gain settings This seems to be correct according to the semantics of the SOC_DOUBLE_R_SX_TLV macro as described in commit 34198710f55b5f359f43e67d9a08fe5aadfbca1b ("ASoC: Add info callback for SX_TLV controls"). However, the (val > max - min) check in snd_soc_put_volsw_sx fails in the above example because val = 127, max - min = 127 - 25 = 102. So I am not sure how this should be fixed. Is the SX_TLV macro being used incorrectly here? Is the check in snd_soc_put_volsw_sx wrong? Any pointers are welcome. Thanks, (If possible, please CC me in any replies) Guillermo Rodriguez Garcia guille.rodriguez(a)gmail.com

3 4

[PATCH 0/2] SX control bounds check fixups
by Charles Keepax 25 Nov '22

25 Nov '22

These two SX control fixups seem to have got lost somewhere along the line. They were merged back in 5.18 but never seems to actually make it into the kernel: https://lore.kernel.org/all/165236477046.1016627.15470197691244479154.b4-ty… Apologies if resending isn't the correct course but it seemed the safest way to go. Note I have made a slight fixup to the second patch. Thanks, Charles Mark Brown (2): ASoC: ops: Fix bounds check for _sx controls ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() sound/soc/soc-ops.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -- 2.30.2

2 3

[PATCH] kselftest/alsa: Add a .gitignore for the newly added PCM test
by Mark Brown 25 Nov '22

25 Nov '22

The newly added PCM test produces a binary which is not ignored by git when built in tree, fix that. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- tools/testing/selftests/alsa/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/alsa/.gitignore b/tools/testing/selftests/alsa/.gitignore index 3bb7c41266a8..2b0d11797f25 100644 --- a/tools/testing/selftests/alsa/.gitignore +++ b/tools/testing/selftests/alsa/.gitignore @@ -1 +1,2 @@ mixer-test +pcm-test -- 2.30.2

3 2

[PATCH 0/2] firmware: cs_dsp: Switch to using namespaced exports
by Richard Fitzgerald 25 Nov '22

25 Nov '22

Use EXPORT_SYMBOL_NS_GPL() instead of EXPORT_SYMBOL_GPL() and patch the three drivers that use cs_dsp to add the MODULE_IMPORT_NS(). To make the namespace more specific the KConfig symbol for cs_dsp is changed from CS_DSP to FW_CS_DSP. Richard Fitzgerald (2): firmware: cs_dsp: Rename KConfig symbol CS_DSP -> FW_CS_DSP firmware: cs_dsp: Make the exports namespaced drivers/firmware/cirrus/Kconfig | 2 +- drivers/firmware/cirrus/Makefile | 2 +- drivers/firmware/cirrus/cs_dsp.c | 62 ++++++++++++++++---------------- sound/pci/hda/Kconfig | 2 +- sound/pci/hda/cs35l41_hda.c | 1 + sound/pci/hda/hda_cs_dsp_ctl.c | 1 + sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/wm_adsp.c | 1 + 8 files changed, 38 insertions(+), 35 deletions(-) -- 2.30.2

2 3

[PATCH] ASoC: qcom: cleanup and fix dependency of QCOM_COMMON
by Srinivas Kandagatla 25 Nov '22

25 Nov '22

SND_SOC_QCOM_COMMON depends on SOUNDWIRE for some symbols but this is not explicitly specified using Kconfig depends. On the other hand SND_SOC_QCOM_COMMON is also directly selected by the sound card Kconfigs, this could result in various combinations and some symbols ending up in modules and soundcard that uses those symbols as in-build driver. Fix these issues by explicitly specifying the dependencies of SND_SOC_QCOM_COMMON and also use imply a to select SND_SOC_QCOM_COMMON so that the symbol is selected based on its dependencies. Also remove dummy stubs in common.c around CONFIG_SOUNDWIRE Fixes: 3bd975f3ae0a ("ASoC: qcom: sm8250: move some code to common") Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/qcom/Kconfig | 16 +++++++++------- sound/soc/qcom/common.c | 2 -- sound/soc/qcom/common.h | 23 ----------------------- 3 files changed, 9 insertions(+), 32 deletions(-) diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 8c7398bc1ca8..96a6d4731e6f 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -2,6 +2,7 @@ menuconfig SND_SOC_QCOM tristate "ASoC support for QCOM platforms" depends on ARCH_QCOM || COMPILE_TEST + imply SND_SOC_QCOM_COMMON help Say Y or M if you want to add support to use audio devices in Qualcomm Technologies SOC-based platforms. @@ -59,13 +60,14 @@ config SND_SOC_STORM config SND_SOC_APQ8016_SBC tristate "SoC Audio support for APQ8016 SBC platforms" select SND_SOC_LPASS_APQ8016 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON help Support for Qualcomm Technologies LPASS audio block in APQ8016 SOC-based systems. Say Y if you want to use audio devices on MI2S. config SND_SOC_QCOM_COMMON + depends on SOUNDWIRE tristate config SND_SOC_QDSP6_COMMON @@ -142,7 +144,7 @@ config SND_SOC_MSM8996 depends on QCOM_APR depends on COMMON_CLK select SND_SOC_QDSP6 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON help Support for Qualcomm Technologies LPASS audio block in APQ8096 SoC-based systems. @@ -153,7 +155,7 @@ config SND_SOC_SDM845 depends on QCOM_APR && I2C && SOUNDWIRE depends on COMMON_CLK select SND_SOC_QDSP6 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON select SND_SOC_RT5663 select SND_SOC_MAX98927 imply SND_SOC_CROS_EC_CODEC @@ -167,7 +169,7 @@ config SND_SOC_SM8250 depends on QCOM_APR && SOUNDWIRE depends on COMMON_CLK select SND_SOC_QDSP6 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON help To add support for audio on Qualcomm Technologies Inc. SM8250 SoC-based systems. @@ -178,7 +180,7 @@ config SND_SOC_SC8280XP depends on QCOM_APR && SOUNDWIRE depends on COMMON_CLK select SND_SOC_QDSP6 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON help To add support for audio on Qualcomm Technologies Inc. SC8280XP SoC-based systems. @@ -188,7 +190,7 @@ config SND_SOC_SC7180 tristate "SoC Machine driver for SC7180 boards" depends on I2C && GPIOLIB depends on SOUNDWIRE || SOUNDWIRE=n - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON select SND_SOC_LPASS_SC7180 select SND_SOC_MAX98357A select SND_SOC_RT5682_I2C @@ -202,7 +204,7 @@ config SND_SOC_SC7180 config SND_SOC_SC7280 tristate "SoC Machine driver for SC7280 boards" depends on I2C && SOUNDWIRE - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON select SND_SOC_LPASS_SC7280 select SND_SOC_MAX98357A select SND_SOC_WCD938X_SDW diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index 69dd3b504e20..49c74c1662a3 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -180,7 +180,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card) } EXPORT_SYMBOL_GPL(qcom_snd_parse_of); -#if IS_ENABLED(CONFIG_SOUNDWIRE) int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, struct sdw_stream_runtime *sruntime, bool *stream_prepared) @@ -294,7 +293,6 @@ int qcom_snd_sdw_hw_free(struct snd_pcm_substream *substream, return 0; } EXPORT_SYMBOL_GPL(qcom_snd_sdw_hw_free); -#endif int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd, struct snd_soc_jack *jack, bool *jack_setup) diff --git a/sound/soc/qcom/common.h b/sound/soc/qcom/common.h index c5472a642de0..3ef5bb6d12df 100644 --- a/sound/soc/qcom/common.h +++ b/sound/soc/qcom/common.h @@ -11,7 +11,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card); int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd, struct snd_soc_jack *jack, bool *jack_setup); -#if IS_ENABLED(CONFIG_SOUNDWIRE) int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, struct sdw_stream_runtime *runtime, bool *stream_prepared); @@ -21,26 +20,4 @@ int qcom_snd_sdw_hw_params(struct snd_pcm_substream *substream, int qcom_snd_sdw_hw_free(struct snd_pcm_substream *substream, struct sdw_stream_runtime *sruntime, bool *stream_prepared); -#else -static inline int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, - struct sdw_stream_runtime *runtime, - bool *stream_prepared) -{ - return -ENOTSUPP; -} - -static inline int qcom_snd_sdw_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, - struct sdw_stream_runtime **psruntime) -{ - return -ENOTSUPP; -} - -static inline int qcom_snd_sdw_hw_free(struct snd_pcm_substream *substream, - struct sdw_stream_runtime *sruntime, - bool *stream_prepared) -{ - return -ENOTSUPP; -} -#endif #endif -- 2.25.1

2 1

[PATCH] ASoC: qcom: Add checks for devm_kcalloc
by Yuan Can 25 Nov '22

25 Nov '22

As the devm_kcalloc may return NULL, the return value needs to be checked to avoid NULL poineter dereference. Fixes: 24caf8d9eb10 ("ASoC: qcom: lpass-sc7180: Add platform driver for lpass audio") Signed-off-by: Yuan Can <yuancan(a)huawei.com> --- sound/soc/qcom/lpass-sc7180.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c index 77a556b27cf0..24a1c121cb2e 100644 --- a/sound/soc/qcom/lpass-sc7180.c +++ b/sound/soc/qcom/lpass-sc7180.c @@ -131,6 +131,9 @@ static int sc7180_lpass_init(struct platform_device *pdev) drvdata->clks = devm_kcalloc(dev, variant->num_clks, sizeof(*drvdata->clks), GFP_KERNEL); + if (!drvdata->clks) + return -ENOMEM; + drvdata->num_clks = variant->num_clks; for (i = 0; i < drvdata->num_clks; i++) -- 2.17.1

2 1

[PATCH 1/2] ASoC: dt-bindings: add compatible string for NAU8318
by David Lin 25 Nov '22

25 Nov '22

The audio amplifier NAU8318 is almost functionally identical to NAU8315. Adds compatible string "nuvoton,nau8318" for driver reuse. Signed-off-by: David Lin <CTLIN0(a)nuvoton.com> --- Documentation/devicetree/bindings/sound/nau8315.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/nau8315.txt b/Documentation/devicetree/bindings/sound/nau8315.txt index 6eaec46f384c..1cd94517d45e 100644 --- a/Documentation/devicetree/bindings/sound/nau8315.txt +++ b/Documentation/devicetree/bindings/sound/nau8315.txt @@ -2,6 +2,7 @@ Nuvoton NAU8315 Mono Class-D Amplifier Required properties: - compatible : "nuvoton,nau8315" + "nuvoton,nau8318" Optional properties: - enable-gpios : GPIO specifier for the chip's device enable input(EN) pin. @@ -16,3 +17,8 @@ nau8315 { compatible = "nuvoton,nau8315"; enable-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; }; + +nau8318 { + compatible = "nuvoton,nau8318"; + enable-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; +}; -- 2.25.1

2 2

[PATCH 1/2] ASoC: nau8315: add new acpi id and compatible id
by David Lin 25 Nov '22

25 Nov '22

Add new acpi id and compatible id for nau8315. Signed-off-by: David Lin <CTLIN0(a)nuvoton.com> --- sound/soc/codecs/nau8315.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/nau8315.c b/sound/soc/codecs/nau8315.c index ad4dce9e5080..125742601f88 100644 --- a/sound/soc/codecs/nau8315.c +++ b/sound/soc/codecs/nau8315.c @@ -137,6 +137,7 @@ static int nau8315_platform_probe(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id nau8315_device_id[] = { { .compatible = "nuvoton,nau8315" }, + { .compatible = "nuvoton,nau8318" }, {} }; MODULE_DEVICE_TABLE(of, nau8315_device_id); @@ -145,6 +146,7 @@ MODULE_DEVICE_TABLE(of, nau8315_device_id); #ifdef CONFIG_ACPI static const struct acpi_device_id nau8315_acpi_match[] = { { "NVTN2010", 0 }, + { "NVTN2012", 0}, {}, }; MODULE_DEVICE_TABLE(acpi, nau8315_acpi_match); -- 2.25.1

3 7