ASoC: SOF: Intel: hda-dai-ops: enable chain_dma for ALH

Use the existing callbacks and mix/match of HDaudio and SoundWire
support.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://msgid.link/r/20240213101247.28887-5-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-dai-ops.c b/sound/soc/sof/intel/hda-dai-ops.c
index 55ce75db23e52001a0ae3753eaa6549d2fa0e73e..f58539d2f937a0d63f9cd43f60165525c758cc48 100644 (file)
--- a/sound/soc/sof/intel/hda-dai-ops.c
+++ b/sound/soc/sof/intel/hda-dai-ops.c
@@ -522,6 +522,17 @@ static const struct hda_dai_widget_dma_ops hda_ipc4_chain_dma_ops = {
        .get_hlink = hda_get_hlink,
 };
 
+static const struct hda_dai_widget_dma_ops sdw_ipc4_chain_dma_ops = {
+       .get_hext_stream = hda_get_hext_stream,
+       .assign_hext_stream = hda_assign_hext_stream,
+       .release_hext_stream = hda_release_hext_stream,
+       .setup_hext_stream = hda_setup_hext_stream,
+       .reset_hext_stream = hda_reset_hext_stream,
+       .trigger = hda_trigger,
+       .calc_stream_format = generic_calc_stream_format,
+       .get_hlink = sdw_get_hlink,
+};
+
 static int hda_ipc3_post_trigger(struct snd_sof_dev *sdev, struct snd_soc_dai *cpu_dai,
                                 struct snd_pcm_substream *substream, int cmd)
 {
@@ -620,6 +631,8 @@ hda_select_dai_widget_ops(struct snd_sof_dev *sdev, struct snd_sof_widget *swidg
        }
        case SOF_IPC_TYPE_4:
        {
+               struct snd_sof_widget *pipe_widget = swidget->spipe->pipe_widget;
+               struct sof_ipc4_pipeline *pipeline = pipe_widget->private;
                struct sof_ipc4_copier *ipc4_copier = sdai->private;
                const struct sof_intel_dsp_desc *chip;
 
@@ -627,15 +640,10 @@ hda_select_dai_widget_ops(struct snd_sof_dev *sdev, struct snd_sof_widget *swidg
 
                switch (ipc4_copier->dai_type) {
                case SOF_DAI_INTEL_HDA:
-               {
-                       struct snd_sof_widget *pipe_widget = swidget->spipe->pipe_widget;
-                       struct sof_ipc4_pipeline *pipeline = pipe_widget->private;
-
                        if (pipeline->use_chain_dma)
                                return &hda_ipc4_chain_dma_ops;
 
                        return &hda_ipc4_dma_ops;
-               }
                case SOF_DAI_INTEL_SSP:
                        if (chip->hw_ip_version < SOF_INTEL_ACE_2_0)
                                return NULL;
@@ -647,6 +655,8 @@ hda_select_dai_widget_ops(struct snd_sof_dev *sdev, struct snd_sof_widget *swidg
                case SOF_DAI_INTEL_ALH:
                        if (chip->hw_ip_version < SOF_INTEL_ACE_2_0)
                                return NULL;
+                       if (pipeline->use_chain_dma)
+                               return &sdw_ipc4_chain_dma_ops;
                        return &sdw_ipc4_dma_ops;
 
                default: