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

ASoC: SOF: ipc3-dtrace: Move host ops wrappers from generic header to private 



Move the snd_sof_dma_trace_* ops wrappers from ops.h to ipc3-priv.h since
they are not used outside of IPC3 code.
While moving, rename them to sof_dtrace_host_*

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPaul Olaru <paul.olaru@oss.nxp.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220516104711.26115-6-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/ipc3-dtrace.c

+5 −5
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 = snd_sof_dma_trace_init(sdev, &params);

	ret = sof_dtrace_host_init(sdev, &params);

	if (ret < 0) {

		dev_err(sdev->dev, "Host dtrace init failed: %d\n", ret);

		return ret;
@@ -427,7 +427,7 @@ static int ipc3_dtrace_enable(struct snd_sof_dev *sdev) 
	}



start:

	ret = snd_sof_dma_trace_trigger(sdev, SNDRV_PCM_TRIGGER_START);

	ret = sof_dtrace_host_trigger(sdev, SNDRV_PCM_TRIGGER_START);

	if (ret < 0) {

		dev_err(sdev->dev, "Host dtrace trigger start failed: %d\n", ret);

		goto trace_release;
@@ -438,7 +438,7 @@ static int ipc3_dtrace_enable(struct snd_sof_dev *sdev) 
	return 0;



trace_release:

	snd_sof_dma_trace_release(sdev);

	sof_dtrace_host_release(sdev);

	return ret;

}
@@ -541,7 +541,7 @@ static void ipc3_dtrace_release(struct snd_sof_dev *sdev, bool only_stop) 
	if (!sdev->fw_trace_is_supported || sdev->dtrace_state == SOF_DTRACE_DISABLED)

		return;



	ret = snd_sof_dma_trace_trigger(sdev, SNDRV_PCM_TRIGGER_STOP);

	ret = sof_dtrace_host_trigger(sdev, SNDRV_PCM_TRIGGER_STOP);

	if (ret < 0)

		dev_err(sdev->dev, "Host dtrace trigger stop failed: %d\n", ret);

	sdev->dtrace_state = SOF_DTRACE_STOPPED;
@@ -563,7 +563,7 @@ static void ipc3_dtrace_release(struct snd_sof_dev *sdev, bool only_stop) 
	if (only_stop)

		goto out;



	ret = snd_sof_dma_trace_release(sdev);

	ret = sof_dtrace_host_release(sdev);

	if (ret < 0)

		dev_err(sdev->dev, "Host dtrace release failed %d\n", ret);

sound/soc/sof/ipc3-priv.h

+32 −0
Original line number Diff line number Diff line
@@ -29,4 +29,36 @@ int sof_ipc3_validate_fw_version(struct snd_sof_dev *sdev); 
int ipc3_dtrace_posn_update(struct snd_sof_dev *sdev,

			    struct sof_ipc_dma_trace_posn *posn);



/* dtrace platform callback wrappers */

static inline int sof_dtrace_host_init(struct snd_sof_dev *sdev,

				       struct sof_ipc_dma_trace_params_ext *dtrace_params)

{

	struct snd_sof_dsp_ops *dsp_ops = sdev->pdata->desc->ops;



	if (dsp_ops->trace_init)

		return dsp_ops->trace_init(sdev, dtrace_params);



	return 0;

}



static inline int sof_dtrace_host_release(struct snd_sof_dev *sdev)

{

	struct snd_sof_dsp_ops *dsp_ops = sdev->pdata->desc->ops;



	if (dsp_ops->trace_release)

		return dsp_ops->trace_release(sdev);



	return 0;

}



static inline int sof_dtrace_host_trigger(struct snd_sof_dev *sdev, int cmd)

{

	struct snd_sof_dsp_ops *dsp_ops = sdev->pdata->desc->ops;



	if (dsp_ops->trace_trigger)

		return dsp_ops->trace_trigger(sdev, cmd);



	return 0;

}



#endif

sound/soc/sof/ops.h

+0 −26
Original line number Diff line number Diff line
@@ -375,32 +375,6 @@ static inline int snd_sof_dsp_send_msg(struct snd_sof_dev *sdev, 
	return sof_ops(sdev)->send_msg(sdev, msg);

}



/* host DMA trace */

static inline int snd_sof_dma_trace_init(struct snd_sof_dev *sdev,

					 struct sof_ipc_dma_trace_params_ext *dtrace_params)

{

	if (sof_ops(sdev)->trace_init)

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



	return 0;

}



static inline int snd_sof_dma_trace_release(struct snd_sof_dev *sdev)

{

	if (sof_ops(sdev)->trace_release)

		return sof_ops(sdev)->trace_release(sdev);



	return 0;

}



static inline int snd_sof_dma_trace_trigger(struct snd_sof_dev *sdev, int cmd)

{

	if (sof_ops(sdev)->trace_trigger)

		return sof_ops(sdev)->trace_trigger(sdev, cmd);



	return 0;

}



/* host PCM ops */

static inline int

snd_sof_pcm_platform_open(struct snd_sof_dev *sdev,