Unverified Commit f1fd9d0e authored by Kai Vehmanen's avatar Kai Vehmanen Committed by Mark Brown
Browse files

ASoC: SOF: intel: extend IPC dump information 



Extend the HDA IPC dump implementation with status of key IRQ
registers. This is useful to debug IPC timeouts and similar
issues.

Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b943f798

sound/soc/sof/intel/cnl.c

+2 −0
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ static void cnl_ipc_dump(struct snd_sof_dev *sdev) 
	u32 hipcida;

	u32 hipctdr;



	hda_ipc_irq_dump(sdev);



	/* read IPC status */

	hipcida = snd_sof_dsp_read(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCIDA);

	hipcctl = snd_sof_dsp_read(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCCTL);

sound/soc/sof/intel/hda.c

+29 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
 * Hardware interface for generic Intel audio DSP HDA IP

 */



#include <sound/hdaudio_ext.h>

#include <sound/hda_register.h>



#include <linux/module.h>

#include <sound/hdaudio_ext.h>

#include <sound/sof.h>
@@ -183,12 +186,38 @@ void hda_dsp_dump(struct snd_sof_dev *sdev, u32 flags) 
	}

}



void hda_ipc_irq_dump(struct snd_sof_dev *sdev)

{

	struct hdac_bus *bus = sof_to_bus(sdev);

	u32 adspis;

	u32 intsts;

	u32 intctl;

	u32 ppsts;

	u8 rirbsts;



	/* read key IRQ stats and config registers */

	adspis = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPIS);

	intsts = snd_sof_dsp_read(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTSTS);

	intctl = snd_sof_dsp_read(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL);

	ppsts = snd_sof_dsp_read(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPSTS);

	rirbsts = snd_hdac_chip_readb(bus, RIRBSTS);



	dev_err(sdev->dev,

		"error: hda irq intsts 0x%8.8x intlctl 0x%8.8x rirb %2.2x\n",

		intsts, intctl, rirbsts);

	dev_err(sdev->dev,

		"error: dsp irq ppsts 0x%8.8x adspis 0x%8.8x\n",

		ppsts, adspis);

}



void hda_ipc_dump(struct snd_sof_dev *sdev)

{

	u32 hipcie;

	u32 hipct;

	u32 hipcctl;



	hda_ipc_irq_dump(sdev);



	/* read IPC status */

	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);

sound/soc/sof/intel/hda.h

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#define SOF_HDA_PP_CAP_ID		0x3

#define SOF_HDA_REG_PP_PPCH		0x10

#define SOF_HDA_REG_PP_PPCTL		0x04

#define SOF_HDA_REG_PP_PPSTS		0x08

#define SOF_HDA_PPCTL_PIE		BIT(31)

#define SOF_HDA_PPCTL_GPROCEN		BIT(30)
@@ -449,6 +450,7 @@ void hda_dsp_set_hw_params_upon_resume(struct snd_sof_dev *sdev); 
void hda_dsp_dump_skl(struct snd_sof_dev *sdev, u32 flags);

void hda_dsp_dump(struct snd_sof_dev *sdev, u32 flags);

void hda_ipc_dump(struct snd_sof_dev *sdev);

void hda_ipc_irq_dump(struct snd_sof_dev *sdev);



/*

 * DSP PCM Operations.

CRA Git | Maintained and supported by SUSTech CRA and CCSE