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

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

18 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

3 2

[PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion
by Kuninori Morimoto 18 Apr '24

18 Apr '24

Hi Mark This is v3 patch-set When we use DPCM, we need to set dpcm_playback/capture flag. If these flag are set, soc_get_playback_capture() will check its availability, but non DPCM doesn't need such special flags. OTOH, it cares playback/capture_only flag. It is needed. This patch adds new assertion flag, and convert current dpcm_playback dpcm_capture flag and playback/capture_only flag to it. v2 -> v3 - re-order patches - add new playback/capture_assertion flag and covert both dpcm_xxx and xxx_only flag into it v1 -> v2 - based on latest ASoC branch - keep comment on Intel - tidyup patch title - tidyup DPCM BE warning output condition - Add new patch for Document Link: https://lore.kernel.org/r/87o7b353of.wl-kuninori.morimoto.gx@renesas.com Link: https://lore.kernel.org/r/87zfuesz8y.wl-kuninori.morimoto.gx@renesas.com Kuninori Morimoto (23): ASoC: soc-pcm: cleanup soc_get_playback_capture() ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings ASoC: soc-dai: remove snd_soc_dai_link_set_capabilities() ASoC: amd: Replace dpcm_playback/capture to playback/capture_assertion ASoC: fsl: Replace dpcm_playback/capture to playback/capture_assertion ASoC: sof: Replace dpcm_playback/capture to playback/capture_assertion ASoC: meson: Replace dpcm_playback/capture to playback/capture_assertion ASoC: Intel: Replace dpcm_playback/capture to playback/capture_assertion ASoC: mediatek: Replace dpcm_playback/capture to playback/capture_assertion ASoC: soc-core: Replace dpcm_playback/capture to playback/capture_assertion ASoC: soc-topology: Replace dpcm_playback/capture to playback/capture_assertion ASoC: soc-compress: Replace dpcm_playback/capture to playback/capture_assertion ASoC: Intel: avs: boards: Replace dpcm_playback/capture to playback/capture_assertion ASoC: ti: Replace playback/capture_only to playback/capture_assertion ASoC: amd: Replace playback/capture_only to playback/capture_assertion ASoC: fsl: Replace playback/capture_only to playback/capture_assertion ASoC: mxs: Replace playback/capture_only to playback/capture_assertion ASoC: atmel: Replace playback/capture_only to playback/capture_assertion ASoC: Intel: Replace playback/capture_only to playback/capture_assertion ASoC: samsung: Replace playback/capture_only to playback/capture_assertion ASoC: generic: Replace playback/capture_only to playback/capture_assertion ASoC: soc-pcm: remove dpcm_playback/capture and playback/capture_only ASoC: doc: Replace dpcm_playback/capture to playback/capture_assertion Documentation/sound/soc/dpcm.rst | 10 +- include/sound/simple_card_utils.h | 2 +- include/sound/soc-dai.h | 1 - include/sound/soc.h | 15 +- sound/soc/amd/acp-da7219-max98357a.c | 20 +-- sound/soc/amd/acp-es8336.c | 4 +- sound/soc/amd/acp/acp-mach-common.c | 34 ++--- sound/soc/amd/acp3x-rt5682-max9836.c | 8 +- sound/soc/amd/ps/ps-mach.c | 2 +- sound/soc/amd/renoir/acp3x-rn.c | 2 +- sound/soc/amd/vangogh/acp5x-mach.c | 14 +- sound/soc/amd/yc/acp6x-mach.c | 2 +- sound/soc/atmel/sam9g20_wm8731.c | 2 +- sound/soc/fsl/fsl-asoc-card.c | 20 +-- sound/soc/fsl/imx-audmix.c | 8 +- sound/soc/fsl/imx-card.c | 7 +- sound/soc/fsl/imx-hdmi.c | 12 +- sound/soc/fsl/imx-rpmsg.c | 10 +- sound/soc/fsl/imx-spdif.c | 10 +- sound/soc/generic/audio-graph-card.c | 2 - sound/soc/generic/audio-graph-card2.c | 10 +- sound/soc/generic/simple-card-utils.c | 6 +- sound/soc/generic/simple-card.c | 2 - sound/soc/intel/avs/boards/da7219.c | 4 +- sound/soc/intel/avs/boards/dmic.c | 4 +- sound/soc/intel/avs/boards/es8336.c | 4 +- sound/soc/intel/avs/boards/hdaudio.c | 8 +- sound/soc/intel/avs/boards/i2s_test.c | 4 +- sound/soc/intel/avs/boards/max98357a.c | 2 +- sound/soc/intel/avs/boards/max98373.c | 4 +- sound/soc/intel/avs/boards/max98927.c | 4 +- sound/soc/intel/avs/boards/nau8825.c | 4 +- sound/soc/intel/avs/boards/rt274.c | 4 +- sound/soc/intel/avs/boards/rt286.c | 4 +- sound/soc/intel/avs/boards/rt298.c | 4 +- sound/soc/intel/avs/boards/rt5514.c | 2 +- sound/soc/intel/avs/boards/rt5663.c | 4 +- sound/soc/intel/avs/boards/rt5682.c | 4 +- sound/soc/intel/avs/boards/ssm4567.c | 4 +- sound/soc/intel/boards/bdw-rt5650.c | 8 +- sound/soc/intel/boards/bdw-rt5677.c | 10 +- sound/soc/intel/boards/bdw_rt286.c | 14 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 34 ++--- sound/soc/intel/boards/bxt_rt298.c | 28 ++-- sound/soc/intel/boards/bytcht_cx2072x.c | 10 +- sound/soc/intel/boards/bytcht_da7213.c | 10 +- sound/soc/intel/boards/bytcht_es8316.c | 10 +- sound/soc/intel/boards/bytcht_nocodec.c | 10 +- sound/soc/intel/boards/bytcr_rt5640.c | 10 +- sound/soc/intel/boards/bytcr_rt5651.c | 10 +- sound/soc/intel/boards/bytcr_wm5102.c | 10 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 10 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 10 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 10 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 10 +- sound/soc/intel/boards/ehl_rt5660.c | 16 +-- sound/soc/intel/boards/glk_rt5682_max98357a.c | 32 ++--- sound/soc/intel/boards/hsw_rt5640.c | 14 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 28 ++-- sound/soc/intel/boards/kbl_da7219_max98927.c | 60 ++++---- sound/soc/intel/boards/kbl_rt5660.c | 20 +-- sound/soc/intel/boards/kbl_rt5663_max98927.c | 48 +++---- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 26 ++-- sound/soc/intel/boards/skl_hda_dsp_common.c | 18 +-- .../soc/intel/boards/skl_nau88l25_max98357a.c | 28 ++-- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 30 ++-- sound/soc/intel/boards/skl_rt286.c | 28 ++-- sound/soc/intel/boards/sof_board_helpers.c | 18 +-- sound/soc/intel/boards/sof_es8336.c | 10 +- sound/soc/intel/boards/sof_pcm512x.c | 8 +- sound/soc/intel/boards/sof_sdw.c | 4 +- sound/soc/intel/boards/sof_wm8804.c | 4 +- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 30 ++-- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 8 +- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 34 ++--- sound/soc/mediatek/mt7986/mt7986-wm8960.c | 8 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 8 +- .../mediatek/mt8173/mt8173-rt5650-rt5514.c | 8 +- .../mediatek/mt8173/mt8173-rt5650-rt5676.c | 12 +- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 12 +- .../mediatek/mt8183/mt8183-da7219-max98357.c | 40 +++--- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 40 +++--- sound/soc/mediatek/mt8186/mt8186-mt6366.c | 108 +++++++-------- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 60 ++++---- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 86 ++++++------ sound/soc/mediatek/mt8195/mt8195-mt6359.c | 62 ++++----- sound/soc/meson/axg-card.c | 9 +- sound/soc/meson/gx-card.c | 1 - sound/soc/meson/meson-card-utils.c | 4 +- sound/soc/mxs/mxs-sgtl5000.c | 4 +- sound/soc/qcom/common.c | 1 - sound/soc/samsung/odroid.c | 12 +- sound/soc/soc-compress.c | 8 +- sound/soc/soc-core.c | 15 +- sound/soc/soc-dai.c | 38 ----- sound/soc/soc-pcm.c | 130 ++++++++++-------- sound/soc/soc-topology-test.c | 4 +- sound/soc/soc-topology.c | 4 +- sound/soc/sof/nocodec.c | 4 +- sound/soc/ti/j721e-evm.c | 8 +- 100 files changed, 789 insertions(+), 832 deletions(-) -- 2.25.1

3 26

RE: Thinkpad with ALC1318 has a chance of damaging the IC
by Kailang 18 Apr '24

18 Apr '24

Hi Takashi, Please don't apply this patch. They want to add stream open to enable GPIO3 functions. BR, Kailang > -----Original Message----- > From: Kailang > Sent: Wednesday, April 10, 2024 5:23 PM > To: Takashi Iwai (tiwai(a)suse.de) <tiwai(a)suse.de> > Cc: (alsa-devel(a)alsa-project.org) <alsa-devel(a)alsa-project.org> > Subject: Thinkpad with ALC1318 has a chance of damaging the IC > > Hi Takashi, > > Thinkpad with ALC1318 has a chance of damaging the IC at S4 resume. > > BR, > Kailang

2 3

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

18 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

2 1

[PATCH v2 0/3] ALSA: hda/tas2781: Add tas2781 driver for SPI.
by Baojun Xu 18 Apr '24

18 Apr '24

This patch was used to add TAS2781 devices on SPI support in sound/pci/hda. It use ACPI node descript about parameters of TAS2781 on SPI, it like: Scope (_SB.PC00.SPI0) { Device (GSPK) { Name (_HID, "TXNW2781") // _HID: Hardware ID Method (_CRS, 0, NotSerialized) { Name (RBUF, ResourceTemplate () { SpiSerialBusV2 (...) SpiSerialBusV2 (...) } } } } And in platform/x86/serial-multi-instantiate.c, those spi devices will be added into system as a single SPI device, so TAS2781 SPI driver will probe twice for every single SPI device. And driver will also parser mono DSP firmware binary and RCA binary for itself. Signed-off-by: Baojun Xu <baojun.xu(a)ti.com> Baojun Xu (3): ALSA: hda/tas2781: Modification for add tas2781 driver for SPI ALSA: hda/tas2781: Main code of tas2781 driver for SPI ALSA: hda/tas2781: Firmware load for tas2781 driver for SPI drivers/acpi/scan.c | 1 + .../platform/x86/serial-multi-instantiate.c | 10 + sound/pci/hda/Kconfig | 15 + sound/pci/hda/Makefile | 2 + sound/pci/hda/patch_realtek.c | 15 + sound/pci/hda/tas2781-spi.h | 162 ++ sound/pci/hda/tas2781_hda_spi.c | 1336 ++++++++++ sound/pci/hda/tas2781_spi_fwlib.c | 2289 +++++++++++++++++ 8 files changed, 3830 insertions(+) create mode 100644 sound/pci/hda/tas2781-spi.h create mode 100644 sound/pci/hda/tas2781_hda_spi.c create mode 100644 sound/pci/hda/tas2781_spi_fwlib.c -- 2.40.1

4 11

Question: layout of a patchset dependent on another tree
by Cezary Rojewski 18 Apr '24

18 Apr '24

Hello Mark, I'd like to send changes which do modify the avs-driver but are dependent on ACPI/NHLT changes I've recently upstream [1] to Rafael's linux-acpi tree. Thanks to Rafael, there's an immutable branch [2] that has all relevant commits on the top. Should I send both the NHLT+avs changes and have broonie/for-next as a base for that or provide only the avs changes and state the dependency within the cover-letter? The latter will fail to compile without its dependency obviously. [1]: https://lore.kernel.org/linux-acpi/20240319083018.3159716-1-cezary.rojewski… [2]: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/log/?h=… Kind regards, Czarek

1 0

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

18 Apr '24

Fixes: 1f05252a3a95 ("Add bridged amplifiers to cs42l43") Signed-off-by: Maciej Strozek <mstrozek(a)opensource.cirrus.com> --- 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

2 3

[PATCH 0/3] adding 705.6/768kHz rates; DSD and 768kHz in aloop
by Pavel Hofman 18 Apr '24

18 Apr '24

This patch series allows using the loopback driver in modern chains with samplerates up to 768kHz and DSD formats. The patch "ALSA:pcm: add support for 705.6kHz and 768kHz sample rates" is basically a copy of commit 4cc4531c310e ("ALSA: pcm: add support for 352.8KHz and 384KHz sample rate"). As of loopback performance at 768kHz - in my tests aloop runs OK event at 12MHz samplerate. Pavel Hofman (3): ALSA:aloop: add DSD formats ALSA:pcm: add support for 705.6kHz and 768kHz sample rates ALSA:aloop: add support for up to 768kHz sample rate include/sound/pcm.h | 5 +++++ sound/core/pcm_native.c | 2 +- sound/drivers/aloop.c | 9 ++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) -- 2.25.1

3 5

[PATCH v2 0/2] Add Cadence I2S-MC controller driver
by Xingyu Wu 18 Apr '24

18 Apr '24

The Cadence Multi-channel I2S (I2S-MC) Controller implements a function of the multi-channel (up to 8-channel) bus. Each stereo channel combines functions of a transmitter and a receiver, and can switch freely between them. Each channel has independent gating, clock and interruption control. It also support some of these channels are used as playback and others can also be used as record in the same time. Four I2S controllers are used on the StarFive JH8100 SoC. Two of the I2S controllers use two stereo channels, one of them use four channels, and one use eight. It had tested on the fpga with WM8960 and PDM. Changes since v1: - Added new compatible for StarFive JH8100 SoC and a special property to be got as the max channels number in the bindings. - Dropped the useless '|' in the bindings. - Moved the drivers to a new folder named 'cdns' and modified the name of functions. v1: https://lore.kernel.org/all/20231221033223.73201-1-xingyu.wu@starfivetech.c… Xingyu Wu (2): ASoC: dt-bindings: Add bindings for Cadence I2S-MC controller ASoC: cdns: Add drivers of Cadence Multi-Channel I2S Controller .../bindings/sound/cdns,i2s-mc.yaml | 110 +++ MAINTAINERS | 6 + sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/cdns/Kconfig | 18 + sound/soc/cdns/Makefile | 3 + sound/soc/cdns/cdns-i2s-mc-pcm.c | 262 +++++++ sound/soc/cdns/cdns-i2s-mc.c | 724 ++++++++++++++++++ sound/soc/cdns/cdns-i2s-mc.h | 157 ++++ 9 files changed, 1282 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/cdns,i2s-mc.yaml create mode 100644 sound/soc/cdns/Kconfig create mode 100644 sound/soc/cdns/Makefile create mode 100644 sound/soc/cdns/cdns-i2s-mc-pcm.c create mode 100644 sound/soc/cdns/cdns-i2s-mc.c create mode 100644 sound/soc/cdns/cdns-i2s-mc.h -- 2.25.1

4 20

[PATCH] Fix volumn control of ThinkBook 16P Gen4
by zhanghuayu1233＠qq.com 18 Apr '24

18 Apr '24

From: Huayu Zhang <zhanghuayu1233(a)qq.com> change HDA & AMP configuration from ALC287_FIXUP_CS35L41_I2C_2 to ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD for ThinkBook 16P Gen4 models to fix volumn control issue (cannot fully mute). Signed-off-by: Huayu Zhang <zhanghuayu1233(a)qq.com> --- sound/pci/hda/patch_realtek.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index d6940bc4ec39..1aef223307bb 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10396,8 +10396,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x3886, "Y780 VECO DUAL", ALC287_FIXUP_TAS2781_I2C), SND_PCI_QUIRK(0x17aa, 0x38a7, "Y780P AMD YG dual", ALC287_FIXUP_TAS2781_I2C), SND_PCI_QUIRK(0x17aa, 0x38a8, "Y780P AMD VECO dual", ALC287_FIXUP_TAS2781_I2C), - SND_PCI_QUIRK(0x17aa, 0x38a9, "Thinkbook 16P", ALC287_FIXUP_CS35L41_I2C_2), - SND_PCI_QUIRK(0x17aa, 0x38ab, "Thinkbook 16P", ALC287_FIXUP_CS35L41_I2C_2), + SND_PCI_QUIRK(0x17aa, 0x38a9, "Thinkbook 16P", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x38ab, "Thinkbook 16P", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), SND_PCI_QUIRK(0x17aa, 0x38b4, "Legion Slim 7 16IRH8", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x17aa, 0x38b5, "Legion Slim 7 16IRH8", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x17aa, 0x38b6, "Legion Slim 7 16APH8", ALC287_FIXUP_CS35L41_I2C_2), -- 2.34.1

1 0