Unverified Commit cc4a3a19 authored Sep 09, 2022 by Peter Ujfalusi Committed by Mark Brown Sep 09, 2022

ASoC: SOF: Intel: Add mtrace type information for IPC4



Set the mtrace type for platforms supported by IPC4.

Note: currently only SOF_IPC4_MTRACE_INTEL_CAVS_2 type is supported by
the ipc4-mtrace driver, which is used by CAVS 2.x platforms (ICL, TGL, ADL)
and ACE (MTL).

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220909114332.31393-8-peter.ujfalusi@linux.intel.com


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

parent 9ee71a31

sound/soc/sof/intel/apl.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,8 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev)
		ipc4_data = sdev->private;
		ipc4_data->manifest_fw_hdr_offset = SOF_MAN4_FW_HDR_OFFSET;

		ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_1_5;

		/* doorbell */
		sof_apl_ops.irq_thread = hda_dsp_ipc4_irq_thread;

sound/soc/sof/intel/cnl.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -366,6 +366,8 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev)
		ipc4_data = sdev->private;
		ipc4_data->manifest_fw_hdr_offset = SOF_MAN4_FW_HDR_OFFSET;

		ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_1_8;

		/* doorbell */
		sof_cnl_ops.irq_thread = cnl_ipc4_irq_thread;

sound/soc/sof/intel/icl.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,8 @@ int sof_icl_ops_init(struct snd_sof_dev *sdev)
		ipc4_data = sdev->private;
		ipc4_data->manifest_fw_hdr_offset = SOF_MAN4_FW_HDR_OFFSET;

		ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_2;

		/* doorbell */
		sof_icl_ops.irq_thread = cnl_ipc4_irq_thread;

sound/soc/sof/intel/mtl.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -764,6 +764,8 @@ int sof_mtl_ops_init(struct snd_sof_dev *sdev)
		ipc4_data = sdev->private;
		ipc4_data->manifest_fw_hdr_offset = SOF_MAN4_FW_HDR_OFFSET;

		ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_2;

		/* set DAI ops */
		hda_set_dai_drv_ops(sdev, &sof_mtl_ops);

sound/soc/sof/intel/tgl.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,8 @@ int sof_tgl_ops_init(struct snd_sof_dev *sdev)
		ipc4_data = sdev->private;
		ipc4_data->manifest_fw_hdr_offset = SOF_MAN4_FW_HDR_OFFSET;

		ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_2;

		/* doorbell */
		sof_tgl_ops.irq_thread = cnl_ipc4_irq_thread;