ASoC: SOF: ipc4-topology: add buffer type support

The corresponding IPC4 module of snd_soc_dapm_buffer widget is module
-to-module copier.
The module-to-module copier is a buffer-like component with demuxing
capabilities.
Rename the host_token_list to common_copier_token_list since it will
be used by host copier and module-to-module copier.
The setup callback is almost the same as sof_ipc4_widget_setup_pcm except
the gtw_cfg data, and the free callback is exactly the same as
sof_ipc4_widget_free_comp_pcm. To reduce the duplication, the commit
reuses the setup and free callbacks.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@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/20230126110637.25542-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c
index 59f4d42..a807a69 100644 (file)
--- a/sound/soc/sof/ipc4-topology.c
+++ b/sound/soc/sof/ipc4-topology.c
@@ -354,6 +354,13 @@ static int sof_ipc4_widget_setup_pcm(struct snd_sof_widget *swidget)
                goto free_available_fmt;
        }
 
+       /*
+        * This callback is used by host copier and module-to-module copier,
+        * and only host copier needs to set gtw_cfg.
+        */
+       if (!WIDGET_IS_AIF(swidget->id))
+               goto skip_gtw_cfg;
+
        ret = sof_update_ipc_object(scomp, available_fmt->dma_buffer_size,
                                    SOF_COPIER_GATEWAY_CFG_TOKENS, swidget->tuples,
                                    swidget->num_tuples, sizeof(u32),
@@ -380,7 +387,7 @@ static int sof_ipc4_widget_setup_pcm(struct snd_sof_widget *swidget)
        }
        dev_dbg(scomp->dev, "host copier '%s' node_type %u\n", swidget->widget->name, node_type);
 
-       ipc4_copier->data.gtw_cfg.node_id = SOF_IPC4_NODE_TYPE(node_type);
+skip_gtw_cfg:
        ipc4_copier->gtw_attr = kzalloc(sizeof(*ipc4_copier->gtw_attr), GFP_KERNEL);
        if (!ipc4_copier->gtw_attr) {
                ret = -ENOMEM;
@@ -391,6 +398,21 @@ static int sof_ipc4_widget_setup_pcm(struct snd_sof_widget *swidget)
        ipc4_copier->data.gtw_cfg.config_length =
                sizeof(struct sof_ipc4_gtw_attributes) >> 2;
 
+       switch (swidget->id) {
+       case snd_soc_dapm_aif_in:
+       case snd_soc_dapm_aif_out:
+               ipc4_copier->data.gtw_cfg.node_id = SOF_IPC4_NODE_TYPE(node_type);
+               break;
+       case snd_soc_dapm_buffer:
+               ipc4_copier->data.gtw_cfg.node_id = SOF_IPC4_INVALID_NODE_ID;
+               ipc4_copier->ipc_config_size = 0;
+               break;
+       default:
+               dev_err(scomp->dev, "invalid widget type %d\n", swidget->id);
+               ret = -EINVAL;
+               goto free_gtw_attr;
+       }
+
        /* set up module info and message header */
        ret = sof_ipc4_widget_setup_msg(swidget, &ipc4_copier->msg);
        if (ret)
@@ -951,7 +973,7 @@ static void sof_ipc4_unprepare_copier_module(struct snd_sof_widget *swidget)
        pipeline = pipe_widget->private;
        pipeline->mem_usage = 0;
 
-       if (WIDGET_IS_AIF(swidget->id)) {
+       if (WIDGET_IS_AIF(swidget->id) || swidget->id == snd_soc_dapm_buffer) {
                ipc4_copier = swidget->private;
        } else if (WIDGET_IS_DAI(swidget->id)) {
                struct snd_sof_dai *dai = swidget->private;
@@ -1177,6 +1199,22 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
 
                break;
        }
+       case snd_soc_dapm_buffer:
+       {
+               ipc4_copier = (struct sof_ipc4_copier *)swidget->private;
+               copier_data = &ipc4_copier->data;
+               available_fmt = &ipc4_copier->available_fmt;
+
+               /*
+                * base_config->audio_fmt represent the input audio formats. Use
+                * the input format as the reference to match pcm params
+                */
+               available_fmt->ref_audio_fmt = &available_fmt->base_config->audio_fmt;
+               ref_audio_fmt_size = sizeof(struct sof_ipc4_base_module_cfg);
+               ref_params = pipeline_params;
+
+               break;
+       }
        default:
                dev_err(sdev->dev, "unsupported type %d for copier %s",
                        swidget->id, swidget->widget->name);
@@ -1465,6 +1503,7 @@ static int sof_ipc4_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget
                break;
        case snd_soc_dapm_aif_in:
        case snd_soc_dapm_aif_out:
+       case snd_soc_dapm_buffer:
        {
                struct sof_ipc4_copier *ipc4_copier = swidget->private;
 
@@ -1970,7 +2009,7 @@ static int sof_ipc4_tear_down_all_pipelines(struct snd_sof_dev *sdev, bool verif
        return 0;
 }
 
-static enum sof_tokens host_token_list[] = {
+static enum sof_tokens common_copier_token_list[] = {
        SOF_COMP_TOKENS,
        SOF_AUDIO_FMT_NUM_TOKENS,
        SOF_AUDIO_FORMAT_BUFFER_SIZE_TOKENS,
@@ -2026,12 +2065,12 @@ static enum sof_tokens src_token_list[] = {
 
 static const struct sof_ipc_tplg_widget_ops tplg_ipc4_widget_ops[SND_SOC_DAPM_TYPE_COUNT] = {
        [snd_soc_dapm_aif_in] =  {sof_ipc4_widget_setup_pcm, sof_ipc4_widget_free_comp_pcm,
-                                 host_token_list, ARRAY_SIZE(host_token_list), NULL,
-                                 sof_ipc4_prepare_copier_module,
+                                 common_copier_token_list, ARRAY_SIZE(common_copier_token_list),
+                                 NULL, sof_ipc4_prepare_copier_module,
                                  sof_ipc4_unprepare_copier_module},
        [snd_soc_dapm_aif_out] = {sof_ipc4_widget_setup_pcm, sof_ipc4_widget_free_comp_pcm,
-                                 host_token_list, ARRAY_SIZE(host_token_list), NULL,
-                                 sof_ipc4_prepare_copier_module,
+                                 common_copier_token_list, ARRAY_SIZE(common_copier_token_list),
+                                 NULL, sof_ipc4_prepare_copier_module,
                                  sof_ipc4_unprepare_copier_module},
        [snd_soc_dapm_dai_in] = {sof_ipc4_widget_setup_comp_dai, sof_ipc4_widget_free_comp_dai,
                                 dai_token_list, ARRAY_SIZE(dai_token_list), NULL,
@@ -2041,6 +2080,10 @@ static const struct sof_ipc_tplg_widget_ops tplg_ipc4_widget_ops[SND_SOC_DAPM_TY
                                  dai_token_list, ARRAY_SIZE(dai_token_list), NULL,
                                  sof_ipc4_prepare_copier_module,
                                  sof_ipc4_unprepare_copier_module},
+       [snd_soc_dapm_buffer] = {sof_ipc4_widget_setup_pcm, sof_ipc4_widget_free_comp_pcm,
+                                common_copier_token_list, ARRAY_SIZE(common_copier_token_list),
+                                NULL, sof_ipc4_prepare_copier_module,
+                                sof_ipc4_unprepare_copier_module},
        [snd_soc_dapm_scheduler] = {sof_ipc4_widget_setup_comp_pipeline,
                                    sof_ipc4_widget_free_comp_pipeline,
                                    pipeline_token_list, ARRAY_SIZE(pipeline_token_list), NULL,

diff --git a/sound/soc/sof/ipc4-topology.h b/sound/soc/sof/ipc4-topology.h
index 0aa87a8..8dbbf69 100644 (file)
--- a/sound/soc/sof/ipc4-topology.h
+++ b/sound/soc/sof/ipc4-topology.h
@@ -53,6 +53,8 @@
 
 #define ALH_MAX_NUMBER_OF_GTW   16
 
+#define SOF_IPC4_INVALID_NODE_ID       0xffffffff
+
 /*
  * The base of multi-gateways. Multi-gateways addressing starts from
  * ALH_MULTI_GTW_BASE and there are ALH_MULTI_GTW_COUNT multi-sources