Skip to content

[TEST] ASoC: SOF/soundwire/intel: use pm_runtime_resume_and_get() in component probe.#3665

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

Closed
plbossart wants to merge 2 commits into from
Closed

[TEST] ASoC: SOF/soundwire/intel: use pm_runtime_resume_and_get() in component probe. #3665

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
0a89522
ASoC: SOF: pcm: use pm_resume_and_get() on component probe
plbossart May 20, 2022
668aba1
soundwire: intel: use pm_runtime_resume_and_get() on component probe
plbossart May 20, 2022
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
19 changes: 19 additions & 0 deletions drivers/soundwire/intel.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1051,6 +1051,24 @@ static int intel_trigger(struct snd_pcm_substream *substream, int cmd, struct sn
return ret;
}

static int intel_component_probe(struct snd_soc_component *component)
{
int ret;

/*
* make sure the device is pm_runtime_active before initiating
* bus transactions during the card registration
*/
ret = pm_runtime_resume_and_get(component->dev);
if (ret < 0 && ret != -EACCES)

@ranj063ranj063May 20, 2022

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.

same comment here. pm_runtime_resume_and_get() will do a put_noidle() in case of -EACCES. Not sure that is intended at all

@ranj063ranj063May 20, 2022

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.

and I also feel like almost all these changes are also wrong: https://github.com/thesofproject/linux/pull/3602/commits

@ranj063ranj063May 20, 2022

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.

I also wonder if one of these changes is what is causing your original problem in the first place

@plbossartplbossartMay 20, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

https://elixir.bootlin.com/linux/latest/source/drivers/base/power/runtime.c#L1121

The put_noidle decreases the value of usage_count that was incremented in resume, so that's fine I think.
it's the old code that was broken, on -EACCES the usage count was NOT decremented.

return ret;

pm_runtime_mark_last_busy(component->dev);
pm_runtime_put_autosuspend(component->dev);

return 0;
}

static int intel_component_dais_suspend(struct snd_soc_component *component)
{
struct snd_soc_dai *dai;
Expand DownExpand Up@@ -1106,6 +1124,7 @@ static const struct snd_soc_dai_ops intel_pcm_dai_ops = {

static const struct snd_soc_component_driver dai_component = {
.name = "soundwire",
.probe = intel_component_probe,
.suspend = intel_component_dais_suspend
};

Expand Down
11 changes: 11 additions & 0 deletions sound/soc/sof/pcm.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -603,6 +603,14 @@ static int sof_pcm_probe(struct snd_soc_component *component)
const char *tplg_filename;
int ret;

/*
* make sure the device is pm_runtime_active before loading the
* topology and initiating IPC or bus transactions
*/
ret = pm_runtime_resume_and_get(component->dev);
if (ret < 0 && ret != -EACCES)
return ret;

/* load the default topology */
sdev->component = component;

Expand All@@ -620,6 +628,9 @@ static int sof_pcm_probe(struct snd_soc_component *component)
return ret;
}

pm_runtime_mark_last_busy(component->dev);
pm_runtime_put_autosuspend(component->dev);

return ret;
}

Expand Down