- Sound-open-firmware - mailman.alsa-project.org

Re: [PATCH] ASoC: SOF: Intel: Use str_enable_disable() helper
by Mark Brown 17 Feb '25

17 Feb '25

On Mon, 10 Feb 2025 13:01:30 +0100, Thorsten Blum wrote: > Remove hard-coded strings by using the str_enable_disable() helper > function. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: Intel: Use str_enable_disable() helper commit: e08fe24c34d37d00e84009f2fb4c35f5978041e6 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [PATCH] ASoC: SOF: ipc3: Use str_enabled_disabled() helper function
by Mark Brown 17 Feb '25

17 Feb '25

On Mon, 10 Feb 2025 23:44:54 +0100, Thorsten Blum wrote: > Remove hard-coded strings by using the str_enabled_disabled() helper > function. Remove unnecessary curly braces. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: ipc3: Use str_enabled_disabled() helper function commit: e0f421d73053eaeb441aa77054b75992705656c7 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [PATCH] ASoC: SOF: Intel: Don't import non-existing module namespace
by Mark Brown 17 Feb '25

17 Feb '25

On Wed, 12 Feb 2025 18:29:47 +0100, Uwe Kleine-König wrote: > There is no module namespace "SND_SOC_SOF_INTEL_HIFI_EP_IPC", so don't > import it. Historically there was such a namespace, but it was dropped > in commit 97e22cbd0dc3 ("ASoC: SOF: Make Intel IPC stream ops generic"). > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: Intel: Don't import non-existing module namespace commit: 9dc016eaba3a70febcd1db5f1a0beeb7430166aa All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [PATCH 0/4] Sound fix for Valve Steam Deck OLED on resume from suspend
by Mark Brown 10 Feb '25

10 Feb '25

On Fri, 07 Feb 2025 13:46:01 +0200, Cristian Ciocaltea wrote: > Stress testing resume from suspend on Valve Steam Deck OLED (Galileo) > revealed that audio may break and cannot be recovered without performing > a system reboot. > > This patch series provides a new ACP quirk to address the issue, along > with a few additional improvements to AMD Vangogh/ACP SOF drivers. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/4] ASoC: SOF: amd: Add post_fw_run_delay ACP quirk commit: 91b98d5a6e8067c5226207487681a48f0d651e46 [2/4] ASoC: SOF: amd: Drop unused includes from Vangogh driver commit: 2ecbc2e9f3b19e2199e8bc3ba603d299f1985f09 [3/4] ASoC: SOF: amd: Handle IPC replies before FW_BOOT_COMPLETE commit: ac84ca815adb4171a4276b1d44096b75f6a150b7 [4/4] ASoC: SOF: amd: Add branch prediction hint in ACP IRQ handler commit: ccc8480d90e8cb60f06bd90e227f34784927e19f All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [PATCH 1/4] ASoC: SOF: amd: Add post_fw_run_delay ACP quirk
by Mukunda,Vijendar 07 Feb '25

07 Feb '25

On 07/02/25 17:16, Cristian Ciocaltea wrote: > Stress testing resume from suspend on Valve Steam Deck OLED (Galileo) > revealed that the DSP firmware could enter an unrecoverable faulty > state, where the kernel ring buffer is flooded with IPC related error > messages: > > [ +0.017002] snd_sof_amd_vangogh 0000:04:00.5: acp_sof_ipc_send_msg: Failed to acquire HW lock > [ +0.000054] snd_sof_amd_vangogh 0000:04:00.5: ipc3_tx_msg_unlocked: ipc message send for 0x30100000 failed: -22 > [ +0.000005] snd_sof_amd_vangogh 0000:04:00.5: Failed to setup widget PIPELINE.6.ACPHS1.IN > [ +0.000004] snd_sof_amd_vangogh 0000:04:00.5: Failed to restore pipeline after resume -22 > [ +0.000003] snd_sof_amd_vangogh 0000:04:00.5: PM: dpm_run_callback(): pci_pm_resume returns -22 > [ +0.000009] snd_sof_amd_vangogh 0000:04:00.5: PM: failed to resume async: error -22 > [...] > [ +0.002582] PM: suspend exit > [ +0.065085] snd_sof_amd_vangogh 0000:04:00.5: ipc tx error for 0x30130000 (msg/reply size: 12/0): -22 > [ +0.000499] snd_sof_amd_vangogh 0000:04:00.5: error: failed widget list set up for pcm 1 dir 0 > [ +0.000011] snd_sof_amd_vangogh 0000:04:00.5: error: set pcm hw_params after resume > [ +0.000006] snd_sof_amd_vangogh 0000:04:00.5: ASoC: error at snd_soc_pcm_component_prepare on 0000:04:00.5: -22 > [...] > > A system reboot would be necessary to restore the speakers > functionality. > > However, by delaying a bit any host to DSP transmission right after > the firmware boot completed, the issue could not be reproduced anymore > and sound continued to work flawlessly even after performing thousands > of suspend/resume cycles. > > Introduce the post_fw_run_delay ACP quirk to allow providing the > aforementioned delay via the snd_sof_dsp_ops->post_fw_run() callback for > the affected devices. As per our understanding, Till ACP firmware starts responding to the driver's IPC messages, FW won't acquire the HW lock. Adding delay in post_fw_run() callback seems to not a correct solution, as there are no IPC messages will be sent from host till FW boot ready is received. Is fail to acquire the HW lock is for first host IPC message? > > Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com> > --- > sound/soc/sof/amd/acp.c | 1 + > sound/soc/sof/amd/acp.h | 1 + > sound/soc/sof/amd/vangogh.c | 18 ++++++++++++++++++ > 3 files changed, 20 insertions(+) > > diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c > index 33648ff8b83365e76d7d90e52c2cb8f884a2fe72..9e13c96528be3371e063072513c118cfc8b93fe8 100644 > --- a/sound/soc/sof/amd/acp.c > +++ b/sound/soc/sof/amd/acp.c > @@ -27,6 +27,7 @@ MODULE_PARM_DESC(enable_fw_debug, "Enable Firmware debug"); > static struct acp_quirk_entry quirk_valve_galileo = { > .signed_fw_image = true, > .skip_iram_dram_size_mod = true, > + .post_fw_run_delay = true, > }; > > const struct dmi_system_id acp_sof_quirk_table[] = { > diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h > index 800594440f73914e7b8ccaf86369ac686e1da630..2a19d82d6200223cdfccd49fbcf1b52968ae1230 100644 > --- a/sound/soc/sof/amd/acp.h > +++ b/sound/soc/sof/amd/acp.h > @@ -220,6 +220,7 @@ struct sof_amd_acp_desc { > struct acp_quirk_entry { > bool signed_fw_image; > bool skip_iram_dram_size_mod; > + bool post_fw_run_delay; > }; > > /* Common device data struct for ACP devices */ > diff --git a/sound/soc/sof/amd/vangogh.c b/sound/soc/sof/amd/vangogh.c > index 8e2672106ac60a22824836a944503a05616f8661..d5f1dddd43e72dd62b3d031130193e6125edf9df 100644 > --- a/sound/soc/sof/amd/vangogh.c > +++ b/sound/soc/sof/amd/vangogh.c > @@ -11,6 +11,7 @@ > * Hardware interface for Audio DSP on Vangogh platform > */ > > +#include <linux/delay.h> > #include <linux/platform_device.h> > #include <linux/module.h> > > @@ -136,6 +137,20 @@ static struct snd_soc_dai_driver vangogh_sof_dai[] = { > }, > }; > > +static int sof_vangogh_post_fw_run_delay(struct snd_sof_dev *sdev) > +{ > + /* > + * Resuming from suspend in some cases my cause the DSP firmware > + * to enter an unrecoverable faulty state. Delaying a bit any host > + * to DSP transmission right after firmware boot completion seems > + * to resolve the issue. > + */ > + if (!sdev->first_boot) > + usleep_range(100, 150); > + > + return 0; > +} > + > /* Vangogh ops */ > struct snd_sof_dsp_ops sof_vangogh_ops; > EXPORT_SYMBOL_NS(sof_vangogh_ops, "SND_SOC_SOF_AMD_COMMON"); > @@ -157,6 +172,9 @@ int sof_vangogh_ops_init(struct snd_sof_dev *sdev) > > if (quirks->signed_fw_image) > sof_vangogh_ops.load_firmware = acp_sof_load_signed_firmware; > + > + if (quirks->post_fw_run_delay) > + sof_vangogh_ops.post_fw_run = sof_vangogh_post_fw_run_delay; > } > > return 0; >

1 0

Re: [PATCH 3/4] ASoC: SOF: amd: Handle IPC replies before FW_BOOT_COMPLETE
by Mukunda,Vijendar 07 Feb '25

07 Feb '25

On 07/02/25 17:46, Cristian Ciocaltea wrote: > On 2/7/25 1:55 PM, Mukunda,Vijendar wrote: >> On 07/02/25 17:16, Cristian Ciocaltea wrote: >>> In some cases, e.g. during resuming from suspend, there is a possibility >>> that some IPC reply messages get received by the host while the DSP >>> firmware has not yet reached the complete boot state. >>> >>> Detect when this happens and do not attempt to process the unexpected >>> replies from DSP. Instead, provide proper debugging support. >> As per our understanding, before FW boot completion there won't >> be any IPC responses sent from Firmware. >> In this case, do we really need such a condition check? > During the suspend/resume stress testing I was able to get this kind of > messages, and that's the actual reason for introducing the verification. > > Also it doesn't seem to be uncommon, e.g. Intel HDA IPC also provides > similar checks. > Could you please share reference logs to know which IPC messages are being received before FW_READY message/FW boot complete? >>> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com> >>> --- >>> sound/soc/sof/amd/acp-ipc.c | 23 ++++++++++++++++------- >>> 1 file changed, 16 insertions(+), 7 deletions(-) >>> >>> diff --git a/sound/soc/sof/amd/acp-ipc.c b/sound/soc/sof/amd/acp-ipc.c >>> index 5f371d9263f3bad507236ace95b7ef323c369187..12caefd08788595be8de03a863b88b5bbc15847d 100644 >>> --- a/sound/soc/sof/amd/acp-ipc.c >>> +++ b/sound/soc/sof/amd/acp-ipc.c >>> @@ -167,6 +167,7 @@ irqreturn_t acp_sof_ipc_irq_thread(int irq, void *context) >>> >>> if (sdev->first_boot && sdev->fw_state != SOF_FW_BOOT_COMPLETE) { >>> acp_mailbox_read(sdev, sdev->dsp_box.offset, &status, sizeof(status)); >>> + >>> if ((status & SOF_IPC_PANIC_MAGIC_MASK) == SOF_IPC_PANIC_MAGIC) { >>> snd_sof_dsp_panic(sdev, sdev->dsp_box.offset + sizeof(status), >>> true); >>> @@ -188,13 +189,21 @@ irqreturn_t acp_sof_ipc_irq_thread(int irq, void *context) >>> >>> dsp_ack = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_SCRATCH_REG_0 + dsp_ack_write); >>> if (dsp_ack) { >>> - spin_lock_irq(&sdev->ipc_lock); >>> - /* handle immediate reply from DSP core */ >>> - acp_dsp_ipc_get_reply(sdev); >>> - snd_sof_ipc_reply(sdev, 0); >>> - /* set the done bit */ >>> - acp_dsp_ipc_dsp_done(sdev); >>> - spin_unlock_irq(&sdev->ipc_lock); >>> + if (likely(sdev->fw_state == SOF_FW_BOOT_COMPLETE)) { >>> + spin_lock_irq(&sdev->ipc_lock); >>> + >>> + /* handle immediate reply from DSP core */ >>> + acp_dsp_ipc_get_reply(sdev); >>> + snd_sof_ipc_reply(sdev, 0); >>> + /* set the done bit */ >>> + acp_dsp_ipc_dsp_done(sdev); >>> + >>> + spin_unlock_irq(&sdev->ipc_lock); >>> + } else { >>> + dev_dbg_ratelimited(sdev->dev, "IPC reply before FW_BOOT_COMPLETE: %#x\n", >>> + dsp_ack); >>> + } >>> + >>> ipc_irq = true; >>> } >>> >>>

1 0

Re: [PATCH 3/4] ASoC: SOF: amd: Handle IPC replies before FW_BOOT_COMPLETE
by Mukunda,Vijendar 07 Feb '25

07 Feb '25

On 07/02/25 17:16, Cristian Ciocaltea wrote: > In some cases, e.g. during resuming from suspend, there is a possibility > that some IPC reply messages get received by the host while the DSP > firmware has not yet reached the complete boot state. > > Detect when this happens and do not attempt to process the unexpected > replies from DSP. Instead, provide proper debugging support. As per our understanding, before FW boot completion there won't be any IPC responses sent from Firmware. In this case, do we really need such a condition check? > > Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com> > --- > sound/soc/sof/amd/acp-ipc.c | 23 ++++++++++++++++------- > 1 file changed, 16 insertions(+), 7 deletions(-) > > diff --git a/sound/soc/sof/amd/acp-ipc.c b/sound/soc/sof/amd/acp-ipc.c > index 5f371d9263f3bad507236ace95b7ef323c369187..12caefd08788595be8de03a863b88b5bbc15847d 100644 > --- a/sound/soc/sof/amd/acp-ipc.c > +++ b/sound/soc/sof/amd/acp-ipc.c > @@ -167,6 +167,7 @@ irqreturn_t acp_sof_ipc_irq_thread(int irq, void *context) > > if (sdev->first_boot && sdev->fw_state != SOF_FW_BOOT_COMPLETE) { > acp_mailbox_read(sdev, sdev->dsp_box.offset, &status, sizeof(status)); > + > if ((status & SOF_IPC_PANIC_MAGIC_MASK) == SOF_IPC_PANIC_MAGIC) { > snd_sof_dsp_panic(sdev, sdev->dsp_box.offset + sizeof(status), > true); > @@ -188,13 +189,21 @@ irqreturn_t acp_sof_ipc_irq_thread(int irq, void *context) > > dsp_ack = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_SCRATCH_REG_0 + dsp_ack_write); > if (dsp_ack) { > - spin_lock_irq(&sdev->ipc_lock); > - /* handle immediate reply from DSP core */ > - acp_dsp_ipc_get_reply(sdev); > - snd_sof_ipc_reply(sdev, 0); > - /* set the done bit */ > - acp_dsp_ipc_dsp_done(sdev); > - spin_unlock_irq(&sdev->ipc_lock); > + if (likely(sdev->fw_state == SOF_FW_BOOT_COMPLETE)) { > + spin_lock_irq(&sdev->ipc_lock); > + > + /* handle immediate reply from DSP core */ > + acp_dsp_ipc_get_reply(sdev); > + snd_sof_ipc_reply(sdev, 0); > + /* set the done bit */ > + acp_dsp_ipc_dsp_done(sdev); > + > + spin_unlock_irq(&sdev->ipc_lock); > + } else { > + dev_dbg_ratelimited(sdev->dev, "IPC reply before FW_BOOT_COMPLETE: %#x\n", > + dsp_ack); > + } > + > ipc_irq = true; > } > >

1 0

Re: [PATCH] ASoC: SOF: mediatek: Use str_on_off() helper function
by Mark Brown 06 Feb '25

06 Feb '25

On Tue, 04 Feb 2025 16:38:04 +0100, Thorsten Blum wrote: > Remove hard-coded strings by using the str_on_off() helper function. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: mediatek: Use str_on_off() helper function commit: 3f75771987f32a9f512c8944e70e343f8c6d71c1 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [PATCH v2] ASoC: SOF: topology: Use krealloc_array() to replace krealloc()
by Mark Brown 05 Feb '25

05 Feb '25

On Fri, 17 Jan 2025 09:43:43 +0800, Zhang Heng wrote: > Use krealloc_array() to replace krealloc() with multiplication. > krealloc_array() has multiply overflow check, which will be safer. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: topology: Use krealloc_array() to replace krealloc() commit: a05143a8f713d9ae6abc41141dac52c66fca8b06 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

[PATCH AUTOSEL 6.12 01/14] ASoC: SOF: Intel: hda-dai: Ensure DAI widget is valid during params
by Sasha Levin 26 Jan '25

26 Jan '25

From: Bard Liao <yung-chuan.liao(a)linux.intel.com> [ Upstream commit 569922b82ca660f8b24e705f6cf674e6b1f99cc7 ] Each cpu DAI should associate with a widget. However, the topology might not create the right number of DAI widgets for aggregated amps. And it will cause NULL pointer deference. Check that the DAI widget associated with the CPU DAI is valid to prevent NULL pointer deference due to missing DAI widgets in topologies with aggregated amps. Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Liam Girdwood <liam.r.girdwood(a)intel.com> Link: https://patch.msgid.link/20241203104853.56956-1-yung-chuan.liao@linux.intel… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/intel/hda-dai.c | 12 ++++++++++++ sound/soc/sof/intel/hda.c | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index 82f46ecd94301..2e58a264da556 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -503,6 +503,12 @@ int sdw_hda_dai_hw_params(struct snd_pcm_substream *substream, int ret; int i; + if (!w) { + dev_err(cpu_dai->dev, "%s widget not found, check amp link num in the topology\n", + cpu_dai->name); + return -EINVAL; + } + ops = hda_dai_get_ops(substream, cpu_dai); if (!ops) { dev_err(cpu_dai->dev, "DAI widget ops not set\n"); @@ -582,6 +588,12 @@ int sdw_hda_dai_hw_params(struct snd_pcm_substream *substream, */ for_each_rtd_cpu_dais(rtd, i, dai) { w = snd_soc_dai_get_widget(dai, substream->stream); + if (!w) { + dev_err(cpu_dai->dev, + "%s widget not found, check amp link num in the topology\n", + dai->name); + return -EINVAL; + } ipc4_copier = widget_to_copier(w); memcpy(&ipc4_copier->dma_config_tlv[cpu_dai_id], dma_config_tlv, sizeof(*dma_config_tlv)); diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 70fc08c8fc99e..f10ed4d102501 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -63,6 +63,11 @@ static int sdw_params_stream(struct device *dev, struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(d, params_data->substream->stream); struct snd_sof_dai_config_data data = { 0 }; + if (!w) { + dev_err(dev, "%s widget not found, check amp link num in the topology\n", + d->name); + return -EINVAL; + } data.dai_index = (params_data->link_id << 8) | d->id; data.dai_data = params_data->alh_stream_id; data.dai_node_id = data.dai_data; -- 2.39.5

1 0