Skip to content

L
linux
Commit 51ec71dc authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files
Options

ASoC: SOF: Intel: Add IPC-specific dai ops for IPC3 

The BE DAI driver ops involve operations that are IPC-specific. For ex:
for the HDA DAI, the trigger op involves sending the DAI_CONFIG IPC to
the DSP to stop the DMA for the stop/pause commands. This sequence is
different for IPC3 and IPC4. So, make the dai driver ops IPC-specific
and set the IPC3-specific ops during the ops_init() callback.
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220421203201.1550328-3-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8e84b6a4
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 21 deletions
sound/soc/sof/intel/apl.c
View file @ 51ec71dc
......@@ -43,6 +43,9 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev)
/* ipc */
sof_apl_ops.send_msg = hda_dsp_ipc_send_msg;
/* set DAI driver ops */
hda_set_dai_drv_ops(sdev, &sof_apl_ops);
/* debug */
sof_apl_ops.debug_map = apl_dsp_debugfs;
sof_apl_ops.debug_map_count = ARRAY_SIZE(apl_dsp_debugfs);
......
sound/soc/sof/intel/cnl.c
View file @ 51ec71dc
......@@ -261,6 +261,9 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev)
/* ipc */
sof_cnl_ops.send_msg = cnl_ipc_send_msg;
/* set DAI driver ops */
hda_set_dai_drv_ops(sdev, &sof_cnl_ops);
/* debug */
sof_cnl_ops.debug_map = cnl_dsp_debugfs;
sof_cnl_ops.debug_map_count = ARRAY_SIZE(cnl_dsp_debugfs);
......
sound/soc/sof/intel/hda-dai.c
View file @ 51ec71dc
......@@ -276,7 +276,7 @@ static int hda_link_dai_config_pause_push_ipc(struct snd_soc_dapm_widget *w)
return ret;
}
static int hda_link_pcm_trigger(struct snd_pcm_substream *substream,
static int ipc3_hda_link_pcm_trigger(struct snd_pcm_substream *substream,
int cmd, struct snd_soc_dai *dai)
{
struct hdac_ext_stream *hext_stream =
......@@ -395,10 +395,10 @@ static int hda_link_hw_free(struct snd_pcm_substream *substream,
return 0;
}
static const struct snd_soc_dai_ops hda_link_dai_ops = {
static const struct snd_soc_dai_ops ipc3_hda_link_dai_ops = {
.hw_params = hda_link_hw_params,
.hw_free = hda_link_hw_free,
.trigger = hda_link_pcm_trigger,
.trigger = ipc3_hda_link_pcm_trigger,
.prepare = hda_link_pcm_prepare,
};
......@@ -478,7 +478,7 @@ static int ssp_dai_prepare(struct snd_pcm_substream *substream,
return ssp_dai_setup(substream, dai, true);
}
static int ssp_dai_trigger(struct snd_pcm_substream *substream,
static int ipc3_ssp_dai_trigger(struct snd_pcm_substream *substream,
int cmd, struct snd_soc_dai *dai)
{
if (cmd != SNDRV_PCM_TRIGGER_SUSPEND)
......@@ -507,15 +507,39 @@ static void ssp_dai_shutdown(struct snd_pcm_substream *substream,
kfree(dma_data);
}
static const struct snd_soc_dai_ops ssp_dai_ops = {
static const struct snd_soc_dai_ops ipc3_ssp_dai_ops = {
.startup = ssp_dai_startup,
.hw_params = ssp_dai_hw_params,
.prepare = ssp_dai_prepare,
.trigger = ssp_dai_trigger,
.trigger = ipc3_ssp_dai_trigger,
.hw_free = ssp_dai_hw_free,
.shutdown = ssp_dai_shutdown,
};
void hda_set_dai_drv_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *ops)
{
int i;
switch (sdev->pdata->ipc_type) {
case SOF_IPC:
for (i = 0; i < ops->num_drv; i++) {
if (strstr(ops->drv[i].name, "SSP")) {
ops->drv[i].ops = &ipc3_ssp_dai_ops;
continue;
}
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
if (strstr(ops->drv[i].name, "iDisp") ||
strstr(ops->drv[i].name, "Analog") ||
strstr(ops->drv[i].name, "Digital"))
ops->drv[i].ops = &ipc3_hda_link_dai_ops;
#endif
}
break;
default:
break;
}
}
/*
* common dai driver for skl+ platforms.
* some products who use this DAI array only physically have a subset of
......@@ -524,7 +548,6 @@ static const struct snd_soc_dai_ops ssp_dai_ops = {
struct snd_soc_dai_driver skl_dai[] = {
{
.name = "SSP0 Pin",
.ops = &ssp_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 8,
......@@ -536,7 +559,6 @@ struct snd_soc_dai_driver skl_dai[] = {
},
{
.name = "SSP1 Pin",
.ops = &ssp_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 8,
......@@ -548,7 +570,6 @@ struct snd_soc_dai_driver skl_dai[] = {
},
{
.name = "SSP2 Pin",
.ops = &ssp_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 8,
......@@ -560,7 +581,6 @@ struct snd_soc_dai_driver skl_dai[] = {
},
{
.name = "SSP3 Pin",
.ops = &ssp_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 8,
......@@ -572,7 +592,6 @@ struct snd_soc_dai_driver skl_dai[] = {
},
{
.name = "SSP4 Pin",
.ops = &ssp_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 8,
......@@ -584,7 +603,6 @@ struct snd_soc_dai_driver skl_dai[] = {
},
{
.name = "SSP5 Pin",
.ops = &ssp_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 8,
......@@ -611,7 +629,6 @@ struct snd_soc_dai_driver skl_dai[] = {
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
{
.name = "iDisp1 Pin",
.ops = &hda_link_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 8,
......@@ -619,7 +636,6 @@ struct snd_soc_dai_driver skl_dai[] = {
},
{
.name = "iDisp2 Pin",
.ops = &hda_link_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 8,
......@@ -627,7 +643,6 @@ struct snd_soc_dai_driver skl_dai[] = {
},
{
.name = "iDisp3 Pin",
.ops = &hda_link_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 8,
......@@ -635,7 +650,6 @@ struct snd_soc_dai_driver skl_dai[] = {
},
{
.name = "iDisp4 Pin",
.ops = &hda_link_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 8,
......@@ -643,7 +657,6 @@ struct snd_soc_dai_driver skl_dai[] = {
},
{
.name = "Analog CPU DAI",
.ops = &hda_link_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 16,
......@@ -655,7 +668,6 @@ struct snd_soc_dai_driver skl_dai[] = {
},
{
.name = "Digital CPU DAI",
.ops = &hda_link_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 16,
......@@ -667,7 +679,6 @@ struct snd_soc_dai_driver skl_dai[] = {
},
{
.name = "Alt Analog CPU DAI",
.ops = &hda_link_dai_ops,
.playback = {
.channels_min = 1,
.channels_max = 16,
......
sound/soc/sof/intel/hda.h
View file @ 51ec71dc
......@@ -761,4 +761,6 @@ int hda_ctrl_dai_widget_free(struct snd_soc_dapm_widget *w, unsigned int quirk_f
extern int sof_hda_position_quirk;
void hda_set_dai_drv_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *ops);
#endif
sound/soc/sof/intel/icl.c
View file @ 51ec71dc
......@@ -127,6 +127,9 @@ int sof_icl_ops_init(struct snd_sof_dev *sdev)
/* dsp core get/put */
sof_icl_ops.core_get = hda_dsp_core_get;
/* set DAI driver ops */
hda_set_dai_drv_ops(sdev, &sof_icl_ops);
return 0;
};
EXPORT_SYMBOL_NS(sof_icl_ops_init, SND_SOC_SOF_INTEL_HDA_COMMON);
......
sound/soc/sof/intel/tgl.c
View file @ 51ec71dc
......@@ -76,6 +76,9 @@ int sof_tgl_ops_init(struct snd_sof_dev *sdev)
/* ipc */
sof_tgl_ops.send_msg = cnl_ipc_send_msg;
/* set DAI driver ops */
hda_set_dai_drv_ops(sdev, &sof_tgl_ops);
/* debug */
sof_tgl_ops.debug_map = tgl_dsp_debugfs;
sof_tgl_ops.debug_map_count = ARRAY_SIZE(tgl_dsp_debugfs);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7