Skip to content

ASoC: SOF: topology: do not power down primary core during topology r… #3005

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

Merged
plbossart merged 1 commit into from
Jun 18, 2021
Merged

ASoC: SOF: topology: do not power down primary core during topology r… #3005

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/topology.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2514,6 +2514,15 @@ static int sof_widget_unload(struct snd_soc_component *scomp,

/* power down the pipeline schedule core */
pipeline = swidget->private;

/*
* Runtime PM should still function normally if topology loading fails and
* it's components are unloaded. Do not power down the primary core so that the
* CTX_SAVE IPC can succeed during runtime suspend.
*/
if (pipeline->core == SOF_DSP_PRIMARY_CORE)
break;
Copy link
Collaborator

@kv2019i kv2019i Jun 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This wil help in debugging as well.


ret = snd_sof_dsp_core_power_down(sdev, 1 << pipeline->core);
Copy link

@keyonjie keyonjie Jun 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about the case that the same secondary core is used by another active pipeline? we should add ref_count to DSP cores, then we don't need to treat this Primary core explicitly.

Copy link
Collaborator Author

@ranj063 ranj063 Jun 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but until then we need this change

if (ret < 0)
dev_err(scomp->dev, "error: powering down pipeline schedule core %d\n",
Expand Down