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

[PATCH v1 1/8] ALSA: hda/tas2781: Add tas2781 SPI-based driver
by Baojun Xu 06 Apr '24

06 Apr '24

Add TXNW2781 support in smi. Signed-off-by: Baojun Xu <baojun.xu(a)ti.com> --- drivers/acpi/scan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 7c157bf92..226bd9097 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1765,6 +1765,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) {"CSC3557", }, {"INT33FE", }, {"INT3515", }, + {"TXNW2781", }, /* Non-conforming _HID for Cirrus Logic already released */ {"CLSA0100", }, {"CLSA0101", }, -- 2.40.1

6 20

[PATCH v2 00/17] ALSA: emu10k1 & emux: fixes related to wavetable playback
by Oswald Buddenhagen 06 Apr '24

06 Apr '24

--- This patch series needs to be applied on top of the patch titled "Revert "ALSA: emu10k1: fix synthesizer sample playback position and caching"". Oswald Buddenhagen (17): ALSA: emux: fix /proc teardown at module unload ALSA: emux: prune unused parameter from snd_soundfont_load_guspatch() ALSA: emux: fix validation of snd_emux.num_ports ALSA: emux: fix init of patch_info.truesize in load_data() ALSA: emu10k1: prune vestiges of SNDRV_SFNT_SAMPLE_{BIDIR,REVERSE}_LOOP support ALSA: emux: centralize & improve patch info validation ALSA: emux: improve patch ioctl data validation ALSA: emu10k1: move patch loader assertions into low-level functions ALSA: emu10k1: fix sample signedness issues in wavetable loader ALSA: emu10k1: fix playback of 8-bit wavetable samples ALSA: emu10k1: merge conditions in patch loader ALSA: emu10k1: fix wavetable offset recalculation ALSA: emu10k1: de-duplicate size calculations for 16-bit samples ALSA: emu10k1: improve cache behavior documentation ALSA: emu10k1: fix wavetable playback position and caching, take 2 ALSA: emu10k1: shrink blank space in front of wavetable samples ALSA: emux: simplify snd_sf_list.callback handling include/sound/emu10k1.h | 32 +++-- include/sound/soundfont.h | 2 +- sound/isa/sb/emu8000_patch.c | 13 -- sound/pci/emu10k1/emu10k1_callback.c | 13 +- sound/pci/emu10k1/emu10k1_patch.c | 207 +++++++++++---------------- sound/pci/emu10k1/memory.c | 55 +++++-- sound/synth/emux/emux.c | 6 +- sound/synth/emux/emux_hwdep.c | 3 +- sound/synth/emux/emux_oss.c | 3 +- sound/synth/emux/emux_proc.c | 1 + sound/synth/emux/emux_seq.c | 6 +- sound/synth/emux/soundfont.c | 73 +++++++--- 12 files changed, 219 insertions(+), 195 deletions(-) base-commit: ed93395844979f6bf2e1fbfcda38d1718289b426 prerequisite-patch-id: b7769e1c8649b86fd9e0b259e11bfd8e468393e5 -- 2.42.0.419.g70bf8a5751

2 22

[PATCH 00/13] ASoC: Intel: avs: Fixes and cleanups for 6.10
by Cezary Rojewski 06 Apr '24

06 Apr '24

Set of changes targeting the avs-driver only. No new features, patchset either fixes or fortifies existing code. Patchset starts off with a fix for debugbility on ICL+ platforms which I have forgotten to fixup when providing support for these initially. The next two address copier module initialization, most importantly, silence the gcc 'field-spanning write' false-positive. The following four: 6/13 ASoC: Intel: avs: Replace risky functions with safer variants 7/13 ASoC: Intel: avs: Fix potential integer overflow 8/13 ASoC: Intel: avs: Test result of avs_get_module_entry() 9/13 ASoC: Intel: avs: Remove dead code address problems found out by Coverity static analysis tool. The last two worth mentioning are: recommendation from the firmware team to wake subsystem from D0ix when starting any pipeline -and- shielding against invalid period/buffer sizes. Audio format shall be taken into consideration when calculating either of these. Amadeusz Sławiński (2): ASoC: Intel: avs: Restore stream decoupling on prepare ASoC: Intel: avs: Add assert_static to guarantee ABI sizes Cezary Rojewski (11): ASoC: Intel: avs: Fix debug-slot offset calculation ASoC: Intel: avs: Silence false-positive memcpy() warnings ASoC: Intel: avs: Fix config_length for config-less copiers ASoC: Intel: avs: Fix ASRC module initialization ASoC: Intel: avs: Replace risky functions with safer variants ASoC: Intel: avs: Fix potential integer overflow ASoC: Intel: avs: Test result of avs_get_module_entry() ASoC: Intel: avs: Remove dead code ASoC: Intel: avs: Wake from D0ix when starting streaming ASoC: Intel: avs: Init debugfs before booting firmware ASoC: Intel: avs: Rule invalid buffer and period sizes out sound/soc/intel/avs/avs.h | 1 + sound/soc/intel/avs/cldma.c | 2 +- sound/soc/intel/avs/core.c | 4 +-- sound/soc/intel/avs/icl.c | 12 ++++++--- sound/soc/intel/avs/loader.c | 6 +++-- sound/soc/intel/avs/messages.h | 47 ++++++++++++++++++++++++++++++++-- sound/soc/intel/avs/path.c | 13 ++++------ sound/soc/intel/avs/pcm.c | 34 +++++++++++++++++++++++- sound/soc/intel/avs/probes.c | 14 ++++++---- 9 files changed, 109 insertions(+), 24 deletions(-) -- 2.25.1

2 14

[PATCH 0/4] ASoC: SOF: Intel: improve and extend HDaudio-based wakes
by Pierre-Louis Bossart 06 Apr '24

06 Apr '24

For LunarLake, the SoundWire in-band wake detection is reported with the HDAudio WAKE_EN/WAKE_STS registers. In the existing code, these registers are only handled for HDaudio codecs. Now the same registers have to be handled with care as shared resources. The in-band wake detection mainly used for jack detection. Without this patchset, the SoundWire headset codecs signal an event that would be ignored and not reported. Pierre-Louis Bossart (4): ASoC: SOF: Intel: hda-ctrl: add missing WAKE_STS clear ASoC: SOF: Intel: lnl: add helper to detect SoundWire wakes ASoC: SOF: Intel: hda-codec: preserve WAKEEN values ASoC: SOF: Intel: hda-ctrl: only clear WAKESTS for HDaudio codecs sound/soc/sof/intel/hda-codec.c | 15 ++++++++++++--- sound/soc/sof/intel/hda-ctrl.c | 9 ++++++++- sound/soc/sof/intel/lnl.c | 18 ++++++++++++++++++ 3 files changed, 38 insertions(+), 4 deletions(-) -- 2.40.1

2 5

[PATCH 0/4] ASoC: SOF: Intel: extend hda-loader for BTP/BRA transfers
by Pierre-Louis Bossart 06 Apr '24

06 Apr '24

For SoundWire BPT/BRA transfers, we need to reuse the HDaudio DMA infrastructure. This patchset extends the code used by the code loader. The BPT/BRA functionality will be provided in a follow-up contribution. Pierre-Louis Bossart (4): ASoC: SOF: Intel: hda-loader: add flag to tag ICCMAX stream ASoC: SOF: Intel: hda-loader: change signature of code loader helpers ASoC: SOF: Intel: don't ignore IOC interrupts for non-audio transfers ASoC: SOF: Intel: hda-stream: clarify comment sound/soc/sof/intel/hda-loader.c | 80 ++++++++++++++++++++++---------- sound/soc/sof/intel/hda-stream.c | 24 ++++++++-- sound/soc/sof/intel/hda.h | 13 ++++-- 3 files changed, 85 insertions(+), 32 deletions(-) -- 2.40.1

2 5

[PATCH] ASoC: qcom: Fix out of bounds access
by Mikhail Kobuk 05 Apr '24

05 Apr '24

Case values introduced in commit 5f78e1fb7a3e ("ASoC: qcom: Add driver support for audioreach solution") cause out of bounds access in arrays of sc7280 driver data (e.g. in case of RX_CODEC_DMA_RX_0 in sc7280_snd_hw_params()). Redefine LPASS_MAX_PORTS to consider the maximum possible port id for q6dsp as sc7280 driver utilizes some of those values. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 77d0ffef793d ("ASoC: qcom: Add macro for lpass DAI id's max limit") Cc: <stable(a)vger.kernel.org> Signed-off-by: Mikhail Kobuk <m.kobuk(a)ispras.ru> --- sound/soc/qcom/lpass.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h index 27a2bf9a6613..10a507c95312 100644 --- a/sound/soc/qcom/lpass.h +++ b/sound/soc/qcom/lpass.h @@ -13,10 +13,11 @@ #include <linux/platform_device.h> #include <linux/regmap.h> #include <dt-bindings/sound/qcom,lpass.h> +#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h> #include "lpass-hdmi.h" #define LPASS_AHBIX_CLOCK_FREQUENCY 131072000 -#define LPASS_MAX_PORTS (LPASS_CDC_DMA_VA_TX8 + 1) +#define LPASS_MAX_PORTS (QUINARY_MI2S_TX + 1) #define LPASS_MAX_MI2S_PORTS (8) #define LPASS_MAX_DMA_CHANNELS (8) #define LPASS_MAX_HDMI_DMA_CHANNELS (4) -- 2.44.0

1 0

[PATCH v2] ASoC: au1x: declare that FIFO is reported in frames
by Oswald Buddenhagen 05 Apr '24

05 Apr '24

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> --- Is this right? The comment on the field says "fifo entries of AC97/I2S PSC", which doesn't suggest bytes. The data sheet speaks of "words" and "byte masks", but without digging into it I can't tell how it would behave with different sample widths and channel counts (which the driver does not seem to limit _at all_? what am I missing?). This is just something I stumbled over while surveying how different drivers set the field. If this is actually a bug, it is minor. --- sound/soc/au1x/dbdma2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c index ea01d6490cec..2c8c01a5fb8f 100644 --- a/sound/soc/au1x/dbdma2.c +++ b/sound/soc/au1x/dbdma2.c @@ -66,7 +66,8 @@ struct au1xpsc_audio_dmadata { /* PCM hardware DMA capabilities - platform specific */ static const struct snd_pcm_hardware au1xpsc_pcm_hardware = { .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | - SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BATCH, + SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BATCH | + SNDRV_PCM_INFO_FIFO_IN_FRAMES, .period_bytes_min = AU1XPSC_PERIOD_MIN_BYTES, .period_bytes_max = 4096 * 1024 - 1, .periods_min = 2, -- 2.42.0.419.g70bf8a5751

2 2

[PATCH v2 0/2] Add support for QCM6490 and QCS6490
by Mohammad Rafi Shaik 05 Apr '24

05 Apr '24

This patchset adds support for sound card on Qualcomm QCM6490 IDP and QCS6490 RB3Gen2 boards. Changes since v1: - Use existing sc8280xp machine driver instead of separate driver. - Modify qcs6490 compatible name as qcs6490-rb3gen2. Mohammad Rafi Shaik (2): ASoC: dt-bindings: qcom,sm8250: Add QCM6490 snd QCS6490 sound card ASoC: qcom: sc8280xp: Add support for QCM6490 and QCS6490 Documentation/devicetree/bindings/sound/qcom,sm8250.yaml | 2 ++ sound/soc/qcom/sc8280xp.c | 2 ++ 2 files changed, 4 insertions(+) -- 2.25.1

2 5

[GIT PULL] ASoC fixes for v6.9-rc2
by Mark Brown 05 Apr '24

05 Apr '24

The following changes since commit 4cece764965020c22cff7665b18a012006359095: Linux 6.9-rc1 (2024-03-24 14:10:05 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.9-rc2 for you to fetch changes up to 90f8917e7a15f6dd508779048bdf00ce119b6ca0: ASoC: SOF: Core: Add remove_late() to sof_init_environment failure path (2024-04-04 19:51:51 +0100) ---------------------------------------------------------------- ASoC: Fixes for v6.9 A relatively large set of fixes here, the biggest piece of it is a series correcting some problems with the delay reporting for Intel SOF cards but there's a bunch of other things. Everything here is driver specific except for a fix in the core for an issue with sign extension handling volume controls. ---------------------------------------------------------------- Amadeusz Sławiński (1): ASoC: Intel: avs: boards: Add modules description Chaitanya Kumar Borah (1): ASoC: SOF: Core: Add remove_late() to sof_init_environment failure path Charles Keepax (1): ASoC: cs42l43: Correct extraction of data pointer in suspend/resume Mark Brown (4): ASoC: SOF: ipc4/Intel: Fix delay reporting ASoC: rt-sdw: fix locking and improve error logs ASoC: codecs: ES8326: solve some hp issues and ASoC: Merge up left over v6.8 fix Peter Ujfalusi (19): ASoC: SOF: Add dsp_max_burst_size_in_ms member to snd_sof_pcm_stream ASoC: SOF: ipc4-topology: Save the DMA maximum burst size for PCMs ASoC: SOF: Intel: hda-pcm: Use dsp_max_burst_size_in_ms to place constraint ASoC: SOF: Intel: hda: Implement get_stream_position (Linear Link Position) ASoC: SOF: Intel: mtl/lnl: Use the generic get_stream_position callback ASoC: SOF: Introduce a new callback pair to be used for PCM delay reporting ASoC: SOF: Intel: Set the dai/host get frame/byte counter callbacks ASoC: SOF: ipc4-pcm: Use the snd_sof_pcm_get_dai_frame_counter() for pcm_delay ASoC: SOF: Intel: hda-common-ops: Do not set the get_stream_position callback ASoC: SOF: Remove the get_stream_position callback ASoC: SOF: ipc4-pcm: Move struct sof_ipc4_timestamp_info definition locally ASoC: SOF: ipc4-pcm: Combine the SOF_IPC4_PIPE_PAUSED cases in pcm_trigger ASoC: SOF: ipc4-pcm: Invalidate the stream_start_offset in PAUSED state ASoC: SOF: sof-pcm: Add pointer callback to sof_ipc_pcm_ops ASoC: SOF: ipc4-pcm: Correct the delay calculation ALSA: hda: Add pplcllpl/u members to hdac_ext_stream ASoC: SOF: Intel: hda: Compensate LLP in case it is not reset ASoC: SOF: Intel: hda-dsp: Skip IMR boot on ACE platforms in case of S3 suspend ASoC: SOF: Intel: lnl: Disable DMIC/SSP offload on remove Pierre-Louis Bossart (6): ASoC: rt5682-sdw: fix locking sequence ASoC: rt711-sdca: fix locking sequence ASoC: rt711-sdw: fix locking sequence ASoC: rt712-sdca-sdw: fix locking sequence ASoC: rt722-sdca-sdw: fix locking sequence ASoC: rt-sdw*: add __func__ to all error logs Rander Wang (1): ASoC: SOF: mtrace: rework mtrace timestamp setting Richard Fitzgerald (1): ASoC: wm_adsp: Fix missing mutex_lock in wm_adsp_write_ctl() Simon Trimmer (1): ASoC: cs-amp-lib: Check for no firmware controls when writing calibration Stephen Lee (1): ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw Vijendar Mukunda (3): ASoC: amd: acp: fix for acp pdm configuration check ASoC: amd: acp: fix for acp_init function error handling ASoC: SOF: amd: fix for false dsp interrupts Zhang Yi (4): ASoC: codecs: ES8326: Solve error interruption issue ASoC: codecs: ES8326: modify clock table ASoC: codecs: ES8326: Solve a headphone detection issue after suspend and resume ASoC: codecs: ES8326: Removing the control of ADC_SCALE include/sound/hdaudio_ext.h | 3 + sound/soc/amd/acp/acp-pci.c | 13 +-- sound/soc/codecs/cs-amp-lib.c | 5 + sound/soc/codecs/cs42l43.c | 12 ++- sound/soc/codecs/es8326.c | 37 ++++--- sound/soc/codecs/es8326.h | 2 +- sound/soc/codecs/rt1316-sdw.c | 8 +- sound/soc/codecs/rt1318-sdw.c | 8 +- sound/soc/codecs/rt5682-sdw.c | 16 +-- sound/soc/codecs/rt700.c | 16 +-- sound/soc/codecs/rt711-sdca-sdw.c | 6 +- sound/soc/codecs/rt711-sdca.c | 18 ++-- sound/soc/codecs/rt711-sdw.c | 8 +- sound/soc/codecs/rt711.c | 16 +-- sound/soc/codecs/rt712-sdca-dmic.c | 24 +++-- sound/soc/codecs/rt712-sdca-sdw.c | 7 +- sound/soc/codecs/rt712-sdca.c | 20 ++-- sound/soc/codecs/rt715-sdca-sdw.c | 2 +- sound/soc/codecs/rt715-sdca.c | 46 ++++---- sound/soc/codecs/rt715-sdw.c | 4 +- sound/soc/codecs/rt715.c | 24 ++--- sound/soc/codecs/rt722-sdca-sdw.c | 4 +- sound/soc/codecs/rt722-sdca.c | 21 ++-- sound/soc/codecs/wm_adsp.c | 3 +- sound/soc/intel/avs/boards/da7219.c | 1 + sound/soc/intel/avs/boards/dmic.c | 1 + sound/soc/intel/avs/boards/es8336.c | 1 + sound/soc/intel/avs/boards/i2s_test.c | 1 + sound/soc/intel/avs/boards/max98357a.c | 1 + sound/soc/intel/avs/boards/max98373.c | 1 + sound/soc/intel/avs/boards/max98927.c | 1 + sound/soc/intel/avs/boards/nau8825.c | 1 + sound/soc/intel/avs/boards/probe.c | 1 + sound/soc/intel/avs/boards/rt274.c | 1 + sound/soc/intel/avs/boards/rt286.c | 1 + sound/soc/intel/avs/boards/rt298.c | 1 + sound/soc/intel/avs/boards/rt5514.c | 1 + sound/soc/intel/avs/boards/rt5663.c | 1 + sound/soc/intel/avs/boards/rt5682.c | 1 + sound/soc/intel/avs/boards/ssm4567.c | 1 + sound/soc/soc-ops.c | 2 +- sound/soc/sof/amd/acp.c | 8 +- sound/soc/sof/core.c | 14 +-- sound/soc/sof/intel/hda-common-ops.c | 3 + sound/soc/sof/intel/hda-dai-ops.c | 11 ++ sound/soc/sof/intel/hda-dsp.c | 20 +++- sound/soc/sof/intel/hda-pcm.c | 29 +++++ sound/soc/sof/intel/hda-stream.c | 70 ++++++++++++ sound/soc/sof/intel/hda.h | 6 ++ sound/soc/sof/intel/lnl.c | 34 ++++-- sound/soc/sof/intel/mtl.c | 14 --- sound/soc/sof/intel/mtl.h | 10 -- sound/soc/sof/ipc4-mtrace.c | 11 +- sound/soc/sof/ipc4-pcm.c | 191 ++++++++++++++++++++++++++------- sound/soc/sof/ipc4-priv.h | 14 --- sound/soc/sof/ipc4-topology.c | 22 +++- sound/soc/sof/ops.h | 24 ++++- sound/soc/sof/pcm.c | 8 ++ sound/soc/sof/sof-audio.h | 9 +- sound/soc/sof/sof-priv.h | 24 +++-- 60 files changed, 596 insertions(+), 267 deletions(-)

2 1

[PATCH] ASoC: SOF: Core: Add remove_late() to sof_init_environment failure path
by Pierre-Louis Bossart 04 Apr '24

04 Apr '24

From: Chaitanya Kumar Borah <chaitanya.kumar.borah(a)intel.com> In cases where the sof driver is unable to find the firmware and/or topology file [1], it exits without releasing the i915 runtime pm wakeref [2]. This results in dmesg warnings[3] during suspend/resume or driver unbind. Add remove_late() to the failure path of sof_init_environment so that i915 wakeref is released appropriately [1] [ 8.990366] sof-audio-pci-intel-mtl 0000:00:1f.3: SOF firmware and/or topology file not found. [ 8.990396] sof-audio-pci-intel-mtl 0000:00:1f.3: Supported default profiles [ 8.990398] sof-audio-pci-intel-mtl 0000:00:1f.3: - ipc type 1 (Requested): [ 8.990399] sof-audio-pci-intel-mtl 0000:00:1f.3: Firmware file: intel/sof-ipc4/mtl/sof-mtl.ri [ 8.990401] sof-audio-pci-intel-mtl 0000:00:1f.3: Topology file: intel/sof-ace-tplg/sof-mtl-rt711-2ch.tplg [ 8.990402] sof-audio-pci-intel-mtl 0000:00:1f.3: Check if you have 'sof-firmware' package installed. [ 8.990403] sof-audio-pci-intel-mtl 0000:00:1f.3: Optionally it can be manually downloaded from: [ 8.990404] sof-audio-pci-intel-mtl 0000:00:1f.3: https://github.com/thesofproject/sof-bin/ [ 8.999088] sof-audio-pci-intel-mtl 0000:00:1f.3: error: sof_probe_work failed err: -2 [2] ref_tracker: 0000:00:02.0@ffff9b8511b6a378 has 1/5 users at track_intel_runtime_pm_wakeref.part.0+0x36/0x70 [i915] __intel_runtime_pm_get+0x51/0xb0 [i915] intel_runtime_pm_get+0x17/0x20 [i915] intel_display_power_get+0x2f/0x70 [i915] i915_audio_component_get_power+0x23/0x120 [i915] snd_hdac_display_power+0x89/0x130 [snd_hda_core] hda_codec_i915_init+0x3f/0x50 [snd_sof_intel_hda] hda_dsp_probe_early+0x170/0x250 [snd_sof_intel_hda_common] snd_sof_device_probe+0x224/0x320 [snd_sof] sof_pci_probe+0x15b/0x220 [snd_sof_pci] hda_pci_intel_probe+0x30/0x70 [snd_sof_intel_hda_common] local_pci_probe+0x4c/0xb0 pci_device_probe+0xcc/0x250 really_probe+0x18e/0x420 __driver_probe_device+0x7e/0x170 driver_probe_device+0x23/0xa0 [3] [ 484.105070] ------------[ cut here ]------------ [ 484.108238] thunderbolt 0000:00:0d.2: PM: pci_pm_suspend_late+0x0/0x50 returned 0 after 0 usecs [ 484.117106] i915 0000:00:02.0: i915 raw-wakerefs=1 wakelocks=1 on cleanup [ 484.792005] WARNING: CPU: 2 PID: 2405 at drivers/gpu/drm/i915/intel_runtime_pm.c:444 intel_runtime_pm_driver_release+0x6c/0x80 Tested-by: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/core.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 9b00ede2a486..cc84d4c81be9 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -339,8 +339,7 @@ static int sof_init_environment(struct snd_sof_dev *sdev) ret = snd_sof_probe(sdev); if (ret < 0) { dev_err(sdev->dev, "failed to probe DSP %d\n", ret); - sof_ops_free(sdev); - return ret; + goto err_sof_probe; } /* check machine info */ @@ -358,15 +357,18 @@ static int sof_init_environment(struct snd_sof_dev *sdev) ret = validate_sof_ops(sdev); if (ret < 0) { snd_sof_remove(sdev); + snd_sof_remove_late(sdev); return ret; } } + return 0; + err_machine_check: - if (ret) { - snd_sof_remove(sdev); - sof_ops_free(sdev); - } + snd_sof_remove(sdev); +err_sof_probe: + snd_sof_remove_late(sdev); + sof_ops_free(sdev); return ret; } -- 2.40.1

2 1