Unverified Commit 31f60a0c authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Make pcm_hw_params snd_sof_dsp_ops callback IPC neutral 



Do not send IPC structure directly via pcm_hw_params to make it IPC
agnostic.

A new struct is created to retrieve the needed platform parameters and if
there is a need it can be extended with new options.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@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 avatarDaniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220310042720.976809-3-ranjani.sridharan@linux.intel.com


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

sound/soc/sof/amd/acp-pcm.c

+5 −3
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
#include "acp-dsp-offset.h"



int acp_pcm_hw_params(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream,

		      struct snd_pcm_hw_params *params, struct sof_ipc_stream_params *ipc_params)

		      struct snd_pcm_hw_params *params,

		      struct snd_sof_platform_stream_params *platform_params)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct acp_dsp_stream *stream = runtime->private_data;
@@ -35,8 +36,9 @@ int acp_pcm_hw_params(struct snd_sof_dev *sdev, struct snd_pcm_substream *substr 
		return ret;

	}



	ipc_params->buffer.phy_addr = stream->reg_offset;

	ipc_params->stream_tag = stream->stream_tag;

	platform_params->use_phy_address = true;

	platform_params->phy_addr = stream->reg_offset;

	platform_params->stream_tag = stream->stream_tag;



	/* write buffer size of stream in scratch memory */

sound/soc/sof/amd/acp.h

+2 −1
Original line number Diff line number Diff line
@@ -201,7 +201,8 @@ int acp_dsp_stream_put(struct snd_sof_dev *sdev, struct acp_dsp_stream *acp_stre 
int acp_pcm_open(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream);

int acp_pcm_close(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream);

int acp_pcm_hw_params(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream,

		      struct snd_pcm_hw_params *params, struct sof_ipc_stream_params *ipc_params);

		      struct snd_pcm_hw_params *params,

		      struct snd_sof_platform_stream_params *platform_params);



extern const struct snd_sof_dsp_ops sof_renoir_ops;

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

+4 −14
Original line number Diff line number Diff line
@@ -93,13 +93,12 @@ u32 hda_dsp_get_bits(struct snd_sof_dev *sdev, int sample_bits) 
int hda_dsp_pcm_hw_params(struct snd_sof_dev *sdev,

			  struct snd_pcm_substream *substream,

			  struct snd_pcm_hw_params *params,

			  struct sof_ipc_stream_params *ipc_params)

			  struct snd_sof_platform_stream_params *platform_params)

{

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

	struct hdac_ext_stream *hext_stream = stream_to_hdac_ext_stream(hstream);

	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;

	struct snd_dma_buffer *dmab;

	struct sof_ipc_fw_version *v = &sdev->fw_ready.version;

	int ret;

	u32 size, rate, bits;
@@ -130,19 +129,10 @@ int hda_dsp_pcm_hw_params(struct snd_sof_dev *sdev, 
	else

		hda_dsp_stream_spib_config(sdev, hext_stream, HDA_DSP_SPIB_DISABLE, 0);



	/* update no_stream_position flag for ipc params */

	if (hda && hda->no_ipc_position) {

		/* For older ABIs set host_period_bytes to zero to inform

		 * FW we don't want position updates. Newer versions use

		 * no_stream_position for this purpose.

		 */

		if (v->abi_version < SOF_ABI_VER(3, 10, 0))

			ipc_params->host_period_bytes = 0;

		else

			ipc_params->no_stream_position = 1;

	}

	if (hda)

		platform_params->no_ipc_position = hda->no_ipc_position;



	ipc_params->stream_tag = hstream->stream_tag;

	platform_params->stream_tag = hstream->stream_tag;



	return 0;

}

sound/soc/sof/intel/hda.h

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ int hda_dsp_pcm_close(struct snd_sof_dev *sdev, 
int hda_dsp_pcm_hw_params(struct snd_sof_dev *sdev,

			  struct snd_pcm_substream *substream,

			  struct snd_pcm_hw_params *params,

			  struct sof_ipc_stream_params *ipc_params);

			  struct snd_sof_platform_stream_params *platform_params);

int hda_dsp_stream_hw_free(struct snd_sof_dev *sdev,

			   struct snd_pcm_substream *substream);

int hda_dsp_pcm_trigger(struct snd_sof_dev *sdev,

sound/soc/sof/ops.h

+3 −3
Original line number Diff line number Diff line
@@ -420,11 +420,11 @@ static inline int 
snd_sof_pcm_platform_hw_params(struct snd_sof_dev *sdev,

			       struct snd_pcm_substream *substream,

			       struct snd_pcm_hw_params *params,

			       struct sof_ipc_stream_params *ipc_params)

			       struct snd_sof_platform_stream_params *platform_params)

{

	if (sof_ops(sdev) && sof_ops(sdev)->pcm_hw_params)

		return sof_ops(sdev)->pcm_hw_params(sdev, substream,

						    params, ipc_params);

		return sof_ops(sdev)->pcm_hw_params(sdev, substream, params,

						    platform_params);



	return 0;

}