Commit 7201a3d4 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown

ASoC: SOF: Introduce PCM setup/free PCM IPC ops

These will be used to perform IPC-specific PCM setup/free.
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarLibin Yang <libin.yang@intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230127120031.10709-8-peter.ujfalusi@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent e380c907
...@@ -85,6 +85,7 @@ struct snd_sof_widget; ...@@ -85,6 +85,7 @@ struct snd_sof_widget;
struct snd_sof_route; struct snd_sof_route;
struct snd_sof_control; struct snd_sof_control;
struct snd_sof_dai; struct snd_sof_dai;
struct snd_sof_pcm;
struct snd_sof_dai_config_data { struct snd_sof_dai_config_data {
int dai_index; int dai_index;
...@@ -97,6 +98,10 @@ struct snd_sof_dai_config_data { ...@@ -97,6 +98,10 @@ struct snd_sof_dai_config_data {
* @hw_free: Function pointer for hw_free * @hw_free: Function pointer for hw_free
* @trigger: Function pointer for trigger * @trigger: Function pointer for trigger
* @dai_link_fixup: Function pointer for DAI link fixup * @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 { struct sof_ipc_pcm_ops {
int (*hw_params)(struct snd_soc_component *component, struct snd_pcm_substream *substream, int (*hw_params)(struct snd_soc_component *component, struct snd_pcm_substream *substream,
...@@ -106,6 +111,8 @@ struct sof_ipc_pcm_ops { ...@@ -106,6 +111,8 @@ struct sof_ipc_pcm_ops {
int (*trigger)(struct snd_soc_component *component, struct snd_pcm_substream *substream, int (*trigger)(struct snd_soc_component *component, struct snd_pcm_substream *substream,
int cmd); int cmd);
int (*dai_link_fixup)(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params); 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);
}; };
/** /**
......
...@@ -1669,6 +1669,7 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index, ...@@ -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_soc_tplg_pcm *pcm, struct snd_soc_dai *dai)
{ {
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp); 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_stream_caps *caps;
struct snd_soc_tplg_private *private = &pcm->priv; struct snd_soc_tplg_private *private = &pcm->priv;
struct snd_sof_pcm *spcm; struct snd_sof_pcm *spcm;
...@@ -1696,6 +1697,13 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index, ...@@ -1696,6 +1697,13 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index,
spcm->pcm = *pcm; spcm->pcm = *pcm;
dev_dbg(scomp->dev, "tplg: load pcm %s\n", pcm->dai_name); 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; dai_drv->dobj.private = spcm;
list_add(&spcm->list, &sdev->pcm_list); list_add(&spcm->list, &sdev->pcm_list);
...@@ -1773,6 +1781,8 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index, ...@@ -1773,6 +1781,8 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index,
static int sof_dai_unload(struct snd_soc_component *scomp, static int sof_dai_unload(struct snd_soc_component *scomp,
struct snd_soc_dobj *dobj) 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; struct snd_sof_pcm *spcm = dobj->private;
/* free PCM DMA pages */ /* free PCM DMA pages */
...@@ -1782,6 +1792,10 @@ static int sof_dai_unload(struct snd_soc_component *scomp, ...@@ -1782,6 +1792,10 @@ static int sof_dai_unload(struct snd_soc_component *scomp,
if (spcm->pcm.capture) if (spcm->pcm.capture)
snd_dma_free_pages(&spcm->stream[SNDRV_PCM_STREAM_CAPTURE].page_table); 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 */ /* remove from list and free spcm */
list_del(&spcm->list); list_del(&spcm->list);
kfree(spcm); kfree(spcm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment