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>

diff --git a/sound/soc/sof/intel/apl.c b/sound/soc/sof/intel/apl.c
index 084c245a952288a66cc3ef3e8c7fb874de9adeeb..295df44be27138aa177be0c417f25dab6e375d36 100644 (file)
--- a/sound/soc/sof/intel/apl.c
+++ b/sound/soc/sof/intel/apl.c
@@ -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;
 

diff --git a/sound/soc/sof/intel/cnl.c b/sound/soc/sof/intel/cnl.c
index a064453f0bc3e58d92be7617c452d8e91e323079..0bb91df27280544ddf9cd1cd42aaad107c4464f3 100644 (file)
--- a/sound/soc/sof/intel/cnl.c
+++ b/sound/soc/sof/intel/cnl.c
@@ -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;
 

diff --git a/sound/soc/sof/intel/icl.c b/sound/soc/sof/intel/icl.c
index 6a8af2d3b580aee5d514e0f93f6a392d47cdcce1..59ce3132fada877302beef337d3f5cc9d01b3fb5 100644 (file)
--- a/sound/soc/sof/intel/icl.c
+++ b/sound/soc/sof/intel/icl.c
@@ -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;
 

diff --git a/sound/soc/sof/intel/mtl.c b/sound/soc/sof/intel/mtl.c
index 96239ebb1eedb16827dcd0077e78977fec754f85..1cc1398336e1ff09091dadd374e4456d7a732d8a 100644 (file)
--- a/sound/soc/sof/intel/mtl.c
+++ b/sound/soc/sof/intel/mtl.c
@@ -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);
 

diff --git a/sound/soc/sof/intel/tgl.c b/sound/soc/sof/intel/tgl.c
index 6dfb4786c7824620556aa564b6f9243e5e0fb034..017bf331ed5a615719555637d6f15f67ade7823a 100644 (file)
--- a/sound/soc/sof/intel/tgl.c
+++ b/sound/soc/sof/intel/tgl.c
@@ -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;