ASoC: SOF: core: Clean up snd_sof_get_status() prints
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Wed, 6 Oct 2021 11:06:42 +0000 (14:06 +0300)
committerMark Brown <broonie@kernel.org>
Thu, 7 Oct 2021 14:45:38 +0000 (15:45 +0100)
Clean up the error prints when decoding the status in snd_sof_get_status():
Drop the "error:" prefixes from the prints,
Use %# to print hexadecimal numbers,
Reword some of the messages to be more precise,
For a known error print out the panic code as well,
For unknown error print only the panic code without the magic

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@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/20211006110645.26679-17-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/core.c

index ce377ff35030444ed538ac99d9f89d28d94a258a..b5ffcd438c1c1040e8d0451edac83c3d3a1f5ac0 100644 (file)
@@ -67,7 +67,7 @@ void snd_sof_get_status(struct snd_sof_dev *sdev, u32 panic_code,
 
        /* is firmware dead ? */
        if ((panic_code & SOF_IPC_PANIC_MAGIC_MASK) != SOF_IPC_PANIC_MAGIC) {
-               dev_err(sdev->dev, "error: unexpected fault 0x%8.8x trace 0x%8.8x\n",
+               dev_err(sdev->dev, "unexpected fault %#010x trace %#010x\n",
                        panic_code, tracep_code);
                return; /* no fault ? */
        }
@@ -76,20 +76,20 @@ void snd_sof_get_status(struct snd_sof_dev *sdev, u32 panic_code,
 
        for (i = 0; i < ARRAY_SIZE(panic_msg); i++) {
                if (panic_msg[i].id == code) {
-                       dev_err(sdev->dev, "error: %s\n", panic_msg[i].msg);
-                       dev_err(sdev->dev, "error: trace point %8.8x\n",
-                               tracep_code);
+                       dev_err(sdev->dev, "reason: %s (%#x)\n", panic_msg[i].msg,
+                               code & SOF_IPC_PANIC_CODE_MASK);
+                       dev_err(sdev->dev, "trace point: %#010x\n", tracep_code);
                        goto out;
                }
        }
 
        /* unknown error */
-       dev_err(sdev->dev, "error: unknown reason %8.8x\n", panic_code);
-       dev_err(sdev->dev, "error: trace point %8.8x\n", tracep_code);
+       dev_err(sdev->dev, "unknown panic code: %#x\n", code & SOF_IPC_PANIC_CODE_MASK);
+       dev_err(sdev->dev, "trace point: %#010x\n", tracep_code);
 
 out:
-       dev_err(sdev->dev, "error: panic at %s:%d\n",
-               panic_info->filename, panic_info->linenum);
+       dev_err(sdev->dev, "panic at %s:%d\n", panic_info->filename,
+               panic_info->linenum);
        sof_oops(sdev, oops);
        sof_stack(sdev, oops, stack, stack_words);
 }