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

[PATCH 6.8 regression fix 0/2] ASoC: Intel: Boards: Fix NULL pointer deref in BYT/CHT boards
by Hans de Goede 12 Feb '24

12 Feb '24

Hi All, While testing 6.8 on a Bay Trail device with a ALC5640 codec I noticed a regression in 6.8 which causes a NULL pointer deref in probe(). All BYT/CHT Intel machine drivers are affected. Patch 1/2 of this series fixes all of them. Patch 2/2 adds some small cleanups to cht_bsw_rt5645.c for issues which I noticed while working on 1/2. Regards, Hans Hans de Goede (2): ASoC: Intel: Boards: Fix NULL pointer deref in BYT/CHT boards ASoC: Intel: cht_bsw_rt5645: Cleanup codec_name handling sound/soc/intel/boards/bytcht_cx2072x.c | 3 ++- sound/soc/intel/boards/bytcht_da7213.c | 3 ++- sound/soc/intel/boards/bytcht_es8316.c | 3 ++- sound/soc/intel/boards/bytcr_rt5640.c | 3 ++- sound/soc/intel/boards/bytcr_rt5651.c | 3 ++- sound/soc/intel/boards/bytcr_wm5102.c | 3 ++- sound/soc/intel/boards/cht_bsw_rt5645.c | 7 +++---- sound/soc/intel/boards/cht_bsw_rt5672.c | 3 ++- 8 files changed, 17 insertions(+), 11 deletions(-) -- 2.43.0

2 3

Re: [REGRESSION] Acp5x probing regression introduced between kernel 6.7.2 -> 6.7.4
by Linux regression tracking (Thorsten Leemhuis) 11 Feb '24

11 Feb '24

[CCing a few people] On 11.02.24 15:34, Ted Chang wrote: > > I noticed 6.7.4 has introduced a regression for the steam deck. The LCD > steam deck can no longer probe the acp5x audio chipset anymore. This > regression does not affect the 6.8.x series. I did not test kernel > 6.7.3 because Opensuse tumbleweed skipped the update on my machine. Thx for your report. FWIW, problems like this can be caused by all sorts of changes, but obviously those in the area of audio support are most likely to cause this. There are just a few in the v6.7.2..v6.7.4 range[1]. Among them a commit that is related to acp5x, that's why I CCed its author as well (Venkata Prasad Potturu). Maybe one of the new recipients will have an idea. If not, you most likely will have to bisect this and check if mainline is affected as well.[2] Ciao, Thorsten [1] $ git log --oneline v6.7.2..v6.7.4 sound/ f3570675bf09af ASoC: codecs: wsa883x: fix PA volume control 2f8e9b77ca2fea ASoC: codecs: lpass-wsa-macro: fix compander volume hack 5b465d6384e4eb ASoC: codecs: wcd938x: fix headphones volume controls 1673211a38012e ASoC: qcom: sc8280xp: limit speaker volumes 242b5bffa23a9c ASoC: codecs: rtq9128: Fix TDM enable and DAI format control flow 2c272ff9859601 ASoC: codecs: rtq9128: Fix PM_RUNTIME usage 4a28302b2c681e ALSA: hda/conexant: Fix headset auto detect fail in cx8070 and SN6140 e37a96941fdd53 ALSA: hda: intel-dspcfg: add filters for ARL-S and ARL ffa3eea886c6fe ALSA: hda: Intel: add HDA_ARL PCI ID support 4b6986b170f2f2 ASoC: amd: Add new dmi entries for acp5x platform e38ad4ace20b4d ALSA: hda: Refer to correct stream index at loops a434c75e0671f9 soundwire: fix initializing sysfs for same devices on different buses [2] I'm working on a guide that describes what's needed: https://www.leemhuis.info/files/misc/How%20to%20bisect%20a%20Linux%20kernel… > Steps to reproduce the problem > 1. Obtain a steam deck > 2. Install kernel 6.7.4 > 3. Boot the device and you will see dummy output in gnome shell > > Observed kernel logs. > > [ 8.755614] cs35l41 spi-VLV1776:00: supply VA not found, using dummy regulator > [ 8.760506] cs35l41 spi-VLV1776:00: supply VP not found, using dummy regulator > [ 8.777148] cs35l41 spi-VLV1776:00: Cirrus Logic CS35L41 (35a40), Revision: B2 > [ 8.777471] cs35l41 spi-VLV1776:01: supply VA not found, using dummy regulator > [ 8.777532] cs35l41 spi-VLV1776:01: supply VP not found, using dummy regulator > [ 8.777709] cs35l41 spi-VLV1776:01: Reset line busy, assuming shared reset > [ 8.788465] cs35l41 spi-VLV1776:01: Cirrus Logic CS35L41 (35a40), Revision: B2 > [ 8.877280] snd_hda_intel 0000:04:00.1: enabling device (0000 -> 0002) > [ 8.877595] snd_hda_intel 0000:04:00.1: Handle vga_switcheroo audio client > [ 8.889913] snd_acp_pci 0000:04:00.5: enabling device (0000 -> 0002) > [ 8.890063] snd_acp_pci 0000:04:00.5: Unsupported device revision:0x50 > [ 8.890129] snd_acp_pci: probe of 0000:04:00.5 failed with error -22 > [ 8.906136] snd_hda_intel 0000:04:00.1: bound 0000:04:00.0 (ops amdgpu_dm_audio_component_bind_ops [amdgpu] > > > No kernel module in use shown. > > 04:00.5 Multimedia controller [0480]: Advanced Micro Devices, Inc. [AMD] > ACP/ACP3X/ACP6x Audio Coprocessor [1022:15e2] (rev 50) > Subsystem: Valve Software Device [1e44:1776] > Flags: fast devsel, IRQ 70, IOMMU group 4 > Memory at 80380000 (32-bit, non-prefetchable) [size=256K] > Capabilities: <access denied> > Kernel modules: snd_pci_acp3x, snd_rn_pci_acp3x, snd_pci_acp5x, > snd_pci_acp6x, snd_acp_pci, snd_rpl_pci_acp6x, snd_pci_ps, > snd_sof_amd_renoir, snd_sof_amd_rembrandt, snd_sof_amd_vangogh, > snd_sof_amd_acp63 > > > Information for package kernel-default: > --------------------------------------- > Repository : openSUSE-Tumbleweed-Oss > Name : kernel-default > Version : 6.7.4-1.1 > Arch : x86_64 > Vendor : openSUSE > Installed Size : 240.3 MiB > Installed : Yes > Status : up-to-date > Source package : kernel-default-6.7.4-1.1.nosrc > Upstream URL : https://www.kernel.org/ <https://www.kernel.org/> > Summary : The Standard Kernel > Description : > The standard kernel for both uniprocessor and multiprocessor systems. > > > Source Timestamp: 2024-02-06 05:32:37 +0000 > GIT Revision: 01735a3e65287585dd830a6a3d33d909a4f9ae7f > GIT Branch: stable > > Handle 0x0000, DMI type 0, 26 bytes > BIOS Information > Vendor: Valve > Version: F7A0120 > Release Date: 12/01/2023 > Address: 0xE0000 > Runtime Size: 128 kB > BIOS Revision: 1.20 > Firmware Revision: 1.16 > > #regzbot introduced: v6.7.2..v6.7.4 >

1 0

[PATCH] ASoC: cs35l56: Remove default from IRQ1_CFG register
by Richard Fitzgerald 09 Feb '24

09 Feb '24

The driver never uses the IRQ1_CFG register so there's no need to provide a default value. It's set as a readable register only for debugging through the regmap registers file. A system-specific firmware could overwrite this register with a non-default value. Therefore the driver can't hardcode what the initial value actually is. As the register is only for debugging the value can be left unknown until someone wants to read it through debugfs. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> --- sound/soc/codecs/cs35l56-shared.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c index 02fba4bc0a14..995d979b6d87 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -51,7 +51,6 @@ static const struct reg_default cs35l56_reg_defaults[] = { { CS35L56_SWIRE_DP3_CH2_INPUT, 0x00000019 }, { CS35L56_SWIRE_DP3_CH3_INPUT, 0x00000029 }, { CS35L56_SWIRE_DP3_CH4_INPUT, 0x00000028 }, - { CS35L56_IRQ1_CFG, 0x00000000 }, { CS35L56_IRQ1_MASK_1, 0x83ffffff }, { CS35L56_IRQ1_MASK_2, 0xffff7fff }, { CS35L56_IRQ1_MASK_4, 0xe0ffffff }, -- 2.30.2

2 1

[PATCH v4] ASoC: tas2781: remove unused acpi_subysystem_id
by Gergo Koteles 09 Feb '24

09 Feb '24

The acpi_subysystem_id is only written and freed, not read, so unnecessary. Signed-off-by: Gergo Koteles <soyer(a)irl.hu> --- Changes since v3: - remove Fixes and CC tags from commit message - remove In-Reply-To from header - rebase onto for-next - link to v3: https://lore.kernel.org/lkml/7f056a4148fec176812ff6cc490860bf565b161c.17072… Changes since v2: remove sub from tas2781_read_acpi Changes since v1: remove physdev from tas2781_read_acpi --- include/sound/tas2781.h | 1 - sound/pci/hda/tas2781_hda_i2c.c | 12 ------------ sound/soc/codecs/tas2781-comlib.c | 1 - 3 files changed, 14 deletions(-) diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h index 9aff384941de..99ca3e401fd1 100644 --- a/include/sound/tas2781.h +++ b/include/sound/tas2781.h @@ -103,7 +103,6 @@ struct tasdevice_priv { struct tm tm; enum device_catlog_id catlog_id; - const char *acpi_subsystem_id; unsigned char cal_binaryname[TASDEVICE_MAX_CHANNELS][64]; unsigned char crc8_lkp_tbl[CRC8_TABLE_SIZE]; unsigned char coef_binaryname[64]; diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index 1bfb00102a77..4c9a788c3501 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -111,9 +111,7 @@ static int tas2781_get_i2c_res(struct acpi_resource *ares, void *data) static int tas2781_read_acpi(struct tasdevice_priv *p, const char *hid) { struct acpi_device *adev; - struct device *physdev; LIST_HEAD(resources); - const char *sub; int ret; adev = acpi_dev_get_first_match_dev(hid, NULL, -1); @@ -129,18 +127,8 @@ static int tas2781_read_acpi(struct tasdevice_priv *p, const char *hid) acpi_dev_free_resource_list(&resources); strscpy(p->dev_name, hid, sizeof(p->dev_name)); - physdev = get_device(acpi_get_first_physical_node(adev)); acpi_dev_put(adev); - /* No side-effect to the playback even if subsystem_id is NULL*/ - sub = acpi_get_subsystem_id(ACPI_HANDLE(physdev)); - if (IS_ERR(sub)) - sub = NULL; - - p->acpi_subsystem_id = sub; - - put_device(physdev); - return 0; err: diff --git a/sound/soc/codecs/tas2781-comlib.c b/sound/soc/codecs/tas2781-comlib.c index 5d0e5348b361..3aa81514dad7 100644 --- a/sound/soc/codecs/tas2781-comlib.c +++ b/sound/soc/codecs/tas2781-comlib.c @@ -408,7 +408,6 @@ void tasdevice_remove(struct tasdevice_priv *tas_priv) { if (gpio_is_valid(tas_priv->irq_info.irq_gpio)) gpio_free(tas_priv->irq_info.irq_gpio); - kfree(tas_priv->acpi_subsystem_id); mutex_destroy(&tas_priv->codec_lock); } EXPORT_SYMBOL_GPL(tasdevice_remove); base-commit: aa0dc84513e94a6ee2df360cf5e3b207abf734e0 -- 2.43.0

2 1

[PATCH v2] ASoC: Intel: avs: Expose FW version with sysfs
by Amadeusz Sławiński 09 Feb '24

09 Feb '24

From: Cezary Rojewski <cezary.rojewski(a)intel.com> Add functionality to read version of loaded FW from sysfs. Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> --- Changes in v2: - Adjust path in Documentation to correct one --- .../ABI/testing/sysfs-bus-pci-devices-avs | 8 +++++ sound/soc/intel/avs/Makefile | 3 +- sound/soc/intel/avs/avs.h | 4 +++ sound/soc/intel/avs/core.c | 1 + sound/soc/intel/avs/sysfs.c | 35 +++++++++++++++++++ 5 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-devices-avs create mode 100644 sound/soc/intel/avs/sysfs.c diff --git a/Documentation/ABI/testing/sysfs-bus-pci-devices-avs b/Documentation/ABI/testing/sysfs-bus-pci-devices-avs new file mode 100644 index 0000000000000..ebff3fa12055d --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-avs @@ -0,0 +1,8 @@ +What: /sys/devices/pci0000:00/<dev>/avs/fw_version +Date: February 2024 +Contact: Cezary Rojewski <cezary.rojewski(a)intel.com> +Description: + Version of AudioDSP firmware ASoC avs driver is communicating + with. + + Format: %d.%d.%d.%d, type:major:minor:build. diff --git a/sound/soc/intel/avs/Makefile b/sound/soc/intel/avs/Makefile index 460ee6599daf0..a3fad926d0fb0 100644 --- a/sound/soc/intel/avs/Makefile +++ b/sound/soc/intel/avs/Makefile @@ -1,7 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only snd-soc-avs-objs := dsp.o ipc.o messages.o utils.o core.o loader.o \ - topology.o path.o pcm.o board_selection.o control.o + topology.o path.o pcm.o board_selection.o control.o \ + sysfs.o snd-soc-avs-objs += cldma.o snd-soc-avs-objs += skl.o apl.o diff --git a/sound/soc/intel/avs/avs.h b/sound/soc/intel/avs/avs.h index d694e08e44e18..69c912feb8a7e 100644 --- a/sound/soc/intel/avs/avs.h +++ b/sound/soc/intel/avs/avs.h @@ -392,4 +392,8 @@ static inline void avs_debugfs_init(struct avs_dev *adev) { } static inline void avs_debugfs_exit(struct avs_dev *adev) { } #endif +/* Filesystems integration */ + +extern const struct attribute_group *avs_attr_groups[]; + #endif /* __SOUND_SOC_INTEL_AVS_H */ diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c index db78eb2f01080..273a902168562 100644 --- a/sound/soc/intel/avs/core.c +++ b/sound/soc/intel/avs/core.c @@ -776,6 +776,7 @@ static struct pci_driver avs_pci_driver = { .probe = avs_pci_probe, .remove = avs_pci_remove, .shutdown = avs_pci_shutdown, + .dev_groups = avs_attr_groups, .driver = { .pm = &avs_dev_pm, }, diff --git a/sound/soc/intel/avs/sysfs.c b/sound/soc/intel/avs/sysfs.c new file mode 100644 index 0000000000000..cce21636fbc02 --- /dev/null +++ b/sound/soc/intel/avs/sysfs.c @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// Copyright(c) 2021-2024 Intel Corporation. All rights reserved. +// +// Authors: Cezary Rojewski <cezary.rojewski(a)intel.com> +// Amadeusz Slawinski <amadeuszx.slawinski(a)linux.intel.com> +// + +#include <linux/sysfs.h> +#include "avs.h" + +static ssize_t fw_version_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct avs_dev *adev = to_avs_dev(dev); + struct avs_fw_version *fw_version = &adev->fw_cfg.fw_version; + + return sysfs_emit(buf, "%d.%d.%d.%d\n", fw_version->major, fw_version->minor, + fw_version->hotfix, fw_version->build); +} +static DEVICE_ATTR_RO(fw_version); + +static struct attribute *avs_fw_attrs[] = { + &dev_attr_fw_version.attr, + NULL +}; + +static const struct attribute_group avs_attr_group = { + .name = "avs", + .attrs = avs_fw_attrs, +}; + +const struct attribute_group *avs_attr_groups[] = { + &avs_attr_group, + NULL +}; -- 2.34.1

2 1

[PATCH 00/24] ASoC: Intel: Machine driver updates for 6.9
by Pierre-Louis Bossart 09 Feb '24

09 Feb '24

A fairly large update this time, with Brent Lu's continued cleanup of Chromebook cards, and updates for new SoundWire configurations. Bard Liao (11): ASoC: Intel: sof_sdw: use single rtd_init for rt_amps ASoC: Intel: add get_codec_dai_by_name helper function ASoC: Intel: sof_sdw_rt_sdca_jack_common: use helper to get codec dai by name ASoC: Intel: sof_sdw_rt711: use helper to get codec dai by name ASoC: Intel: sof_sdw_rt712_sdca: use helper to get codec dai by name ASoC: Intel: sof_sdw_rt700: use helper to get codec dai by name ASoC: Intel: sof_sdw_cs42l42: use helper to get codec dai by name ASoC: Intel: sof_sdw_rt5682: use helper to get codec dai by name ASoC: Intel: sof_sdw: add common sdw dai link init ASoC: Intel: sof_sdw: remove .init callbacks ASoC: Intel: sof_sdw: starts non sdw BE id with the highest sdw BE id Brent Lu (8): ASoC: Intel: sof_rt5682: board id cleanup for jsl boards ASoC: Intel: sof_rt5682: board id cleanup for tgl boards ASoC: Intel: sof_rt5682: board id cleanup for adl boards ASoC: Intel: sof_rt5682: board id cleanup for rpl boards ASoC: Intel: sof_rt5682: board id cleanup for mtl boards ASoC: Intel: sof_rt5682: dmi quirk cleanup for mtl boards ASoC: Intel: board_helpers: support DAI link order customization ASoC: Intel: sof_cs42l42: use common module for DAI link generation Chao Song (2): ASoC: Intel: soc-acpi: add RT712 support for LNL ASoC: Intel: soc-acpi-intel-lnl-match: Add rt722 support Charles Keepax (2): ASoC: Intel: ssp-common: Add stub for sof_ssp_get_codec_name ASoC: Intel: sof_sdw: Remove unused function prototypes mosomate (1): ASoC: Intel: common: DMI remap for rebranded Intel NUC M15 (LAPRC710) laptops drivers/soundwire/dmi-quirks.c | 8 + sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/sof_board_helpers.c | 225 ++++++++++++------ sound/soc/intel/boards/sof_board_helpers.h | 29 +++ sound/soc/intel/boards/sof_cs42l42.c | 224 +++++------------ sound/soc/intel/boards/sof_rt5682.c | 151 +----------- sound/soc/intel/boards/sof_sdw.c | 106 +++++++-- sound/soc/intel/boards/sof_sdw_common.h | 82 ++----- sound/soc/intel/boards/sof_sdw_cs42l42.c | 35 ++- sound/soc/intel/boards/sof_sdw_cs42l43.c | 25 +- sound/soc/intel/boards/sof_sdw_cs_amp.c | 3 +- sound/soc/intel/boards/sof_sdw_maxim.c | 4 +- sound/soc/intel/boards/sof_sdw_rt5682.c | 35 ++- sound/soc/intel/boards/sof_sdw_rt700.c | 35 ++- sound/soc/intel/boards/sof_sdw_rt711.c | 19 +- sound/soc/intel/boards/sof_sdw_rt712_sdca.c | 39 ++- sound/soc/intel/boards/sof_sdw_rt715.c | 12 +- sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 12 +- sound/soc/intel/boards/sof_sdw_rt_amp.c | 53 +---- .../boards/sof_sdw_rt_sdca_jack_common.c | 19 +- sound/soc/intel/boards/sof_ssp_common.h | 8 + .../intel/common/soc-acpi-intel-adl-match.c | 12 +- .../intel/common/soc-acpi-intel-jsl-match.c | 10 +- .../intel/common/soc-acpi-intel-lnl-match.c | 102 ++++++++ .../intel/common/soc-acpi-intel-mtl-match.c | 4 +- .../intel/common/soc-acpi-intel-rpl-match.c | 4 +- .../intel/common/soc-acpi-intel-tgl-match.c | 6 +- 27 files changed, 585 insertions(+), 678 deletions(-) -- 2.40.1

2 25

ALSA-LIB: Support for format IEC958_SUBFRAME_LE in the plug plugin?
by Pavel Hofman 09 Feb '24

09 Feb '24

Hi, RPi has recently moved to the VC4 driver which accepts only IEC958_SUBFRAME_LE format https://github.com/torvalds/linux/blob/ecb1b8288dc7ccbdcb3b9df005fa1c0e0c03… . Since then people started to have issues with their previous configs which use only the plug plugin (plughw:X). Wrapping the device with the hdmi plugin solves the problem, as it should. But e.g. mainline java support for alsa offers only hw cards wrapped with the plug plugin (hardcoded, not possible to specify the device name directly). Stock Java apps then do not work with RPi HDMI. I was wondering if it made sense to add support for the IEC958 formats (using the iec958 plugin methods) to the plug plugin. It may be complicated with the hdmi_mode hint though, I do not know if there is any API to recognize HDMI vs. SPDIF. Maybe a different format specifically for HDMI could have been perhaps useful but it may be too late for that. Thank you very much for consideration. With regards, Pavel.

2 11

[PATCH] ALSA: hda/realtek: Add "Intel Reference board" SSID in the ALC256.
by Pierre-Louis Bossart 09 Feb '24

09 Feb '24

From: "Sayed, Karimuddin" <karimuddin.sayed(a)intel.com> Add "Intel Reference board" SSID in the alc256. Enable "power saving mode" and Enable "headset jack mode". Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Signed-off-by: Sayed, Karimuddin <karimuddin.sayed(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f6f16622f9cc..0052a654204d 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10081,6 +10081,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x10ec, 0x1252, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK), SND_PCI_QUIRK(0x10ec, 0x1254, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK), SND_PCI_QUIRK(0x10ec, 0x12cc, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK), + SND_PCI_QUIRK(0x10ec, 0x12f6, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK), SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_HEADSET_MODE), SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC), SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_AMP), -- 2.40.1

2 1

[PATCH] ALSA: HDA: intel-sdw-acpi: add kernel parameter to select alternate controller
by Pierre-Louis Bossart 09 Feb '24

09 Feb '24

Existing DSDT or SSDT platforms hard-code clock and frame shape configurations. For validation, we'd like to use alternate configurations. It's not always possible to generate new tables due to missing symbols, and modifying existing objects usually leads to AE_OBJECT_EXIST errors. The mechanism suggested in this patch is to add a NEW ACPI controller device with a different _ADR value. e.g. Scope (_SB_.PC00.RP08.PXSX.HDAS) { Device (SDWP) { Name (_ADR, 0x40000001) // _ADR: Address The desired _ADR can be passed as a parameter with options snd-intel-sdw-acpi sdw_ctrl_addr=0x40000001 This solution leads to minimal tables with just what the developers or validation engineers need, and without overriding any of the existing firmware definitions. It's consistent with the recommendation to extend ACPI definitions and not redefine them with a risk of conflict. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- sound/hda/intel-sdw-acpi.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/hda/intel-sdw-acpi.c b/sound/hda/intel-sdw-acpi.c index b57d72ea4503..5f60658c6051 100644 --- a/sound/hda/intel-sdw-acpi.c +++ b/sound/hda/intel-sdw-acpi.c @@ -23,6 +23,10 @@ static int ctrl_link_mask; module_param_named(sdw_link_mask, ctrl_link_mask, int, 0444); MODULE_PARM_DESC(sdw_link_mask, "Intel link mask (one bit per link)"); +static ulong ctrl_addr = 0x40000000; +module_param_named(sdw_ctrl_addr, ctrl_addr, ulong, 0444); +MODULE_PARM_DESC(sdw_ctrl_addr, "Intel SoundWire Controller _ADR"); + static bool is_link_enabled(struct fwnode_handle *fw_node, u8 idx) { struct fwnode_handle *link; @@ -141,6 +145,9 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level, if (FIELD_GET(GENMASK(31, 28), adr) != SDW_LINK_TYPE) return AE_OK; /* keep going */ + if (adr != ctrl_addr) + return AE_OK; /* keep going */ + /* found the correct SoundWire controller */ info->handle = handle; -- 2.40.1

2 1

[PATCH v2] ASoC: cs35l56: Fix deadlock in ASP1 mixer register initialization
by Richard Fitzgerald 08 Feb '24

08 Feb '24

Rewrite the handling of ASP1 TX mixer mux initialization to prevent a deadlock during component_remove(). The firmware can overwrite the ASP1 TX mixer registers with system-specific settings. This is mainly for hardware that uses the ASP as a chip-to-chip link controlled by the firmware. Because of this the driver cannot know the starting state of the ASP1 mixer muxes until the firmware has been downloaded and rebooted. The original workaround for this was to queue a work function from the dsp_work() job. This work then read the register values (populating the regmap cache the first time around) and then called snd_soc_dapm_mux_update_power(). The problem with this is that it was ultimately triggered by cs35l56_component_probe() queueing dsp_work, which meant that it would be running in parallel with the rest of the ASoC component and card initialization. To prevent accessing DAPM before it was fully initialized the work function took the card mutex. But this would deadlock if cs35l56_component_remove() was called before the work job had completed, because ASoC calls component_remove() with the card mutex held. This new version removes the work function. Instead the regmap cache and DAPM mux widgets are initialized the first time any of the associated ALSA controls is read or written. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> Fixes: 07f7d6e7a124 ("ASoC: cs35l56: Fix for initializing ASP1 mixer registers") --- Change from V1: Move the check of asp1_mixer_widgets_initialized into cs35l56_sync_asp1_mixer_widgets_with_firmware(). --- sound/soc/codecs/cs35l56.c | 157 +++++++++++++++++-------------------- sound/soc/codecs/cs35l56.h | 2 +- 2 files changed, 75 insertions(+), 84 deletions(-) diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c index ebed5ab1245b..98d3957c66e7 100644 --- a/sound/soc/codecs/cs35l56.c +++ b/sound/soc/codecs/cs35l56.c @@ -68,6 +68,66 @@ static const char * const cs35l56_asp1_mux_control_names[] = { "ASP1 TX1 Source", "ASP1 TX2 Source", "ASP1 TX3 Source", "ASP1 TX4 Source" }; +static int cs35l56_sync_asp1_mixer_widgets_with_firmware(struct cs35l56_private *cs35l56) +{ + struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cs35l56->component); + const char *prefix = cs35l56->component->name_prefix; + char full_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + const char *name; + struct snd_kcontrol *kcontrol; + struct soc_enum *e; + unsigned int val[4]; + int i, item, ret; + + if (cs35l56->asp1_mixer_widgets_initialized) + return 0; + + /* + * Resume so we can read the registers from silicon if the regmap + * cache has not yet been populated. + */ + ret = pm_runtime_resume_and_get(cs35l56->base.dev); + if (ret < 0) + return ret; + + /* Wait for firmware download and reboot */ + cs35l56_wait_dsp_ready(cs35l56); + + ret = regmap_bulk_read(cs35l56->base.regmap, CS35L56_ASP1TX1_INPUT, + val, ARRAY_SIZE(val)); + + pm_runtime_mark_last_busy(cs35l56->base.dev); + pm_runtime_put_autosuspend(cs35l56->base.dev); + + if (ret) { + dev_err(cs35l56->base.dev, "Failed to read ASP1 mixer regs: %d\n", ret); + return ret; + } + + for (i = 0; i < ARRAY_SIZE(cs35l56_asp1_mux_control_names); ++i) { + name = cs35l56_asp1_mux_control_names[i]; + + if (prefix) { + snprintf(full_name, sizeof(full_name), "%s %s", prefix, name); + name = full_name; + } + + kcontrol = snd_soc_card_get_kcontrol(dapm->card, name); + if (!kcontrol) { + dev_warn(cs35l56->base.dev, "Could not find control %s\n", name); + continue; + } + + e = (struct soc_enum *)kcontrol->private_value; + item = snd_soc_enum_val_to_item(e, val[i] & CS35L56_ASP_TXn_SRC_MASK); + snd_soc_dapm_mux_update_power(dapm, kcontrol, item, e, NULL); + } + + cs35l56->asp1_mixer_widgets_initialized = true; + + return 0; +} + static int cs35l56_dspwait_asp1tx_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -78,9 +138,9 @@ static int cs35l56_dspwait_asp1tx_get(struct snd_kcontrol *kcontrol, unsigned int addr, val; int ret; - /* Wait for mux to be initialized */ - cs35l56_wait_dsp_ready(cs35l56); - flush_work(&cs35l56->mux_init_work); + ret = cs35l56_sync_asp1_mixer_widgets_with_firmware(cs35l56); + if (ret) + return ret; addr = cs35l56_asp1_mixer_regs[index]; ret = regmap_read(cs35l56->base.regmap, addr, &val); @@ -106,9 +166,9 @@ static int cs35l56_dspwait_asp1tx_put(struct snd_kcontrol *kcontrol, bool changed; int ret; - /* Wait for mux to be initialized */ - cs35l56_wait_dsp_ready(cs35l56); - flush_work(&cs35l56->mux_init_work); + ret = cs35l56_sync_asp1_mixer_widgets_with_firmware(cs35l56); + if (ret) + return ret; addr = cs35l56_asp1_mixer_regs[index]; val = snd_soc_enum_item_to_val(e, item); @@ -124,70 +184,6 @@ static int cs35l56_dspwait_asp1tx_put(struct snd_kcontrol *kcontrol, return changed; } -static void cs35l56_mark_asp1_mixer_widgets_dirty(struct cs35l56_private *cs35l56) -{ - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cs35l56->component); - const char *prefix = cs35l56->component->name_prefix; - char full_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; - const char *name; - struct snd_kcontrol *kcontrol; - struct soc_enum *e; - unsigned int val[4]; - int i, item, ret; - - /* - * Resume so we can read the registers from silicon if the regmap - * cache has not yet been populated. - */ - ret = pm_runtime_resume_and_get(cs35l56->base.dev); - if (ret < 0) - return; - - ret = regmap_bulk_read(cs35l56->base.regmap, CS35L56_ASP1TX1_INPUT, - val, ARRAY_SIZE(val)); - - pm_runtime_mark_last_busy(cs35l56->base.dev); - pm_runtime_put_autosuspend(cs35l56->base.dev); - - if (ret) { - dev_err(cs35l56->base.dev, "Failed to read ASP1 mixer regs: %d\n", ret); - return; - } - - snd_soc_card_mutex_lock(dapm->card); - WARN_ON(!dapm->card->instantiated); - - for (i = 0; i < ARRAY_SIZE(cs35l56_asp1_mux_control_names); ++i) { - name = cs35l56_asp1_mux_control_names[i]; - - if (prefix) { - snprintf(full_name, sizeof(full_name), "%s %s", prefix, name); - name = full_name; - } - - kcontrol = snd_soc_card_get_kcontrol(dapm->card, name); - if (!kcontrol) { - dev_warn(cs35l56->base.dev, "Could not find control %s\n", name); - continue; - } - - e = (struct soc_enum *)kcontrol->private_value; - item = snd_soc_enum_val_to_item(e, val[i] & CS35L56_ASP_TXn_SRC_MASK); - snd_soc_dapm_mux_update_power(dapm, kcontrol, item, e, NULL); - } - - snd_soc_card_mutex_unlock(dapm->card); -} - -static void cs35l56_mux_init_work(struct work_struct *work) -{ - struct cs35l56_private *cs35l56 = container_of(work, - struct cs35l56_private, - mux_init_work); - - cs35l56_mark_asp1_mixer_widgets_dirty(cs35l56); -} - static DECLARE_TLV_DB_SCALE(vol_tlv, -10000, 25, 0); static const struct snd_kcontrol_new cs35l56_controls[] = { @@ -936,14 +932,6 @@ static void cs35l56_dsp_work(struct work_struct *work) else cs35l56_patch(cs35l56, firmware_missing); - - /* - * Set starting value of ASP1 mux widgets. Updating a mux takes - * the DAPM mutex. Post this to a separate job so that DAPM - * power-up can wait for dsp_work to complete without deadlocking - * on the DAPM mutex. - */ - queue_work(cs35l56->dsp_wq, &cs35l56->mux_init_work); err: pm_runtime_mark_last_busy(cs35l56->base.dev); pm_runtime_put_autosuspend(cs35l56->base.dev); @@ -989,6 +977,13 @@ static int cs35l56_component_probe(struct snd_soc_component *component) debugfs_create_bool("can_hibernate", 0444, debugfs_root, &cs35l56->base.can_hibernate); debugfs_create_bool("fw_patched", 0444, debugfs_root, &cs35l56->base.fw_patched); + /* + * The widgets for the ASP1TX mixer can't be initialized + * until the firmware has been downloaded and rebooted. + */ + regcache_drop_region(cs35l56->base.regmap, CS35L56_ASP1TX1_INPUT, CS35L56_ASP1TX4_INPUT); + cs35l56->asp1_mixer_widgets_initialized = false; + queue_work(cs35l56->dsp_wq, &cs35l56->dsp_work); return 0; @@ -999,7 +994,6 @@ static void cs35l56_component_remove(struct snd_soc_component *component) struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(component); cancel_work_sync(&cs35l56->dsp_work); - cancel_work_sync(&cs35l56->mux_init_work); if (cs35l56->dsp.cs_dsp.booted) wm_adsp_power_down(&cs35l56->dsp); @@ -1070,10 +1064,8 @@ int cs35l56_system_suspend(struct device *dev) dev_dbg(dev, "system_suspend\n"); - if (cs35l56->component) { + if (cs35l56->component) flush_work(&cs35l56->dsp_work); - cancel_work_sync(&cs35l56->mux_init_work); - } /* * The interrupt line is normally shared, but after we start suspending @@ -1224,7 +1216,6 @@ static int cs35l56_dsp_init(struct cs35l56_private *cs35l56) return -ENOMEM; INIT_WORK(&cs35l56->dsp_work, cs35l56_dsp_work); - INIT_WORK(&cs35l56->mux_init_work, cs35l56_mux_init_work); dsp = &cs35l56->dsp; cs35l56_init_cs_dsp(&cs35l56->base, &dsp->cs_dsp); diff --git a/sound/soc/codecs/cs35l56.h b/sound/soc/codecs/cs35l56.h index 596b141e3f96..b000e7365e40 100644 --- a/sound/soc/codecs/cs35l56.h +++ b/sound/soc/codecs/cs35l56.h @@ -34,7 +34,6 @@ struct cs35l56_private { struct wm_adsp dsp; /* must be first member */ struct cs35l56_base base; struct work_struct dsp_work; - struct work_struct mux_init_work; struct workqueue_struct *dsp_wq; struct snd_soc_component *component; struct regulator_bulk_data supplies[CS35L56_NUM_BULK_SUPPLIES]; @@ -52,6 +51,7 @@ struct cs35l56_private { u8 asp_slot_count; bool tdm_mode; bool sysclk_set; + bool asp1_mixer_widgets_initialized; u8 old_sdw_clock_scale; }; -- 2.30.2

2 1