1 From 968b497e1027ec78e986370976c76e1652aa0459 Mon Sep 17 00:00:00 2001
2 From: Marek Szyprowski <m.szyprowski@samsung.com>
3 Date: Fri, 28 Feb 2014 14:42:48 +0100
4 Subject: [PATCH 050/182] drivers: of: add initialization code for dynamic
7 This patch adds support for dynamically allocated reserved memory regions
8 declared in device tree. Such regions are defined by 'size', 'alignment'
9 and 'alloc-ranges' properties.
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/Kconfig | 6 ++
17 drivers/of/Makefile | 1 +
18 drivers/of/fdt.c | 13 ++-
19 drivers/of/of_reserved_mem.c | 188 +++++++++++++++++++++++++++++++++++++++
20 include/linux/of_reserved_mem.h | 21 +++++
21 5 files changed, 227 insertions(+), 2 deletions(-)
22 create mode 100644 drivers/of/of_reserved_mem.c
23 create mode 100644 include/linux/of_reserved_mem.h
25 --- a/drivers/of/Kconfig
26 +++ b/drivers/of/Kconfig
27 @@ -75,4 +75,10 @@ config OF_MTD
31 +config OF_RESERVED_MEM
32 + depends on OF_EARLY_FLATTREE
35 + Helpers to allow for reservation of memory regions
38 --- a/drivers/of/Makefile
39 +++ b/drivers/of/Makefile
40 @@ -9,3 +9,4 @@ obj-$(CONFIG_OF_MDIO) += of_mdio.o
41 obj-$(CONFIG_OF_PCI) += of_pci.o
42 obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o
43 obj-$(CONFIG_OF_MTD) += of_mtd.o
44 +obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
45 --- a/drivers/of/fdt.c
46 +++ b/drivers/of/fdt.c
48 #include <linux/module.h>
50 #include <linux/of_fdt.h>
51 +#include <linux/of_reserved_mem.h>
52 #include <linux/sizes.h>
53 #include <linux/string.h>
54 #include <linux/errno.h>
55 @@ -450,7 +451,7 @@ static int __init __reserved_mem_reserve
56 phys_addr_t base, size;
60 + int nomap, first = 1;
62 prop = of_get_flat_dt_prop(node, "reg", &len);
64 @@ -477,6 +478,10 @@ static int __init __reserved_mem_reserve
65 uname, &base, (unsigned long)size / SZ_1M);
69 + fdt_reserved_mem_save_node(node, uname, base, size);
75 @@ -512,6 +517,7 @@ static int __init __fdt_scan_reserved_me
81 if (!found && depth == 1 && strcmp(uname, "reserved-memory") == 0) {
82 if (__reserved_mem_check_root(node) != 0) {
83 @@ -534,7 +540,9 @@ static int __init __fdt_scan_reserved_me
84 if (status && strcmp(status, "okay") != 0 && strcmp(status, "ok") != 0)
87 - __reserved_mem_reserve_reg(node, uname);
88 + err = __reserved_mem_reserve_reg(node, uname);
89 + if (err == -ENOENT && of_get_flat_dt_prop(node, "size", NULL))
90 + fdt_reserved_mem_save_node(node, uname, 0, 0);
94 @@ -550,6 +558,7 @@ static int __init __fdt_scan_reserved_me
95 void __init early_init_fdt_scan_reserved_mem(void)
97 of_scan_flat_dt(__fdt_scan_reserved_mem, NULL);
98 + fdt_init_reserved_mem();
103 +++ b/drivers/of/of_reserved_mem.c
106 + * Device tree based initialization code for reserved memory.
108 + * Copyright (c) 2013, The Linux Foundation. All Rights Reserved.
109 + * Copyright (c) 2013,2014 Samsung Electronics Co., Ltd.
110 + * http://www.samsung.com
111 + * Author: Marek Szyprowski <m.szyprowski@samsung.com>
112 + * Author: Josh Cartwright <joshc@codeaurora.org>
114 + * This program is free software; you can redistribute it and/or
115 + * modify it under the terms of the GNU General Public License as
116 + * published by the Free Software Foundation; either version 2 of the
117 + * License or (at your optional) any later version of the license.
120 +#include <linux/err.h>
121 +#include <linux/of.h>
122 +#include <linux/of_fdt.h>
123 +#include <linux/of_platform.h>
124 +#include <linux/mm.h>
125 +#include <linux/sizes.h>
126 +#include <linux/of_reserved_mem.h>
128 +#define MAX_RESERVED_REGIONS 16
129 +static struct reserved_mem reserved_mem[MAX_RESERVED_REGIONS];
130 +static int reserved_mem_count;
132 +#if defined(CONFIG_HAVE_MEMBLOCK)
133 +#include <linux/memblock.h>
134 +int __init __weak early_init_dt_alloc_reserved_memory_arch(phys_addr_t size,
135 + phys_addr_t align, phys_addr_t start, phys_addr_t end, bool nomap,
136 + phys_addr_t *res_base)
139 + * We use __memblock_alloc_base() because memblock_alloc_base()
140 + * panic()s on allocation failure.
142 + phys_addr_t base = __memblock_alloc_base(size, align, end);
147 + * Check if the allocated region fits in to start..end window
149 + if (base < start) {
150 + memblock_free(base, size);
156 + return memblock_remove(base, size);
160 +int __init __weak early_init_dt_alloc_reserved_memory_arch(phys_addr_t size,
161 + phys_addr_t align, phys_addr_t start, phys_addr_t end, bool nomap,
162 + phys_addr_t *res_base)
164 + pr_err("Reserved memory not supported, ignoring region 0x%llx%s\n",
165 + size, nomap ? " (nomap)" : "");
171 + * res_mem_save_node() - save fdt node for second pass initialization
173 +void __init fdt_reserved_mem_save_node(unsigned long node, const char *uname,
174 + phys_addr_t base, phys_addr_t size)
176 + struct reserved_mem *rmem = &reserved_mem[reserved_mem_count];
178 + if (reserved_mem_count == ARRAY_SIZE(reserved_mem)) {
179 + pr_err("Reserved memory: not enough space all defined regions.\n");
183 + rmem->fdt_node = node;
184 + rmem->name = uname;
188 + reserved_mem_count++;
193 + * res_mem_alloc_size() - allocate reserved memory described by 'size', 'align'
194 + * and 'alloc-ranges' properties
196 +static int __init __reserved_mem_alloc_size(unsigned long node,
197 + const char *uname, phys_addr_t *res_base, phys_addr_t *res_size)
199 + int t_len = (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32);
200 + phys_addr_t start = 0, end = 0;
201 + phys_addr_t base = 0, align = 0, size;
207 + prop = of_get_flat_dt_prop(node, "size", &len);
211 + if (len != dt_root_size_cells * sizeof(__be32)) {
212 + pr_err("Reserved memory: invalid size property in '%s' node.\n",
216 + size = dt_mem_next_cell(dt_root_size_cells, &prop);
218 + nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;
220 + prop = of_get_flat_dt_prop(node, "alignment", &len);
222 + if (len != dt_root_addr_cells * sizeof(__be32)) {
223 + pr_err("Reserved memory: invalid alignment property in '%s' node.\n",
227 + align = dt_mem_next_cell(dt_root_addr_cells, &prop);
230 + prop = of_get_flat_dt_prop(node, "alloc-ranges", &len);
233 + if (len % t_len != 0) {
234 + pr_err("Reserved memory: invalid alloc-ranges property in '%s', skipping node.\n",
242 + start = dt_mem_next_cell(dt_root_addr_cells, &prop);
243 + end = start + dt_mem_next_cell(dt_root_size_cells,
246 + ret = early_init_dt_alloc_reserved_memory_arch(size,
247 + align, start, end, nomap, &base);
249 + pr_debug("Reserved memory: allocated memory for '%s' node: base %pa, size %ld MiB\n",
251 + (unsigned long)size / SZ_1M);
258 + ret = early_init_dt_alloc_reserved_memory_arch(size, align,
259 + 0, 0, nomap, &base);
261 + pr_debug("Reserved memory: allocated memory for '%s' node: base %pa, size %ld MiB\n",
262 + uname, &base, (unsigned long)size / SZ_1M);
266 + pr_info("Reserved memory: failed to allocate memory for node '%s'\n",
278 + * fdt_init_reserved_mem - allocate and init all saved reserved memory regions
280 +void __init fdt_init_reserved_mem(void)
283 + for (i = 0; i < reserved_mem_count; i++) {
284 + struct reserved_mem *rmem = &reserved_mem[i];
285 + unsigned long node = rmem->fdt_node;
288 + if (rmem->size == 0)
289 + err = __reserved_mem_alloc_size(node, rmem->name,
290 + &rmem->base, &rmem->size);
294 +++ b/include/linux/of_reserved_mem.h
296 +#ifndef __OF_RESERVED_MEM_H
297 +#define __OF_RESERVED_MEM_H
299 +struct reserved_mem {
301 + unsigned long fdt_node;
306 +#ifdef CONFIG_OF_RESERVED_MEM
307 +void fdt_init_reserved_mem(void);
308 +void fdt_reserved_mem_save_node(unsigned long node, const char *uname,
309 + phys_addr_t base, phys_addr_t size);
311 +static inline void fdt_init_reserved_mem(void) { }
312 +static inline void fdt_reserved_mem_save_node(unsigned long node,
313 + const char *uname, phys_addr_t base, phys_addr_t size) { }
316 +#endif /* __OF_RESERVED_MEM_H */