1 From fc9e25ed9db2fcfbf16a9cbbf5a1f449da78f1d9 Mon Sep 17 00:00:00 2001
2 From: Marek Szyprowski <m.szyprowski@samsung.com>
3 Date: Fri, 28 Feb 2014 14:42:49 +0100
4 Subject: [PATCH 051/182] drivers: of: add support for custom reserved memory
7 Add support for custom reserved memory drivers. Call their init() function
8 for each reserved region and prepare for using operations provided by them
9 with by the reserved_mem->ops array.
11 Based on previous code provided by Josh Cartwright <joshc@codeaurora.org>
13 Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
14 Signed-off-by: Grant Likely <grant.likely@linaro.org>
16 drivers/of/of_reserved_mem.c | 29 +++++++++++++++++++++++++++++
17 include/asm-generic/vmlinux.lds.h | 11 +++++++++++
18 include/linux/of_reserved_mem.h | 32 ++++++++++++++++++++++++++++++++
19 3 files changed, 72 insertions(+)
21 diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
22 index 69b8117..daaaf93 100644
23 --- a/drivers/of/of_reserved_mem.c
24 +++ b/drivers/of/of_reserved_mem.c
25 @@ -170,6 +170,33 @@ static int __init __reserved_mem_alloc_size(unsigned long node,
29 +static const struct of_device_id __rmem_of_table_sentinel
30 + __used __section(__reservedmem_of_table_end);
33 + * res_mem_init_node() - call region specific reserved memory init code
35 +static int __init __reserved_mem_init_node(struct reserved_mem *rmem)
37 + extern const struct of_device_id __reservedmem_of_table[];
38 + const struct of_device_id *i;
40 + for (i = __reservedmem_of_table; i < &__rmem_of_table_sentinel; i++) {
41 + reservedmem_of_init_fn initfn = i->data;
42 + const char *compat = i->compatible;
44 + if (!of_flat_dt_is_compatible(rmem->fdt_node, compat))
47 + if (initfn(rmem, rmem->fdt_node, rmem->name) == 0) {
48 + pr_info("Reserved memory: initialized node %s, compatible id %s\n",
49 + rmem->name, compat);
57 * fdt_init_reserved_mem - allocate and init all saved reserved memory regions
59 @@ -184,5 +211,7 @@ void __init fdt_init_reserved_mem(void)
61 err = __reserved_mem_alloc_size(node, rmem->name,
62 &rmem->base, &rmem->size);
64 + __reserved_mem_init_node(rmem);
67 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
68 index bd02ca7..146e4ff 100644
69 --- a/include/asm-generic/vmlinux.lds.h
70 +++ b/include/asm-generic/vmlinux.lds.h
72 #define CLK_OF_TABLES()
75 +#ifdef CONFIG_OF_RESERVED_MEM
76 +#define RESERVEDMEM_OF_TABLES() \
78 + VMLINUX_SYMBOL(__reservedmem_of_table) = .; \
79 + *(__reservedmem_of_table) \
80 + *(__reservedmem_of_table_end)
82 +#define RESERVEDMEM_OF_TABLES()
86 #define CPU_METHOD_OF_TABLES() . = ALIGN(8); \
87 VMLINUX_SYMBOL(__cpu_method_of_table_begin) = .; \
90 MEM_DISCARD(init.rodata) \
92 + RESERVEDMEM_OF_TABLES() \
94 CPU_METHOD_OF_TABLES() \
96 diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h
97 index 89226ed..9b1fbb7 100644
98 --- a/include/linux/of_reserved_mem.h
99 +++ b/include/linux/of_reserved_mem.h
101 #ifndef __OF_RESERVED_MEM_H
102 #define __OF_RESERVED_MEM_H
105 +struct of_phandle_args;
106 +struct reserved_mem_ops;
108 struct reserved_mem {
110 unsigned long fdt_node;
111 + const struct reserved_mem_ops *ops;
117 +struct reserved_mem_ops {
118 + void (*device_init)(struct reserved_mem *rmem,
119 + struct device *dev);
120 + void (*device_release)(struct reserved_mem *rmem,
121 + struct device *dev);
124 +typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem,
125 + unsigned long node, const char *uname);
127 #ifdef CONFIG_OF_RESERVED_MEM
128 void fdt_init_reserved_mem(void);
129 void fdt_reserved_mem_save_node(unsigned long node, const char *uname,
130 phys_addr_t base, phys_addr_t size);
132 +#define RESERVEDMEM_OF_DECLARE(name, compat, init) \
133 + static const struct of_device_id __reservedmem_of_table_##name \
134 + __used __section(__reservedmem_of_table) \
135 + = { .compatible = compat, \
136 + .data = (init == (reservedmem_of_init_fn)NULL) ? \
140 static inline void fdt_init_reserved_mem(void) { }
141 static inline void fdt_reserved_mem_save_node(unsigned long node,
142 const char *uname, phys_addr_t base, phys_addr_t size) { }
144 +#define RESERVEDMEM_OF_DECLARE(name, compat, init) \
145 + static const struct of_device_id __reservedmem_of_table_##name \
146 + __attribute__((unused)) \
147 + = { .compatible = compat, \
148 + .data = (init == (reservedmem_of_init_fn)NULL) ? \
153 #endif /* __OF_RESERVED_MEM_H */