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

sof-hda-dsp/sof-soundwire: Create "hdmi:" mapping PCMs to allow passthrough if supported
by GitHub pull_request - opened 22 Apr '24

22 Apr '24

alsa-project/alsa-ucm-conf pull request #411 was opened from ujfalusi: Hi, SOF with IPC4 can use 'ChainDMA' on selected PCMs (HDMI/DP currently) which allows them to be used for bytestream passthrough since the data is passed through unmodified. The kernel will list the PCMs with ChainDMA to the card's components list: https://github.com/thesofproject/linux/pull/4921 For example for sof-dsp-hda cards `iec61937-pcm:5,4,3` will be added. For user space to use HDMI passthrough, the `hdmi:` PCM device should be present correctly mapping to the machine, for example for sof-dsp-hda: ``` aplay -L | grep hdmi hdmi:CARD=sofhdadsp,DEV=0 hdmi:CARD=sofhdadsp,DEV=1 hdmi:CARD=sofhdadsp,DEV=2 ``` This PR does this by 1. Checking the `iec61937-pcm` indexes against the expected HDMI devices (sof-dsp-hda: 3-5, sof-soundwire: 5-7) 2. If there is a match (passthrough can be supported) then we will create three conf files: The generated files are: [1] /var/lib/alsa/conf.d/42-sof-hdmi.conf [2] /var/lib/alsa/card[card_number].conf.d/30-sof-hdmi-common.conf [3] /var/lib/alsa/card[card_number].conf.d/31-sof-hdmi.conf [1] includes the pcm/iec958.conf and pcm/hdmi.conf to global space of alsaconf to be used by the card macros [2] Card specific macros for hdmi PCM definition, mapping [3] Card specific definitions of the three HDMI port Note for [1]: I needed to use `shell "echo '...` since the `cfg-save` would expand the includes into the saved config file and that just does not result a working alsa configuration. @perexg, I'm sure all this can be done in a cleaner way... We cannot do this unconditionally as if the HDMI is not using ChainDMA (and SOF is not IPC4) then the passthrough is not possible since the firmware might touch the data. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/411 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/411.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2 0/3] ASoC: nau8821: Add delay control for ADC
by Seven Lee 22 Apr '24

22 Apr '24

Change the original fixed delay to the assignment from the property. It will make it more flexible to different platforms to avoid pop noise at the beginning of recording. Change: V1 -> V2: - Revise adc-delay-ms properties description. - Fix examples of bugs found by bots. Seven Lee (3): ASoC: dt-bindings: nau8821: Add delay control for ADC ASoC: nau8821: Add delay control for ADC ASoC: nau8821: Remove redundant ADC controls .../bindings/sound/nuvoton,nau8821.yaml | 7 +++++++ sound/soc/codecs/nau8821.c | 19 +++++++++---------- sound/soc/codecs/nau8821.h | 1 + 3 files changed, 17 insertions(+), 10 deletions(-) -- 2.25.1

3 5

[PATCH] ALSA: scarlett2: Zero initialize ret in scarlett2_ag_target_ctl_get()
by Nathan Chancellor 21 Apr '24

21 Apr '24

Clang warns (or errors with CONFIG_WERROR): sound/usb/mixer_scarlett2.c:3697:6: error: variable 'err' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] 3697 | if (private->autogain_updated) { | ^~~~~~~~~~~~~~~~~~~~~~~~~ sound/usb/mixer_scarlett2.c:3707:9: note: uninitialized use occurs here 3707 | return err; | ^~~ sound/usb/mixer_scarlett2.c:3697:2: note: remove the 'if' if its condition is always true 3697 | if (private->autogain_updated) { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/usb/mixer_scarlett2.c:3688:9: note: initialize the variable 'err' to silence this warning 3688 | int err; | ^ | = 0 1 error generated. Initialize ret to zero to ensure ret is initialized in all paths within scarlett2_ag_target_ctl_get(), which matches the style of other functions in this driver. Fixes: e30ea5340c25 ("ALSA: scarlett2: Add autogain target controls") Signed-off-by: Nathan Chancellor <nathan(a)kernel.org> --- FWIW, a lot of the functions that end in just 'mutex_unlock()' before returning could probably benefit from the cleanup.h infrastructure, which would help with the scope of err in this particular function, but I decided to go with the most minimal fix here. --- sound/usb/mixer_scarlett2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/mixer_scarlett2.c b/sound/usb/mixer_scarlett2.c index a2de31a0371b..b251d25f2a85 100644 --- a/sound/usb/mixer_scarlett2.c +++ b/sound/usb/mixer_scarlett2.c @@ -3685,7 +3685,7 @@ static int scarlett2_ag_target_ctl_get( struct usb_mixer_elem_info *elem = kctl->private_data; struct usb_mixer_interface *mixer = elem->head.mixer; struct scarlett2_data *private = mixer->private_data; - int err; + int err = 0; mutex_lock(&private->data_mutex); --- base-commit: 32cb23a0f911317cdb5030035e49a204aa86fef5 change-id: 20240419-alsa-scarlett2-fix-wsometimes-uninitialized-d44f7659b52a Best regards, -- Nathan Chancellor <nathan(a)kernel.org>

2 1

[PATCH] ASoC: codecs: wsa881x: set clk_stop_mode1 flag
by srinivas.kandagatla＠linaro.org 21 Apr '24

21 Apr '24

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> WSA881x codecs do not retain the state while clock is stopped, so mark this with clk_stop_mode1 flag. Fixes: a0aab9e1404a ("ASoC: codecs: add wsa881x amplifier support") Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/codecs/wsa881x.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c index 3c025dabaf7a..1253695bebd8 100644 --- a/sound/soc/codecs/wsa881x.c +++ b/sound/soc/codecs/wsa881x.c @@ -1155,6 +1155,7 @@ static int wsa881x_probe(struct sdw_slave *pdev, pdev->prop.sink_ports = GENMASK(WSA881X_MAX_SWR_PORTS, 0); pdev->prop.sink_dpn_prop = wsa_sink_dpn_prop; pdev->prop.scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY; + pdev->prop.clk_stop_mode1 = true; gpiod_direction_output(wsa881x->sd_n, !wsa881x->sd_n_val); wsa881x->regmap = devm_regmap_init_sdw(pdev, &wsa881x_regmap_config); -- 2.43.0

2 1

[PATCH 0/2] ASoC: Intel: avs: Refactor IRQ handling
by Cezary Rojewski 21 Apr '24

21 Apr '24

The existing code can be both improved and simplified. To make this change easier to manage, first add new implementation and then remove deadcode in a separate patch. Simplification achieved with: - reduce the amount of resources requested by the driver i.e.: IPC and CLDMA request_irq() merged into one - reduce the number of DSP ops from 2 to 1: irq_handler/thread() vs dsp_interrupt() - drop ambiguity around CLDMA interrupt, let skl.c handle that explicitly as it is the only user With that done, switch to the new implementation and remove unused members. While the change is non-trivial, from functional perspective status quo is achieved. Cezary Rojewski (2): ASoC: Intel: avs: New IRQ handling implementation ASoC: Intel: avs: Remove unused IRQ-related code sound/soc/intel/avs/apl.c | 20 +++++++- sound/soc/intel/avs/avs.h | 8 ++-- sound/soc/intel/avs/cldma.c | 42 ++++------------- sound/soc/intel/avs/cldma.h | 1 + sound/soc/intel/avs/cnl.c | 91 ++++++++++++++++++++++++------------- sound/soc/intel/avs/core.c | 85 ++++++++++++++++------------------ sound/soc/intel/avs/icl.c | 3 +- sound/soc/intel/avs/ipc.c | 48 ------------------- sound/soc/intel/avs/skl.c | 73 +++++++++++++++++++++-------- sound/soc/intel/avs/tgl.c | 3 +- 10 files changed, 186 insertions(+), 188 deletions(-) -- 2.25.1

2 3

[PATCH 0/4] ASoC: qcom: display port changes
by srinivas.kandagatla＠linaro.org 20 Apr '24

20 Apr '24

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> This patchset adds support for. 1. parse Display Port module tokens from ASoC topology 2. add support to DP/HDMI Jack events. 3. fixes a typo in function name in sm8250 Verified these patches on X13s along with changes to tplg in https://git.codelinaro.org/linaro/qcomlt/audioreach-topology/-/tree/topic/x… and ucm chagnes from https://github.com/Srinivas-Kandagatla/alsa-ucm-conf/tree/topic/x13s-dp Thanks, Srini Srinivas Kandagatla (4): ASoC: qcom: q6dsp: parse Display port tokens ASoC: qcom: common: add Display port Jack function ASoC: qcom: sc8280xp: add Display port Jack ASoC: qcom: sm8250: fix a typo in function name sound/soc/qcom/common.c | 30 ++++++++++++++++++++++++++++++ sound/soc/qcom/common.h | 3 +++ sound/soc/qcom/qdsp6/topology.c | 26 ++++++++++++++++++++++++++ sound/soc/qcom/sc8280xp.c | 13 +++++++++++++ sound/soc/qcom/sm8250.c | 4 ++-- 5 files changed, 74 insertions(+), 2 deletions(-) -- 2.43.0

2 6

RE: [PATCH v1 0/7] Add support for various laptops using CS35L41 HDA without _DSD
by Niclas Söderlund 19 Apr '24

19 Apr '24

Hi, amazingly high level of laymanship here and equally high level of dispear. But model after model is added to fix the problem with speakers not working, but nowhere is my model seen. I have the Lenovo 13X G2 model and even at kernel 6.8.7 my speakers still doesnt work. Where can I add a request to also include this model in the patches, so I have a hope of having the speakers start working? I do apologise in advance, Mvh, Niclas

2 1

[PATCH v2] spi: cs42l43: Correct name of ACPI property
by Maciej Strozek 19 Apr '24

19 Apr '24

Fixes: 439fbc97502a ("spi: cs42l43: Add bridged cs35l56 amplifiers") Signed-off-by: Maciej Strozek <mstrozek(a)opensource.cirrus.com> --- v2: Corrected the Fixes tag to point to right commit drivers/spi/spi-cs42l43.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-cs42l43.c b/drivers/spi/spi-cs42l43.c index cdc61cd089ad..9d747ea69926 100644 --- a/drivers/spi/spi-cs42l43.c +++ b/drivers/spi/spi-cs42l43.c @@ -267,7 +267,7 @@ static bool cs42l43_has_sidecar(struct fwnode_handle *fwnode) continue; ret = fwnode_property_read_u32(ext_fwnode, - "01fa-cirrus-sidecar-instances", + "01fa-sidecar-instances", &val); fwnode_handle_put(ext_fwnode); -- 2.34.1

3 2

[PATCH] ASoC: ti: davinci-mcasp: Fix race condition during probe
by Joao Paulo Goncalves 19 Apr '24

19 Apr '24

From: Joao Paulo Goncalves <joao.goncalves(a)toradex.com> When using davinci-mcasp as CPU DAI with simple-card, there are some conditions that cause simple-card to finish registering a sound card before davinci-mcasp finishes registering all sound components. This creates a non-working sound card from userspace with no problem indication apart from not being able to play/record audio on a PCM stream. The issue arises during simultaneous probe execution of both drivers. Specifically, the simple-card driver, awaiting a CPU DAI, proceeds as soon as davinci-mcasp registers its DAI. However, this process can lead to the client mutex lock (client_mutex in soc-core.c) being held or davinci-mcasp being preempted before PCM DMA registration on davinci-mcasp finishes. This situation occurs when the probes of both drivers run concurrently. Below is the code path for this condition. To solve the issue, defer davinci-mcasp CPU DAI registration to the last step in the audio part of it. This way, simple-card CPU DAI parsing will be deferred until all audio components are registered. Fail Code Path: simple-card.c: probe starts simple-card.c: simple_dai_link_of: simple_parse_node(..,cpu,..) returns EPROBE_DEFER, no CPU DAI yet davinci-mcasp.c: probe starts davinci-mcasp.c: devm_snd_soc_register_component() register CPU DAI simple-card.c: probes again, finish CPU DAI parsing and call devm_snd_soc_register_card() simple-card.c: finish probe davinci-mcasp.c: *dma_pcm_platform_register() register PCM DMA davinci-mcasp.c: probe finish Cc: stable(a)vger.kernel.org Fixes: 9fbd58cf4ab0 ("ASoC: davinci-mcasp: Choose PCM driver based on configured DMA controller") Signed-off-by: Joao Paulo Goncalves <joao.goncalves(a)toradex.com> --- sound/soc/ti/davinci-mcasp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index b892d66f78470..1e760c3155213 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -2417,12 +2417,6 @@ static int davinci_mcasp_probe(struct platform_device *pdev) mcasp_reparent_fck(pdev); - ret = devm_snd_soc_register_component(&pdev->dev, &davinci_mcasp_component, - &davinci_mcasp_dai[mcasp->op_mode], 1); - - if (ret != 0) - goto err; - ret = davinci_mcasp_get_dma_type(mcasp); switch (ret) { case PCM_EDMA: @@ -2449,6 +2443,12 @@ static int davinci_mcasp_probe(struct platform_device *pdev) goto err; } + ret = devm_snd_soc_register_component(&pdev->dev, &davinci_mcasp_component, + &davinci_mcasp_dai[mcasp->op_mode], 1); + + if (ret != 0) + goto err; + no_audio: ret = davinci_mcasp_init_gpiochip(mcasp); if (ret) { -- 2.34.1

4 3

Re: [PATCH v1 0/7] Add support for various laptops using CS35L41 HDA without _DSD
by Niclas Söderlund 19 Apr '24

19 Apr '24

Hi, amazingly high level of laymanship here and equally high level of dispear. But model after model is added to fix the problem with speakers not working, but nowhere is my model seen. I have the Lenovo 13X G2 model and even at kernel 6.8.7 my speakers still doesnt work. Where can I add a request to also include this model in the patches, so I have a hope of having the speakers start working? I do apologise in advance but it would be a huge loss if this laptop is not appended as being one of the models being fixed. Mvh, Niclas Söderlund

1 0