ASoC: SOF: Intel: cnl: Add separate ops for ipc_dump for IPC4

The use of the IPC registers are different between IPC3 and IPC4.
The ipc_dump needs to use different prints depending on the used IPC
protocol.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Link: https://lore.kernel.org/r/20220923133616.26267-2-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/cnl.c b/sound/soc/sof/intel/cnl.c
index 180001d0a38aeb7c658b18c529ca6c589558dcc1..1e71f6dc604e9f59a255abc68b056e893cb35522 100644 (file)
--- a/sound/soc/sof/intel/cnl.c
+++ b/sound/soc/sof/intel/cnl.c
@@ -332,6 +332,27 @@ void cnl_ipc_dump(struct snd_sof_dev *sdev)
                hipcida, hipctdr, hipcctl);
 }
 
+void cnl_ipc4_dump(struct snd_sof_dev *sdev)
+{
+       u32 hipcidr, hipcidd, hipcida, hipctdr, hipctdd, hipctda, hipcctl;
+
+       hda_ipc_irq_dump(sdev);
+
+       hipcidr = snd_sof_dsp_read(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCIDR);
+       hipcidd = snd_sof_dsp_read(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCIDD);
+       hipcida = snd_sof_dsp_read(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCIDA);
+       hipctdr = snd_sof_dsp_read(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCTDR);
+       hipctdd = snd_sof_dsp_read(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCTDD);
+       hipctda = snd_sof_dsp_read(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCTDA);
+       hipcctl = snd_sof_dsp_read(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCCTL);
+
+       /* dump the IPC regs */
+       /* TODO: parse the raw msg */
+       dev_err(sdev->dev,
+               "Host IPC initiator: %#x|%#x|%#x, target: %#x|%#x|%#x, ctl: %#x\n",
+               hipcidr, hipcidd, hipcida, hipctdr, hipctdd, hipctda, hipcctl);
+}
+
 /* cannonlake ops */
 struct snd_sof_dsp_ops sof_cnl_ops;
 EXPORT_SYMBOL_NS(sof_cnl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);
@@ -351,6 +372,9 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev)
 
                /* ipc */
                sof_cnl_ops.send_msg    = cnl_ipc_send_msg;
+
+               /* debug */
+               sof_cnl_ops.ipc_dump    = cnl_ipc_dump;
        }
 
        if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
@@ -370,6 +394,9 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev)
 
                /* ipc */
                sof_cnl_ops.send_msg    = cnl_ipc4_send_msg;
+
+               /* debug */
+               sof_cnl_ops.ipc_dump    = cnl_ipc4_dump;
        }
 
        /* set DAI driver ops */
@@ -378,7 +405,6 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev)
        /* debug */
        sof_cnl_ops.debug_map   = cnl_dsp_debugfs;
        sof_cnl_ops.debug_map_count     = ARRAY_SIZE(cnl_dsp_debugfs);
-       sof_cnl_ops.ipc_dump    = cnl_ipc_dump;
 
        /* pre/post fw run */
        sof_cnl_ops.post_fw_run = hda_dsp_post_fw_run;

diff --git a/sound/soc/sof/intel/hda-ipc.h b/sound/soc/sof/intel/hda-ipc.h
index 10fbca5939dba63dd4f70cb97adab1670aaa5671..8ec5e9f6f8d7a4afb7b2f792d66e0eb1a707b5d3 100644 (file)
--- a/sound/soc/sof/intel/hda-ipc.h
+++ b/sound/soc/sof/intel/hda-ipc.h
@@ -51,5 +51,6 @@
 irqreturn_t cnl_ipc_irq_thread(int irq, void *context);
 int cnl_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg);
 void cnl_ipc_dump(struct snd_sof_dev *sdev);
+void cnl_ipc4_dump(struct snd_sof_dev *sdev);
 
 #endif

diff --git a/sound/soc/sof/intel/icl.c b/sound/soc/sof/intel/icl.c
index 59ce3132fada877302beef337d3f5cc9d01b3fb5..f1018c6db5c241cb738061b80847c27de25d7068 100644 (file)
--- a/sound/soc/sof/intel/icl.c
+++ b/sound/soc/sof/intel/icl.c
@@ -113,6 +113,9 @@ int sof_icl_ops_init(struct snd_sof_dev *sdev)
 
                /* ipc */
                sof_icl_ops.send_msg    = cnl_ipc_send_msg;
+
+               /* debug */
+               sof_icl_ops.ipc_dump    = cnl_ipc_dump;
        }
 
        if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
@@ -132,12 +135,14 @@ int sof_icl_ops_init(struct snd_sof_dev *sdev)
 
                /* ipc */
                sof_icl_ops.send_msg    = cnl_ipc4_send_msg;
+
+               /* debug */
+               sof_icl_ops.ipc_dump    = cnl_ipc4_dump;
        }
 
        /* debug */
        sof_icl_ops.debug_map   = icl_dsp_debugfs;
        sof_icl_ops.debug_map_count     = ARRAY_SIZE(icl_dsp_debugfs);
-       sof_icl_ops.ipc_dump    = cnl_ipc_dump;
 
        /* pre/post fw run */
        sof_icl_ops.post_fw_run = icl_dsp_post_fw_run;

diff --git a/sound/soc/sof/intel/tgl.c b/sound/soc/sof/intel/tgl.c
index 5135e1c7e6cf4c5f10dd91ce63fef310a7dbb10a..c606c3691de7a4b4c2e30a675e8b607e605ee033 100644 (file)
--- a/sound/soc/sof/intel/tgl.c
+++ b/sound/soc/sof/intel/tgl.c
@@ -68,6 +68,9 @@ int sof_tgl_ops_init(struct snd_sof_dev *sdev)
 
                /* ipc */
                sof_tgl_ops.send_msg    = cnl_ipc_send_msg;
+
+               /* debug */
+               sof_tgl_ops.ipc_dump    = cnl_ipc_dump;
        }
 
        if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
@@ -87,6 +90,9 @@ int sof_tgl_ops_init(struct snd_sof_dev *sdev)
 
                /* ipc */
                sof_tgl_ops.send_msg    = cnl_ipc4_send_msg;
+
+               /* debug */
+               sof_tgl_ops.ipc_dump    = cnl_ipc4_dump;
        }
 
        /* set DAI driver ops */
@@ -95,7 +101,6 @@ int sof_tgl_ops_init(struct snd_sof_dev *sdev)
        /* debug */
        sof_tgl_ops.debug_map   = tgl_dsp_debugfs;
        sof_tgl_ops.debug_map_count     = ARRAY_SIZE(tgl_dsp_debugfs);
-       sof_tgl_ops.ipc_dump    = cnl_ipc_dump;
 
        /* pre/post fw run */
        sof_tgl_ops.post_fw_run = hda_dsp_post_fw_run;