From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759740AbbCDR27 (ORCPT ); Wed, 4 Mar 2015 12:28:59 -0500 Received: from mail-qg0-f45.google.com ([209.85.192.45]:38906 "EHLO mail-qg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933111AbbCDRYv (ORCPT ); Wed, 4 Mar 2015 12:24:51 -0500 From: Peter Hurley To: Greg Kroah-Hartman , Grant Likely , Rob Herring Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Hurley Subject: [PATCH -next 01/12] serial: earlycon: Fixup earlycon console name and index Date: Wed, 4 Mar 2015 12:24:20 -0500 Message-Id: <1425489871-22415-2-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.3.1 In-Reply-To: <1425489871-22415-1-git-send-email-peter@hurleysoftware.com> References: <1425489871-22415-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Properly initialize the struct console::name and ::index for the registering earlycon. The earlycon's ::index == 0 for earlycons without trailing numerals and the numeral value for earlycons with trailing numerals. For example, exynos4210 earlycon ::name == "exynos" and ::index = 4210. Earlycons with embedded numerals will have all non-trailing numerals as part of the name; for example, s3c2412 earlycon ::name == "s3c" and ::index == 2412. This ackward scheme was initially supported for the uart8250 earlycon; this patch extends this support to the other earlycon "drivers". Introduce earlycon_init() which performs the string scanning and initializes the ::name and ::index fields; encapsulate the other console field initializations within. Signed-off-by: Peter Hurley --- drivers/tty/serial/earlycon.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index 5fdc9f3..bfe21b8 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -28,7 +28,7 @@ #include static struct console early_con = { - .name = "uart", /* 8250 console switch requires this name */ + .name = "uart", /* fixed up at earlycon registration */ .flags = CON_PRINTBUFFER | CON_BOOT, .index = -1, }; @@ -61,6 +61,25 @@ static void __iomem * __init earlycon_map(unsigned long paddr, size_t size) return base; } +static void __init earlycon_init(struct earlycon_device *device, + const char *name) +{ + struct console *earlycon = device->con; + const char *s; + size_t len; + + /* scan backwards from end of string for first non-numeral */ + for (s = name + strlen(name); + s > name && s[-1] >= '0' && s[-1] <= '9'; + s--) + ; + if (*s) + earlycon->index = simple_strtoul(s, NULL, 10); + len = s - name; + strlcpy(earlycon->name, name, min(len + 1, sizeof(earlycon->name))); + earlycon->data = &early_console_dev; +} + static int __init parse_options(struct earlycon_device *device, char *options) { struct uart_port *port = &device->port; @@ -116,7 +135,7 @@ static int __init register_earlycon(char *buf, const struct earlycon_id *match) if (port->mapbase) port->membase = earlycon_map(port->mapbase, 64); - early_console_dev.con->data = &early_console_dev; + earlycon_init(&early_console_dev, match->name); err = match->setup(&early_console_dev, buf); if (err < 0) return err; -- 2.3.1