serial: convert early_uart to earlycon for 8250
Subsystems (4)
PATCH 4/5 serial: convert early_uart to earlycon for 8250
Andrew,
Please don't drop others if there is problem with this one.
YH
[PATCH 4/5] serial: convert early_uart to earlycon for 8250
Beacuse SERIAL_PORT_DFNS is removed from include/asm-i386/serial.h and include/asm-x86_64/serial.h. the serial8250_ports need to be probed late in serial initializing stage. the console_init=>serial8250_console_init=> register_console=>serial8250_console_setup will return -ENDEV, and console ttyS0 can not be enabled at that time.
need to wait till uart_add_one_port in drivers/serial/serial_core.c to call register_console to get console ttyS0. that is too late.
Make early_uart to use early_param, so uart console can be used earlier. Make it to be bootconsole with CON_BOOT flag, so can use console handover feature. and it will switch to corresponding normal serial console automatically.
new command line will be:
console=uart8250,io,0x3f8,9600n8 console=uart8250,mmio,0xff5e0000,115200n8 or earlycon=uart8250,io,0x3f8,9600n8 earlycon=uart8250,mmio,0xff5e0000,115200n8
it will print in very early stage:
Early serial console at I/O port 0x3f8 (options '9600n8') console [uart0] enabled later for console it will print: console handover: boot [uart0] -> real [ttyS0]
Documentation/kernel-parameters.txt | 11 +++ arch/ia64/kernel/setup.c | 4 - drivers/serial/8250.c | 28 ++------- drivers/serial/8250_early.c | 108 ++++++++++++++++-------------------- drivers/serial/Kconfig | 14 ++++ include/asm-i386/fixmap.h | 2 include/asm-i386/io.h | 1 include/asm-x86_64/fixmap.h | 4 + include/asm-x86_64/io.h | 1 include/linux/console.h | 2 include/linux/serial.h | 6 -- include/linux/serial_8250.h | 3 + init/main.c | 5 + kernel/printk.c | 22 +++++++ 14 files changed, 118 insertions(+), 93 deletions(-)
Documentation/kernel-parameters.txt +9 -2
@@ -464,13 +464,20 @@ and is between 256 and 4096 characters. It is defined in the file Documentation/networking/netconsole.txt for an alternative. - uart,io,<addr>[,options] - uart,mmio,<addr>[,options] + uart8250,io,<addr>[,options] + uart8250,mmio,<addr>[,options] Start an early, polled-mode console on the 8250/16550 UART at the specified I/O port or MMIO address, switching to the matching ttyS device later. The options are the same as for ttyS, above. + earlycon= [KNL] Output early console device and options. + uart8250,io,<addr>[,options] + uart8250,mmio,<addr>[,options] + Start an early, polled-mode console on the 8250/16550 + UART at the specified I/O port or MMIO address. + The options are the same as for ttyS, above. + cpcihp_generic= [HW,PCI] Generic port I/O CompactPCI driver Format: <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]
arch/i386/mm/ioremap.c +0 -0
arch/ia64/kernel/setup.c +0 -4
@@ -390,10 +390,6 @@ early_console_setup (char *cmdline)if (!efi_setup_pcdp_console (cmdline)) earlycons++;#endif -#ifdef CONFIG_SERIAL_8250_CONSOLE -if (!early_serial_console_init (cmdline)) - earlycons++; -#endif return (earlycons) ?0 :-1 ; }
arch/x86_64/mm/ioremap.c +0 -0
drivers/serial/8250.c +7 -21
@@ -2514,12 +2514,18 @@ static int __init serial8250_console_setup(struct console *co, char *options)return uart_set_options (port, co, baud, parity, bits, flow); } +static int __init serial8250_console_early_setup (void ) +{ +return serial8250_find_port_for_earlycon (); +} +static struct uart_driver serial8250_reg;static struct console serial8250_console = { .name ="ttyS" , .write = serial8250_console_write, .device = uart_console_device, .setup = serial8250_console_setup, + .early_setup = serial8250_console_early_setup, .flags =CON_PRINTBUFFER , .index =-1 , .data = &serial8250_reg,
@@ -2533,7 +2539,7 @@ static int __init serial8250_console_init(void) }console_initcall (serial8250_console_init); -static int __init find_port (struct uart_port *p) +int serial8250_find_port (struct uart_port *p) {int line;struct uart_port *port;
@@ -2546,26 +2552,6 @@ static int __init find_port(struct uart_port *p) return -ENODEV; } -int __init serial8250_start_console (struct uart_port *port,char *options) -{ -int line; - - line =find_port (port); -if (line <0 ) -return -ENODEV ; - -add_preferred_console ("ttyS" , line, options); -printk ("Adding console on ttyS%d at %s 0x%lx (options '%s')\n" , - line, port->iotype ==UPIO_MEM ?"MMIO" :"I/O port" , - port->iotype ==UPIO_MEM ? (unsigned long ) port->mapbase : - (unsigned long ) port->iobase, options); -if (!(serial8250_console.flags &CON_ENABLED )) { - serial8250_console.flags &= ~CON_PRINTBUFFER ; -register_console (&serial8250_console); - } -return line; -} -#define SERIAL8250_CONSOLE &serial8250_console#else #define SERIAL8250_CONSOLE NULL
drivers/serial/8250_early.c +50 -58
186 lines not on this page · raw message
drivers/serial/Kconfig +14 -0
@@ -62,8 +62,22 @@ config SERIAL_8250_CONSOLE kernel will automatically use the first serial line, /dev/ttyS0, as system console. + you can set that using a kernel command line option such as + "console=uart8250,io,0x3f8,9600n8" + "console=uart8250,mmio,0xff5e0000,115200n8". + and it will switch to normal serial console when correponding port is + ready. + "earlycon=uart8250,io,0x3f8,9600n8" + "earlycon=uart8250,mmio,0xff5e0000,115200n8". + it will not only setup early console. + If unsure, say N. +config FIX_EARLYCON_MEM + bool + depends on X86 + default y + config SERIAL_8250_GSC tristate depends on SERIAL_8250 && GSC
include/asm-i386/fixmap.h +2 -0
@@ -54,6 +54,8 @@ extern unsigned long __FIXADDR_TOP;enum fixed_addresses {FIX_HOLE ,FIX_VDSO , +FIX_DBGP_BASE , +FIX_EARLYCON_MEM_BASE ,#ifdef CONFIG_X86_LOCAL_APIC FIX_APIC_BASE ,/* local (CPU) APIC) -- required for SMP or not */ #endif
include/asm-i386/io.h +1 -0
@@ -129,6 +129,7 @@ extern void iounmap(volatile void __iomem *addr);*/ extern void *bt_ioremap (unsigned long offset,unsigned long size);extern void bt_iounmap (void *addr,unsigned long size); +extern void __iomem *fix_ioremap (unsigned idx,unsigned long phys);/* Use early IO mappings for DMI because it's initialized early */ #define dmi_ioremap bt_ioremap
include/asm-ia64/io.h +0 -0
include/asm-x86_64/fixmap.h +3 -1
@@ -35,6 +35,8 @@ enum fixed_addresses {VSYSCALL_LAST_PAGE ,VSYSCALL_FIRST_PAGE =VSYSCALL_LAST_PAGE + ((VSYSCALL_END -VSYSCALL_START ) >>PAGE_SHIFT ) -1 ,VSYSCALL_HPET , +FIX_DBGP_BASE , +FIX_EARLYCON_MEM_BASE ,FIX_HPET_BASE ,FIX_APIC_BASE ,/* local (CPU) APIC) -- required for SMP or not */ FIX_IO_APIC_BASE_0,
@@ -84,7 +86,7 @@ static __always_inline unsigned long fix_to_virt(const unsigned int idx)if (idx >= __end_of_fixed_addresses)__this_fixmap_does_not_exist (); - return __fix_to_virt(idx); + return __fix_to_virt(idx); }#endif
include/asm-x86_64/io.h +1 -0
@@ -144,6 +144,7 @@ extern void early_iounmap(void *addr, unsigned long size);*/ extern void __iomem *ioremap_nocache (unsigned long offset,unsigned long size);extern void iounmap (volatile void __iomem *addr); +extern void __iomem *fix_ioremap (unsigned idx,unsigned long phys);/* * ISA I/O bus memory addresses are 1:1 with the physical address.
include/linux/console.h +2 -0
@@ -99,6 +99,7 @@ struct console {struct tty_driver *(*device)(struct console *,int *);void (*unblank)(void );int (*setup)(struct console *,char *); +int (*early_setup)(void );short flags;short index;int cflag;
@@ -107,6 +108,7 @@ struct console { };extern int add_preferred_console (char *name,int idx,char *options); +extern int update_console_cmdline (char *name,int idx,char *name_new,int idx_new,char *options);extern void register_console (struct console *);extern int unregister_console (struct console *);extern struct console *console_drivers;
include/linux/serial.h +0 -6
@@ -177,11 +177,5 @@ struct serial_icounter_struct {#ifdef __KERNEL__#include <linux/compiler.h> -/* Allow architectures to override entries in serial8250_ports[] at run time: */ -struct uart_port ;/* forward declaration */ -extern int early_serial_setup (struct uart_port *port); -extern int early_serial_console_init (char *options); -extern int serial8250_start_console (struct uart_port *port,char *options); -#endif /* __KERNEL__ */ #endif /* _LINUX_SERIAL_H */
include/linux/serial_8250.h +3 -0
@@ -60,4 +60,7 @@ void serial8250_unregister_port(int line);void serial8250_suspend_port (int line);void serial8250_resume_port (int line); +extern int serial8250_find_port (struct uart_port *p); +extern int serial8250_find_port_for_earlycon (void ); +#endif
init/main.c +4 -1
@@ -452,7 +452,10 @@ static int __init do_early_param(char *param, char *val)struct obs_kernel_param *p;for (p = __setup_start; p < __setup_end; p++) { -if (p->early &&strcmp (param, p->str) ==0 ) { +if ((p->early &&strcmp (param, p->str) ==0 ) || + (strcmp (param,"console" ) ==0 && +strcmp (p->str,"earlycon" ) ==0 ) + ) {if (p->setup_func (val) !=0 )printk (KERN_WARNING "Malformed early option '%s'\n" , param);
kernel/printk.c +22 -0
@@ -726,6 +726,25 @@ int __init add_preferred_console(char *name, int idx, char *options)return 0 ; } +int __init update_console_cmdline (char *name,int idx,char *name_new,int idx_new,char *options) +{ +struct console_cmdline *c; +int i; + +for (i =0 ; i <MAX_CMDLINECONSOLES && console_cmdline[i].name[0 ]; i++) +if (strcmp (console_cmdline[i].name, name) ==0 && + console_cmdline[i].index == idx) { + c = &console_cmdline[i]; +memcpy (c->name, name_new,sizeof (c->name)); + c->name[sizeof (c->name) -1 ] =0 ; + c->options = options; + c->index = idx_new; +return i; + } +/* not found */ +return -1 ; +} +#ifndef CONFIG_DISABLE_CONSOLE_SUSPEND /** * suspend_console - suspend the console subsystem
@@ -942,6 +961,9 @@ void register_console(struct console *console)if (preferred_console <0 || bootconsole || !console_drivers) preferred_console = selected_console; +if (console->early_setup) + console->early_setup (); +/* * See if we want to use this console driver. If we * didn't select a console we take the first one
Quoted 53 lines · On Thu, 31 May 2007 14:01:33 -0700 Yinghai Lu <[email protected]> wrote:
Andrew,
Please don't drop others if there is problem with this one.
YH
[PATCH 4/5] serial: convert
early_uartto earlycon for 8250Beacuse
SERIAL_PORT_DFNSis removed frominclude/asm-i386/serial.handinclude/asm-x86_64/serial.h. theserial8250_portsneed to be probed late in serial initializing stage. the console_init=>serial8250_console_init=> register_console=>serial8250_console_setup will return-ENDEV, and console ttyS0 can not be enabled at that time.
need to wait tilluart_add_one_portindrivers/serial/serial_core.cto callregister_consoleto get console ttyS0. that is too late.Make
early_uartto useearly_param, so uart console can be used earlier. Make it to be bootconsole withCON_BOOTflag, so can use console handover feature. and it will switch to corresponding normal serial console automatically.new command line will be:
console=uart8250,io,0x3f8,9600n8 console=uart8250,mmio,0xff5e0000,115200n8 or earlycon=uart8250,io,0x3f8,9600n8 earlycon=uart8250,mmio,0xff5e0000,115200n8it will print in very early stage:
Early serial console at I/O port 0x3f8 (options '9600n8') console [uart0] enabled later for console it will print: console handover: boot [uart0] -> real [ttyS0]...
drivers/serial/8250_early.c +5
-0@@ -32,17 +30,21 @@#include <linux/serial_core.h> #include <linux/serial_reg.h> #include <linux/serial.h> +#include <linux/serial_8250.h> #include <asm/io.h> #include <asm/serial.h> +#ifdef CONFIG_FIX_EARLYCON_MEM +#include <asm/pgtable.h> +#include <asm/fixmap.h> +#endif
drivers/serial/8250_early.c static int __init parse_options(struct early_uart_device *device, char *options) · line 152
Quoted 10 lines
drivers/serial/8250_early.c +6
-1@@ -143,12 +144,18 @@ static int __init parse_options(struct early_uart_device *device, char *options)if (!strncmp (options,"mmio," ,5 )) { port->iotype =UPIO_MEM ; port->mapbase =simple_strtoul (options +5 , &options,0 ); - port->membase =ioremap (port->mapbase, mapsize); +#ifdef CONFIG_FIX_EARLYCON_MEM +set_fixmap_nocache (FIX_EARLYCON_MEM_BASE , port->mapbase &PAGE_MASK ); + port->membase = (void __iomem *)__fix_to_virt (FIX_EARLYCON_MEM_BASE ); + port->membase += port->mapbase & ~PAGE_MASK ; +#else + port->membase =ioremap (port->mapbase,64 );
ug. OK, that'll work. Simple and direct ;)
drivers/serial/Kconfig config SERIAL_8250_CONSOLE · line 80
Quoted 10 lines
drivers/serial/Kconfig +5
-0+config FIX_EARLYCON_MEM + bool + depends on X86 + default y +
It might have been nicer to do this in arch/i386/Kconfig and arch/x86_64/Kconfig. That way we don't end up with a great string of arch selectors in non-arch Kconfig files (do "grep SPARC */Kconfig*")
otoh, doing that means that FIX_EARLYCON_MEM doesn't get mentioned in drivers/serial/Kconfig and you need to go on a great hunting expedition to find out who sets it.
Quoted 21 lines · Andrew Morton
drivers/serial/Kconfig config SERIAL_8250_CONSOLE · line 80
Quoted 13 lines · On Thu, 31 May 2007 14:01:33 -0700 Yinghai Lu <[email protected]> wrote:
Andrew,
Please don't drop others if there is problem with this one.
YH
[PATCH 4/5] serial: convert
early_uartto earlycon for 8250drivers/serial/Kconfig +5
-0+config FIX_EARLYCON_MEM + bool + depends on X86 + default y +It might have been nicer to do this in
arch/i386/Kconfigandarch/x86_64/Kconfig. That way we don't end up with a great string of arch selectors in non-archKconfigfiles (do "grep SPARC */Kconfig*")
Quoted 4 lines
otoh, doing that means that
FIX_EARLYCON_MEMdoesn't get mentioned indrivers/serial/Kconfigand you need to go on a great hunting expedition to find out who sets it.
we could extend that to others arch that is support fixmap like ./asm-i386/fixmap.h./asm-mips/fixmap.h./asm-parisc/fixmap.h./asm-sh/fixmap.h./asm-sparc/fixmap.h./asm-um/fixmap.h./asm-x86_64/fixmap.h
so it will be
Quoted 5 lines
drivers/serial/Kconfig config SERIAL_8250_CONSOLE · line 80
Quoted 5 lines
drivers/serial/Kconfig +5
-0+config FIX_EARLYCON_MEM + bool + depends on X86 || MIPS || PARISC || SH || SPARC || UM + default y +
You you can provide another config like
CONFIG_FIXMAP
YH