Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b7eec2a authored by Jeffy Chen's avatar Jeffy Chen Committed by Greg Kroah-Hartman
Browse files

serial: 8250_ingenic: 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 99d27316

drivers/tty/serial/8250/8250_ingenic.c

+4 −4
Original line number Diff line number Diff line
@@ -50,17 +50,17 @@ static const struct of_device_id of_match[]; 


static struct earlycon_device *early_device;



static uint8_t __init early_in(struct uart_port *port, int offset)

static uint8_t early_in(struct uart_port *port, int offset)

{

	return readl(port->membase + (offset << 2));

}



static void __init early_out(struct uart_port *port, int offset, uint8_t value)

static void early_out(struct uart_port *port, int offset, uint8_t value)

{

	writel(value, port->membase + (offset << 2));

}



static void __init ingenic_early_console_putc(struct uart_port *port, int c)

static void ingenic_early_console_putc(struct uart_port *port, int c)

{

	uint8_t lsr;
@@ -71,7 +71,7 @@ static void __init ingenic_early_console_putc(struct uart_port *port, int c) 
	early_out(port, UART_TX, c);

}



static void __init ingenic_early_console_write(struct console *console,

static void ingenic_early_console_write(struct console *console,

					      const char *s, unsigned int count)

{

	uart_console_write(&early_device->port, s, count,