ASoC: SOF: Intel: Fix pipeline state transitions for aggregate DAIs by ujfalusi · Pull Request #5765 · thesofproject/linux

ujfalusi · 2026-05-07T13:10:21Z

For aggregate DAIs (num_cpus > 1) the pre_trigger/post_trigger callbacks
send pipeline state IPCs per-DAI without considering that multiple DAIs
may share the same pipeline. This causes premature state transitions
where the pipeline goes RUNNING before all link DMAs have started, or
individual DAIs send redundant IPCs for shared pipelines.

Fix this by checking the HDA stream running state in post_trigger:

START/PAUSE_RELEASE: defer RUNNING IPC until all DAIs sharing the
same pipeline have their link DMA streams running
STOP/SUSPEND/PAUSE_PUSH: use pipeline state dedup so the PAUSED IPC
is sent once regardless of how many DAIs share the pipeline

The running-state check naturally handles all aggregate topologies:
shared pipelines, independent pipelines, and mixed cases without
requiring per-pipeline counters.

Copilot

Pull request overview

This PR fixes IPC4 pipeline state transitions for aggregate back-end links (num_cpus > 1) where multiple CPU DAIs may share the same SOF pipeline, which can currently cause premature RUNNING transitions and redundant PAUSED IPCs.

Changes:

Add a per-pipeline trigger_count to gate START/PAUSE_RELEASE so RUNNING is sent only after all DAIs sharing a pipeline have completed link DMA triggering.
Deduplicate STOP/SUSPEND/PAUSE_PUSH PAUSED IPCs for shared pipelines by checking the current pipeline state.
Compute the “DAIs-per-pipeline” threshold dynamically per BE link to support shared/independent/mixed aggregate topologies.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File	Description
sound/soc/sof/sof-audio.h	Adds `trigger_count` to `struct snd_sof_pipeline` to track aggregate trigger completion per pipeline.
sound/soc/sof/intel/hda-dai-ops.c	Adds per-pipeline DAI counting and uses `trigger_count` to gate RUNNING/PAUSED IPC transitions for aggregate DAIs.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

kv2019i · 2026-05-12T12:51:46Z

+ if (!w)
+ continue;
+
+ sw = w->dobj.private;


Please check

+ int spipe_dais = hda_ipc4_count_spipe_dais(substream,
+ swidget->spipe);
+
+ swidget->spipe->trigger_count++;
+ swidget->spipe->started_count++;
+ if (swidget->spipe->trigger_count < spipe_dais)
+ break;


kv2019i

Please check the copilot comment on defensive programming. Otherwise complex, but looks good to me.

kv2019i · 2026-05-12T12:51:46Z

+ if (!w)
+ continue;
+
+ sw = w->dobj.private;


Please check

ujfalusi · 2026-05-12T13:05:30Z

Changes since v1:

add NULL pointer check for w->dobj.private
correct started_count possible unbalance

ujfalusi · 2026-05-13T07:20:25Z

Changes since v2: new approach to drop the changes outside of sof/intel code

remove the counter for triggers
use the channel's state as indication of it is running
the logic otherwise unchanged and all DAI configurations (single DAI, multiple DAIs, multiple pipelines, etc) should be handled, all transition are handled as well.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

ujfalusi · 2026-05-13T07:45:54Z

+ /*
+ * For aggregated DAIs (num_cpus > 1), defer pipeline RUNNING
+ * IPC until all CPU DAIs sharing this pipeline have started
+ * their link DMAs via hda_trigger(). The running state of each
+ * DAI's HDA stream naturally tracks completion.
+ */
+ if (num_cpus > 1 &&
+ !hda_ipc4_all_spipe_dmas_running(substream, swidget->spipe))
+ break;


the PR description has been updated...

ujfalusi · 2026-05-13T07:47:20Z

 /*
 * STOP/SUSPEND trigger is invoked only once when all users of this pipeline have
- * been stopped. So, clear the started_count so that the pipeline can be reset
+ * been stopped. So, clear the started_count so that the pipeline can be reset.
 */
 swidget->spipe->started_count = 0;


this change should be removed, it is not related to topic.

For aggregate DAIs (num_cpus > 1) the pre_trigger/post_trigger callbacks send pipeline state IPCs per-DAI without considering that multiple DAIs may share the same pipeline. This causes premature state transitions where the pipeline goes RUNNING before all link DMAs have started, or individual DAIs send redundant IPCs for shared pipelines. Fix this by checking the HDA stream running state in post_trigger: - START/PAUSE_RELEASE: defer RUNNING IPC until all DAIs sharing the same pipeline have their link DMA streams running - STOP/SUSPEND/PAUSE_PUSH: use pipeline state dedup so the PAUSED IPC is sent once regardless of how many DAIs share the pipeline The running-state check naturally handles all aggregate topologies: shared pipelines, independent pipelines, and mixed cases without requiring per-pipeline counters. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

ujfalusi · 2026-08-07T05:57:16Z

Changes since v3:

restructure the code in hda_ipc4_all_spipe_dmas_running() to cover NULL pointer issues
rebased

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

+ hext_stream = snd_soc_dai_get_dma_data(dai, substream);
+ if (!hext_stream || !hext_stream->hstream.running)
+ return false;


CopilotAI lite review requested due to automatic review settings May 7, 2026 13:10

ujfalusi requested review from bardliao, dbaluta, kv2019i, lgirdwood, plbossart and ranj063 as code owners May 7, 2026 13:10

Copilotstarted reviewing on behalf of ujfalusi May 7, 2026 13:13 View session

ujfalusi mentioned this pull request May 7, 2026
Dell XPS 14 DA14260 (Panther Lake, 1028:0db9): DSP error when unsuspending thesofproject/sof#10700
Open

CopilotAI reviewed May 7, 2026
View reviewed changes

kv2019i previously approved these changes May 12, 2026
View reviewed changes

Comment threadsound/soc/sof/intel/hda-dai-ops.c
if (!w)
continue;

sw = w->dobj.private;
kv2019iMay 12, 2026
Copy link
Copy Markdown
Collaborator
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please check

ujfalusi dismissed kv2019i’s stale review via 22f1037May 12, 2026 13:04

ujfalusi force-pushed the peter/sof/pr/aggregated-sdw-trigger branch from 4f4063d to 22f1037Compare May 12, 2026 13:04

CopilotAI review requested due to automatic review settings May 13, 2026 07:17

ujfalusi force-pushed the peter/sof/pr/aggregated-sdw-trigger branch from 22f1037 to 763f980Compare May 13, 2026 07:17

ujfalusi changed the title ~~ASoC: SOF: ipc4: Fix pipeline state transitions for aggregate DAIs~~ASoC: SOF: Intel: Fix pipeline state transitions for aggregate DAIsMay 13, 2026

Copilotstarted reviewing on behalf of ujfalusi May 13, 2026 07:20 View session

CopilotAI reviewed May 13, 2026
View reviewed changes

lgirdwood previously approved these changes May 14, 2026
View reviewed changes

ujfalusi dismissed lgirdwood’s stale review via 1dc00a6August 7, 2026 05:55

ujfalusi force-pushed the peter/sof/pr/aggregated-sdw-trigger branch from 763f980 to 1dc00a6Compare August 7, 2026 05:55

CopilotAI review requested due to automatic review settings August 7, 2026 05:55

Copilotstarted reviewing on behalf of ujfalusi August 7, 2026 05:59 View session

CopilotAI reviewed Aug 7, 2026
View reviewed changes

Comment threadsound/soc/sof/intel/hda-dai-ops.c
Comment on lines +384 to +386
hext_stream = snd_soc_dai_get_dma_data(dai, substream);
if (!hext_stream || !hext_stream->hstream.running)
return false;

Navigation Menu

Uh oh!

ASoC: SOF: Intel: Fix pipeline state transitions for aggregate DAIs - #5765

ASoC: SOF: Intel: Fix pipeline state transitions for aggregate DAIs#5765
ujfalusi wants to merge 1 commit into
thesofproject:topic/sof-devfrom
ujfalusi:peter/sof/pr/aggregated-sdw-trigger

ujfalusi commented May 7, 2026•
edited
Loading

Uh oh!

CopilotAI left a comment

Uh oh!

kv2019iMay 12, 2026

Uh oh!

kv2019i left a comment

Uh oh!

kv2019iMay 12, 2026

Uh oh!

ujfalusi commented May 12, 2026

Uh oh!

ujfalusi commented May 13, 2026

Uh oh!

CopilotAI left a comment

Uh oh!

ujfalusiMay 13, 2026

Uh oh!

ujfalusiMay 13, 2026

Uh oh!

ujfalusi commented Aug 7, 2026

Uh oh!

CopilotAI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

ujfalusi commented May 7, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

kv2019iMay 12, 2026

Choose a reason for hiding this comment

Uh oh!

kv2019i left a comment

Choose a reason for hiding this comment

Uh oh!

kv2019iMay 12, 2026

Choose a reason for hiding this comment

Uh oh!

ujfalusi commented May 12, 2026

Uh oh!

ujfalusi commented May 13, 2026

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

ujfalusiMay 13, 2026

Choose a reason for hiding this comment

Uh oh!

ujfalusiMay 13, 2026

Choose a reason for hiding this comment

Uh oh!

ujfalusi commented Aug 7, 2026

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ujfalusi commented May 7, 2026•
edited
Loading