Commit 30b7a3bc authored by Russell King's avatar Russell King Committed by Russell King

[SERIAL] Prefix serial printks with KERN_INFO and pre-format

Pre-format the IO part of the ttyS printks, and prefix them with
KERN_INFO to avoid bootsplash corruption.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d2740074
...@@ -1947,21 +1947,29 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port) ...@@ -1947,21 +1947,29 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
static inline void static inline void
uart_report_port(struct uart_driver *drv, struct uart_port *port) uart_report_port(struct uart_driver *drv, struct uart_port *port)
{ {
printk("%s%d", drv->dev_name, port->line); char address[64];
printk(" at ");
switch (port->iotype) { switch (port->iotype) {
case UPIO_PORT: case UPIO_PORT:
printk("I/O 0x%x", port->iobase); snprintf(address, sizeof(address),
"I/O 0x%x", port->iobase);
break; break;
case UPIO_HUB6: case UPIO_HUB6:
printk("I/O 0x%x offset 0x%x", port->iobase, port->hub6); snprintf(address, sizeof(address),
"I/O 0x%x offset 0x%x", port->iobase, port->hub6);
break; break;
case UPIO_MEM: case UPIO_MEM:
case UPIO_MEM32: case UPIO_MEM32:
printk("MMIO 0x%lx", port->mapbase); snprintf(address, sizeof(address),
"MMIO 0x%lx", port->mapbase);
break;
default:
strlcpy(address, "*unknown*", sizeof(address));
break; break;
} }
printk(" (irq = %d) is a %s\n", port->irq, uart_type(port));
printk(KERN_INFO "%s%d at %s (irq = %d) is a %s\n",
drv->dev_name, port->line, address, port->irq, uart_type(port));
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment