ASoC: SOF: Add a 'message' parameter to snd_sof_dsp_dbg_dump()

When snd_sof_dsp_dbg_dump() is called we have an explanatory message to
give some hint on the reason why we have the dump on the caller level.

Pass this message to snd_sof_dsp_dbg_dump() and handle the print according
to the dump rules.

This way we can finally print information on the HDA boot iteration if all
dumps are enabled.

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>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20211223113628.18582-7-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c
index 9e4a128b59184c38b9c072f5a459205b3c38214d..cf7d95c33afe56953c948924894b689eddc72ce0 100644 (file)
--- a/sound/soc/sof/debug.c
+++ b/sound/soc/sof/debug.c
@@ -955,7 +955,7 @@ static void snd_sof_dbg_print_fw_state(struct snd_sof_dev *sdev)
        dev_err(sdev->dev, "fw_state: UNKNOWN (%d)\n", sdev->fw_state);
 }
 
-void snd_sof_dsp_dbg_dump(struct snd_sof_dev *sdev, u32 flags)
+void snd_sof_dsp_dbg_dump(struct snd_sof_dev *sdev, const char *msg, u32 flags)
 {
        bool print_all = sof_debug_check_flag(SOF_DBG_PRINT_ALL_DUMPS);
 
@@ -964,11 +964,15 @@ void snd_sof_dsp_dbg_dump(struct snd_sof_dev *sdev, u32 flags)
 
        if (sof_ops(sdev)->dbg_dump && !sdev->dbg_dump_printed) {
                dev_err(sdev->dev, "------------[ DSP dump start ]------------\n");
+               if (msg)
+                       dev_err(sdev->dev, "%s\n", msg);
                snd_sof_dbg_print_fw_state(sdev);
                sof_ops(sdev)->dbg_dump(sdev, flags);
                dev_err(sdev->dev, "------------[ DSP dump end ]------------\n");
                if (!print_all)
                        sdev->dbg_dump_printed = true;
+       } else if (msg) {
+               dev_err(sdev->dev, "%s\n", msg);
        }
 }
 EXPORT_SYMBOL(snd_sof_dsp_dbg_dump);
@@ -997,7 +1001,8 @@ void snd_sof_handle_fw_exception(struct snd_sof_dev *sdev)
 
        /* dump vital information to the logs */
        snd_sof_ipc_dump(sdev);
-       snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX);
+       snd_sof_dsp_dbg_dump(sdev, "Firmware exception",
+                            SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX);
        snd_sof_trace_notify_for_error(sdev);
 }
 EXPORT_SYMBOL(snd_sof_handle_fw_exception);

diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c
index 8ef16f1082e35c757559f682c5142f4bb5455d3c..33306d2023a78da909133207230f739957c22c2a 100644 (file)
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@ -88,6 +88,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag)
        const struct sof_intel_dsp_desc *chip = hda->desc;
        unsigned int status;
        unsigned long mask;
+       char *dump_msg;
        u32 flags, j;
        int ret;
        int i;
@@ -189,9 +190,12 @@ err:
        if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS)
                flags &= ~SOF_DBG_DUMP_OPTIONAL;
 
-       snd_sof_dsp_dbg_dump(sdev, flags);
+       dump_msg = kasprintf(GFP_KERNEL, "Boot iteration failed: %d/%d",
+                            hda->boot_iteration, HDA_FW_BOOT_ATTEMPTS);
+       snd_sof_dsp_dbg_dump(sdev, dump_msg, flags);
        hda_dsp_core_reset_power_down(sdev, chip->host_managed_cores_mask);
 
+       kfree(dump_msg);
        return ret;
 }
 
@@ -421,12 +425,11 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev)
         */
        hda->boot_iteration = HDA_FW_BOOT_ATTEMPTS;
        ret = cl_copy_fw(sdev, stream);
-       if (!ret) {
+       if (!ret)
                dev_dbg(sdev->dev, "Firmware download successful, booting...\n");
-       } else {
-               snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX);
-               dev_err(sdev->dev, "error: load fw failed ret: %d\n", ret);
-       }
+       else
+               snd_sof_dsp_dbg_dump(sdev, "Firmware download failed",
+                                    SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX);
 
 cleanup:
        /*

diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c
index c04646647637e112eb7f058ede34a6f23b40d944..8977a65b5704eb3eabcf3b76cb516e93238caca6 100644 (file)
--- a/sound/soc/sof/loader.c
+++ b/sound/soc/sof/loader.c
@@ -820,8 +820,8 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)
        /* boot the firmware on the DSP */
        ret = snd_sof_dsp_run(sdev);
        if (ret < 0) {
-               dev_err(sdev->dev, "error: failed to start DSP\n");
-               snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_MBOX | SOF_DBG_DUMP_PCI);
+               snd_sof_dsp_dbg_dump(sdev, "Failed to start DSP",
+                                    SOF_DBG_DUMP_MBOX | SOF_DBG_DUMP_PCI);
                return ret;
        }
 
@@ -835,8 +835,8 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)
                                 sdev->fw_state > SOF_FW_BOOT_IN_PROGRESS,
                                 msecs_to_jiffies(sdev->boot_timeout));
        if (ret == 0) {
-               dev_err(sdev->dev, "error: firmware boot failure\n");
-               snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX |
+               snd_sof_dsp_dbg_dump(sdev, "Firmware boot failure due to timeout",
+                                    SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX |
                                     SOF_DBG_DUMP_TEXT | SOF_DBG_DUMP_PCI);
                sof_set_fw_state(sdev, SOF_FW_BOOT_FAILED);
                return -EIO;

diff --git a/sound/soc/sof/ops.c b/sound/soc/sof/ops.c
index 9abf7a8e55e08b46802814df0983c1311ac6cd79..edfd080a3e4fc4e88d8f26f71e68d25b098742d8 100644 (file)
--- a/sound/soc/sof/ops.c
+++ b/sound/soc/sof/ops.c
@@ -171,12 +171,11 @@ void snd_sof_dsp_panic(struct snd_sof_dev *sdev, u32 offset, bool non_recoverabl
         * if all dumps should be printed
         */
        if (non_recoverable || sof_debug_check_flag(SOF_DBG_PRINT_ALL_DUMPS)) {
-               dev_err(sdev->dev, "DSP panic!\n");
-
                /* We want to see the DSP panic! */
                sdev->dbg_dump_printed = false;
 
-               snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX);
+               snd_sof_dsp_dbg_dump(sdev, "DSP panic!",
+                                    SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX);
                snd_sof_trace_notify_for_error(sdev);
        }
 }

diff --git a/sound/soc/sof/ops.h b/sound/soc/sof/ops.h
index bca7d35536e4682ec9ed6cec3252c6aa6bbbc927..ffe7456e77139e5d53b2545936dc937fa7df74cf 100644 (file)
--- a/sound/soc/sof/ops.h
+++ b/sound/soc/sof/ops.h
@@ -274,7 +274,7 @@ snd_sof_dsp_set_power_state(struct snd_sof_dev *sdev,
 }
 
 /* debug */
-void snd_sof_dsp_dbg_dump(struct snd_sof_dev *sdev, u32 flags);
+void snd_sof_dsp_dbg_dump(struct snd_sof_dev *sdev, const char *msg, u32 flags);
 
 static inline int snd_sof_debugfs_add_region_item(struct snd_sof_dev *sdev,
                enum snd_sof_fw_blk_type blk_type, u32 offset, size_t size,