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

ASoC: SOF: Intel: hda: 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-3-peter.ujfalusi@linux.intel.com


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

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

+18 −0
Original line number Diff line number Diff line
@@ -662,6 +662,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
@@ -851,6 +851,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