hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

serial: omap: 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: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jeffy Chen 2017-07-18 14:02:55 +08:00 committed by Greg Kroah-Hartman
parent ac1e696559
commit b38dd0e8ed
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/tty/serial/omap-serial.c
View File

@ -1235,21 +1235,20 @@ out:
#ifdef CONFIG_SERIAL_OMAP_CONSOLE #ifdef CONFIG_SERIAL_OMAP_CONSOLE
#ifdef CONFIG_SERIAL_EARLYCON #ifdef CONFIG_SERIAL_EARLYCON
static unsigned int __init omap_serial_early_in(struct uart_port *port, static unsigned int omap_serial_early_in(struct uart_port *port, int offset)
int offset)
{ {
offset <<= port->regshift; offset <<= port->regshift;
return readw(port->membase + offset); return readw(port->membase + offset);
} }
static void __init omap_serial_early_out(struct uart_port *port, int offset, static void omap_serial_early_out(struct uart_port *port, int offset,
int value) int value)
{ {
offset <<= port->regshift; offset <<= port->regshift;
writew(value, port->membase + offset); writew(value, port->membase + offset);
} }
static void __init omap_serial_early_putc(struct uart_port *port, int c) static void omap_serial_early_putc(struct uart_port *port, int c)
{ {
unsigned int status; unsigned int status;
@ -1262,8 +1261,8 @@ static void __init omap_serial_early_putc(struct uart_port *port, int c)
omap_serial_early_out(port, UART_TX, c); omap_serial_early_out(port, UART_TX, c);
} }
static void __init early_omap_serial_write(struct console *console, static void early_omap_serial_write(struct console *console, const char *s,
const char *s, unsigned int count) unsigned int count)
{ {
struct earlycon_device *device = console->data; struct earlycon_device *device = console->data;
struct uart_port *port = &device->port; struct uart_port *port = &device->port;