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>

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 126232a..e1e368f 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -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_panic_info panic_info;
        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);
 
-       /* now try generic SOF status messages */
-       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);
-
+       /* print panic info if FW boot is complete. Otherwise, print the extended ROM status */
        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_STACK_DUMP_SIZE);
                snd_sof_get_status(sdev, status, panic, &xoops, &panic_info,
                                   stack, HDA_DSP_STACK_DUMP_SIZE);
        } 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_get_status(sdev);
        }
 }