mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASoC: SOF: free widgets in sof_tear_down_pipelines() for static pipelines

Browse source 
Free widgets for static pipelines in sof_tear_down_pipelines().
But this feature is unavailable in older firmware with ABI < 3.19.
Just reset widget use_count's for this case. This would ensure that
the secondary cores enabled required for topology setup are powered
down properly before the primary core is powered off during
system suspend.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20211119192621.4096077-8-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ranjani Sridharan 2021-11-19 21:26:18 +02:00 committed by Mark Brown
parent 7cc7b9ba21
commit b2ebcf42a4
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 10 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

13
sound/soc/sof/sof-audio.c
View file

@ -665,11 +665,12 @@ int sof_set_up_pipelines(struct snd_sof_dev *sdev, bool verify)
} }
/* /*
* This function doesn't free widgets during suspend. It only resets the set up status for all * For older firmware, this function doesn't free widgets for static pipelines during suspend.
* routes and use_count for all widgets. * It only resets use_count for all widgets.
*/ */
int sof_tear_down_pipelines(struct snd_sof_dev *sdev, bool verify) int sof_tear_down_pipelines(struct snd_sof_dev *sdev, bool verify)
{ {
struct sof_ipc_fw_version *v = &sdev->fw_ready.version;
struct snd_sof_widget *swidget; struct snd_sof_widget *swidget;
struct snd_sof_route *sroute; struct snd_sof_route *sroute;
int ret; int ret;
@ -681,8 +682,14 @@ int sof_tear_down_pipelines(struct snd_sof_dev *sdev, bool verify)
* loading the sound card unavailable to open PCMs. * loading the sound card unavailable to open PCMs.
*/ */
list_for_each_entry_reverse(swidget, &sdev->widget_list, list) { list_for_each_entry_reverse(swidget, &sdev->widget_list, list) {
if (!verify) { if (swidget->dynamic_pipeline_widget)
continue;
/* Do not free widgets for static pipelines with FW ABI older than 3.19 */
if (!verify && !swidget->dynamic_pipeline_widget &&
v->abi_version < SOF_ABI_VER(3, 19, 0)) {
swidget->use_count = 0; swidget->use_count = 0;
swidget->complete = 0;
continue; continue;
} }