Unverified Commit e9b0ff93 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF: ipc4/Intel: Improve and enable IPC error dump 

Merge series from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:

On Intel platforms the registers for DSP communications are used differently,
the IPC dump information is not correct since important registers are not
printed and existing ones are used a bit differently for IPC4.

As a last step, enable the IPC timeout 'handling' and allow the printout of
the now usefull IPC dump.
parents 5b887b4d 4245fdba

sound/soc/sof/intel/apl.c

+6 −1
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev) 


		/* ipc */

		sof_apl_ops.send_msg	= hda_dsp_ipc_send_msg;



		/* debug */

		sof_apl_ops.ipc_dump	= hda_ipc_dump;

	}



	if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
@@ -64,6 +67,9 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev) 


		/* ipc */

		sof_apl_ops.send_msg	= hda_dsp_ipc4_send_msg;



		/* debug */

		sof_apl_ops.ipc_dump	= hda_ipc4_dump;

	}



	/* set DAI driver ops */
@@ -72,7 +78,6 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev) 
	/* debug */

	sof_apl_ops.debug_map	= apl_dsp_debugfs;

	sof_apl_ops.debug_map_count	= ARRAY_SIZE(apl_dsp_debugfs);

	sof_apl_ops.ipc_dump	= hda_ipc_dump;



	/* firmware run */

	sof_apl_ops.run = hda_dsp_cl_boot_firmware;

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/hda.c

+20 −1
Original line number Diff line number Diff line
@@ -598,7 +598,8 @@ void hda_dsp_dump(struct snd_sof_dev *sdev, u32 flags) 
	/* print ROM/FW status */

	hda_dsp_get_state(sdev, level);



	if (flags & SOF_DBG_DUMP_REGS) {

	/* The firmware register dump only available with IPC3 */

	if (flags & SOF_DBG_DUMP_REGS && sdev->pdata->ipc_type == SOF_IPC) {

		u32 status = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_SRAM_REG_FW_STATUS);

		u32 panic = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_SRAM_REG_FW_TRACEP);
@@ -662,6 +663,24 @@ void hda_ipc_dump(struct snd_sof_dev *sdev) 
		hipcie, hipct, hipcctl);

}



void hda_ipc4_dump(struct snd_sof_dev *sdev)

{

	u32 hipci, hipcie, hipct, hipcte, hipcctl;



	hda_ipc_irq_dump(sdev);



	hipci = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCI);

	hipcie = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCIE);

	hipct = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCT);

	hipcte = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCTE);

	hipcctl = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCCTL);



	/* dump the IPC regs */

	/* TODO: parse the raw msg */

	dev_err(sdev->dev, "Host IPC initiator: %#x|%#x, target: %#x|%#x, ctl: %#x\n",

		hipci, hipcie, hipct, hipcte, hipcctl);

}



static int hda_init(struct snd_sof_dev *sdev)

{

	struct hda_bus *hbus;

sound/soc/sof/intel/hda.h

+1 −0
Original line number Diff line number Diff line
@@ -853,6 +853,7 @@ irqreturn_t cnl_ipc4_irq_thread(int irq, void *context); 
int cnl_ipc4_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg);

irqreturn_t hda_dsp_ipc4_irq_thread(int irq, void *context);

int hda_dsp_ipc4_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg);

void hda_ipc4_dump(struct snd_sof_dev *sdev);

extern struct sdw_intel_ops sdw_callback;



#endif