ASoC: SOF: topology: Set IPC-specific trigger order for DAI links

Add a new topology IPC op to set up DAI links and set the link trigger
order to match the expectation based on the IPC type. Note that the
link_setup op implementations for IPC3 and IPC4 are not identical and
have contrasting trigger orders for playback and capture.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230127120031.10709-7-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/ipc3-topology.c b/sound/soc/sof/ipc3-topology.c
index 72ac172..3f52dfb 100644 (file)
--- a/sound/soc/sof/ipc3-topology.c
+++ b/sound/soc/sof/ipc3-topology.c
@@ -2426,6 +2426,24 @@ static int sof_ipc3_parse_manifest(struct snd_soc_component *scomp, int index,
        return 0;
 }
 
+static int sof_ipc3_link_setup(struct snd_sof_dev *sdev, struct snd_soc_dai_link *link)
+{
+       if (link->no_pcm)
+               return 0;
+
+       /*
+        * set default trigger order for all links. Exceptions to
+        * the rule will be handled in sof_pcm_dai_link_fixup()
+        * For playback, the sequence is the following: start FE,
+        * start BE, stop BE, stop FE; for Capture the sequence is
+        * inverted start BE, start FE, stop FE, stop BE
+        */
+       link->trigger[SNDRV_PCM_STREAM_PLAYBACK] = SND_SOC_DPCM_TRIGGER_PRE;
+       link->trigger[SNDRV_PCM_STREAM_CAPTURE] = SND_SOC_DPCM_TRIGGER_POST;
+
+       return 0;
+}
+
 /* token list for each topology object */
 static enum sof_tokens host_token_list[] = {
        SOF_CORE_TOKENS,
@@ -2537,4 +2555,5 @@ const struct sof_ipc_tplg_ops ipc3_tplg_ops = {
        .set_up_all_pipelines = sof_ipc3_set_up_all_pipelines,
        .tear_down_all_pipelines = sof_ipc3_tear_down_all_pipelines,
        .parse_manifest = sof_ipc3_parse_manifest,
+       .link_setup = sof_ipc3_link_setup,
 };

diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c
index 3938ff2..b07a405 100644 (file)
--- a/sound/soc/sof/ipc4-topology.c
+++ b/sound/soc/sof/ipc4-topology.c
@@ -2038,6 +2038,24 @@ static int sof_ipc4_tear_down_all_pipelines(struct snd_sof_dev *sdev, bool verif
        return 0;
 }
 
+static int sof_ipc4_link_setup(struct snd_sof_dev *sdev, struct snd_soc_dai_link *link)
+{
+       if (link->no_pcm)
+               return 0;
+
+       /*
+        * set default trigger order for all links. Exceptions to
+        * the rule will be handled in sof_pcm_dai_link_fixup()
+        * For playback, the sequence is the following: start BE,
+        * start FE, stop FE, stop BE; for Capture the sequence is
+        * inverted start FE, start BE, stop BE, stop FE
+        */
+       link->trigger[SNDRV_PCM_STREAM_PLAYBACK] = SND_SOC_DPCM_TRIGGER_POST;
+       link->trigger[SNDRV_PCM_STREAM_CAPTURE] = SND_SOC_DPCM_TRIGGER_PRE;
+
+       return 0;
+}
+
 static enum sof_tokens common_copier_token_list[] = {
        SOF_COMP_TOKENS,
        SOF_AUDIO_FMT_NUM_TOKENS,
@@ -2144,4 +2162,5 @@ const struct sof_ipc_tplg_ops ipc4_tplg_ops = {
        .parse_manifest = sof_ipc4_parse_manifest,
        .dai_get_clk = sof_ipc4_dai_get_clk,
        .tear_down_all_pipelines = sof_ipc4_tear_down_all_pipelines,
+       .link_setup = sof_ipc4_link_setup,
 };

diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h
index 8e4abb1..28062a0 100644 (file)
--- a/sound/soc/sof/sof-audio.h
+++ b/sound/soc/sof/sof-audio.h
@@ -180,6 +180,7 @@ struct sof_ipc_tplg_widget_ops {
  * @set_up_all_pipelines: Function pointer for setting up all topology pipelines
  * @tear_down_all_pipelines: Function pointer for tearing down all topology pipelines
  * @parse_manifest: Function pointer for ipc4 specific parsing of topology manifest
+ * @link_setup: Function pointer for IPC-specific DAI link set up
  *
  * Note: function pointers (ops) are optional
  */
@@ -201,6 +202,7 @@ struct sof_ipc_tplg_ops {
        int (*tear_down_all_pipelines)(struct snd_sof_dev *sdev, bool verify);
        int (*parse_manifest)(struct snd_soc_component *scomp, int index,
                              struct snd_soc_tplg_manifest *man);
+       int (*link_setup)(struct snd_sof_dev *sdev, struct snd_soc_dai_link *link);
 };
 
 /** struct snd_sof_tuple - Tuple info

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 560771b..f67c39c 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -1813,26 +1813,15 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_
        }
        link->platforms->name = dev_name(scomp->dev);
 
-       /*
-        * Set nonatomic property for FE dai links as their trigger action
-        * involves IPC's.
-        */
+       if (tplg_ops && tplg_ops->link_setup) {
+               ret = tplg_ops->link_setup(sdev, link);
+               if (ret < 0)
+                       return ret;
+       }
+
+       /* Set nonatomic property for FE dai links as their trigger action involves IPC's */
        if (!link->no_pcm) {
                link->nonatomic = true;
-
-               /*
-                * set default trigger order for all links. Exceptions to
-                * the rule will be handled in sof_pcm_dai_link_fixup()
-                * For playback, the sequence is the following: start FE,
-                * start BE, stop BE, stop FE; for Capture the sequence is
-                * inverted start BE, start FE, stop FE, stop BE
-                */
-               link->trigger[SNDRV_PCM_STREAM_PLAYBACK] =
-                                       SND_SOC_DPCM_TRIGGER_PRE;
-               link->trigger[SNDRV_PCM_STREAM_CAPTURE] =
-                                       SND_SOC_DPCM_TRIGGER_POST;
-
-               /* nothing more to do for FE dai links */
                return 0;
        }