| Message ID | 20200911093927.608024-1-hsinyi@chromium.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] tty: serial: print earlycon info after match->setup | expand |
On Fri, Sep 11, 2020 at 05:39:26PM +0800, Hsin-Yi Wang wrote: > 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. But this means you do something which user didn't ask for... > +static void __init earlycon_info(struct earlycon_device *device) Can it be earlycon_pr_info() or earlycon_print_info() ? -- With Best Regards, Andy Shevchenko
On Tue, Sep 15, 2020 at 12:06 AM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > On Fri, Sep 11, 2020 at 05:39:26PM +0800, Hsin-Yi Wang wrote: > > 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. > > But this means you do something which user didn't ask for... > 8250_uniphier states that it can only use mmio32 https://elixir.bootlin.com/linux/v5.9-rc4/source/drivers/tty/serial/8250/8250_uniphier.c#L46 For MTK, may be the same case. So they are set in the driver. > > +static void __init earlycon_info(struct earlycon_device *device) > > Can it be earlycon_pr_info() or earlycon_print_info() ? > Sure. I'll send a v2. > -- > With Best Regards, > Andy Shevchenko > >
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index 2ae9190b64bb9..22f0876f72d49 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -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_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_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_info(&early_console_dev); if (err < 0) return err; if (!early_console_dev.con->write)
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: Hsin-Yi Wang <hsinyi@chromium.org> --- drivers/tty/serial/earlycon.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)