linux-serial.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Hurley <peter@hurleysoftware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Rob Herring <robh+dt@kernel.org>,
	Grant Likely <grant.likely@linaro.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 v2 -next 01/14] of: earlycon: Fix 'stdout-path' with ':' path terminator
Date: Fri,  6 Mar 2015 14:25:17 -0500	[thread overview]
Message-ID: <1425669930-22137-2-git-send-email-peter@hurleysoftware.com> (raw)
In-Reply-To: <1425669930-22137-1-git-send-email-peter@hurleysoftware.com>

stdout-path defines ':' as a path terminator and commit 75c28c09af99a
("of: add optional options parameter to of_find_node_by_path()") added
the necessary support to parse paths terminated with ':'.
commit 7914a7c5651a5 ("of: support passing console options with
stdout-path") added options string support to the stdout-path property,
which broke earlycon.

Add the same support to earlycon to process 'stdout-path' properties
which contain an options string.

Requires: "libfdt: Add fdt_path_offset_namelen()"
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
 drivers/of/fdt.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 3a896c9..7cef9f9 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -765,7 +765,7 @@ extern struct of_device_id __earlycon_of_table[];
 static int __init early_init_dt_scan_chosen_serial(void)
 {
 	int offset;
-	const char *p;
+	const char *p, *q;
 	int l;
 	const struct of_device_id *match = __earlycon_of_table;
 	const void *fdt = initial_boot_params;
@@ -782,8 +782,10 @@ static int __init early_init_dt_scan_chosen_serial(void)
 	if (!p || !l)
 		return -ENOENT;
 
+	q = strchrnul(p, ':');
+
 	/* Get the node specified by stdout-path */
-	offset = fdt_path_offset(fdt, p);
+	offset = fdt_path_offset_namelen(fdt, p, (int)(q - p));
 	if (offset < 0)
 		return -ENODEV;
 
-- 
2.3.1

  reply	other threads:[~2015-03-06 19:25 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-06 19:25 [PATCH v2 -next 00/14] OF earlycon cleanup Peter Hurley
2015-03-06 19:25 ` Peter Hurley [this message]
2015-03-06 19:25 ` [PATCH v2 -next 02/14] serial: earlycon: Fixup earlycon console name and index Peter Hurley
2015-03-06 19:25 ` [PATCH v2 -next 03/14] serial: earlycon: Emit earlycon name in the OF table Peter Hurley
2015-03-06 19:25 ` [PATCH v2 -next 04/14] of: earlycon: Fixup earlycon console name and index Peter Hurley
2015-03-06 19:25 ` [PATCH v2 -next 05/14] of: earlycon: Add options string handling Peter Hurley
2015-03-06 19:25 ` [PATCH v2 -next 06/14] of: earlycon: of_setup_earlycon() requires CONFIG_OF_EARLY_FLATTREE Peter Hurley
2015-03-06 19:25 ` [PATCH v2 -next 07/14] of: earlycon: Initialize port fields from DT properties Peter Hurley
2015-03-06 19:25 ` [PATCH v2 -next 08/14] of: earlycon: Move address translation to of_setup_earlycon() Peter Hurley
2015-03-06 19:25 ` [PATCH v2 -next 09/14] serial: earlycon: Common log banner for command line and DT Peter Hurley
2015-03-06 19:25 ` [PATCH v2 -next 10/14] serial: earlycon: Show the earlycon "driver" in banner Peter Hurley
2015-03-06 19:25 ` [PATCH v2 -next 11/14] of: earlycon: Allow multiple OF_EARLYCON_DECLARE() with same name Peter Hurley
2015-03-06 19:25 ` [PATCH v2 -next 12/14] of: earlycon: Log more helpful message if earlycon not found Peter Hurley
2015-03-06 19:25 ` [PATCH v2 -next 13/14] serial: 8250_early: Use port->regshift Peter Hurley
2015-03-06 19:25 ` [PATCH v2 -next 14/14] serial: 8250_omap: Add omap8250 earlycon 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=1425669930-22137-2-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 \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).