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

[PATCH alsa-ucm-conf v2 1/2] sof-soundwire: Change mapped control names to make them unique
by Maciej Strozek 08 Oct '24

08 Oct '24

Both 'Speaker Digital' and 'cs42l43 PDM2' names were found as substrings in other alsa controls, confusing the MixerElems paths. Make them unique to avoid errors for hardware mutes. Also add 'Capture' string into microphone controls to make them work properly. Fixes: e87dde51d689 ("sof-soundwire: Add basic support for cs42l43") Fixes: e4277a204cd6 ("sof-soundwire: Add support for cs42l43/cs35l56 bridge configuration") Signed-off-by: Maciej Strozek <mstrozek(a)opensource.cirrus.com> --- v2: Rename to "Speaker Playback" instead of "Speaker Combined" --- ucm2/codecs/cs42l43/init.conf | 4 ++-- ucm2/sof-soundwire/cs35l56-bridge.conf | 6 +++--- ucm2/sof-soundwire/cs42l43-dmic.conf | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ucm2/codecs/cs42l43/init.conf b/ucm2/codecs/cs42l43/init.conf index 10a6e1f..cf61833 100644 --- a/ucm2/codecs/cs42l43/init.conf +++ b/ucm2/codecs/cs42l43/init.conf @@ -2,11 +2,11 @@ LibraryConfig.remap.Config { ctl.default.map { - "name='cs42l43 PDM2 Switch'" { + "name='cs42l43 Microphone Capture Switch'" { "name='cs42l43 Decimator 3 Switch'".vindex.0 0 "name='cs42l43 Decimator 4 Switch'".vindex.1 0 } - "name='cs42l43 PDM2 Volume'" { + "name='cs42l43 Microphone Capture Volume'" { "name='cs42l43 Decimator 3 Volume'".vindex.0 0 "name='cs42l43 Decimator 4 Volume'".vindex.1 0 } diff --git a/ucm2/sof-soundwire/cs35l56-bridge.conf b/ucm2/sof-soundwire/cs35l56-bridge.conf index 5435b11..a3cf6ad 100644 --- a/ucm2/sof-soundwire/cs35l56-bridge.conf +++ b/ucm2/sof-soundwire/cs35l56-bridge.conf @@ -2,11 +2,11 @@ LibraryConfig.remap.Config { ctl.default.map { - "name='Speaker Digital Switch'" { + "name='Speaker Playback Switch'" { "name='AMPL Speaker Switch'".vindex.0 0 "name='AMPR Speaker Switch'".vindex.1 0 } - "name='Speaker Digital Volume'" { + "name='Speaker Playback Volume'" { "name='AMPL Speaker Volume'".vindex.0 0 "name='AMPR Speaker Volume'".vindex.1 0 } @@ -56,6 +56,6 @@ SectionDevice."Speaker" { PlaybackPriority 100 PlaybackPCM "hw:${CardId},0" PlaybackMixer "default:${CardId}" - PlaybackMixerElem "Speaker Digital" + PlaybackMixerElem "Speaker Playback" } } diff --git a/ucm2/sof-soundwire/cs42l43-dmic.conf b/ucm2/sof-soundwire/cs42l43-dmic.conf index d5f895d..b68a70d 100644 --- a/ucm2/sof-soundwire/cs42l43-dmic.conf +++ b/ucm2/sof-soundwire/cs42l43-dmic.conf @@ -21,6 +21,6 @@ SectionDevice."Mic" { CapturePriority 100 CapturePCM "hw:${CardId},4" CaptureMixer "default:${CardId}" - CaptureMixerElem "cs42l43 PDM2" + CaptureMixerElem "cs42l43 Microphone" } } -- 2.39.5

1 2

[PATCH v1] ASoC: codecs: lpass-macro: Add support for channel map mixer control
by Mohammad Rafi Shaik 08 Oct '24

08 Oct '24

From: Rohit kumar <quic_rohkumar(a)quicinc.com> Add channel map mixer control for lpass macro codec DAIs. Signed-off-by: Rohit kumar <quic_rohkumar(a)quicinc.com> Co-developed-by: Mohammad Rafi Shaik <quic_mohs(a)quicinc.com> Signed-off-by: Mohammad Rafi Shaik <quic_mohs(a)quicinc.com> --- sound/soc/codecs/lpass-macro-common.c | 55 +++++++++++++++++++++++++++ sound/soc/codecs/lpass-macro-common.h | 2 + sound/soc/codecs/lpass-rx-macro.c | 12 ++++++ sound/soc/codecs/lpass-tx-macro.c | 9 +++++ sound/soc/codecs/lpass-va-macro.c | 9 +++++ sound/soc/codecs/lpass-wsa-macro.c | 12 ++++++ 6 files changed, 99 insertions(+) diff --git a/sound/soc/codecs/lpass-macro-common.c b/sound/soc/codecs/lpass-macro-common.c index 6e3b8d0897dd..777af4885245 100644 --- a/sound/soc/codecs/lpass-macro-common.c +++ b/sound/soc/codecs/lpass-macro-common.c @@ -8,12 +8,67 @@ #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/pm_runtime.h> +#include <sound/control.h> +#include <sound/pcm.h> +#include <sound/soc.h> #include "lpass-macro-common.h" static DEFINE_MUTEX(lpass_codec_mutex); static enum lpass_codec_version lpass_codec_version; +static int lpass_macro_chmap_ctl_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol); + struct snd_soc_dai *dai = info->private_data; + u32 *chmap_data = NULL; + u32 rx_ch_cnt = 0; + u32 tx_ch_cnt = 0; + u32 rx_ch, tx_ch; + + chmap_data = kzalloc(sizeof(u32) * 2, GFP_KERNEL); + if (!chmap_data) + return -ENOMEM; + + snd_soc_dai_get_channel_map(dai, &tx_ch_cnt, &tx_ch, &rx_ch_cnt, &rx_ch); + if (rx_ch_cnt) { + chmap_data[0] = rx_ch_cnt; + chmap_data[1] = rx_ch; + } else if (tx_ch_cnt) { + chmap_data[0] = tx_ch_cnt; + chmap_data[1] = tx_ch; + } + memcpy(ucontrol->value.bytes.data, chmap_data, sizeof(u32) * 2); + + kfree(chmap_data); + return 0; +} + +int lpass_macro_add_chmap_ctls(struct snd_soc_pcm_runtime *rtd, + struct snd_soc_dai *dai, int dir) +{ + struct snd_pcm_chmap *info; + int ret; + + info = kzalloc(sizeof(*info), GFP_KERNEL); + if (!info) + return -ENOMEM; + + ret = snd_pcm_add_chmap_ctls(rtd->pcm, dir, NULL, + 2 * sizeof(u32), 0, &info); + if (ret < 0) { + kfree(info); + return ret; + } + + /* override handlers */ + info->private_data = dai; + info->kctl->get = lpass_macro_chmap_ctl_get; + return 0; +} +EXPORT_SYMBOL_GPL(lpass_macro_add_chmap_ctls); + struct lpass_macro *lpass_macro_pds_init(struct device *dev) { struct lpass_macro *l_pds; diff --git a/sound/soc/codecs/lpass-macro-common.h b/sound/soc/codecs/lpass-macro-common.h index fb4b96cb2b23..23ed6836addf 100644 --- a/sound/soc/codecs/lpass-macro-common.h +++ b/sound/soc/codecs/lpass-macro-common.h @@ -40,6 +40,8 @@ struct lpass_macro *lpass_macro_pds_init(struct device *dev); void lpass_macro_pds_exit(struct lpass_macro *pds); void lpass_macro_set_codec_version(enum lpass_codec_version version); enum lpass_codec_version lpass_macro_get_codec_version(void); +int lpass_macro_add_chmap_ctls(struct snd_soc_pcm_runtime *rtd, + struct snd_soc_dai *dai, int dir); static inline void lpass_macro_pds_exit_action(void *pds) { diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 71e0d3bffd3f..05bd0f8d126b 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -1954,10 +1954,22 @@ static int rx_macro_digital_mute(struct snd_soc_dai *dai, int mute, int stream) return 0; } +static int rx_macro_pcm_new(struct snd_soc_pcm_runtime *rtd, + struct snd_soc_dai *dai) +{ + int dir = SNDRV_PCM_STREAM_PLAYBACK; + + if (dai->id == RX_MACRO_AIF_ECHO) + dir = SNDRV_PCM_STREAM_CAPTURE; + + return lpass_macro_add_chmap_ctls(rtd, dai, dir); +} + static const struct snd_soc_dai_ops rx_macro_dai_ops = { .hw_params = rx_macro_hw_params, .get_channel_map = rx_macro_get_channel_map, .mute_stream = rx_macro_digital_mute, + .pcm_new = rx_macro_pcm_new, }; static struct snd_soc_dai_driver rx_macro_dai[] = { diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index a134584acf90..c7a8e2694e36 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -1211,10 +1211,19 @@ static int tx_macro_digital_mute(struct snd_soc_dai *dai, int mute, int stream) return 0; } +static int tx_macro_pcm_new(struct snd_soc_pcm_runtime *rtd, + struct snd_soc_dai *dai) +{ + int dir = SNDRV_PCM_STREAM_CAPTURE; + + return lpass_macro_add_chmap_ctls(rtd, dai, dir); +} + static const struct snd_soc_dai_ops tx_macro_dai_ops = { .hw_params = tx_macro_hw_params, .get_channel_map = tx_macro_get_channel_map, .mute_stream = tx_macro_digital_mute, + .pcm_new = tx_macro_pcm_new, }; static struct snd_soc_dai_driver tx_macro_dai[] = { diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c index c781da476240..1a13f472ed3a 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -939,10 +939,19 @@ static int va_macro_digital_mute(struct snd_soc_dai *dai, int mute, int stream) return 0; } +static int va_macro_pcm_new(struct snd_soc_pcm_runtime *rtd, + struct snd_soc_dai *dai) +{ + int dir = SNDRV_PCM_STREAM_CAPTURE; + + return lpass_macro_add_chmap_ctls(rtd, dai, dir); +} + static const struct snd_soc_dai_ops va_macro_dai_ops = { .hw_params = va_macro_hw_params, .get_channel_map = va_macro_get_channel_map, .mute_stream = va_macro_digital_mute, + .pcm_new = va_macro_pcm_new, }; static struct snd_soc_dai_driver va_macro_dais[] = { diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index c989d82d1d3c..7c4fd4bf2668 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -1344,9 +1344,21 @@ static int wsa_macro_get_channel_map(const struct snd_soc_dai *dai, return 0; } +static int wsa_macro_pcm_new(struct snd_soc_pcm_runtime *rtd, + struct snd_soc_dai *dai) +{ + int dir = SNDRV_PCM_STREAM_PLAYBACK; + + if (dai->id == WSA_MACRO_AIF_VI || dai->id == WSA_MACRO_AIF_ECHO) + dir = SNDRV_PCM_STREAM_CAPTURE; + + return lpass_macro_add_chmap_ctls(rtd, dai, dir); +} + static const struct snd_soc_dai_ops wsa_macro_dai_ops = { .hw_params = wsa_macro_hw_params, .get_channel_map = wsa_macro_get_channel_map, + .pcm_new = wsa_macro_pcm_new, }; static struct snd_soc_dai_driver wsa_macro_dai[] = { -- 2.25.1

2 1

[PATCH 0/3] Fixes and improvements related to amd soundwire machine
by Vijendar Mukunda 07 Oct '24

07 Oct '24

This patch series consists of smatch error fixes and code improvements related to amd soundwire generic machine driver. Vijendar Mukunda (3): ASoC: amd: acp: fix for inconsistent indenting ASoC: amd: acp: fix for cpu dai index logic ASoC: amd: acp: refactor sof_card_dai_links_create() function sound/soc/amd/acp/acp-sdw-sof-mach.c | 47 +++++++++++----------------- 1 file changed, 18 insertions(+), 29 deletions(-) -- 2.34.1

2 4

Fix build with FFmpeg 7
by GitHub pull_request - opened 07 Oct '24

07 Oct '24

alsa-project/tinycompress pull request #25 was opened from fossdd: Patch provided by the Arch Linux team: https://gitlab.archlinux.org/archlinux/packaging/packages/tinycompress/-/bl… Request URL : https://github.com/alsa-project/tinycompress/pull/25 Patch URL : https://github.com/alsa-project/tinycompress/pull/25.patch Repository URL: https://github.com/alsa-project/tinycompress

1 0

[PATCH] ASoC: dt-bindings: davinci-mcasp: Fix interrupt properties
by Miquel Raynal 07 Oct '24

07 Oct '24

Combinations of "tx" alone, "rx" alone and "tx", "rx" together are supposedly valid (see link below), which is not the case today as "rx" alone is not accepted by the current binding. Let's rework the two interrupt properties to expose all correct possibilities. Cc: Péter Ujfalusi <peter.ujfalusi(a)gmail.com> Link: https://lore.kernel.org/linux-sound/20241003102552.2c11840e@xps-13/T/#m277f… Fixes: 8be90641a0bb ("ASoC: dt-bindings: davinci-mcasp: convert McASP bindings to yaml schema") Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> --- Hello Mark, This patch applies on top of the one you already took, but if you prefer you can squash them together, I don't mind. Cheers, Miquèl --- .../bindings/sound/davinci-mcasp-audio.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml index ab3206ffa4af..beef193aaaeb 100644 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml @@ -102,21 +102,21 @@ properties: default: 2 interrupts: - oneOf: - - minItems: 1 - items: - - description: TX interrupt - - description: RX interrupt - - items: - - description: common/combined interrupt + minItems: 1 + maxItems: 2 interrupt-names: oneOf: - - minItems: 1 + - description: TX interrupt + const: tx + - description: RX interrupt + const: rx + - description: TX and RX interrupts items: - const: tx - const: rx - - const: common + - description: Common/combined interrupt + const: common fck_parent: $ref: /schemas/types.yaml#/definitions/string -- 2.43.0

3 2

Re: [v3?] ASoC: qcom: Fix NULL Dereference in asoc_qcom_lpass_cpu_platform_probe()
by Markus Elfring 07 Oct '24

07 Oct '24

… > --- > v2: Fix "From" tag. > v3: Format tags to Fixes/Cc/Signed-off-by. > --- … * How do you think about to reconsider the version numbers a bit more? * Would you like to mention the repeated adjustment of the patch subject? * Can a duplicate marker line be replaced by a blank line? See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Doc… Is the email address “linux-kernel(a)vger.kernel.xn--org-9o0a still relevant here? Regards, Markus

2 1

Re: [PATCH v3] ASoC: qcom: Fix NULL Dereference in asoc_qcom_lpass_cpu_platform_probe()
by Markus Elfring 07 Oct '24

07 Oct '24

> A devm_kzalloc() in asoc_qcom_lpass_cpu_platform_probe() could call? > possibly return NULL pointer. NULL Pointer Dereference may be Can the term “null pointer dereference” be applied for the final commit message (including the summary phrase)? > triggerred without addtional check. triggered? additional? Regards, Markus

2 1

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

07 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 --- 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

5 9

[PATCH v2 0/7] qrb4210-rb2: add HDMI audio playback support
by Alexey Klimov 06 Oct '24

06 Oct '24

Rebased on top of -master, tested. Changes since v1: -- removed handling of MI2S clock in sm2450_snd_shutdown(): setting clock rate and disabling it causes audio delay on playback start; -- removed empty sound { } node from sm6115.dtsi as suggested by Krzysztof; -- moved lpi_i2s2_active pins description to qrb423310 board-specific file as suggested by Dmitry Baryshkov; -- moved q6asmdai DAIs to apr soc node as suggested by Konrad Dybcio; -- lpass_tlmm is not disabled; -- lpass_tlmm node moved to sm4250.dtsi; -- kept MultiMedia DAIs as is, without them the sound card driver doesn't initialise; -- added some reviewed-by tags. This series still keeps "qcom,qrb4210-rb2-sndcard" for sm8250 soundcard. As per off the list discussion with Srini it was suggested to have it since in future it may be required to add clocks, workarounds, quirks, model-specific things based on this compatible. The same as for RB5 compatible in sm8250 snd driver. This focuses on HDMI audio playback only hence there are no soundwire and dmic pins, for instance. The work to enable playback via wcd+wsa8815 amplifier is in progress (it works) and one of the routes is to merge such two patchsets together. Link to prev series: https://lore.kernel.org/linux-sound/20240628010715.438471-1-alexey.klimov@l… Alexey Klimov (7): ASoC: dt-bindings: qcom,sm8250: add qrb4210-rb2-sndcard ASoC: qcom: sm8250: add qrb4210-rb2-sndcard compatible string ASoC: qcom: sm8250: add handling of secondary MI2S clock arm64: dts: qcom: sm6115: add apr and its services arm64: dts: qcom: sm4250: add LPASS LPI pin controller arm64: dts: qcom: qrb4210-rb2: add description of lpi_i2s2 pins arm64: dts: qcom: qrb4210-rb2: add HDMI audio playback support .../bindings/sound/qcom,sm8250.yaml | 1 + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 91 +++++++++++++++++++ arch/arm64/boot/dts/qcom/sm4250.dtsi | 16 ++++ arch/arm64/boot/dts/qcom/sm6115.dtsi | 72 +++++++++++++++ sound/soc/qcom/sm8250.c | 9 ++ 5 files changed, 189 insertions(+) -- 2.45.2

5 15

Ubuntu 24.04 microphone is not working USB-Audio: ALC4080 Z-590E
by GitHub issues - edited 05 Oct '24

05 Oct '24

alsa-project/alsa-ucm-conf issue #447 was edited from jiutian12: My rear microphone is not working on Ubuntu 24.04 (nor on Ubuntu 22), but it can be used normally on Windows 10. Can hear sound After updating the master branch, the microphone still doesn't work, but the response is the same as the sound system Initial feedback on the issue, the following is my hardware information, I am not sure if it is complete http://alsa-project.org/db/?f=2558f03ffd8c55e18f8208a806f3e2336d9fa49c Kernel: k6.8.0-45-generic USB-Audio: ALC4080 ROG STRIX Z590-E This command can be recorded, but the sound is very low： arecord -D plughw:1,0 -c 1 -r 16000 -f S16_LE output.wav Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/447 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0