From: gregkh@linuxfoundation•org (Greg Kroah-Hartman)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v7 1/5] of/serial: move earlycon early_param handling to serial
Date: Thu, 31 Mar 2016 09:32:03 -0700 [thread overview]
Message-ID: <20160331163203.GC10256@kroah.com> (raw)
In-Reply-To: <1459431629-27934-2-git-send-email-aleksey.makarov@linaro.org>
On Thu, Mar 31, 2016 at 04:40:23PM +0300, Aleksey Makarov wrote:
> From: Leif Lindholm <leif.lindholm@linaro•org>
>
> We have multiple "earlycon" early_param handlers - merge the DT one into
> the main earlycon one. It's a cleanup that also will be useful
> to defer setting up DT console until ACPI/DT decision is made.
>
> Rename the exported function to avoid clashing with the function from
> arch/microblaze/kernel/prom.c
>
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro•org>
> Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro•org>
> Acked-by: Rob Herring <robh@kernel•org>
> ---
> drivers/of/fdt.c | 11 +----------
> drivers/tty/serial/earlycon.c | 2 +-
> include/linux/of_fdt.h | 2 ++
> 3 files changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> index 3349d2a..b50f775 100644
> --- a/drivers/of/fdt.c
> +++ b/drivers/of/fdt.c
> @@ -805,7 +805,7 @@ static inline void early_init_dt_check_for_initrd(unsigned long node)
>
> #ifdef CONFIG_SERIAL_EARLYCON
>
> -static int __init early_init_dt_scan_chosen_serial(void)
> +int __init early_init_dt_scan_chosen_stdout(void)
> {
> int offset;
> const char *p, *q, *options = NULL;
> @@ -849,15 +849,6 @@ static int __init early_init_dt_scan_chosen_serial(void)
> }
> return -ENODEV;
> }
> -
> -static int __init setup_of_earlycon(char *buf)
> -{
> - if (buf)
> - return 0;
> -
> - return early_init_dt_scan_chosen_serial();
> -}
> -early_param("earlycon", setup_of_earlycon);
> #endif
>
> /**
> diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
> index 067783f..7aae655 100644
> --- a/drivers/tty/serial/earlycon.c
> +++ b/drivers/tty/serial/earlycon.c
> @@ -209,7 +209,7 @@ static int __init param_setup_earlycon(char *buf)
> * don't generate a warning from parse_early_params() in that case
> */
> if (!buf || !buf[0])
> - return 0;
> + return early_init_dt_scan_chosen_stdout();
>
> err = setup_earlycon(buf);
> if (err == -ENOENT || err == -EALREADY)
> diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
> index 2fbe868..5cfe322 100644
> --- a/include/linux/of_fdt.h
> +++ b/include/linux/of_fdt.h
> @@ -63,6 +63,7 @@ extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,
> int depth, void *data);
> extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
> int depth, void *data);
> +extern int early_init_dt_scan_chosen_stdout(void);
> extern void early_init_fdt_scan_reserved_mem(void);
> extern void early_init_fdt_reserve_self(void);
> extern void early_init_dt_add_memory_arch(u64 base, u64 size);
> @@ -91,6 +92,7 @@ extern void early_get_first_memblock_info(void *, phys_addr_t *);
> extern u64 of_flat_dt_translate_address(unsigned long node);
> extern void of_fdt_limit_memory(int limit);
> #else /* CONFIG_OF_FLATTREE */
> +static inline int early_init_dt_scan_chosen_stdout(void) { return -ENODEV; }
Doesn't this change the default logic? Today you are returning 0 if you
don't have this config option set, and now you return -ENODEV, did you
test this out?
thanks,
greg k-h
next prev parent reply other threads:[~2016-03-31 16:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-31 13:40 [PATCH v7 0/5] ACPI: parse the SPCR table Aleksey Makarov
2016-03-31 13:40 ` [PATCH v7 1/5] of/serial: move earlycon early_param handling to serial Aleksey Makarov
2016-03-31 16:32 ` Greg Kroah-Hartman [this message]
2016-03-31 17:04 ` Aleksey Makarov
2016-03-31 17:37 ` Greg Kroah-Hartman
2016-03-31 18:21 ` Aleksey Makarov
2016-04-04 21:07 ` Peter Hurley
2016-04-29 0:42 ` Greg Kroah-Hartman
2016-03-31 13:40 ` [PATCH v7 2/5] ACPICA: Headers: Add new constants for the DBG2 ACPI table Aleksey Makarov
2016-03-31 13:40 ` [PATCH v7 3/5] ACPI: parse SPCR and enable matching console Aleksey Makarov
2016-04-04 21:23 ` Peter Hurley
2016-04-06 10:31 ` Aleksey Makarov
2016-03-31 13:40 ` [PATCH v7 4/5] ARM64: ACPI: enable ACPI_SPCR_TABLE Aleksey Makarov
2016-03-31 13:40 ` [PATCH v7 5/5] serial: pl011: add console matching function Aleksey Makarov
2016-04-04 21:08 ` Peter Hurley
2016-04-29 0:43 ` Greg Kroah-Hartman
2016-04-05 16:27 ` [PATCH v7 0/5] ACPI: parse the SPCR table Mark Salter
2016-04-06 10:24 ` Aleksey Makarov
2016-04-06 10:52 ` Graeme Gregory
2016-04-06 14:18 ` Mark Salter
2016-04-06 16:27 ` Peter Hurley
2016-04-06 19:00 ` Mark Salter
2016-05-12 8:20 ` Jon Masters
2016-05-12 11:52 ` Aleksey Makarov
2016-05-12 13:08 ` Kefeng Wang
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=20160331163203.GC10256@kroah.com \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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