OSDN Git Service

ASoC: SOF: Introduce PCM setup/free PCM IPC ops
authorRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Fri, 27 Jan 2023 12:00:20 +0000 (14:00 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 27 Jan 2023 12:14:04 +0000 (12:14 +0000)
These will be used to perform IPC-specific PCM setup/free.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Libin Yang <libin.yang@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@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-8-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/sof-audio.h
sound/soc/sof/topology.c

index 28062a0..bcde2eb 100644 (file)
@@ -85,6 +85,7 @@ struct snd_sof_widget;
 struct snd_sof_route;
 struct snd_sof_control;
 struct snd_sof_dai;
+struct snd_sof_pcm;
 
 struct snd_sof_dai_config_data {
        int dai_index;
@@ -97,6 +98,10 @@ struct snd_sof_dai_config_data {
  * @hw_free: Function pointer for hw_free
  * @trigger: Function pointer for trigger
  * @dai_link_fixup: Function pointer for DAI link fixup
+ * @pcm_setup: Function pointer for IPC-specific PCM set up that can be used for allocating
+ *            additional memory in the SOF PCM stream structure
+ * @pcm_free: Function pointer for PCM free that can be used for freeing any
+ *            additional memory in the SOF PCM stream structure
  */
 struct sof_ipc_pcm_ops {
        int (*hw_params)(struct snd_soc_component *component, struct snd_pcm_substream *substream,
@@ -106,6 +111,8 @@ struct sof_ipc_pcm_ops {
        int (*trigger)(struct snd_soc_component *component,  struct snd_pcm_substream *substream,
                       int cmd);
        int (*dai_link_fixup)(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params);
+       int (*pcm_setup)(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm);
+       void (*pcm_free)(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm);
 };
 
 /**
index f67c39c..51f6fed 100644 (file)
@@ -1669,6 +1669,7 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index,
                        struct snd_soc_tplg_pcm *pcm, struct snd_soc_dai *dai)
 {
        struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
+       const struct sof_ipc_pcm_ops *ipc_pcm_ops = sof_ipc_get_ops(sdev, pcm);
        struct snd_soc_tplg_stream_caps *caps;
        struct snd_soc_tplg_private *private = &pcm->priv;
        struct snd_sof_pcm *spcm;
@@ -1696,6 +1697,13 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index,
        spcm->pcm = *pcm;
        dev_dbg(scomp->dev, "tplg: load pcm %s\n", pcm->dai_name);
 
+       /* perform pcm set op */
+       if (ipc_pcm_ops && ipc_pcm_ops->pcm_setup) {
+               ret = ipc_pcm_ops->pcm_setup(sdev, spcm);
+               if (ret < 0)
+                       return ret;
+       }
+
        dai_drv->dobj.private = spcm;
        list_add(&spcm->list, &sdev->pcm_list);
 
@@ -1773,6 +1781,8 @@ free_playback_tables:
 static int sof_dai_unload(struct snd_soc_component *scomp,
                          struct snd_soc_dobj *dobj)
 {
+       struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
+       const struct sof_ipc_pcm_ops *ipc_pcm_ops = sof_ipc_get_ops(sdev, pcm);
        struct snd_sof_pcm *spcm = dobj->private;
 
        /* free PCM DMA pages */
@@ -1782,6 +1792,10 @@ static int sof_dai_unload(struct snd_soc_component *scomp,
        if (spcm->pcm.capture)
                snd_dma_free_pages(&spcm->stream[SNDRV_PCM_STREAM_CAPTURE].page_table);
 
+       /* perform pcm free op */
+       if (ipc_pcm_ops && ipc_pcm_ops->pcm_free)
+               ipc_pcm_ops->pcm_free(sdev, spcm);
+
        /* remove from list and free spcm */
        list_del(&spcm->list);
        kfree(spcm);