On Tue, Sep 08, 2015 at 01:52:45PM +0100, Mark Rutland wrote:
> On Tue, Sep 08, 2015 at 01:43:34PM +0100, Leif Lindholm wrote:
> > We have multiple "earlycon" early_param handlers - merge the DT one into
> > the main earlycon one. This means the earlycon early_param handler does
> > not just return success if no options are specified.
> >
> > Signed-off-by: Leif Lindholm <leif.lindholm@xxxxxxxxxx>
> > ---
> > drivers/of/fdt.c | 11 +----------
> > drivers/tty/serial/earlycon.c | 4 +++-
> > include/linux/of_fdt.h | 1 +
> > 3 files changed, 5 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> > index 6e82bc42..fcfc4c7 100644
> > --- a/drivers/of/fdt.c
> > +++ b/drivers/of/fdt.c
> > @@ -793,7 +793,7 @@ static inline void early_init_dt_check_for_initrd(unsigned long node)
> > #ifdef CONFIG_SERIAL_EARLYCON
> > extern struct of_device_id __earlycon_of_table[];
> >
> > -static int __init early_init_dt_scan_chosen_serial(void)
> > +int __init early_init_dt_scan_chosen_serial(void)
> > {
> > int offset;
> > const char *p;
> > @@ -834,15 +834,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 f096360..2bda09a 100644
> > --- a/drivers/tty/serial/earlycon.c
> > +++ b/drivers/tty/serial/earlycon.c
> > @@ -17,6 +17,7 @@
> > #include <linux/kernel.h>
> > #include <linux/init.h>
> > #include <linux/io.h>
> > +#include <linux/of_fdt.h>
> > #include <linux/serial_core.h>
> > #include <linux/sizes.h>
> > #include <linux/mod_devicetable.h>
> > @@ -187,7 +188,8 @@ 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;
> > + if (IS_ENABLED(CONFIG_OF_FLATTREE))
> > + return early_init_dt_scan_chosen_serial();
> >
> > err = setup_earlycon(buf);
> > if (err == -ENOENT || err == -EALREADY)
> > diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
> > index df9ef38..772c47c 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_serial(void);
>
> I think you need a static inline stub to prevent link errors in
> !CONFIG_OF_FLATTREE kernels, as we do for
> early_init_fdt_scan_reserved_mem and friends.
Will add, thanks.
>
> Mark.
>
> > 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);
> > --
> > 2.1.4
> >
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
