All of lore.kernel.org
 help / color / mirror / Atom feed
From: peter@hurleysoftware.com (Peter Hurley)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 3/3] of: support passing console options with stdout-path
Date: Thu, 26 Feb 2015 06:55:22 -0500	[thread overview]
Message-ID: <54EF09AA.2080706@hurleysoftware.com> (raw)
In-Reply-To: <1417110967-16284-4-git-send-email-leif.lindholm@linaro.org>

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);
>  
> 

WARNING: multiple messages have this Message-ID (diff)
From: Peter Hurley <peter@hurleysoftware.com>
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
Date: Thu, 26 Feb 2015 06:55:22 -0500	[thread overview]
Message-ID: <54EF09AA.2080706@hurleysoftware.com> (raw)
In-Reply-To: <1417110967-16284-4-git-send-email-leif.lindholm@linaro.org>

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);
>  
> 

  parent reply	other threads:[~2015-02-26 11:55 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-27 17:56 [PATCH v3 0/3] of: support passing console options with stdout-path Leif Lindholm
2014-11-27 17:56 ` Leif Lindholm
2014-11-27 17:56 ` Leif Lindholm
2014-11-27 17:56 ` [PATCH v3 1/3] devicetree: of: Add bindings for chosen node, stdout-path Leif Lindholm
2014-11-27 17:56   ` Leif Lindholm
2014-11-27 18:41   ` Mark Rutland
2014-11-27 18:41     ` Mark Rutland
2014-11-28  0:22     ` Grant Likely
2014-11-28  0:22       ` Grant Likely
2014-12-03  2:24   ` Frank Rowand
2014-12-03  2:24     ` Frank Rowand
2014-12-03  2:24     ` Frank Rowand
2014-12-03 15:12     ` Grant Likely
2014-12-03 15:12       ` Grant Likely
2014-12-03 15:12       ` Grant Likely
2014-12-03 19:46       ` Frank Rowand
2014-12-03 19:46         ` Frank Rowand
2014-12-03 21:45         ` Grant Likely
2014-12-03 21:45           ` Grant Likely
2014-12-03 23:07           ` Frank Rowand
2014-12-03 23:07             ` Frank Rowand
2014-12-03 23:07             ` Frank Rowand
2014-12-04 10:39             ` Grant Likely
2014-12-04 10:39               ` Grant Likely
2014-12-04 10:39               ` Grant Likely
2014-11-27 17:56 ` [PATCH v3 2/3] of: add optional options parameter to of_find_node_by_path() Leif Lindholm
2014-11-27 17:56   ` Leif Lindholm
2014-11-28  0:44   ` Grant Likely
2014-11-28  0:44     ` Grant Likely
2014-11-28  0:44     ` Grant Likely
2014-11-28 11:34     ` Leif Lindholm
2014-11-28 11:34       ` Leif Lindholm
2014-11-28 11:34       ` Leif Lindholm
2014-11-28 15:25       ` Grant Likely
2014-11-28 15:25         ` Grant Likely
2014-11-28 15:33         ` Grant Likely
2014-11-28 15:33           ` Grant Likely
2014-11-28 16:38         ` [PATCH v3 2/3] of: add optional options parameter to? of_find_node_by_path() Leif Lindholm
2014-11-28 16:38           ` Leif Lindholm
2014-11-28 16:38           ` Leif Lindholm
2014-11-28 23:57           ` Grant Likely
2014-11-28 23:57             ` Grant Likely
2014-11-28 23:57             ` Grant Likely
2015-03-04 15:45   ` [PATCH v3 2/3] of: add optional options parameter to of_find_node_by_path() Peter Hurley
2015-03-04 15:45     ` Peter Hurley
2015-03-06 16:52     ` Leif Lindholm
2015-03-06 16:52       ` Leif Lindholm
2015-03-06 16:52       ` Leif Lindholm
2015-03-06 18:11       ` Peter Hurley
2015-03-06 18:11         ` Peter Hurley
2015-03-06 18:59         ` Peter Hurley
2015-03-06 18:59           ` Peter Hurley
2015-03-13 15:23           ` Rob Herring
2015-03-13 15:23             ` Rob Herring
2014-11-27 17:56 ` [PATCH v3 3/3] of: support passing console options with stdout-path Leif Lindholm
2014-11-27 17:56   ` Leif Lindholm
2014-11-28 15:39   ` Grant Likely
2014-11-28 15:39     ` Grant Likely
2015-02-26 11:55   ` Peter Hurley [this message]
2015-02-26 11:55     ` Peter Hurley
2015-02-26 13:46     ` Andrew Lunn
2015-02-26 13:46       ` Andrew Lunn
2015-02-26 13:46       ` Andrew Lunn
2015-02-26 14:09       ` Peter Hurley
2015-02-26 14:09         ` Peter Hurley
2015-02-26 14:09         ` Peter Hurley
2015-02-26 14:44         ` Andrew Lunn
2015-02-26 14:44           ` Andrew Lunn

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=54EF09AA.2080706@hurleysoftware.com \
    --to=peter@hurleysoftware.com \
    --cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.