Unverified Commit 9272d6c2 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-dai: regroup dai and link DMA operations 



Just code move with no functionality change, to clearly separate out
the 'dai' operation from the link DMA ones.

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


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

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

+102 −101
Original line number Diff line number Diff line
@@ -162,20 +162,6 @@ static int hda_link_dma_params(struct hdac_ext_stream *hext_stream, 
	return 0;

}



static int hda_dai_widget_update(struct snd_soc_dapm_widget *w,

				 int channel, bool widget_setup)

{

	struct snd_sof_dai_config_data data;



	data.dai_data = channel;



	/* set up/free DAI widget and send DAI_CONFIG IPC */

	if (widget_setup)

		return hda_ctrl_dai_widget_setup(w, SOF_DAI_CONFIG_FLAGS_2_STEP_STOP, &data);



	return hda_ctrl_dai_widget_free(w, SOF_DAI_CONFIG_FLAGS_NONE, &data);

}



static int hda_link_dma_hw_params(struct snd_pcm_substream *substream,

				  struct snd_pcm_hw_params *params)

{
@@ -220,6 +206,108 @@ static int hda_link_dma_hw_params(struct snd_pcm_substream *substream, 
	return hda_link_dma_params(hext_stream, &p_params);

}



static int hda_link_dma_prepare(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	int stream = substream->stream;



	return hda_link_dma_hw_params(substream, &rtd->dpcm[stream].hw_params);

}



static int hda_link_dma_trigger(struct snd_pcm_substream *substream, int cmd)

{

	struct hdac_stream *hstream = substream->runtime->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	struct hdac_ext_stream *hext_stream = snd_soc_dai_get_dma_data(cpu_dai, substream);

	struct hdac_ext_link *link;

	struct hdac_bus *bus = hstream->bus;

	int stream_tag;



	link = snd_hdac_ext_bus_get_link(bus, codec_dai->component->name);

	if (!link)

		return -EINVAL;



	dev_dbg(cpu_dai->dev, "%s: cmd=%d\n", __func__, cmd);

	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

		snd_hdac_ext_link_stream_start(hext_stream);

		break;

	case SNDRV_PCM_TRIGGER_SUSPEND:

	case SNDRV_PCM_TRIGGER_STOP:

		snd_hdac_ext_link_stream_clear(hext_stream);



		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

			stream_tag = hdac_stream(hext_stream)->stream_tag;

			snd_hdac_ext_link_clear_stream_id(link, stream_tag);

		}



		hext_stream->link_prepared = 0;

		break;

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

		snd_hdac_ext_link_stream_clear(hext_stream);



		break;

	default:

		return -EINVAL;

	}

	return 0;

}



static int hda_link_dma_hw_free(struct snd_pcm_substream *substream)

{

	struct hdac_stream *hstream = substream->runtime->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	struct sof_intel_hda_stream *hda_stream;

	struct hdac_bus *bus = hstream->bus;

	struct hdac_ext_stream *hext_stream;

	struct hdac_ext_link *link;

	int stream_tag;



	hext_stream = snd_soc_dai_get_dma_data(cpu_dai, substream);

	if (!hext_stream) {

		dev_dbg(cpu_dai->dev, "%s: hext_stream is not assigned\n", __func__);

		return -EINVAL;

	}



	link = snd_hdac_ext_bus_get_link(bus, codec_dai->component->name);

	if (!link)

		return -EINVAL;



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

		stream_tag = hdac_stream(hext_stream)->stream_tag;

		snd_hdac_ext_link_clear_stream_id(link, stream_tag);

	}



	snd_soc_dai_set_dma_data(cpu_dai, substream, NULL);

	snd_hdac_ext_stream_release(hext_stream, HDAC_EXT_STREAM_TYPE_LINK);

	hext_stream->link_prepared = 0;



	/* free the host DMA channel reserved by hostless streams */

	hda_stream = hstream_to_sof_hda_stream(hext_stream);

	hda_stream->host_reserved = 0;



	return 0;

}



static int hda_dai_widget_update(struct snd_soc_dapm_widget *w,

				 int channel, bool widget_setup)

{

	struct snd_sof_dai_config_data data;



	data.dai_data = channel;



	/* set up/free DAI widget and send DAI_CONFIG IPC */

	if (widget_setup)

		return hda_ctrl_dai_widget_setup(w, SOF_DAI_CONFIG_FLAGS_2_STEP_STOP, &data);



	return hda_ctrl_dai_widget_free(w, SOF_DAI_CONFIG_FLAGS_NONE, &data);

}



static int hda_dai_hw_params_update(struct snd_pcm_substream *substream,

				    struct snd_pcm_hw_params *params,

				    struct snd_soc_dai *dai)
@@ -253,13 +341,6 @@ static int hda_dai_hw_params(struct snd_pcm_substream *substream, 
	return hda_dai_hw_params_update(substream, params, dai);

}



static int hda_link_dma_prepare(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	int stream = substream->stream;



	return hda_link_dma_hw_params(substream, &rtd->dpcm[stream].hw_params);

}



static int hda_dai_config_pause_push_ipc(struct snd_soc_dapm_widget *w)

{
@@ -301,47 +382,6 @@ static int ipc3_hda_dai_prepare(struct snd_pcm_substream *substream, 
	return hda_dai_hw_params_update(substream, &rtd->dpcm[stream].hw_params, dai);

}



static int hda_link_dma_trigger(struct snd_pcm_substream *substream, int cmd)

{

	struct hdac_stream *hstream = substream->runtime->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	struct hdac_ext_stream *hext_stream = snd_soc_dai_get_dma_data(cpu_dai, substream);

	struct hdac_ext_link *link;

	struct hdac_bus *bus = hstream->bus;

	int stream_tag;



	link = snd_hdac_ext_bus_get_link(bus, codec_dai->component->name);

	if (!link)

		return -EINVAL;



	dev_dbg(cpu_dai->dev, "%s: cmd=%d\n", __func__, cmd);

	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

		snd_hdac_ext_link_stream_start(hext_stream);

		break;

	case SNDRV_PCM_TRIGGER_SUSPEND:

	case SNDRV_PCM_TRIGGER_STOP:

		snd_hdac_ext_link_stream_clear(hext_stream);



		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

			stream_tag = hdac_stream(hext_stream)->stream_tag;

			snd_hdac_ext_link_clear_stream_id(link, stream_tag);

		}



		hext_stream->link_prepared = 0;

		break;

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

		snd_hdac_ext_link_stream_clear(hext_stream);



		break;

	default:

		return -EINVAL;

	}

	return 0;

}



static int ipc3_hda_dai_trigger(struct snd_pcm_substream *substream,

				int cmd, struct snd_soc_dai *dai)
@@ -379,45 +419,6 @@ static int ipc3_hda_dai_trigger(struct snd_pcm_substream *substream, 
	return 0;

}



static int hda_link_dma_hw_free(struct snd_pcm_substream *substream)

{

	struct hdac_stream *hstream = substream->runtime->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	struct sof_intel_hda_stream *hda_stream;

	struct hdac_bus *bus = hstream->bus;

	struct hdac_ext_stream *hext_stream;

	struct hdac_ext_link *link;

	int stream_tag;



	hext_stream = snd_soc_dai_get_dma_data(cpu_dai, substream);

	if (!hext_stream) {

		dev_dbg(cpu_dai->dev,

			"%s: hext_stream is not assigned\n", __func__);

		return -EINVAL;

	}



	link = snd_hdac_ext_bus_get_link(bus, codec_dai->component->name);

	if (!link)

		return -EINVAL;



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

		stream_tag = hdac_stream(hext_stream)->stream_tag;

		snd_hdac_ext_link_clear_stream_id(link, stream_tag);

	}



	snd_soc_dai_set_dma_data(cpu_dai, substream, NULL);

	snd_hdac_ext_stream_release(hext_stream, HDAC_EXT_STREAM_TYPE_LINK);

	hext_stream->link_prepared = 0;



	/* free the host DMA channel reserved by hostless streams */

	hda_stream = hstream_to_sof_hda_stream(hext_stream);

	hda_stream->host_reserved = 0;



	return 0;

}



static int hda_dai_hw_free(struct snd_pcm_substream *substream,

			   struct snd_soc_dai *dai)

{