Skip to content

ASoC: SOF: pcm/pm/Intel: Fix VoW during system suspend #5951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ujfalusi wants to merge 2 commits into
base: topic/sof-dev
Choose a base branch
from
+18 −1
Open

ASoC: SOF: pcm/pm/Intel: Fix VoW during system suspend #5951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
377f958
ASoC: SOF: pcm/pm: Fix WoV flow during system suspend / resume
ujfalusi Sep 23, 2026
a55afd6
ASoC: SOF: Intel:hda-pcm: Set SNDRV_PCM_INFO_RESUME for VoW capture s…
ujfalusi Sep 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions sound/soc/sof/intel/hda-pcm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,15 @@ int hda_dsp_pcm_open(struct snd_sof_dev *sdev,
spcm->stream[substream->stream].d0i3_compatible)
flags |= SOF_HDA_STREAM_DMI_L1_COMPATIBLE;

/*
* d0i3 on a capture stream indicates WoV support which needs to allow
* RESUME. The core will ignore the trigger but applications must not
* try to restart the WoV capture stream due to not supported RESUME
*/
if (direction == SNDRV_PCM_STREAM_CAPTURE &&
spcm->stream[substream->stream].d0i3_compatible)
runtime->hw.info |= SNDRV_PCM_INFO_RESUME;
Comment on lines +360 to +362

dsp_stream = hda_dsp_stream_get(sdev, direction, flags);
if (!dsp_stream) {
dev_err(sdev->dev, "error: no stream available\n");
Expand Down
7 changes: 7 additions & 0 deletions sound/soc/sof/pcm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,13 @@ static int sof_pcm_trigger(struct snd_soc_component *component,
if (pcm_ops && pcm_ops->ipc_first_on_start)
ipc_first = true;
break;
case SNDRV_PCM_TRIGGER_RESUME:
if (spcm->stream[substream->stream].suspend_ignored) {
spcm->stream[substream->stream].suspend_ignored = false;
return 0;
}
spcm_err(spcm, substream->stream, "RESUME trigger is not supported\n");
return -EINVAL;
case SNDRV_PCM_TRIGGER_SUSPEND:
/*
* If DSP D0I3 is allowed during S0iX, set the suspend_ignored flag for
Expand Down
3 changes: 2 additions & 1 deletion sound/soc/sof/pm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)
* suspended, it is brought back to full power and then
* suspended again
*/
if (tplg_ops && tplg_ops->tear_down_all_pipelines && (old_state == SOF_DSP_PM_D0))
if (tplg_ops && tplg_ops->tear_down_all_pipelines && (old_state == SOF_DSP_PM_D0) &&
(target_state != SOF_DSP_PM_D0))
tplg_ops->tear_down_all_pipelines(sdev, false);

if (sdev->fw_state != SOF_FW_BOOT_COMPLETE)
Expand Down
Loading