LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Peter Hurley <peter@hurleysoftware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Grant Likely <grant.likely@linaro.org>,
Rob Herring <robh+dt@kernel.org>
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Hurley <peter@hurleysoftware.com>,
Leif Lindholm <leif.lindholm@linaro.org>
Subject: [PATCH -next 04/12] of: earlycon: Add options string handling
Date: Wed, 4 Mar 2015 12:24:23 -0500 [thread overview]
Message-ID: <1425489871-22415-5-git-send-email-peter@hurleysoftware.com> (raw)
In-Reply-To: <1425489871-22415-1-git-send-email-peter@hurleysoftware.com>
commit 7914a7c5651a5 ("of: support passing console options with
stdout-path") added options string support to the stdout-path property.
Handle the options string for earlycon as well.
Requires: "libfdt: Teach fdt_path_offset() about ':' path separator"
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
drivers/of/fdt.c | 8 ++++++--
drivers/tty/serial/earlycon.c | 9 +++++++--
include/linux/serial_core.h | 3 ++-
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 5b67c6a..bdb74a8 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -765,7 +765,7 @@ extern struct of_device_id __earlycon_of_table[];
int __init early_init_dt_scan_chosen_serial(void)
{
int offset;
- const char *p;
+ const char *p, *options;
int l;
const struct of_device_id *match = __earlycon_of_table;
const void *fdt = initial_boot_params;
@@ -782,6 +782,10 @@ int __init early_init_dt_scan_chosen_serial(void)
if (!p || !l)
return -ENOENT;
+ options = strchr(p, ':');
+ if (options)
+ options++;
+
/* Get the node specified by stdout-path */
offset = fdt_path_offset(fdt, p);
if (offset < 0)
@@ -798,7 +802,7 @@ int __init early_init_dt_scan_chosen_serial(void)
if (!addr)
return -ENXIO;
- of_setup_earlycon(addr, match);
+ of_setup_earlycon(addr, match, options);
return 0;
}
return -ENODEV;
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 04aa22c..436ac88 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -218,7 +218,8 @@ static int __init param_setup_earlycon(char *buf)
early_param("earlycon", param_setup_earlycon);
int __init of_setup_earlycon(unsigned long addr,
- const struct of_device_id *match)
+ const struct of_device_id *match,
+ const char *options)
{
int err;
struct uart_port *port = &early_console_dev.port;
@@ -229,8 +230,12 @@ int __init of_setup_earlycon(unsigned long addr,
port->uartclk = BASE_BAUD * 16;
port->membase = earlycon_map(addr, SZ_4K);
+ if (options) {
+ strlcpy(early_console_dev.options, options,
+ sizeof(early_console_dev.options));
+ }
earlycon_init(&early_console_dev, match->name);
- err = setup(&early_console_dev, NULL);
+ err = setup(&early_console_dev, options);
if (err < 0)
return err;
if (!early_console_dev.con->write)
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index a2db5bd..ebbcd43 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -346,7 +346,8 @@ struct earlycon_id {
extern int setup_earlycon(char *buf);
extern int of_setup_earlycon(unsigned long addr,
- const struct of_device_id *match);
+ const struct of_device_id *match,
+ const char *options);
#define EARLYCON_DECLARE(_name, func) \
static const struct earlycon_id __earlycon_##_name \
--
2.3.1
next prev parent reply other threads:[~2015-03-04 17:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-04 17:24 [PATCH -next 00/12] OF earlycon cleanup Peter Hurley
2015-03-04 17:24 ` [PATCH -next 01/12] serial: earlycon: Fixup earlycon console name and index Peter Hurley
2015-03-04 17:24 ` [PATCH -next 02/12] serial: earlycon: Emit earlycon name in the OF table Peter Hurley
2015-03-05 15:13 ` Rob Herring
2015-03-06 16:05 ` Peter Hurley
2015-03-04 17:24 ` [PATCH -next 03/12] of: earlycon: Fixup earlycon console name and index Peter Hurley
2015-03-04 17:24 ` Peter Hurley [this message]
2015-03-05 16:28 ` [PATCH -next 04/12] of: earlycon: Add options string handling Rob Herring
2015-03-04 17:24 ` [PATCH -next 05/12] of: earlycon: Initialize port fields from DT properties Peter Hurley
2015-03-05 16:16 ` Rob Herring
2015-03-04 17:24 ` [PATCH -next 06/12] of: earlycon: Move address translation to of_setup_earlycon() Peter Hurley
2015-03-05 16:25 ` Rob Herring
2015-03-04 17:24 ` [PATCH -next 07/12] serial: earlycon: Common log banner for command line and DT Peter Hurley
2015-03-05 12:02 ` Geert Uytterhoeven
2015-03-05 12:24 ` Peter Hurley
2015-03-04 17:24 ` [PATCH -next 08/12] serial: earlycon: Id the earlycon "driver" in banner Peter Hurley
2015-03-04 17:24 ` [PATCH -next 09/12] of: earlycon: Allow multiple OF_EARLYCON_DECLARE() with same name Peter Hurley
2015-03-04 17:24 ` [PATCH -next 10/12] of: earlycon: Log more helpful message if earlycon not found Peter Hurley
2015-03-04 17:24 ` [PATCH -next 11/12] serial: 8250_early: Use port->regshift Peter Hurley
2015-03-04 17:24 ` [PATCH -next 12/12] serial: 8250_omap: Add omap8250 earlycon Peter Hurley
2015-03-04 17:33 ` [PATCH -next 00/12] OF earlycon cleanup Peter Hurley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425489871-22415-5-git-send-email-peter@hurleysoftware.com \
--to=peter@hurleysoftware.com \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=leif.lindholm@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=robh+dt@kernel.org \
--subject='Re: [PATCH -next 04/12] of: earlycon: Add options string handling' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).