Commit bdc4704b authored by Jeffy Chen's avatar Jeffy Chen Committed by Greg Kroah-Hartman

serial: 8250_early: Remove __init marking from early write

The earlycon would be alive outside the init code in these cases:
1/ we have keep_bootcon in cmdline.
2/ we don't have a real console to switch to.

So remove the __init marking to avoid invalid memory access.
Signed-off-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Tested-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b7eec2a
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/serial.h> #include <asm/serial.h>
static unsigned int __init serial8250_early_in(struct uart_port *port, int offset) static unsigned int serial8250_early_in(struct uart_port *port, int offset)
{ {
int reg_offset = offset; int reg_offset = offset;
offset <<= port->regshift; offset <<= port->regshift;
...@@ -60,7 +60,7 @@ static unsigned int __init serial8250_early_in(struct uart_port *port, int offse ...@@ -60,7 +60,7 @@ static unsigned int __init serial8250_early_in(struct uart_port *port, int offse
} }
} }
static void __init serial8250_early_out(struct uart_port *port, int offset, int value) static void serial8250_early_out(struct uart_port *port, int offset, int value)
{ {
int reg_offset = offset; int reg_offset = offset;
offset <<= port->regshift; offset <<= port->regshift;
...@@ -89,7 +89,7 @@ static void __init serial8250_early_out(struct uart_port *port, int offset, int ...@@ -89,7 +89,7 @@ static void __init serial8250_early_out(struct uart_port *port, int offset, int
#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
static void __init serial_putc(struct uart_port *port, int c) static void serial_putc(struct uart_port *port, int c)
{ {
unsigned int status; unsigned int status;
...@@ -103,7 +103,7 @@ static void __init serial_putc(struct uart_port *port, int c) ...@@ -103,7 +103,7 @@ static void __init serial_putc(struct uart_port *port, int c)
} }
} }
static void __init early_serial8250_write(struct console *console, static void early_serial8250_write(struct console *console,
const char *s, unsigned int count) const char *s, unsigned int count)
{ {
struct earlycon_device *device = console->data; struct earlycon_device *device = console->data;
......
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