Unverified Commit 4b49cbd1 authored May 16, 2022 by Peter Ujfalusi Committed by Mark Brown May 19, 2022

ASoC: SOF: Modify the host trace_init parameter list to include dmab



Stop host code (AMD, Intel) to access sdev->dmatb directly.
Modify the trace_init prototype to include the pointer to a
struct snd_dma_buffer. The ipc3-dtrace passes for now the pointer to
sdev->dmatb, but the aim is to move all tracing related runtime information
local to a trace implementation.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Paul Olaru <paul.olaru@oss.nxp.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220516104711.26115-7-peter.ujfalusi@linux.intel.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent b69979a1

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ int acp_sof_trace_release(struct snd_sof_dev *sdev)
		}
		EXPORT_SYMBOL_NS(acp_sof_trace_release, SND_SOC_SOF_AMD_COMMON);

		int acp_sof_trace_init(struct snd_sof_dev *sdev,
		int acp_sof_trace_init(struct snd_sof_dev sdev, struct snd_dma_buffer dmab,
		struct sof_ipc_dma_trace_params_ext *dtrace_params)
		{
		struct acp_dsp_stream *stream;
		@@ -46,7 +46,7 @@ int acp_sof_trace_init(struct snd_sof_dev *sdev,
		if (!stream)
		return -ENODEV;

		stream->dmab = &sdev->dmatb;
		stream->dmab = dmab;
		stream->num_pages = NUM_PAGES;

		ret = acp_dsp_stream_config(sdev, stream);

sound/soc/sof/amd/acp.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -212,7 +212,7 @@ extern 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,
		int acp_sof_trace_init(struct snd_sof_dev sdev, struct snd_dma_buffer dmab,
		struct sof_ipc_dma_trace_params_ext *dtrace_params);
		int acp_sof_trace_release(struct snd_sof_dev *sdev);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ 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,
		int hda_dsp_trace_init(struct snd_sof_dev sdev, struct snd_dma_buffer dmab,
		struct sof_ipc_dma_trace_params_ext *dtrace_params)
		{
		struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
		@@ -57,7 +57,7 @@ int hda_dsp_trace_init(struct snd_sof_dev *sdev,
		* initialize capture stream, set BDL address and return corresponding
		* stream tag which will be sent to the firmware by IPC message.
		*/
		ret = hda_dsp_trace_prepare(sdev, &sdev->dmatb);
		ret = hda_dsp_trace_prepare(sdev, dmab);
		if (ret < 0) {
		dev_err(sdev->dev, "error: hdac trace init failed: %d\n", ret);
		hda_dsp_stream_put(sdev, SNDRV_PCM_STREAM_CAPTURE,

sound/soc/sof/intel/hda.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -658,7 +658,7 @@ 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,
		int hda_dsp_trace_init(struct snd_sof_dev sdev, struct snd_dma_buffer dmab,
		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/ipc3-dtrace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -412,7 +412,7 @@ static int ipc3_dtrace_enable(struct snd_sof_dev *sdev)
		sdev->host_offset = 0;
		sdev->dtrace_draining = false;

		ret = sof_dtrace_host_init(sdev, &params);
		ret = sof_dtrace_host_init(sdev, &sdev->dmatb, &params);
		if (ret < 0) {
		dev_err(sdev->dev, "Host dtrace init failed: %d\n", ret);
		return ret;