console: Use flush() before panic and reset

To make sure the panic and the reset messages will go out, console flush() should be used.
Sleep periods do not work in early u-boot phase when timer driver is not initialized yet.

Reference: https://lists.denx.de/pipermail/u-boot/2023-March/512233.html

Signed-off-by: Tony Dinh <mibodhi@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c
index 95169bae1c13a8a5c605842ceec1ef2c6a627f75..3e051e36f12dd0739934d4b7c2ece9fdb7ecb06f 100644 (file)
--- a/arch/arm/lib/reset.c
+++ b/arch/arm/lib/reset.c
@@ -25,6 +25,7 @@
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <linux/delay.h>
+#include <stdio.h>
 
 __weak void reset_misc(void)
 {
@@ -33,8 +34,7 @@ __weak void reset_misc(void)
 int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        puts ("resetting ...\n");
-
-       mdelay(50);                             /* wait 50 ms */
+       flush();
 
        disable_interrupts();
 

diff --git a/lib/panic.c b/lib/panic.c
index 58382ac4f4cc782c4d53e9d3ea8f9b6b57294309..66ae17f3df9942a4ffd16003314bd1ab727e8257 100644 (file)
--- a/lib/panic.c
+++ b/lib/panic.c
@@ -15,6 +15,7 @@
 #include <command.h>
 #endif
 #include <linux/delay.h>
+#include <stdio.h>
 
 static void panic_finish(void) __attribute__ ((noreturn));
 
@@ -24,7 +25,8 @@ static void panic_finish(void)
 #if defined(CONFIG_PANIC_HANG)
        hang();
 #else
-       udelay(100000); /* allow messages to go out */
+       flush();  /* flush the panic message before reset */
+
        do_reset(NULL, 0, 0, NULL);
 #endif
        while (1)