kernel: backport bcma patches queued for 3.20
[openwrt/svn-archive/archive.git] / target / linux / ipq806x / patches / 0051-drivers-of-add-support-for-custom-reserved-memory-dr.patch
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
5 drivers
6
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.
10
11 Based on previous code provided by Josh Cartwright <joshc@codeaurora.org>
12
13 Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
14 Signed-off-by: Grant Likely <grant.likely@linaro.org>
15 ---
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(+)
20
21 --- a/drivers/of/of_reserved_mem.c
22 +++ b/drivers/of/of_reserved_mem.c
23 @@ -170,6 +170,33 @@ static int __init __reserved_mem_alloc_s
24 return 0;
25 }
26
27 +static const struct of_device_id __rmem_of_table_sentinel
28 + __used __section(__reservedmem_of_table_end);
29 +
30 +/**
31 + * res_mem_init_node() - call region specific reserved memory init code
32 + */
33 +static int __init __reserved_mem_init_node(struct reserved_mem *rmem)
34 +{
35 + extern const struct of_device_id __reservedmem_of_table[];
36 + const struct of_device_id *i;
37 +
38 + for (i = __reservedmem_of_table; i < &__rmem_of_table_sentinel; i++) {
39 + reservedmem_of_init_fn initfn = i->data;
40 + const char *compat = i->compatible;
41 +
42 + if (!of_flat_dt_is_compatible(rmem->fdt_node, compat))
43 + continue;
44 +
45 + if (initfn(rmem, rmem->fdt_node, rmem->name) == 0) {
46 + pr_info("Reserved memory: initialized node %s, compatible id %s\n",
47 + rmem->name, compat);
48 + return 0;
49 + }
50 + }
51 + return -ENOENT;
52 +}
53 +
54 /**
55 * fdt_init_reserved_mem - allocate and init all saved reserved memory regions
56 */
57 @@ -184,5 +211,7 @@ void __init fdt_init_reserved_mem(void)
58 if (rmem->size == 0)
59 err = __reserved_mem_alloc_size(node, rmem->name,
60 &rmem->base, &rmem->size);
61 + if (err == 0)
62 + __reserved_mem_init_node(rmem);
63 }
64 }
65 --- a/include/asm-generic/vmlinux.lds.h
66 +++ b/include/asm-generic/vmlinux.lds.h
67 @@ -177,6 +177,16 @@
68 #define CLK_OF_TABLES()
69 #endif
70
71 +#ifdef CONFIG_OF_RESERVED_MEM
72 +#define RESERVEDMEM_OF_TABLES() \
73 + . = ALIGN(8); \
74 + VMLINUX_SYMBOL(__reservedmem_of_table) = .; \
75 + *(__reservedmem_of_table) \
76 + *(__reservedmem_of_table_end)
77 +#else
78 +#define RESERVEDMEM_OF_TABLES()
79 +#endif
80 +
81 #ifdef CONFIG_SMP
82 #define CPU_METHOD_OF_TABLES() . = ALIGN(8); \
83 VMLINUX_SYMBOL(__cpu_method_of_table_begin) = .; \
84 @@ -510,6 +520,7 @@
85 TRACE_SYSCALLS() \
86 MEM_DISCARD(init.rodata) \
87 CLK_OF_TABLES() \
88 + RESERVEDMEM_OF_TABLES() \
89 CLKSRC_OF_TABLES() \
90 CPU_METHOD_OF_TABLES() \
91 KERNEL_DTB() \
92 --- a/include/linux/of_reserved_mem.h
93 +++ b/include/linux/of_reserved_mem.h
94 @@ -1,21 +1,53 @@
95 #ifndef __OF_RESERVED_MEM_H
96 #define __OF_RESERVED_MEM_H
97
98 +struct device;
99 +struct of_phandle_args;
100 +struct reserved_mem_ops;
101 +
102 struct reserved_mem {
103 const char *name;
104 unsigned long fdt_node;
105 + const struct reserved_mem_ops *ops;
106 phys_addr_t base;
107 phys_addr_t size;
108 + void *priv;
109 +};
110 +
111 +struct reserved_mem_ops {
112 + void (*device_init)(struct reserved_mem *rmem,
113 + struct device *dev);
114 + void (*device_release)(struct reserved_mem *rmem,
115 + struct device *dev);
116 };
117
118 +typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem,
119 + unsigned long node, const char *uname);
120 +
121 #ifdef CONFIG_OF_RESERVED_MEM
122 void fdt_init_reserved_mem(void);
123 void fdt_reserved_mem_save_node(unsigned long node, const char *uname,
124 phys_addr_t base, phys_addr_t size);
125 +
126 +#define RESERVEDMEM_OF_DECLARE(name, compat, init) \
127 + static const struct of_device_id __reservedmem_of_table_##name \
128 + __used __section(__reservedmem_of_table) \
129 + = { .compatible = compat, \
130 + .data = (init == (reservedmem_of_init_fn)NULL) ? \
131 + init : init }
132 +
133 #else
134 static inline void fdt_init_reserved_mem(void) { }
135 static inline void fdt_reserved_mem_save_node(unsigned long node,
136 const char *uname, phys_addr_t base, phys_addr_t size) { }
137 +
138 +#define RESERVEDMEM_OF_DECLARE(name, compat, init) \
139 + static const struct of_device_id __reservedmem_of_table_##name \
140 + __attribute__((unused)) \
141 + = { .compatible = compat, \
142 + .data = (init == (reservedmem_of_init_fn)NULL) ? \
143 + init : init }
144 +
145 #endif
146
147 #endif /* __OF_RESERVED_MEM_H */