From d399ca6da5591d624dcc1ba426628a7c28a7779a Mon Sep 17 00:00:00 2001
From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Date: Thu, 6 May 2021 17:05:37 -0700
Subject: [PATCH] fixup! ASoC: SOF: Add support for dynamic pipelines

Fix the sof_widget_list_setup() to set up the pipeline
widget for the pipeline that the widget belongs to first
before setting up the widget. This change is in preparation
for IPC4 which requires the pipeline widget to be
set up first.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
 sound/soc/sof/sof-audio.c | 55 ++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index f91a4995a5ca9d..3cad8e18fa69f1 100644
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -340,7 +340,6 @@ int sof_widget_list_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm, in
 {
 	struct snd_soc_dapm_widget_list *list = spcm->stream[dir].list;
 	struct snd_soc_dapm_widget *widget;
-	int num_pipe_widgets = 0;
 	int i, ret, num_widgets;
 
 	/* nothing to set up */
@@ -350,13 +349,36 @@ int sof_widget_list_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm, in
 	/* set up widgets in the list */
 	for_each_dapm_widgets(list, num_widgets, widget) {
 		struct snd_sof_widget *swidget = widget->dobj.private;
+		struct snd_sof_widget *pipe_widget;
 
 		if (!swidget)
 			continue;
 
-		ret = sof_widget_setup(sdev, swidget);
+		/*
+		 * The scheduler widget for a pipeline is not part of the connected DAPM
+		 * widget list and it needs to be set up before the widgets in the pipeline
+		 * are set up. The use_count for the scheduler widget is incremented for every
+		 * widget in a given pipeline to ensure that it is freed only after the last
+		 * widget in the pipeline is freed.
+		 */
+		pipe_widget = swidget->pipe_widget;
+		if (!pipe_widget) {
+			dev_err(sdev->dev, "error: no pipeline widget found for %s\n",
+				swidget->widget->name);
+			ret = -EINVAL;
+			goto widget_free;
+		}
+
+		ret = sof_widget_setup(sdev, pipe_widget);
 		if (ret < 0)
 			goto widget_free;
+
+		/* set up the widget */
+		ret = sof_widget_setup(sdev, swidget);
+		if (ret < 0) {
+			sof_widget_free(sdev, pipe_widget);
+			goto widget_free;
+		}
 	}
 
 	/*
@@ -367,7 +389,7 @@ int sof_widget_list_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm, in
 	if (ret < 0)
 		goto widget_free;
 
-	/* setup pipeline widgets and complete pipelines */
+	/* complete pipelines */
 	for_each_dapm_widgets(list, i, widget) {
 		struct snd_sof_widget *swidget = widget->dobj.private;
 		struct snd_sof_widget *pipe_widget;
@@ -380,49 +402,34 @@ int sof_widget_list_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm, in
 			dev_err(sdev->dev, "error: no pipeline widget found for %s\n",
 				swidget->widget->name);
 			ret = -EINVAL;
-			goto pipe_free;
+			goto widget_free;
 		}
 
-		ret = sof_widget_setup(sdev, pipe_widget);
-		if (ret < 0)
-			goto pipe_free;
-
-		num_pipe_widgets++;
-
 		if (pipe_widget->complete)
 			continue;
 
 		pipe_widget->complete = snd_sof_complete_pipeline(sdev->dev, pipe_widget);
 		if (pipe_widget->complete < 0) {
 			ret = pipe_widget->complete;
-			goto pipe_free;
+			goto widget_free;
 		}
 	}
 
 	return 0;
 
-pipe_free:
-	/* free the pipe widgets that were set up successfully */
+widget_free:
+	/* free all widgets that have been set up successfully */
 	for_each_dapm_widgets(list, i, widget) {
 		struct snd_sof_widget *swidget = widget->dobj.private;
 
 		if (!swidget)
 			continue;
 
-		if (!num_pipe_widgets--)
-			break;
-
-		sof_widget_free(sdev, swidget->pipe_widget);
-	}
-
-widget_free:
-	/* free all widgets that have been set up successfully */
-	for_each_dapm_widgets(list, i, widget) {
 		if (!num_widgets--)
 			break;
 
-		if (widget->dobj.private)
-			sof_widget_free(sdev, widget->dobj.private);
+		sof_widget_free(sdev, swidget);
+		sof_widget_free(sdev, swidget->pipe_widget);
 	}
 
 	return ret;