ASoC: SOF: intel: hda-loader: Use snd_sof_dsp_dbg_dump() for DSP dump

Do not call directly the hda_dsp_dump(), use the generic wrapper instead
to provide consistent output.

Mark the DSP dumps as optional to not spam the kernel log with the
exception of the last dump in case the DSP fails to run.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20211006110645.26679-10-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c
index 6f4771bf9de34193431f10c8e017856bd608e802..d2be02dc2801edf4ed3f3b0fd2aba0303c1bc1a3 100644 (file)
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@ -177,13 +177,19 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag)
                        __func__);
 
 err:
-       flags = SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX;
+       flags = SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX |
+               SOF_DBG_DUMP_OPTIONAL;
 
-       /* force error log level after max boot attempts */
-       if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS)
+       /*
+        * after max boot attempts make sure that the dump is printed and error
+        * log level is used
+        */
+       if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS) {
                flags |= SOF_DBG_DUMP_FORCE_ERR_LEVEL;
+               flags &= ~SOF_DBG_DUMP_OPTIONAL;
+       }
 
-       hda_dsp_dump(sdev, flags);
+       snd_sof_dsp_dbg_dump(sdev, flags);
        snd_sof_dsp_core_power_down(sdev, chip->host_managed_cores_mask);
 
        return ret;
@@ -414,8 +420,8 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev)
        if (!ret) {
                dev_dbg(sdev->dev, "Firmware download successful, booting...\n");
        } else {
-               hda_dsp_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX |
-                            SOF_DBG_DUMP_FORCE_ERR_LEVEL);
+               snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_PCI |
+                                    SOF_DBG_DUMP_MBOX | SOF_DBG_DUMP_FORCE_ERR_LEVEL);
                dev_err(sdev->dev, "error: load fw failed ret: %d\n", ret);
        }