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

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: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Link: https://lore.kernel.org/r/20220923133616.26267-2-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/intel/cnl.c

+27 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/sof/intel/hda-ipc.h

+1 −0
Original line number Diff line number Diff line
@@ -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

sound/soc/sof/intel/icl.c

+6 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/sof/intel/tgl.c

+6 −1
Original line number Diff line number Diff line
@@ -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;