The patch titled
serial: make early_uart use early_param instead of console_initcall
has been removed from the -mm tree. Its filename was
serial-make-early_uart-to-use-early_prarm-instead-of.patch
This patch was dropped because it had testing failures
------------------------------------------------------
Subject: serial: make early_uart use early_param instead of console_initcall
From: Yinghai Lu <Yinghai.Lu@xxxxxxx>
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
earlycon=uart,io,0x3f8,9600n8
earlycon=uart,io,0x3f8,9600n8 console=tty0
it will print in very early stage
Early serial console at I/O port 0x3f8 (options '9600n8')
later for console it will print
console handover: boot [uart0] -> real [ttyS0]
[akpm@xxxxxxxxxxxxxxxxxxxx: cleanups]
Signed-off-by: Yinghai Lu <yinghai.lu@xxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/serial/8250.c | 23 --------
drivers/serial/8250_early.c | 86 ++++++++++++++++-----------------
drivers/serial/Kconfig | 7 ++
drivers/serial/serial_core.c | 5 +
include/linux/console.h | 2
include/linux/serial.h | 6 --
include/linux/serial_8250.h | 3 +
include/linux/serial_core.h | 5 +
kernel/printk.c | 17 ++++++
9 files changed, 84 insertions(+), 70 deletions(-)
diff -puN drivers/serial/8250.c~serial-make-early_uart-to-use-early_prarm-instead-of drivers/serial/8250.c
--- a/drivers/serial/8250.c~serial-make-early_uart-to-use-early_prarm-instead-of
+++ a/drivers/serial/8250.c
@@ -2367,6 +2367,7 @@ static struct uart_ops serial8250_pops =
.request_port = serial8250_request_port,
.config_port = serial8250_config_port,
.verify_port = serial8250_verify_port,
+ .find_port_for_earlycon = serial8250_find_port_for_earlycon,
};
static struct uart_8250_port serial8250_ports[UART_NR];
@@ -2533,7 +2534,7 @@ static int __init serial8250_console_ini
}
console_initcall(serial8250_console_init);
-static int __init find_port(struct uart_port *p)
+int __init find_port_serial8250(struct uart_port *p)
{
int line;
struct uart_port *port;
@@ -2546,26 +2547,6 @@ static int __init find_port(struct uart_
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
diff -puN drivers/serial/8250_early.c~serial-make-early_uart-to-use-early_prarm-instead-of drivers/serial/8250_early.c
--- a/drivers/serial/8250_early.c~serial-make-early_uart-to-use-early_prarm-instead-of
+++ a/drivers/serial/8250_early.c
@@ -17,13 +17,9 @@
* we locate the device directly by its MMIO or I/O port address.
*
* The user can specify the device directly, e.g.,
- * console=uart,io,0x3f8,9600n8
- * console=uart,mmio,0xff5e0000,115200n8
- * or platform code can call early_uart_console_init() to set
- * the early UART device.
+ * earlycon=uart,io,0x3f8,9600n8
+ * earlycon=uart,mmio,0xff5e0000,115200n8
*
- * After the normal serial driver starts, we try to locate the
- * matching ttyS device and start a console there.
*/
#include <linux/tty.h>
@@ -32,6 +28,7 @@
#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>
@@ -42,7 +39,6 @@ struct early_uart_device {
};
static struct early_uart_device early_device __initdata;
-static int early_uart_registered __initdata;
static unsigned int __init serial_in(struct uart_port *port, int offset)
{
@@ -175,6 +171,13 @@ static int __init parse_options(struct e
return 0;
}
+static struct console early_uart_console __initdata = {
+ .name = "uart",
+ .write = early_uart_write,
+ .flags = CON_PRINTBUFFER,
+ .index = -1,
+};
+
static int __init early_uart_setup(struct console *console, char *options)
{
struct early_uart_device *device = &early_device;
@@ -190,61 +193,60 @@ static int __init early_uart_setup(struc
return 0;
}
-static struct console early_uart_console __initdata = {
- .name = "uart",
- .write = early_uart_write,
- .setup = early_uart_setup,
- .flags = CON_PRINTBUFFER,
- .index = -1,
-};
-
-static int __init early_uart_console_init(void)
-{
- if (!early_uart_registered) {
- register_console(&early_uart_console);
- early_uart_registered = 1;
- }
- return 0;
-}
-console_initcall(early_uart_console_init);
-
-int __init early_serial_console_init(char *cmdline)
+static int __init setup_early_serial_console(char *cmdline)
{
char *options;
int err;
- options = strstr(cmdline, "console=uart,");
+ options = strstr(cmdline, "uart,");
if (!options)
return -ENODEV;
options = strchr(cmdline, ',') + 1;
if ((err = early_uart_setup(NULL, options)) < 0)
return err;
- return early_uart_console_init();
+
+ early_uart_console.flags |= CON_BOOT;
+ register_console(&early_uart_console);
+
+ /* add one dummy entry in console_cmdline*/
+ add_preferred_console("ttyS", 255, early_device.options);
+
+ return 0;
}
-static int __init early_uart_console_switch(void)
+int serial8250_find_port_for_earlycon(void)
{
struct early_uart_device *device = &early_device;
struct uart_port *port = &device->port;
- int mmio, line;
+ int line;
- if (!(early_uart_console.flags & CON_ENABLED))
- return 0;
+ line = find_port_serial8250(port);
- /* Try to start the normal driver on a matching line. */
- mmio = (port->iotype == UPIO_MEM);
- line = serial8250_start_console(port, device->options);
if (line < 0)
- printk("No ttyS device at %s 0x%lx for console\n",
- mmio ? "MMIO" : "I/O port",
- mmio ? port->mapbase :
- (unsigned long) port->iobase);
+ return -ENODEV;
+
+ /* update the dummy entry to what we want console type */
+ update_console_cmdline_console_index("ttyS", 255, line);
+
+ return 0;
+
+}
- unregister_console(&early_uart_console);
- if (mmio)
+early_param("earlycon", setup_early_serial_console);
+
+static int __init early_uart_console_post(void)
+{
+ struct early_uart_device *device = &early_device;
+ struct uart_port *port = &device->port;
+
+ if (!(early_uart_console.flags & CON_ENABLED))
+ return 0;
+
+ if (port->iotype == UPIO_MEM)
iounmap(port->membase);
return 0;
}
-late_initcall(early_uart_console_switch);
+
+late_initcall(early_uart_console_post);
diff -puN drivers/serial/Kconfig~serial-make-early_uart-to-use-early_prarm-instead-of drivers/serial/Kconfig
--- a/drivers/serial/Kconfig~serial-make-early_uart-to-use-early_prarm-instead-of
+++ a/drivers/serial/Kconfig
@@ -62,6 +62,13 @@ config SERIAL_8250_CONSOLE
kernel will automatically use the first serial line, /dev/ttyS0, as
system console.
+ Early console may be specified using a kernel command line option
+ such as
+ "earlycon=uart,io,0x3f8,9600n8" or
+ "earlycon=uart,mem,0xfe000008,115200n8".
+ and it will switch to the normal serial console when the
+ corresponding port is ready.
+
If unsure, say N.
config SERIAL_8250_GSC
diff -puN drivers/serial/serial_core.c~serial-make-early_uart-to-use-early_prarm-instead-of drivers/serial/serial_core.c
--- a/drivers/serial/serial_core.c~serial-make-early_uart-to-use-early_prarm-instead-of
+++ a/drivers/serial/serial_core.c
@@ -2303,8 +2303,11 @@ int uart_add_one_port(struct uart_driver
* It may be that the port was not available.
*/
if (port->type != PORT_UNKNOWN &&
- port->cons && !(port->cons->flags & CON_ENABLED))
+ port->cons && !(port->cons->flags & CON_ENABLED)) {
+ if (port->ops && port->ops->find_port_for_earlycon)
+ port->ops->find_port_for_earlycon();
register_console(port->cons);
+ }
/*
* Ensure UPF_DEAD is not set.
diff -puN include/linux/console.h~serial-make-early_uart-to-use-early_prarm-instead-of include/linux/console.h
--- a/include/linux/console.h~serial-make-early_uart-to-use-early_prarm-instead-of
+++ a/include/linux/console.h
@@ -107,6 +107,8 @@ struct console {
};
extern int add_preferred_console(char *name, int idx, char *options);
+extern int update_console_cmdline_console_index(char *name, int idx_old,
+ int idx_new);
extern void register_console(struct console *);
extern int unregister_console(struct console *);
extern struct console *console_drivers;
diff -puN include/linux/serial.h~serial-make-early_uart-to-use-early_prarm-instead-of include/linux/serial.h
--- a/include/linux/serial.h~serial-make-early_uart-to-use-early_prarm-instead-of
+++ a/include/linux/serial.h
@@ -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 */
diff -puN include/linux/serial_8250.h~serial-make-early_uart-to-use-early_prarm-instead-of include/linux/serial_8250.h
--- a/include/linux/serial_8250.h~serial-make-early_uart-to-use-early_prarm-instead-of
+++ a/include/linux/serial_8250.h
@@ -60,4 +60,7 @@ void serial8250_unregister_port(int line
void serial8250_suspend_port(int line);
void serial8250_resume_port(int line);
+extern int find_port_serial8250(struct uart_port *p);
+extern int serial8250_find_port_for_earlycon(void);
+
#endif
diff -puN include/linux/serial_core.h~serial-make-early_uart-to-use-early_prarm-instead-of include/linux/serial_core.h
--- a/include/linux/serial_core.h~serial-make-early_uart-to-use-early_prarm-instead-of
+++ a/include/linux/serial_core.h
@@ -199,6 +199,11 @@ struct uart_ops {
void (*config_port)(struct uart_port *, int);
int (*verify_port)(struct uart_port *, struct serial_struct *);
int (*ioctl)(struct uart_port *, unsigned int, unsigned long);
+
+ /*
+ * for earlycon to console switch
+ */
+ int (*find_port_for_earlycon)(void);
};
#define UART_CONFIG_TYPE (1 << 0)
diff -puN kernel/printk.c~serial-make-early_uart-to-use-early_prarm-instead-of kernel/printk.c
--- a/kernel/printk.c~serial-make-early_uart-to-use-early_prarm-instead-of
+++ a/kernel/printk.c
@@ -726,6 +726,23 @@ int __init add_preferred_console(char *n
return 0;
}
+int __init update_console_cmdline_console_index(char *name, int idx_old,
+ int idx_new)
+{
+ 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_old) {
+ console_cmdline[i].index = idx_new;
+ return 0;
+ }
+ }
+
+ return 0;
+}
+
#ifndef CONFIG_DISABLE_CONSOLE_SUSPEND
/**
* suspend_console - suspend the console subsystem
_
Patches currently in -mm which might be from Yinghai.Lu@xxxxxxx are
serial-make-early_uart-to-use-early_prarm-instead-of.patch
serial-set-dtr-in-uart-for-kernel-serial-console.patch
x86-early_print-kernel-console-should-send-crlf-not-lfcr.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
