x86, setup: Check early serial console per string instead of one char
PATCH 1/1 x86, setup: Check early serial console per string instead of one char
Move out serial_putchar() calling out of putchar
Let puts() to call serial_putchar() directly.
So only need to check early_serial_base per string.
--- arch/x86/boot/tty.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
arch/x86/boot/tty.c +10 -4
@@ -52,16 +52,22 @@ static void __attribute__((section(".inivoid __attribute__((section (".inittext" )))putchar (int ch) {if (ch =='\n' ) -putchar ('\r' );/* \n -> \r\n */ +bios_putchar ('\r' );/* \n -> \r\n */ bios_putchar (ch); - -if (early_serial_base !=0 ) -serial_putchar (ch); }void __attribute__((section (".inittext" )))puts (const char *str) { +if (early_serial_base) { +const char *s = str; +while (*s) { +if (*s =='\n' ) +serial_putchar ('\r' ); +serial_putchar (*s++); + } + } +while (*str)putchar (*str++); }
H. Peter Anvin
reviewerQuoted 8 lines · Yinghai Lu
Move out
serial_putchar()calling out of putchar
Letputs()to callserial_putchar()directly.So only need to check
early_serial_baseper string.Signed-off-by Yinghai Lu <[email protected]>
This seems to add a bunch of code for zero benefit. Testing a global variable is zero cost compared to either a BIOS call or poking a serial port.
-hpa
Quoted 5 lines · H. Peter Anvin
Quoted 4 lines · Yinghai Lu
Move out
serial_putchar()calling out of putchar
Letputs()to callserial_putchar()directly.
Quoted 8 lines
Quoted 4 lines
So only need to check
early_serial_baseper string.Signed-off-by Yinghai Lu <[email protected]>This seems to add a bunch of code for zero benefit. Testing a global variable is zero cost compared to either a BIOS call or poking a serial port.
some server have bios serial console redirection support, and bios int call could send char to screen and serial port.
in that case, take out serial_putchar from putchar could produce more readable print out from serial console
Thanks
Yinghai
H. Peter Anvin
reviewerQuoted 9 lines · Yinghai Lu
Quoted 4 lines
This seems to add a bunch of code for zero benefit. Testing a global variable is zero cost compared to either a BIOS call or poking a serial port.
some server have bios serial console redirection support, and bios int call could send char to screen and serial port.
in that case, take out
serial_putcharfrom putchar could produce more readable print out from serial console
That doesn't appear to have anything to do with this code change. What you're saying is that "if BIOS does serial console redirection, we shouldn't output to both the serial console and the BIOS console", which is of course a truism, but that doesn't justify in any way this particular code reconfiguration.
-hpa