Unverified Commit 90219f1b authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: intel: hda: Clean up link DMA for IPC3 during stop 

With IPC3, we reset hw_params during the stop trigger, so we should also
clean up the link DMA during the stop trigger.

Fixes: 1bf83fa6 ("ASoC: SOF: Intel: hda-dai: Do not perform DMA cleanup during stop")
Closes: https://github.com/thesofproject/linux/issues/4455
Closes: https://github.com/thesofproject/linux/issues/4482
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217673


Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230808110627.32375-1-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e6199488

sound/soc/sof/intel/hda-dai-ops.c

+10 −1
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ static const struct hda_dai_widget_dma_ops hda_ipc4_chain_dma_ops = { 
static int hda_ipc3_post_trigger(struct snd_sof_dev *sdev, struct snd_soc_dai *cpu_dai,

				 struct snd_pcm_substream *substream, int cmd)

{

	struct hdac_ext_stream *hext_stream = hda_get_hext_stream(sdev, cpu_dai, substream);

	struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(cpu_dai, substream->stream);



	switch (cmd) {
@@ -379,9 +380,17 @@ static int hda_ipc3_post_trigger(struct snd_sof_dev *sdev, struct snd_soc_dai *c 
	case SNDRV_PCM_TRIGGER_STOP:

	{

		struct snd_sof_dai_config_data data = { 0 };

		int ret;



		data.dai_data = DMA_CHAN_INVALID;

		return hda_dai_config(w, SOF_DAI_CONFIG_FLAGS_HW_FREE, &data);

		ret = hda_dai_config(w, SOF_DAI_CONFIG_FLAGS_HW_FREE, &data);

		if (ret < 0)

			return ret;



		if (cmd == SNDRV_PCM_TRIGGER_STOP)

			return hda_link_dma_cleanup(substream, hext_stream, cpu_dai);



		break;

	}

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

		return hda_dai_config(w, SOF_DAI_CONFIG_FLAGS_PAUSE, NULL);

sound/soc/sof/intel/hda-dai.c

+2 −3
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ hda_dai_get_ops(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai 
	return sdai->platform_private;

}



static int hda_link_dma_cleanup(struct snd_pcm_substream *substream,

				struct hdac_ext_stream *hext_stream,

int hda_link_dma_cleanup(struct snd_pcm_substream *substream, struct hdac_ext_stream *hext_stream,

			 struct snd_soc_dai *cpu_dai)

{

	const struct hda_dai_widget_dma_ops *ops = hda_dai_get_ops(substream, cpu_dai);

sound/soc/sof/intel/hda.h

+2 −0
Original line number Diff line number Diff line
@@ -963,5 +963,7 @@ const struct hda_dai_widget_dma_ops * 
hda_select_dai_widget_ops(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget);

int hda_dai_config(struct snd_soc_dapm_widget *w, unsigned int flags,

		   struct snd_sof_dai_config_data *data);

int hda_link_dma_cleanup(struct snd_pcm_substream *substream, struct hdac_ext_stream *hext_stream,

			 struct snd_soc_dai *cpu_dai);



#endif