mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-21 18:11:39 +00:00
ASoC: SOF: Intel: hda: clean up hda_dsp_dump()
Clean up the hda_dsp_dump() function to avoid duplicating the ROM status and error. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Bard Liao <bard.liao@intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://lore.kernel.org/r/20210528160551.10145-1-kai.vehmanen@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
b1b384de0a
commit
7ff562fed9
1 changed files with 5 additions and 12 deletions
|
@ -394,28 +394,21 @@ void hda_dsp_dump(struct snd_sof_dev *sdev, u32 flags)
|
||||||
struct sof_ipc_dsp_oops_xtensa xoops;
|
struct sof_ipc_dsp_oops_xtensa xoops;
|
||||||
struct sof_ipc_panic_info panic_info;
|
struct sof_ipc_panic_info panic_info;
|
||||||
u32 stack[HDA_DSP_STACK_DUMP_SIZE];
|
u32 stack[HDA_DSP_STACK_DUMP_SIZE];
|
||||||
u32 status, panic;
|
|
||||||
|
|
||||||
/* try APL specific status message types first */
|
/* print ROM/FW status */
|
||||||
hda_dsp_get_status(sdev);
|
hda_dsp_get_status(sdev);
|
||||||
|
|
||||||
/* now try generic SOF status messages */
|
/* print panic info if FW boot is complete. Otherwise, print the extended ROM status */
|
||||||
status = snd_sof_dsp_read(sdev, HDA_DSP_BAR,
|
|
||||||
HDA_DSP_SRAM_REG_FW_STATUS);
|
|
||||||
panic = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_SRAM_REG_FW_TRACEP);
|
|
||||||
|
|
||||||
if (sdev->fw_state == SOF_FW_BOOT_COMPLETE) {
|
if (sdev->fw_state == SOF_FW_BOOT_COMPLETE) {
|
||||||
|
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);
|
||||||
|
|
||||||
hda_dsp_get_registers(sdev, &xoops, &panic_info, stack,
|
hda_dsp_get_registers(sdev, &xoops, &panic_info, stack,
|
||||||
HDA_DSP_STACK_DUMP_SIZE);
|
HDA_DSP_STACK_DUMP_SIZE);
|
||||||
snd_sof_get_status(sdev, status, panic, &xoops, &panic_info,
|
snd_sof_get_status(sdev, status, panic, &xoops, &panic_info,
|
||||||
stack, HDA_DSP_STACK_DUMP_SIZE);
|
stack, HDA_DSP_STACK_DUMP_SIZE);
|
||||||
} else {
|
} else {
|
||||||
sof_dev_dbg_or_err(sdev->dev, flags & SOF_DBG_DUMP_FORCE_ERR_LEVEL,
|
|
||||||
"status = 0x%8.8x panic = 0x%8.8x\n",
|
|
||||||
status, panic);
|
|
||||||
|
|
||||||
hda_dsp_dump_ext_rom_status(sdev, flags);
|
hda_dsp_dump_ext_rom_status(sdev, flags);
|
||||||
hda_dsp_get_status(sdev);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue