Commit f28295cc authored by Hsin-Yi Wang's avatar Hsin-Yi Wang Committed by Greg Kroah-Hartman
Browse files

tty: serial: print earlycon info after match->setup 



8250 devices may modify iotype in their own earlycon setup. For example:
8250_mtk and 8250_uniphier force iotype to be MMIO32. Print earlycon info
after match->setup to reflect actual earlycon info.

Signed-off-by: default avatarHsin-Yi Wang <hsinyi@chromium.org>
Link: https://lore.kernel.org/r/20200915054825.3289105-1-hsinyi@chromium.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4be002f1

drivers/tty/serial/earlycon.c

+8 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ static void __init earlycon_init(struct earlycon_device *device, 
				 const char *name)

{

	struct console *earlycon = device->con;

	struct uart_port *port = &device->port;

	const char *s;

	size_t len;
@@ -70,6 +69,12 @@ static void __init earlycon_init(struct earlycon_device *device, 
	len = s - name;

	strlcpy(earlycon->name, name, min(len + 1, sizeof(earlycon->name)));

	earlycon->data = &early_console_dev;

}



static void __init earlycon_print_info(struct earlycon_device *device)

{

	struct console *earlycon = device->con;

	struct uart_port *port = &device->port;



	if (port->iotype == UPIO_MEM || port->iotype == UPIO_MEM16 ||

	    port->iotype == UPIO_MEM32 || port->iotype == UPIO_MEM32BE)
@@ -140,6 +145,7 @@ static int __init register_earlycon(char *buf, const struct earlycon_id *match) 


	earlycon_init(&early_console_dev, match->name);

	err = match->setup(&early_console_dev, buf);

	earlycon_print_info(&early_console_dev);

	if (err < 0)

		return err;

	if (!early_console_dev.con->write)
@@ -302,6 +308,7 @@ int __init of_setup_earlycon(const struct earlycon_id *match, 
	}

	earlycon_init(&early_console_dev, match->name);

	err = match->setup(&early_console_dev, options);

	earlycon_print_info(&early_console_dev);

	if (err < 0)

		return err;

	if (!early_console_dev.con->write)