DT early console initialization

From: Rob Herring <[email protected]>

All the parameters for RESERVEDMEM_OF_DECLARE function callbacks are members of struct reserved_mem, so just pass the struct ptr to callback functions so the function callback is more in line with other OF match table callbacks.

Cc Marek Szyprowski <[email protected]>

Cc Grant Likely <[email protected]>

Signed-off-by Rob Herring <[email protected]>

---
  drivers/of/of_reserved_mem.c    | 2 +-
  include/linux/of_reserved_mem.h | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)

drivers/of/of_reserved_mem.c +1 -1

index e420eb5..632aae8 100644
@@ -188,7 +188,7 @@ static int __init __reserved_mem_init_node(struct reserved_mem *rmem)
  		if (!of_flat_dt_is_compatible(rmem->fdt_node, compat))
  			continue;
 
-		if (initfn(rmem, rmem->fdt_node, rmem->name) == 0) {
+		if (initfn(rmem) == 0) {
  			pr_info("Reserved memory: initialized node %s, compatible id %s\n",
  				rmem->name, compat);
  			return 0;

include/linux/of_reserved_mem.h +0 -0

index 9b1fbb7..4c81b84 100644

From: Rob Herring <[email protected]>

We now have several OF match tables using linker sections that are nearly the same definition. The only variation is the callback function prototype. Create a common define for creating linker section OF match table entries which each table declaration can use.

Cc Grant Likely <[email protected]>

Signed-off-by Rob Herring <[email protected]>

---
 drivers/clocksource/clksrc-of.c |  2 +-
 drivers/irqchip/irqchip.h       |  7 +++----
 include/linux/clk-provider.h    |  5 +----
 include/linux/clocksource.h     | 16 +++-------------
 include/linux/of.h              | 22 ++++++++++++++++++++++
 include/linux/of_reserved_mem.h | 18 ++----------------
 6 files changed, 32 insertions(+), 38 deletions(-)

drivers/clocksource/clksrc-of.c +1 -1

index ae2e427..0093a8e 100644
@@ -27,7 +27,7 @@ void __init clocksource_of_init(void)
 {
 	struct device_node *np;
 	const struct of_device_id *match;
-	clocksource_of_init_fn init_func;
+	of_init_fn_1 init_func;
 	unsigned clocksources = 0;
 
 	for_each_matching_node_and_match(np, __clksrc_of_table, &match) {

drivers/irqchip/irqchip.h +3 -4

index e445ba2..0f6486d 100644
@@ -11,6 +11,8 @@
 #ifndef _IRQCHIP_H
 #define _IRQCHIP_H
 
+#include <linux/of.h>
+
 /*
  * This macro must be used by the different irqchip drivers to declare
  * the association between their DT compatible string and their

@@ -21,9 +23,6 @@
  * @compstr: compatible string of the irqchip driver
  * @fn: initialization function
  */
-#define IRQCHIP_DECLARE(name,compstr,fn)				\
-	static const struct of_device_id irqchip_of_match_##name	\
-	__used __section(__irqchip_of_table)				\
-	= { .compatible = compstr, .data = fn }
+#define IRQCHIP_DECLARE(name, compat, fn) OF_DECLARE_2(irqchip, name, compat, fn)
 
 #endif

include/linux/clk-provider.h +1 -4

index 59e2eb5..3429929 100644
@@ -501,10 +501,7 @@ struct clk_onecell_data {
 
 extern struct of_device_id __clk_of_table;
 
-#define CLK_OF_DECLARE(name, compat, fn)			\
-	static const struct of_device_id __clk_of_table_##name	\
-		__used __section(__clk_of_table)		\
-		= { .compatible = compat, .data = fn };
+#define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn)
 
 #ifdef CONFIG_OF
 int of_clk_add_provider(struct device_node *np,

include/linux/clocksource.h +3 -13

index 67301a4..a16b497 100644
@@ -339,23 +339,13 @@ extern int clocksource_mmio_init(void __iomem *, const char *,
 
 extern int clocksource_i8253_init(void);
 
-struct device_node;
-typedef void(*clocksource_of_init_fn)(struct device_node *);
+#define CLOCKSOURCE_OF_DECLARE(name, compat, fn) \
+	OF_DECLARE_1(clksrc, name, compat, fn)
+
 #ifdef CONFIG_CLKSRC_OF
 extern void clocksource_of_init(void);
-
-#define CLOCKSOURCE_OF_DECLARE(name, compat, fn)			\
-	static const struct of_device_id __clksrc_of_table_##name	\
-		__used __section(__clksrc_of_table)			\
-		 = { .compatible = compat,				\
-		     .data = (fn == (clocksource_of_init_fn)NULL) ? fn : fn }
 #else
 static inline void clocksource_of_init(void) {}
-#define CLOCKSOURCE_OF_DECLARE(name, compat, fn)			\
-	static const struct of_device_id __clksrc_of_table_##name	\
-		__attribute__((unused))					\
-		 = { .compatible = compat,				\
-		     .data = (fn == (clocksource_of_init_fn)NULL) ? fn : fn }
 #endif
 
 #endif /* _LINUX_CLOCKSOURCE_H */

include/linux/of.h +22 -0

index 3bad8d1..6fb2185 100644
@@ -757,4 +757,26 @@ static inline int of_get_available_child_count(const struct device_node *np)
 	return num;
 }
 
+#ifdef CONFIG_OF
+#define _OF_DECLARE(table, name, compat, fn, fn_type)			\
+	static const struct of_device_id __of_table_##name		\
+		__used __section(__##table##_of_table)			\
+		 = { .compatible = compat,				\
+		     .data = (fn == (fn_type)NULL) ? fn : fn  }
+#else
+#define _OF_DECLARE(name, compat, fn, fn_type)					\
+	static const struct of_device_id __of_table_##name		\
+		__attribute__((unused))					\
+		 = { .compatible = compat,				\
+		     .data = (fn == (fn_type)NULL) ? fn : fn }
+#endif
+
+typedef int (*of_init_fn_2)(struct device_node *, struct device_node *);
+typedef void (*of_init_fn_1)(struct device_node *);
+
+#define OF_DECLARE_1(table, name, compat, fn) \
+		_OF_DECLARE(table, name, compat, fn, of_init_fn_1)
+#define OF_DECLARE_2(table, name, compat, fn) \
+		_OF_DECLARE(table, name, compat, fn, of_init_fn_2)
+
 #endif /* _LINUX_OF_H */

include/linux/of_reserved_mem.h +2 -16

index 4c81b84..4669ddf 100644
@@ -23,31 +23,17 @@ struct reserved_mem_ops {
 
 typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem);
 
+#define RESERVEDMEM_OF_DECLARE(name, compat, init)			\
+	_OF_DECLARE(reservedmem, name, compat, init, reservedmem_of_init_fn)
 
 #ifdef CONFIG_OF_RESERVED_MEM
 void fdt_init_reserved_mem(void);
 void fdt_reserved_mem_save_node(unsigned long node, const char *uname,
 			       phys_addr_t base, phys_addr_t size);
-
-#define RESERVEDMEM_OF_DECLARE(name, compat, init)			\
-	static const struct of_device_id __reservedmem_of_table_##name	\
-		__used __section(__reservedmem_of_table)		\
-		 = { .compatible = compat,				\
-		     .data = (init == (reservedmem_of_init_fn)NULL) ?	\
-				init : init }
-
 #else
 static inline void fdt_init_reserved_mem(void) { }
 static inline void fdt_reserved_mem_save_node(unsigned long node,
 		const char *uname, phys_addr_t base, phys_addr_t size) { }
-
-#define RESERVEDMEM_OF_DECLARE(name, compat, init)			\
-	static const struct of_device_id __reservedmem_of_table_##name	\
-		__attribute__((unused))					\
-		 = { .compatible = compat,				\
-		     .data = (init == (reservedmem_of_init_fn)NULL) ?	\
-				init : init }
-
 #endif
 
 #endif /* __OF_RESERVED_MEM_H */

Signature · 1 line

1.9.1

From: Rob Herring <[email protected]>

This series adds support for early serial console initialization using DT. This enables determining the serial port type and address using the FDT and allows enabling the console before platform specific initialization runs. I've tested this on arm64. ARM support is dependent on adding fixmap support.

Currently, the earlycon is only enabled if "earlycon" is present on the kernel command line. The FDT needs to have /chosen/stdout-path set to the path of the serial port.

This series is dependent on generic earlycon[1], libfdt support[2], and vmlinux.lds.h clean-ups[3]. The first 2 are in linux-next already. A git branch is available here:

git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git earlycon-dt

Rob

[1] https://lkml.org/lkml/2014/4/18/573
[2] https://lkml.org/lkml/2014/4/22/1202
[3] https://lkml.org/lkml/2014/3/27/285

Rob Herring (6):
of: align RESERVEDMEM_OF_DECLARE function callbacks to other callbacks
of: consolidate linker section OF match table declarations
serial: earlycon: add DT support
of/fdt: add FDT address translation support
of/fdt: add FDT serial scanning for earlycon
tty/serial: pl011: add DT based earlycon support

 drivers/clocksource/clksrc-of.c   |   2 +-
 drivers/irqchip/irqchip.h         |   7 +-
 drivers/of/Makefile               |   2 +
 drivers/of/fdt.c                  |  56 +++++++++
 drivers/of/fdt_address.c          | 241 ++++++++++++++++++++++++++++++++++++++
 drivers/of/of_reserved_mem.c      |   2 +-
 drivers/tty/serial/amba-pl011.c   |   1 +
 drivers/tty/serial/earlycon.c     |  27 +++++
 include/asm-generic/vmlinux.lds.h |   4 +-
 include/linux/clk-provider.h      |   5 +-
 include/linux/clocksource.h       |  16 +--
 include/linux/of.h                |  22 ++++
 include/linux/of_fdt.h            |   1 +
 include/linux/of_reserved_mem.h   |  22 +---
 include/linux/serial_core.h       |   6 +
 15 files changed, 372 insertions(+), 42 deletions(-)
 create mode 100644 drivers/of/fdt_address.c

Signature · 1 line

1.9.1

Quoted 16 lines · Rob Herring

From: Rob Herring <[email protected]>

This series adds support for early serial console initialization using DT. This enables determining the serial port type and address using the FDT and allows enabling the console before platform specific initialization runs. I've tested this on arm64. ARM support is dependent on adding fixmap support.

Currently, the earlycon is only enabled if "earlycon" is present on the kernel command line. The FDT needs to have /chosen/stdout-path set to the path of the serial port.

This series is dependent on generic earlycon[1], libfdt support[2], and vmlinux.lds.h clean-ups[3]. The first 2 are in linux-next already. A git branch is available here:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git earlycon-dt

Nice. For the whole series:

Acked-by Grant Likely <[email protected]>

I haven't tested it though.

Quoted 14 lines

Rob

[1] https://lkml.org/lkml/2014/4/18/573
[2] https://lkml.org/lkml/2014/4/22/1202
[3] https://lkml.org/lkml/2014/3/27/285

Rob Herring (6):
of: align RESERVEDMEM_OF_DECLARE function callbacks to other callbacks
of: consolidate linker section OF match table declarations
serial: earlycon: add DT support
of/fdt: add FDT address translation support
of/fdt: add FDT serial scanning for earlycon
tty/serial: pl011: add DT based earlycon support

Quoted 17 lines · Grant Likely

Quoted 16 lines · Rob Herring

From: Rob Herring <[email protected]>

This series adds support for early serial console initialization using DT. This enables determining the serial port type and address using the FDT and allows enabling the console before platform specific initialization runs. I've tested this on arm64. ARM support is dependent on adding fixmap support.

Currently, the earlycon is only enabled if "earlycon" is present on the kernel command line. The FDT needs to have /chosen/stdout-path set to the path of the serial port.

This series is dependent on generic earlycon[1], libfdt support[2], and vmlinux.lds.h clean-ups[3]. The first 2 are in linux-next already. A git branch is available here:

Quoted 21 lines

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git earlycon-dt

Nice. For the whole series:

Acked-by Grant Likely <[email protected]>

I haven't tested it though.

Quoted 14 lines

Rob

[1] https://lkml.org/lkml/2014/4/18/573
[2] https://lkml.org/lkml/2014/4/22/1202
[3] https://lkml.org/lkml/2014/3/27/285

Rob Herring (6):
of: align RESERVEDMEM_OF_DECLARE function callbacks to other callbacks
of: consolidate linker section OF match table declarations
serial: earlycon: add DT support
of/fdt: add FDT address translation support
of/fdt: add FDT serial scanning for earlycon
tty/serial: pl011: add DT based earlycon support

Greg, I plan to take this series thru the DT tree for 3.16 unless you have any objections. It has dependencies on both the tty-next and the DT trees.