Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 07:31:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

serial: introduce CONFIG_CONSOLE_FLUSH_ON_NEWLINE

Browse source 
When debugging, one sometimes only gets partial output lines or
nothing at all from the last printf, because the uart has a largish
buffer, and the code after the printf() may cause the CPU to hang
before the uart IP has time to actually emit all the characters. That
can be very confusing, because one doesn't then know exactly where the
hang happens.

Introduce a config knob allowing one to wait for the uart fifo to
drain whenever a newline character is printed, roughly corresponding
to the effect of setvbuf(..., _IOLBF, ...) in ordinary C programs.

Since this uses IS_ENABLED() instead of cpp ifdef, we can remove the
ifdef around the _serial_flush() definition - if neither
CONSOLE_FLUSH_SUPPORT or CONSOLE_FLUSH_ON_NEWLINE are enabled, the
compiler elides _serial_flush(), but it won't warn about it being
unused.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Rasmus Villemoes 2023-10-16 10:35:22 +02:00 committed by Tom Rini
parent 1000e2f96b
commit 35dc728a3c
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/Kconfig
View file

@ -224,6 +224,16 @@ config CONSOLE_FLUSH_SUPPORT
help
This enables compilation of flush() function for console flush support.
config CONSOLE_FLUSH_ON_NEWLINE
bool "Flush console buffer on every newline character"
depends on DM_SERIAL
help
This makes the serial core code flush the console device
whenever a newline (\n) character has been emitted. This can
be especially useful when "printf debugging", as otherwise
lots of output could still be in the UART's FIFO by the time
one hits the code which causes the CPU to hang or reset.
config CONSOLE_MUX
bool "Enable console multiplexing"
default y if VIDEO || LCD

8
drivers/serial/serial-uclass.c
View file

@ -182,7 +182,6 @@ int serial_initialize(void)
return serial_init();
}
#ifdef CONFIG_CONSOLE_FLUSH_SUPPORT
static void _serial_flush(struct udevice *dev)
{
struct dm_serial_ops *ops = serial_get_ops(dev);
@ -192,7 +191,6 @@ static void _serial_flush(struct udevice *dev)
while (ops->pending(dev, false) > 0)
;
}
#endif
static void _serial_putc(struct udevice *dev, char ch)
{
@ -205,6 +203,9 @@ static void _serial_putc(struct udevice *dev, char ch)
do {
err = ops->putc(dev, ch);
} while (err == -EAGAIN);
if (IS_ENABLED(CONFIG_CONSOLE_FLUSH_ON_NEWLINE) && ch == '\n')
_serial_flush(dev);
}
static int __serial_puts(struct udevice *dev, const char *str, size_t len)
@ -243,6 +244,9 @@ static void _serial_puts(struct udevice *dev, const char *str)
if (*newline && __serial_puts(dev, "\r\n", 2))
return;
if (IS_ENABLED(CONFIG_CONSOLE_FLUSH_ON_NEWLINE) && *newline)
_serial_flush(dev);
str += len + !!*newline;
} while (*str);
}