ASoC: SOF: Add new fields to snd_sof_route

Add two new fields to save the source widget and sink widget
pointers in struct snd_sof_route to make it easier to look up
routes by source/sink widget. Also, add a flag to indicate
if the route has been set up in the DSP. These will be used
when the dynamic pipeline feature is implemented and routes
will have to be set up at run time.

Also, add a new sof_tear_down_pipelines() callback, that will
used to reset the set up status for all routes during 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>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20210927120517.20505-7-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c
index 89b4b3d765391f5927033a3739a78d178edf39da..2a9b90eb680916349f1555c28ffaf566f3979cbf 100644 (file)
--- a/sound/soc/sof/pm.c
+++ b/sound/soc/sof/pm.c
@@ -208,6 +208,8 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)
        if (target_state == SOF_DSP_PM_D0)
                goto suspend;
 
+       sof_tear_down_pipelines(dev);
+
        /* release trace */
        snd_sof_release_trace(sdev);
 

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index a4b9bb99bced027038b17cb66bee979e01b7d8e1..b52a453ae9d7caa70693a6ea5aa8570f3734244b 100644 (file)
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -276,6 +276,7 @@ int sof_restore_pipelines(struct device *dev)
 
                        return ret;
                }
+               sroute->setup = true;
        }
 
        /* restore dai links */
@@ -317,6 +318,20 @@ int sof_restore_pipelines(struct device *dev)
        return ret;
 }
 
+/* This function doesn't free widgets. It only resets the set up status for all routes */
+void sof_tear_down_pipelines(struct device *dev)
+{
+       struct snd_sof_dev *sdev = dev_get_drvdata(dev);
+       struct snd_sof_route *sroute;
+
+       /*
+        * No need to protect sroute->setup as this function is called only during the suspend
+        * callback and all streams should be suspended by then
+        */
+       list_for_each_entry(sroute, &sdev->route_list, list)
+               sroute->setup = false;
+}
+
 /*
  * Generic object lookup APIs.
  */

diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h
index 4a1c38c5618d0d3eee3f5811e5f3b158f362e459..fe997a80a8476cfd21ed98785bb128c56cd0bcfb 100644 (file)
--- a/sound/soc/sof/sof-audio.h
+++ b/sound/soc/sof/sof-audio.h
@@ -118,6 +118,9 @@ struct snd_sof_route {
 
        struct snd_soc_dapm_route *route;
        struct list_head list;  /* list in sdev route list */
+       struct snd_sof_widget *src_widget;
+       struct snd_sof_widget *sink_widget;
+       bool setup;
 
        void *private;
 };
@@ -240,6 +243,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
 
 /* PM */
 int sof_restore_pipelines(struct device *dev);
+void sof_tear_down_pipelines(struct device *dev);
 int sof_set_hw_params_upon_resume(struct device *dev);
 bool snd_sof_stream_suspend_ignored(struct snd_sof_dev *sdev);
 bool snd_sof_dsp_only_d0i3_compatible_stream_active(struct snd_sof_dev *sdev);

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 60d1db6a919337e10dc868d2cc6e0dcc0eb333c1..58f966ab2e8139318fab1c96b7bf85932bc98b2d 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -3501,6 +3501,9 @@ static int sof_route_load(struct snd_soc_component *scomp, int index,
                sroute->route = route;
                dobj->private = sroute;
                sroute->private = connect;
+               sroute->src_widget = source_swidget;
+               sroute->sink_widget = sink_swidget;
+               sroute->setup = true;
 
                /* add route to route list */
                list_add(&sroute->list, &sdev->route_list);