Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932423AbbBZLz2 (ORCPT <rfc822;w@1wt.eu>);
	Thu, 26 Feb 2015 06:55:28 -0500
Received: from mail-qc0-f181.google.com ([209.85.216.181]:34378 "EHLO
	mail-qc0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932120AbbBZLz0 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 26 Feb 2015 06:55:26 -0500
Message-ID: <54EF09AA.2080706@hurleysoftware.com>
Date: Thu, 26 Feb 2015 06:55:22 -0500
From: Peter Hurley <peter@hurleysoftware.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0
MIME-Version: 1.0
To: Leif Lindholm <leif.lindholm@linaro.org>, grant.likely@linaro.org
CC: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, mark.rutland@arm.com, robh+dt@kernel.org,
        plagnioj@jcrosoft.com, ijc@debian.org, andrew@lunn.ch,
        s.hauer@pengutronix.de
Subject: Re: [PATCH v3 3/3] of: support passing console options with stdout-path
References: <1417110967-16284-1-git-send-email-leif.lindholm@linaro.org> <1417110967-16284-4-git-send-email-leif.lindholm@linaro.org>
In-Reply-To: <1417110967-16284-4-git-send-email-leif.lindholm@linaro.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2116
Lines: 64

On 11/27/2014 12:56 PM, Leif Lindholm wrote:
> Support specifying console options (like with console=ttyXN,<options>)
> by appending them to the stdout-path property after a separating ':'.
> 
> Example:
>         stdout-path = "uart0:115200";

This format breaks DT earlycon because libfdt doesn't recognize ':' as a
path terminator.

It's simple enough to fix this directly in early_init_dt_scan_chosen_serial()
but perhaps it would better to teach fdt_path_offset() to recognize ':'?

Regards,
Peter Hurley

> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> ---
>  drivers/of/base.c |    9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index 7f0e5f7..6d2d45e 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -37,6 +37,7 @@ EXPORT_SYMBOL(of_allnodes);
>  struct device_node *of_chosen;
>  struct device_node *of_aliases;
>  struct device_node *of_stdout;
> +static const char *of_stdout_options;
>  
>  struct kset *of_kset;
>  
> @@ -1844,7 +1845,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
>  		if (IS_ENABLED(CONFIG_PPC) && !name)
>  			name = of_get_property(of_aliases, "stdout", NULL);
>  		if (name)
> -			of_stdout = of_find_node_by_path(name);
> +			of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);
>  	}
>  
>  	if (!of_aliases)
> @@ -1968,9 +1969,13 @@ EXPORT_SYMBOL_GPL(of_prop_next_string);
>   */
>  bool of_console_check(struct device_node *dn, char *name, int index)
>  {
> +	char *console_options;
> +
>  	if (!dn || dn != of_stdout || console_set_on_cmdline)
>  		return false;
> -	return !add_preferred_console(name, index, NULL);
> +
> +	console_options = kstrdup(of_stdout_options, GFP_KERNEL);
> +	return !add_preferred_console(name, index, console_options);
>  }
>  EXPORT_SYMBOL_GPL(of_console_check);
>  
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/