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

ASoC: SOF: dma-trace: Pass pointer to params_ext struct in trace_init() 



Instead of passing a pointer to the stream_tag within the
struct sof_ipc_dma_trace_params_ext, pass the pointer to the containing
struct.

AMD needs to update buffer.phy_addr (and don't really use the stream_tag)
for the trace implementation.

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 avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220128123623.23569-3-peter.ujfalusi@linux.intel.com


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

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

+9 −29
Original line number Diff line number Diff line
@@ -34,51 +34,31 @@ int acp_sof_trace_release(struct snd_sof_dev *sdev) 
}

EXPORT_SYMBOL_NS(acp_sof_trace_release, SND_SOC_SOF_AMD_COMMON);



static int acp_sof_trace_prepare(struct snd_sof_dev *sdev,

				 struct sof_ipc_dma_trace_params_ext *params)

int acp_sof_trace_init(struct snd_sof_dev *sdev,

		       struct sof_ipc_dma_trace_params_ext *dtrace_params)

{

	struct acp_dsp_stream *stream;

	struct acp_dev_data *adata;

	int ret;



	adata = sdev->pdata->hw_pdata;

	stream = adata->dtrace_stream;

	stream = acp_dsp_stream_get(sdev, ACP_LOGGER_STREAM);

	if (!stream)

		return -ENODEV;



	stream->dmab = &sdev->dmatb;

	stream->num_pages = NUM_PAGES;



	ret = acp_dsp_stream_config(sdev, stream);

	if (ret < 0) {

		dev_err(sdev->dev, "Failed to configure trace stream\n");

		acp_dsp_stream_put(sdev, stream);

		return ret;

	}



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

	params->stream_tag = stream->stream_tag;



	return 0;

}



int acp_sof_trace_init(struct snd_sof_dev *sdev, u32 *stream_tag)

{

	struct sof_ipc_dma_trace_params_ext *params;

	struct acp_dsp_stream *stream;

	struct acp_dev_data *adata;

	int ret;



	adata = sdev->pdata->hw_pdata;

	stream = acp_dsp_stream_get(sdev, ACP_LOGGER_STREAM);

	if (!stream)

		return -ENODEV;



	adata->dtrace_stream = stream;

	params = container_of(stream_tag, struct sof_ipc_dma_trace_params_ext, stream_tag);

	ret = acp_sof_trace_prepare(sdev, params);

	if (ret < 0) {

		acp_dsp_stream_put(sdev, stream);

		return ret;

	}

	dtrace_params->stream_tag = stream->stream_tag;

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



	*stream_tag = stream->stream_tag;

	return 0;

}

EXPORT_SYMBOL_NS(acp_sof_trace_init, SND_SOC_SOF_AMD_COMMON);

sound/soc/sof/amd/acp.h

+2 −1
Original line number Diff line number Diff line
@@ -210,7 +210,8 @@ extern const struct snd_sof_dsp_ops sof_renoir_ops; 
int snd_amd_acp_find_config(struct pci_dev *pci);



/* Trace */

int acp_sof_trace_init(struct snd_sof_dev *sdev, u32 *stream_tag);

int acp_sof_trace_init(struct snd_sof_dev *sdev,

		       struct sof_ipc_dma_trace_params_ext *dtrace_params);

int acp_sof_trace_release(struct snd_sof_dev *sdev);



struct sof_amd_acp_desc {

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

+6 −4
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ static int hda_dsp_trace_prepare(struct snd_sof_dev *sdev, struct snd_dma_buffer 
	return ret;

}



int hda_dsp_trace_init(struct snd_sof_dev *sdev, u32 *stream_tag)

int hda_dsp_trace_init(struct snd_sof_dev *sdev,

		       struct sof_ipc_dma_trace_params_ext *dtrace_params)

{

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

	int ret;
@@ -50,7 +51,7 @@ int hda_dsp_trace_init(struct snd_sof_dev *sdev, u32 *stream_tag) 
		return -ENODEV;

	}



	*stream_tag = hda->dtrace_stream->hstream.stream_tag;

	dtrace_params->stream_tag = hda->dtrace_stream->hstream.stream_tag;



	/*

	 * initialize capture stream, set BDL address and return corresponding
@@ -59,9 +60,10 @@ int hda_dsp_trace_init(struct snd_sof_dev *sdev, u32 *stream_tag) 
	ret = hda_dsp_trace_prepare(sdev, &sdev->dmatb);

	if (ret < 0) {

		dev_err(sdev->dev, "error: hdac trace init failed: %d\n", ret);

		hda_dsp_stream_put(sdev, SNDRV_PCM_STREAM_CAPTURE, *stream_tag);

		hda_dsp_stream_put(sdev, SNDRV_PCM_STREAM_CAPTURE,

				   dtrace_params->stream_tag);

		hda->dtrace_stream = NULL;

		*stream_tag = 0;

		dtrace_params->stream_tag = 0;

	}



	return ret;

sound/soc/sof/intel/hda.h

+2 −1
Original line number Diff line number Diff line
@@ -670,7 +670,8 @@ static inline int hda_codec_i915_exit(struct snd_sof_dev *sdev) { return 0; } 
/*

 * Trace Control.

 */

int hda_dsp_trace_init(struct snd_sof_dev *sdev, u32 *stream_tag);

int hda_dsp_trace_init(struct snd_sof_dev *sdev,

		       struct sof_ipc_dma_trace_params_ext *dtrace_params);

int hda_dsp_trace_release(struct snd_sof_dev *sdev);

int hda_dsp_trace_trigger(struct snd_sof_dev *sdev, int cmd);

sound/soc/sof/ops.h

+2 −2
Original line number Diff line number Diff line
@@ -369,10 +369,10 @@ static inline int snd_sof_dsp_send_msg(struct snd_sof_dev *sdev, 


/* host DMA trace */

static inline int snd_sof_dma_trace_init(struct snd_sof_dev *sdev,

					 u32 *stream_tag)

					 struct sof_ipc_dma_trace_params_ext *dtrace_params)

{

	if (sof_ops(sdev)->trace_init)

		return sof_ops(sdev)->trace_init(sdev, stream_tag);

		return sof_ops(sdev)->trace_init(sdev, dtrace_params);



	return 0;

}