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

[GIT PULL] ASoC fixes for v6.4-rc6
by Mark Brown 06 Jun '23

06 Jun '23

The following changes since commit 011a8719d6105dcb48077ea7a6a88ac019d4aa50: ASoC: dwc: move DMA init to snd_soc_dai_driver probe() (2023-05-23 21:39:30 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.4-rc6 for you to fetch changes up to 32cf0046a652116d6a216d575f3049a9ff9dd80d: ASoC: fsl_sai: Enable BCI bit if SAI works on synchronous mode with BYP asserted (2023-06-02 12:54:07 +0100) ---------------------------------------------------------------- ASoC: Fixes for v6.4 A lot of routine driver specific fixes here, nothing in the core though there are a couple of fixes for the generic cards. There's also a few new quirks for x86 platforms. ---------------------------------------------------------------- Chancel Liu (1): ASoC: fsl_sai: Enable BCI bit if SAI works on synchronous mode with BYP asserted Edson Juliano Drosdeck (1): ASoC: nau8824: Add quirk to active-high jack-detect Herve Codina (1): ASoC: simple-card: Add missing of_node_put() in case of error Mark Brown (1): ASoC: mediatek: fix use-after-free in driver remove Richard Fitzgerald (1): ASoC: cs35l56: Remove NULL check from cs35l56_sdw_dai_set_stream() Robert Hancock (1): ASoC: simple-card-utils: fix PCM constraint error check Ryan Lee (2): ASoC: max98363: Removed 32bit support ASoC: max98363: limit the number of channel to 1 Sicong Jiang (1): ASoC: amd: yc: Add Thinkpad Neo14 to quirks list for acp6x Srinivas Kandagatla (3): ASoC: codecs: wsa883x: do not set can_multi_write flag ASoC: codecs: wsa881x: do not set can_multi_write flag ASoC: codecs: wcd938x-sdw: do not set can_multi_write flag Trevor Wu (2): ASoC: mediatek: mt8188: fix use-after-free in driver remove path ASoC: mediatek: mt8195: fix use-after-free in driver remove path Vijendar Mukunda (1): ASoC: amd: ps: fix for acp_lock access in pdm driver sound/soc/amd/ps/pci-ps.c | 3 +- sound/soc/amd/ps/ps-pdm-dma.c | 10 +++--- sound/soc/amd/yc/acp6x-mach.c | 7 ++++ sound/soc/codecs/cs35l56.c | 3 -- sound/soc/codecs/max98363.c | 4 +-- sound/soc/codecs/nau8824.c | 24 ++++++++++++++ sound/soc/codecs/wcd938x-sdw.c | 1 - sound/soc/codecs/wsa881x.c | 1 - sound/soc/codecs/wsa883x.c | 1 - sound/soc/fsl/fsl_sai.c | 11 +++++-- sound/soc/fsl/fsl_sai.h | 1 + sound/soc/generic/simple-card-utils.c | 2 +- sound/soc/generic/simple-card.c | 1 + sound/soc/mediatek/mt8188/mt8188-afe-clk.c | 7 ---- sound/soc/mediatek/mt8188/mt8188-afe-clk.h | 1 - sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 4 --- sound/soc/mediatek/mt8188/mt8188-audsys-clk.c | 47 ++++++++++++++------------- sound/soc/mediatek/mt8188/mt8188-audsys-clk.h | 1 - sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 5 --- sound/soc/mediatek/mt8195/mt8195-afe-clk.h | 1 - sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 4 --- sound/soc/mediatek/mt8195/mt8195-audsys-clk.c | 47 ++++++++++++++------------- sound/soc/mediatek/mt8195/mt8195-audsys-clk.h | 1 - 23 files changed, 99 insertions(+), 88 deletions(-)

2 1

[bug report] ASoC: starfive: Add JH7110 TDM driver
by Dan Carpenter 06 Jun '23

06 Jun '23

Hello Walker Chen, The patch fd4762b6b5cf: "ASoC: starfive: Add JH7110 TDM driver" from May 26, 2023, leads to the following Smatch static checker warning: sound/soc/starfive/jh7110_tdm.c:584 jh7110_tdm_clk_reset_get() warn: passing zero to 'PTR_ERR' sound/soc/starfive/jh7110_tdm.c 564 static int jh7110_tdm_clk_reset_get(struct platform_device *pdev, 565 struct jh7110_tdm_dev *tdm) 566 { 567 int ret; 568 569 tdm->clks[0].id = "mclk_inner"; 570 tdm->clks[1].id = "tdm_ahb"; 571 tdm->clks[2].id = "tdm_apb"; 572 tdm->clks[3].id = "tdm_internal"; 573 tdm->clks[4].id = "tdm_ext"; 574 tdm->clks[5].id = "tdm"; 575 576 ret = devm_clk_bulk_get(&pdev->dev, ARRAY_SIZE(tdm->clks), tdm->clks); 577 if (ret) { 578 dev_err(&pdev->dev, "Failed to get tdm clocks\n"); 579 return ret; 580 } 581 582 tdm->resets = devm_reset_control_array_get_exclusive(&pdev->dev); The devm_reset_control_array_get() function returns NULL if it's an optional request. But this is not optional. 583 if (IS_ERR_OR_NULL(tdm->resets)) { So that means this should be an if (IS_ERR()) check. --> 584 ret = PTR_ERR(tdm->resets); 585 dev_err(&pdev->dev, "Failed to get tdm resets"); Or if optional was intended then NULL should not be treated as an error case, but as a special kind of success case (no error message). See my blog for a long form of this information: https://staticthinking.wordpress.com/2022/08/01/mixing-error-pointers-and-n… 586 return ret; 587 } 588 589 return 0; 590 } regards, dan carpenter

2 1

[PATCH v3 0/3] Fixes and cleanup for CS35L41 HDA
by Stefan Binding 06 Jun '23

06 Jun '23

Several minor issues were found during additional testing and static analysis. These patches fix these minor issues. CHANGES SINCE V2: Patch 3: - Add missing break CHANGES SINCE V1: Patch 2: - Removed unnecessary cast Stefan Binding (3): ALSA: hda: cs35l41: Clean up Firmware Load Controls ALSA: hda: cs35l41: Fix endian conversions ALSA: hda/realtek: Delete cs35l41 component master during free sound/pci/hda/cs35l41_hda.c | 32 ++++++++++++++------------------ sound/pci/hda/patch_realtek.c | 3 +++ 2 files changed, 17 insertions(+), 18 deletions(-) -- 2.34.1

2 4

[PATCH] ALSA: control: Keep the previous numid at snd_ctl_rename_id()
by Takashi Iwai 06 Jun '23

06 Jun '23

We don't need to change the numid at each time snd_ctl_rename_id() is called, as the control element size itself doesn't change. Let's keep the previous numid value. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/control.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/core/control.c b/sound/core/control.c index 82aa1af1d1d8..f4a90a687ae5 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -730,12 +730,16 @@ EXPORT_SYMBOL_GPL(snd_ctl_activate_id); * Finds the control with the old id from the card, and replaces the * id with the new one. * + * The function tries to keep the already assigned numid while replacing + * the rest. + * * Return: Zero if successful, or a negative error code on failure. */ int snd_ctl_rename_id(struct snd_card *card, struct snd_ctl_elem_id *src_id, struct snd_ctl_elem_id *dst_id) { struct snd_kcontrol *kctl; + int saved_numid; down_write(&card->controls_rwsem); kctl = snd_ctl_find_id(card, src_id); @@ -743,10 +747,10 @@ int snd_ctl_rename_id(struct snd_card *card, struct snd_ctl_elem_id *src_id, up_write(&card->controls_rwsem); return -ENOENT; } + saved_numid = kctl->id.numid; remove_hash_entries(card, kctl); kctl->id = *dst_id; - kctl->id.numid = card->last_numid + 1; - card->last_numid += kctl->count; + kctl->id.numid = saved_numid; add_hash_entries(card, kctl); up_write(&card->controls_rwsem); return 0; -- 2.35.3

2 2

[PATCH 0/4] Add Loongson HD Audio support
by Yanteng Si 06 Jun '23

06 Jun '23

* The Loongson HDA controller is compatible with High Definition Audio Specification Revision 1.0a. See <https://loongson.github.io/LoongArch-Documentation/Loongson- 7A1000-usermanual-EN.html#hda-controller> Yanteng Si (4): ALSA: hda: Add Loongson LS7A HD-Audio support ALSA: hda: Using polling mode for loongson controller by default ALSA: hda: Workaround for SDnCTL register on loongson controller ALSA: hda/intel: Workaround for WALLCLK register for loongson controller include/linux/pci_ids.h | 3 +++ sound/hda/hdac_controller.c | 8 +++++++- sound/hda/hdac_device.c | 1 + sound/hda/hdac_stream.c | 8 +++++++- sound/pci/hda/hda_controller.h | 1 + sound/pci/hda/hda_intel.c | 10 ++++++++++ sound/pci/hda/patch_hdmi.c | 1 + 7 files changed, 30 insertions(+), 2 deletions(-) -- 2.31.4

2 8

[PATCH] firmware: cs_dsp: Log correct region name in bin error messages
by Richard Fitzgerald 06 Jun '23

06 Jun '23

In cs_dsp_load_coeff() region_name should be set in the XM/YM/ZM cases otherwise any errors will log the region as "Unknown". While doing this also change one error message that logged the region type ID to log the region_name instead. This makes it consistent with other messages in the same function. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> --- drivers/firmware/cirrus/cs_dsp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/cirrus/cs_dsp.c b/drivers/firmware/cirrus/cs_dsp.c index d7e46a57ecf9..6a9aa97373d3 100644 --- a/drivers/firmware/cirrus/cs_dsp.c +++ b/drivers/firmware/cirrus/cs_dsp.c @@ -2124,6 +2124,7 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware file, blocks, le32_to_cpu(blk->len), type, le32_to_cpu(blk->id)); + region_name = cs_dsp_mem_region_name(type); mem = cs_dsp_find_region(dsp, type); if (!mem) { cs_dsp_err(dsp, "No base for region %x\n", type); @@ -2147,8 +2148,8 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware reg = dsp->ops->region_to_reg(mem, reg); reg += offset; } else { - cs_dsp_err(dsp, "No %x for algorithm %x\n", - type, le32_to_cpu(blk->id)); + cs_dsp_err(dsp, "No %s for algorithm %x\n", + region_name, le32_to_cpu(blk->id)); } break; -- 2.30.2

2 1

[PATCH 0/4] ALSA: Fix kctl->id initialization
by Takashi Iwai 06 Jun '23

06 Jun '23

Inspired by the recent Jaroslav's fix patch, I skimmed over the tree and found that there are a few other similar bugs. Here is a patch set to address them. Most of them are just shuffling the call order, while the one in HD-audio is changed to use snd_ctl_replace_id() helper. Takashi === Takashi Iwai (4): ALSA: ymfpci: Fix kctl->id initialization ALSA: cmipci: Fix kctl->id initialization ALSA: gus: Fix kctl->id initialization ALSA: hda: Fix kctl->id initialization sound/isa/gus/gus_pcm.c | 2 +- sound/pci/cmipci.c | 6 +++--- sound/pci/hda/hda_codec.c | 6 +++++- sound/pci/ymfpci/ymfpci_main.c | 6 +++--- 4 files changed, 12 insertions(+), 8 deletions(-) -- 2.35.3

2 5

[PATCH] ALSA: ice1712,ice1724: fix the kcontrol->id initialization
by Jaroslav Kysela 06 Jun '23

06 Jun '23

The new xarray lookup code requires to know complete kcontrol->id before snd_ctl_add() call. Reorder the code to make the initialization properly. Cc: stable(a)kernel.org # v5.19+ Reported-by: Martin Zidek <zidek(a)master.cz> Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- sound/pci/ice1712/aureon.c | 7 ++++--- sound/pci/ice1712/ice1712.c | 14 +++++++++----- sound/pci/ice1712/ice1724.c | 16 ++++++++++------ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c index 24b978234000..027849329c1b 100644 --- a/sound/pci/ice1712/aureon.c +++ b/sound/pci/ice1712/aureon.c @@ -1899,11 +1899,12 @@ static int aureon_add_controls(struct snd_ice1712 *ice) else { for (i = 0; i < ARRAY_SIZE(cs8415_controls); i++) { struct snd_kcontrol *kctl; - err = snd_ctl_add(ice->card, (kctl = snd_ctl_new1(&cs8415_controls[i], ice))); - if (err < 0) - return err; + kctl = snd_ctl_new1(&cs8415_controls[i], ice); if (i > 1) kctl->id.device = ice->pcm->device; + err = snd_ctl_add(ice->card, kctl); + if (err < 0) + return err; } } } diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index a5241a287851..3b0c3e70987b 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c @@ -2371,22 +2371,26 @@ int snd_ice1712_spdif_build_controls(struct snd_ice1712 *ice) if (snd_BUG_ON(!ice->pcm_pro)) return -EIO; - err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_ice1712_spdif_default, ice)); + kctl = snd_ctl_new1(&snd_ice1712_spdif_default, ice); + kctl->id.device = ice->pcm_pro->device; + err = snd_ctl_add(ice->card, kctl); if (err < 0) return err; + kctl = snd_ctl_new1(&snd_ice1712_spdif_maskc, ice); kctl->id.device = ice->pcm_pro->device; - err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_ice1712_spdif_maskc, ice)); + err = snd_ctl_add(ice->card, kctl); if (err < 0) return err; + kctl = snd_ctl_new1(&snd_ice1712_spdif_maskp, ice); kctl->id.device = ice->pcm_pro->device; - err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_ice1712_spdif_maskp, ice)); + err = snd_ctl_add(ice->card, kctl); if (err < 0) return err; + kctl = snd_ctl_new1(&snd_ice1712_spdif_stream, ice); kctl->id.device = ice->pcm_pro->device; - err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_ice1712_spdif_stream, ice)); + err = snd_ctl_add(ice->card, kctl); if (err < 0) return err; - kctl->id.device = ice->pcm_pro->device; ice->spdif.stream_ctl = kctl; return 0; } diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 6fab2ad85bbe..1dc776acd637 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c @@ -2392,23 +2392,27 @@ static int snd_vt1724_spdif_build_controls(struct snd_ice1712 *ice) if (err < 0) return err; - err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_vt1724_spdif_default, ice)); + kctl = snd_ctl_new1(&snd_vt1724_spdif_default, ice); + kctl->id.device = ice->pcm->device; + err = snd_ctl_add(ice->card, kctl); if (err < 0) return err; + kctl = snd_ctl_new1(&snd_vt1724_spdif_maskc, ice); kctl->id.device = ice->pcm->device; - err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_vt1724_spdif_maskc, ice)); + err = snd_ctl_add(ice->card, kctl); if (err < 0) return err; + kctl = snd_ctl_new1(&snd_vt1724_spdif_maskp, ice); kctl->id.device = ice->pcm->device; - err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_vt1724_spdif_maskp, ice)); + err = snd_ctl_add(ice->card, kctl); if (err < 0) return err; - kctl->id.device = ice->pcm->device; #if 0 /* use default only */ - err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_vt1724_spdif_stream, ice)); + kctl = snd_ctl_new1(&snd_vt1724_spdif_stream, ice); + kctl->id.device = ice->pcm->device; + err = snd_ctl_add(ice->card, kctl); if (err < 0) return err; - kctl->id.device = ice->pcm->device; ice->spdif.stream_ctl = kctl; #endif return 0; -- 2.39.2

2 1

Add Asus ROG STRIX X670E-F Gaming Wifi to USB-Audio.conf
by GitHub pull_request - opened 06 Jun '23

06 Jun '23

alsa-project/alsa-ucm-conf pull request #320 was opened from ksenchy: Since the id was already present in the list, I have only added a comment denoting this board also uses that id My alsa-info as a proof can be found here: http://alsa-project.org/db/?f=1ad83f467dc312e2ac7743859c647695dbccb6ce Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/320 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/320.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 0/9] ASoC: SOF: Intel: LunarLake preparation patches
by Pierre-Louis Bossart 05 Jun '23

05 Jun '23

This patchset adds the changes required for the hda-dai extension to deal with SSSP/DMIC/SoundWire starting with LunarLake, as well as the new TLV IPC to provide the DMA stream_tag to the DSP firmware. LunarLake support for SSP/DMIC is ready but is gated by the patch "ASoC: SOF: Intel: shim: add enum for ACE 2.0 IP used in LunarLake" currently only present in the SoundWire tree. Pierre-Louis Bossart (9): ASoC: SOF: Intel: hda-dai: add error checks to prevent static analysis warnings ASoC: SOF: Intel: hda-dai: add codec_dai_set_stream callback ASoC: SOF: Intel: hda-dai: add calc_stream_format callback ASoC: SOF: Intel: hda-dai: add get_hlink callback ASoC: SOF: ipc4-topology: extend ALH-specific data structure ASoC: SOF: ipc4-topology: introduce DMA config TLV ASoC: SOF: ipc4-topology: add DMA config TLV to IPC data ASoC: SOF: Intel: mtl: prepare for code reuse ASoC: SOF: Intel: hda: add helper to extract SoundWire link count sound/soc/sof/intel/hda-dai-ops.c | 58 ++++++++++++++++++++++- sound/soc/sof/intel/hda-dai.c | 64 +++++++++++--------------- sound/soc/sof/intel/hda.c | 25 ++++++++++ sound/soc/sof/intel/hda.h | 19 ++++++++ sound/soc/sof/intel/mtl.c | 12 ++--- sound/soc/sof/intel/mtl.h | 7 +++ sound/soc/sof/ipc4-topology.c | 44 ++++++++++++++---- sound/soc/sof/ipc4-topology.h | 76 +++++++++++++++++++++++++------ 8 files changed, 239 insertions(+), 66 deletions(-) -- 2.37.2

2 10