Hi all!
This is yet another update of the second attempt to add basic support for dynamic allocation of memory reserved regions defined in device tree.
This time I've tried to address all the issues reported by Grant Likely. The side-effect of it is a complete rewrite of memory reservation code, which results in added support for for multiple tuples in 'reg' property and complete support for 'size', 'align' and 'alloc-ranges' properties.
The initial code for this feature were posted here [1], merged as commit 9d8eab7af79cb4ce2de5de39f82c455b1f796963 ("drivers: of: add initialization code for dma reserved memory") and later reverted by commit 1931ee143b0ab72924944bc06e363d837ba05063. For more information, see [2]. Finally a new bindings has been proposed [3] and Josh Cartwright a few days ago prepared some code which implements those bindings [4]. This finally pushed me again to find some time to finish this task and review the code. Josh agreed to give me the ownership of this series to continue preparing them for mainline inclusion.
For more information please refer to the changlelog below.
[1]: http://lkml.kernel.org/g/1377527959-5080-1-git-send-email-m.szyprowski@samsu... [2]: http://lkml.kernel.org/g/1381476448-14548-1-git-send-email-m.szyprowski@sams... [3]: http://lkml.kernel.org/g/20131030134702.19B57C402A0@trevor.secretlab.ca [4]: http://thread.gmane.org/gmane.linux.documentation/19579
Changelog:
v3: - refactored memory reservation code, created common code to parse reg, size, align, alloc-ranges properties - added support for multiple tuples in 'reg' property - memory is reserved regardless of presence of the driver for its compatible - prepared arch specific hooks for memory reservation (defaults use memblock calls) - removed node matching by string during device initialization - CMA init code: added checks for required region alignment - more code cleanup here and there
v2: http://thread.gmane.org/gmane.linux.documentation/19870/ - removed copying of the node name - split shared-dma-pool handling into separate files (one for CMA and one for dma_declare_coherent based implementations) for making the code easier to understand - added support for AMBA devices, changed prototypes to use struct decice instead of struct platform_device - renamed some functions to better match other names used in drivers/of/ - restructured the rest of the code a bit for better readability - added 'reusable' property to exmaple linux,cma node in documentation - exclusive dma (dma_coherent) is used for only handling 'shared-dma-pool' regions without 'reusable' property and CMA is used only for handling 'shared-dma-pool' regions with 'reusable' property.
v1: http://thread.gmane.org/gmane.linux.documentation/19579 - initial version prepared by Josh Cartwright
Summary:
Grant Likely (1): of: document bindings for reserved-memory nodes
Josh Cartwright (2): drivers: of: implement reserved-memory handling for dma drivers: of: implement reserved-memory handling for cma
Marek Szyprowski (3): base: dma-contiguous: add dma_contiguous_init_reserved_mem() function drivers: of: add initialization code for reserved memory ARM: init: add support for reserved memory defined by device tree
.../bindings/reserved-memory/reserved-memory.txt | 138 +++++++ arch/arm/Kconfig | 1 + arch/arm/mm/init.c | 3 + drivers/base/dma-contiguous.c | 70 ++-- drivers/of/Kconfig | 19 + drivers/of/Makefile | 3 + drivers/of/fdt.c | 2 + drivers/of/of_reserved_mem.c | 390 ++++++++++++++++++++ drivers/of/of_reserved_mem_cma.c | 68 ++++ drivers/of/of_reserved_mem_dma.c | 65 ++++ drivers/of/platform.c | 7 + include/asm-generic/vmlinux.lds.h | 11 + include/linux/dma-contiguous.h | 7 + include/linux/of_reserved_mem.h | 65 ++++ 14 files changed, 827 insertions(+), 22 deletions(-) create mode 100644 Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt create mode 100644 drivers/of/of_reserved_mem.c create mode 100644 drivers/of/of_reserved_mem_cma.c create mode 100644 drivers/of/of_reserved_mem_dma.c create mode 100644 include/linux/of_reserved_mem.h
Add new dma_contiguous_init_reserved_mem() function, which creates CMA area from previously reserved memory region.
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com --- drivers/base/dma-contiguous.c | 70 +++++++++++++++++++++++++++------------- include/linux/dma-contiguous.h | 7 ++++ 2 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c index 165c2c299e57..ece82e8f3a8b 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c @@ -182,6 +182,53 @@ static int __init cma_init_reserved_areas(void) core_initcall(cma_init_reserved_areas);
/** + * dma_contiguous_init_reserved_mem() - reserve custom contiguous area + * @size: Size of the reserved area (in bytes), + * @base: Base address of the reserved area optional, use 0 for any + * @limit: End address of the reserved memory (optional, 0 for any). + * @res_cma: Pointer to store the created cma region. + * + * This function reserves memory from early allocator. It should be + * called by arch specific code once the early allocator (memblock or bootmem) + * has been activated and all other subsystems have already allocated/reserved + * memory. This function allows to create custom reserved areas for specific + * devices. + */ +int __init dma_contiguous_init_reserved_mem(phys_addr_t size, phys_addr_t base, + struct cma **res_cma) +{ + struct cma *cma = &cma_areas[cma_area_count]; + phys_addr_t alignment; + + /* Sanity checks */ + if (cma_area_count == ARRAY_SIZE(cma_areas)) { + pr_err("Not enough slots for CMA reserved regions!\n"); + return -ENOSPC; + } + + if (!size || !memblock_is_region_reserved(base, size)) + return -EINVAL; + + /* Sanitise input arguments */ + alignment = PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order); + if (ALIGN(base, alignment) != base || ALIGN(size, alignment) != size) + return -EINVAL; + + cma->base_pfn = PFN_DOWN(base); + cma->count = size >> PAGE_SHIFT; + *res_cma = cma; + cma_area_count++; + + pr_info("CMA: reserved %ld MiB at %08lx\n", (unsigned long)size / SZ_1M, + (unsigned long)base); + + /* Architecture specific contiguous memory fixup. */ + dma_contiguous_early_fixup(base, size); + return 0; +} + + +/** * dma_contiguous_reserve_area() - reserve custom contiguous area * @size: Size of the reserved area (in bytes), * @base: Base address of the reserved area optional, use 0 for any @@ -197,7 +244,6 @@ core_initcall(cma_init_reserved_areas); int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base, phys_addr_t limit, struct cma **res_cma) { - struct cma *cma = &cma_areas[cma_area_count]; phys_addr_t alignment; int ret = 0;
@@ -205,12 +251,6 @@ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base, (unsigned long)size, (unsigned long)base, (unsigned long)limit);
- /* Sanity checks */ - if (cma_area_count == ARRAY_SIZE(cma_areas)) { - pr_err("Not enough slots for CMA reserved regions!\n"); - return -ENOSPC; - } - if (!size) return -EINVAL;
@@ -241,21 +281,7 @@ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base, } }
- /* - * Each reserved area must be initialised later, when more kernel - * subsystems (like slab allocator) are available. - */ - cma->base_pfn = PFN_DOWN(base); - cma->count = size >> PAGE_SHIFT; - *res_cma = cma; - cma_area_count++; - - pr_info("CMA: reserved %ld MiB at %08lx\n", (unsigned long)size / SZ_1M, - (unsigned long)base); - - /* Architecture specific contiguous memory fixup. */ - dma_contiguous_early_fixup(base, size); - return 0; + return dma_contiguous_init_reserved_mem(size, base, res_cma); err: pr_err("CMA: failed to reserve %ld MiB\n", (unsigned long)size / SZ_1M); return ret; diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h index 3b28f937d959..550497393ae7 100644 --- a/include/linux/dma-contiguous.h +++ b/include/linux/dma-contiguous.h @@ -90,6 +90,8 @@ void dma_contiguous_reserve(phys_addr_t addr_limit); int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base, phys_addr_t limit, struct cma **res_cma);
+int dma_contiguous_init_reserved_mem(phys_addr_t size, phys_addr_t base, + struct cma **res_cma); /** * dma_declare_contiguous() - reserve area for contiguous memory handling * for particular device @@ -140,6 +142,11 @@ static inline int dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base return -ENOSYS; }
+static inline int dma_contiguous_init_reserved_mem(phys_addr_t size, + phys_addr_t base, struct cma **res_cma) { + return -ENOSYS; +} + static inline int dma_declare_contiguous(struct device *dev, phys_addr_t size, phys_addr_t base, phys_addr_t limit)
This patch adds device tree support for contiguous and reserved memory regions defined in device tree.
Large memory blocks can be reliably reserved only during early boot. This must happen before the whole memory management subsystem is initialized, because we need to ensure that the given contiguous blocks are not yet allocated by kernel. Also it must happen before kernel mappings for the whole low memory are created, to ensure that there will be no mappings (for reserved blocks) or mapping with special properties can be created (for CMA blocks). This all happens before device tree structures are unflattened, so we need to get reserved memory layout directly from fdt.
Later, those reserved memory regions are assigned to devices on each device structure initialization.
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com [joshc: rework to implement new DT binding, provide mechanism for plugging in new reserved-memory node handlers via RESERVEDMEM_OF_DECLARE] Signed-off-by: Josh Cartwright joshc@codeaurora.org [mszyprow: added generic memory reservation code] Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com --- drivers/of/Kconfig | 5 + drivers/of/Makefile | 1 + drivers/of/fdt.c | 2 + drivers/of/of_reserved_mem.c | 390 +++++++++++++++++++++++++++++++++++++ drivers/of/platform.c | 7 + include/asm-generic/vmlinux.lds.h | 11 ++ include/linux/of_reserved_mem.h | 65 +++++++ 7 files changed, 481 insertions(+) create mode 100644 drivers/of/of_reserved_mem.c create mode 100644 include/linux/of_reserved_mem.h
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index c6973f101a3e..f25931dfc6db 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -75,4 +75,9 @@ config OF_MTD depends on MTD def_bool y
+config OF_RESERVED_MEM + bool + help + Helpers to allow for reservation of memory regions + endmenu # OF diff --git a/drivers/of/Makefile b/drivers/of/Makefile index efd05102c405..ed9660adad77 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_OF_MDIO) += of_mdio.o obj-$(CONFIG_OF_PCI) += of_pci.o obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o obj-$(CONFIG_OF_MTD) += of_mtd.o +obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 758b4f8b30b7..c205c84e51a1 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_fdt.h> +#include <linux/of_reserved_mem.h> #include <linux/string.h> #include <linux/errno.h> #include <linux/slab.h> @@ -907,6 +908,7 @@ void __init unflatten_device_tree(void)
/* Get pointer to "/chosen" and "/aliases" nodes for use everywhere */ of_alias_scan(early_init_dt_alloc_memory_arch); + of_reserved_mem_scan(); }
/** diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c new file mode 100644 index 000000000000..074d66e41da8 --- /dev/null +++ b/drivers/of/of_reserved_mem.c @@ -0,0 +1,390 @@ +/* + * Device tree based initialization code for reserved memory. + * + * Copyright (c) 2013, The Linux Foundation. All Rights Reserved. + * Copyright (c) 2013,2014 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * Author: Marek Szyprowski m.szyprowski@samsung.com + * Author: Josh Cartwright joshc@codeaurora.org + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License or (at your optional) any later version of the license. + */ + +#include <linux/err.h> +#include <linux/of.h> +#include <linux/of_fdt.h> +#include <linux/of_platform.h> +#include <linux/mm.h> +#include <linux/sizes.h> +#include <linux/of_reserved_mem.h> + +#define MAX_RESERVED_REGIONS 16 +static struct reserved_mem reserved_mem[MAX_RESERVED_REGIONS]; +static int reserved_mem_count; + +#if defined(CONFIG_HAVE_MEMBLOCK) +#include <linux/memblock.h> +int __init __weak +early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, + bool nomap) +{ + if (memblock_is_region_reserved(base, size)) + return -EBUSY; + if (nomap) + return memblock_remove(base, size); + return memblock_reserve(base, size); +} + +int __init __weak +early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, phys_addr_t align, + phys_addr_t start, phys_addr_t end, + bool nomap, phys_addr_t *res_base) +{ + /* + * We use __memblock_alloc_base() since memblock_alloc_base() panic()s. + */ + phys_addr_t base = __memblock_alloc_base(size, align, end); + if (!base) + return -ENOMEM; + + if (base < start) { + memblock_free(base, size); + return -ENOMEM; + } + + *res_base = base; + if (nomap) + return memblock_remove(base, size); + return 0; +} +#else +int __init __weak +early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, + bool nomap) +{ + pr_error("Reserved memory not supported, ignoring range 0x%llx - 0x%llx%s\n", + base, size, nomap ? " (nomap)" : ""); + return -ENOSYS; +} + +int __init __weak +early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, phys_addr_t align, + phys_addr_t start, phys_addr_t end, + bool nomap, phys_addr_t *res_base) +{ + pr_error("Reserved memory not supported, ignoring region 0x%llx%s\n", + size, nomap ? " (nomap)" : ""); + return -ENOSYS; +} +#endif + +/** + * res_mem_reserve_reg() - reserve all memory described in 'reg' property + */ +static int __init +res_mem_reserve_reg(unsigned long node, const char *uname, int nomap, + phys_addr_t *res_base, phys_addr_t *res_size) +{ + int t_len = (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32); + phys_addr_t base, size; + unsigned long len; + __be32 *prop; + + prop = of_get_flat_dt_prop(node, "reg", &len); + if (!prop) + return -ENOENT; + + if (len && len % t_len != 0) { + pr_err("Reserved memory: invalid reg property in '%s', skipping node.\n", + uname); + return -EINVAL; + } + + /* store base and size values from the first reg tuple */ + *res_base = 0; + while (len > 0) { + base = dt_mem_next_cell(dt_root_addr_cells, &prop); + size = dt_mem_next_cell(dt_root_size_cells, &prop); + + if (base && size && + early_init_dt_reserve_memory_arch(base, size, nomap) == 0) + pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %ld MiB\n", + uname, &base, (unsigned long)size / SZ_1M); + else + pr_info("Reserved memory: failed to reserve memory for node '%s': base %pa, size %ld MiB\n", + uname, &base, (unsigned long)size / SZ_1M); + + len -= t_len; + + if (!(*res_base)) { + *res_base = base; + *res_size = size; + } + } + return 0; +} + +/** + * res_mem_alloc_size() - allocate reserved memory described by 'size', 'align' + * and 'alloc-ranges' properties + */ +static int __init +res_mem_alloc_size(unsigned long node, const char *uname, int nomap, + phys_addr_t *res_base, phys_addr_t *res_size) +{ + int t_len = (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32); + phys_addr_t start = 0, end = 0; + phys_addr_t base = 0, align = 0, size; + unsigned long len; + __be32 *prop; + int ret; + + prop = of_get_flat_dt_prop(node, "size", &len); + if (!prop) + return -EINVAL; + + if (len != dt_root_size_cells * sizeof(__be32)) { + pr_err("Reserved memory: invalid size property in '%s' node.\n", + uname); + return -EINVAL; + } + size = dt_mem_next_cell(dt_root_size_cells, &prop); + + prop = of_get_flat_dt_prop(node, "align", &len); + if (prop) { + if (len != dt_root_addr_cells * sizeof(__be32)) { + pr_err("Reserved memory: invalid align property in '%s' node.\n", + uname); + return -EINVAL; + } + align = dt_mem_next_cell(dt_root_addr_cells, &prop); + } + + prop = of_get_flat_dt_prop(node, "alloc-ranges", &len); + if (prop) { + + if (len % t_len != 0) { + pr_err("Reserved memory: invalid alloc-ranges property in '%s', skipping node.\n", + uname); + return -EINVAL; + } + + base = 0; + + while (len > 0) { + start = dt_mem_next_cell(dt_root_addr_cells, &prop); + end = start + dt_mem_next_cell(dt_root_size_cells, + &prop); + + ret = early_init_dt_alloc_reserved_memory_arch(size, + align, start, end, nomap, &base); + if (ret == 0) { + pr_debug("Reserved memory: allocated memory for '%s' node: base %pa, size %ld MiB\n", + uname, &base, + (unsigned long)size / SZ_1M); + break; + } + len -= t_len; + } + + } else { + ret = early_init_dt_alloc_reserved_memory_arch(size, align, + 0, 0, nomap, &base); + if (ret == 0) + pr_debug("Reserved memory: allocated memory for '%s' node: base %pa, size %ld MiB\n", + uname, &base, (unsigned long)size / SZ_1M); + } + + if (base == 0) { + pr_info("Reserved memory: failed to allocate memory for node '%s'\n", + uname); + return -ENOMEM; + } + + *res_base = base; + *res_size = size; + + return 0; +} + +static const struct of_device_id __rmem_of_table_sentinel + __used __section(__reservedmem_of_table_end); + +/** + * res_mem_init_node() - call region specific reserved memory init code + */ +static int __init +res_mem_init_node(unsigned long node, const char *uname, phys_addr_t base, + phys_addr_t size) +{ + struct reserved_mem *rmem = &reserved_mem[reserved_mem_count]; + extern const struct of_device_id __reservedmem_of_table[]; + const struct of_device_id *i; + + if (reserved_mem_count == ARRAY_SIZE(reserved_mem)) { + pr_err("Reserved memory: not enough space all defined regions.\n"); + return -ENOSPC; + } + + rmem->base = base; + rmem->size = size; + + for (i = __reservedmem_of_table; i < &__rmem_of_table_sentinel; i++) { + reservedmem_of_init_fn initfn = i->data; + const char *compat = i->compatible; + + if (!of_flat_dt_is_compatible(node, compat)) + continue; + + if (initfn(rmem, node, uname) == 0) { + pr_info("Reserved memory: initialized node %s, compatible id %s\n", + uname, compat); + rmem->name = uname; + reserved_mem_count++; + return 0; + } + } + return -EINVAL; +} + +/** + * fdt_scan_reserved_mem() - scan a single FDT node for reserved memory + */ +static int __init +fdt_scan_reserved_mem(unsigned long node, const char *uname, int depth, + void *data) +{ + phys_addr_t base, size; + const char *status; + int nomap; + int err; + + status = of_get_flat_dt_prop(node, "status", NULL); + if (status && strcmp(status, "okay") != 0 && strcmp(status, "ok") != 0) + return 0; + + nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL; + + err = res_mem_reserve_reg(node, uname, nomap, &base, &size); + if (err == -ENOENT) + err = res_mem_alloc_size(node, uname, nomap, &base, &size); + if (err) + goto end; + + res_mem_init_node(node, uname, base, size); +end: + /* scan next node */ + return 0; +} + +/** + * early_init_dt_scan_reserved_mem() - create reserved memory regions + * + * This function grabs memory from early allocator for device exclusive use + * defined in device tree structures. It should be called by arch specific code + * once the early allocator (i.e. memblock) has been fully activated. + */ +void __init early_init_dt_scan_reserved_mem(void) +{ + of_scan_flat_dt_by_path("/reserved-memory", fdt_scan_reserved_mem, + NULL); +} + +/** + * of_reserved_mem_scan() - scan and create structures required by reserved + * memory regions + * + * This function creates all structures required by reserved memory regions + * management code. It should be called by common code once the device tree + * has been unflattened. + */ +void __init of_reserved_mem_scan(void) +{ + struct device_node *root, *np; + + root = of_find_node_by_path("/reserved-memory"); + + if (of_n_addr_cells(root) != dt_root_addr_cells || + of_n_size_cells(root) != dt_root_size_cells) + panic("Unsupported address or size cells for /reserved-memory node\n"); + + for (np = NULL;;) { + const char *name; + int i; + + np = of_get_next_available_child(root, np); + if (!np) + break; + + name = kbasename(np->full_name); + for (i = 0; i < reserved_mem_count; i++) + if (strcmp(name, reserved_mem[i].name) == 0) + reserved_mem[i].node = np; + } +} + +static inline struct reserved_mem *find_rmem(struct device_node *phandle) +{ + unsigned int i; + for (i = 0; i < reserved_mem_count; i++) + if (reserved_mem[i].node == phandle) + return &reserved_mem[i]; + return NULL; +} + +/** + * of_reserved_mem_device_init() - assign reserved memory region to given device + * + * This function assign memory region pointed by "memory-region" device tree + * property to the given device. + */ +void of_reserved_mem_device_init(struct device *dev) +{ + struct device_node *np = dev->of_node; + struct reserved_mem *rmem; + struct of_phandle_args s; + unsigned int i; + + for (i = 0; of_parse_phandle_with_args(np, "memory-region", + "#memory-region-cells", i, &s) == 0; i++) { + + rmem = find_rmem(s.np); + if (!rmem || !rmem->ops || !rmem->ops->device_init) { + of_node_put(s.np); + continue; + } + + rmem->ops->device_init(rmem, dev, &s); + dev_info(dev, "assigned reserved memory node %s\n", + rmem->name); + of_node_put(s.np); + break; + } +} + +/** + * of_reserved_mem_device_release() - release reserved memory device structures + * + * This function releases structures allocated for memory region handling for + * the given device. + */ +void of_reserved_mem_device_release(struct device *dev) +{ + struct device_node *np = dev->of_node; + struct reserved_mem *rmem; + struct of_phandle_args s; + unsigned int i; + + for (i = 0; of_parse_phandle_with_args(np, "memory-region", + "#memory-region-cells", i, &s) == 0; i++) { + + rmem = find_rmem(s.np); + if (rmem && rmem->ops && rmem->ops->device_release) + rmem->ops->device_release(rmem, dev); + + of_node_put(s.np); + } +} diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 404d1daebefa..3df0b1826e8b 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -21,6 +21,7 @@ #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/of_platform.h> +#include <linux/of_reserved_mem.h> #include <linux/platform_device.h>
const struct of_device_id of_default_bus_match_table[] = { @@ -220,6 +221,8 @@ static struct platform_device *of_platform_device_create_pdata( dev->dev.bus = &platform_bus_type; dev->dev.platform_data = platform_data;
+ of_reserved_mem_device_init(&dev->dev); + /* We do not fill the DMA ops for platform devices by default. * This is currently the responsibility of the platform code * to do such, possibly using a device notifier @@ -227,6 +230,7 @@ static struct platform_device *of_platform_device_create_pdata(
if (of_device_add(dev) != 0) { platform_device_put(dev); + of_reserved_mem_device_release(&dev->dev); return NULL; }
@@ -282,6 +286,8 @@ static struct amba_device *of_amba_device_create(struct device_node *node, else of_device_make_bus_id(&dev->dev);
+ of_reserved_mem_device_init(&dev->dev); + /* Allow the HW Peripheral ID to be overridden */ prop = of_get_property(node, "arm,primecell-periphid", NULL); if (prop) @@ -308,6 +314,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node, return dev;
err_free: + of_reserved_mem_device_release(&dev->dev); amba_device_put(dev); return NULL; } diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index bc2121fa9132..f10f64fcc815 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -167,6 +167,16 @@ #define CLK_OF_TABLES() #endif
+#ifdef CONFIG_OF_RESERVED_MEM +#define RESERVEDMEM_OF_TABLES() \ + . = ALIGN(8); \ + VMLINUX_SYMBOL(__reservedmem_of_table) = .; \ + *(__reservedmem_of_table) \ + *(__reservedmem_of_table_end) +#else +#define RESERVEDMEM_OF_TABLES() +#endif + #define KERNEL_DTB() \ STRUCT_ALIGN(); \ VMLINUX_SYMBOL(__dtb_start) = .; \ @@ -490,6 +500,7 @@ TRACE_SYSCALLS() \ MEM_DISCARD(init.rodata) \ CLK_OF_TABLES() \ + RESERVEDMEM_OF_TABLES() \ CLKSRC_OF_TABLES() \ KERNEL_DTB() \ IRQCHIP_OF_MATCH_TABLE() diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h new file mode 100644 index 000000000000..39a4fb17a5ea --- /dev/null +++ b/include/linux/of_reserved_mem.h @@ -0,0 +1,65 @@ +#ifndef __OF_RESERVED_MEM_H +#define __OF_RESERVED_MEM_H + +struct cma; +struct platform_device; +struct of_phandle_args; +struct reserved_mem_ops; + +struct reserved_mem { + const char *name; + struct device_node *node; + const struct reserved_mem_ops *ops; + phys_addr_t base; + phys_addr_t size; + void *priv; +}; + +struct reserved_mem_ops { + void (*device_init)(struct reserved_mem *rmem, + struct device *dev, + struct of_phandle_args *args); + void (*device_release)(struct reserved_mem *rmem, + struct device *dev); +}; + +typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem, + unsigned long node, const char *uname); + +#ifdef CONFIG_OF_RESERVED_MEM +void of_reserved_mem_device_init(struct device *dev); +void of_reserved_mem_device_release(struct device *dev); +void early_init_dt_scan_reserved_mem(void); +void of_reserved_mem_scan(void); + +int of_parse_flat_dt_reg(unsigned long node, const char *uname, + phys_addr_t *base, phys_addr_t *size); +int of_parse_flat_dt_size(unsigned long node, const char *uname, + 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 of_reserved_mem_device_init(struct device *dev) { } + +static inline +void of_reserved_mem_device_release(struct device *pdev) { } + +static inline void early_init_dt_scan_reserved_mem(void) { } +static inline void of_reserved_mem_scan(void) { } + +#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 */
On Tue, 18 Feb 2014 14:37:57 +0100, Marek Szyprowski m.szyprowski@samsung.com wrote:
This patch adds device tree support for contiguous and reserved memory regions defined in device tree.
Large memory blocks can be reliably reserved only during early boot. This must happen before the whole memory management subsystem is initialized, because we need to ensure that the given contiguous blocks are not yet allocated by kernel. Also it must happen before kernel mappings for the whole low memory are created, to ensure that there will be no mappings (for reserved blocks) or mapping with special properties can be created (for CMA blocks). This all happens before device tree structures are unflattened, so we need to get reserved memory layout directly from fdt.
Later, those reserved memory regions are assigned to devices on each device structure initialization.
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com [joshc: rework to implement new DT binding, provide mechanism for plugging in new reserved-memory node handlers via RESERVEDMEM_OF_DECLARE] Signed-off-by: Josh Cartwright joshc@codeaurora.org [mszyprow: added generic memory reservation code] Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com
drivers/of/Kconfig | 5 + drivers/of/Makefile | 1 + drivers/of/fdt.c | 2 + drivers/of/of_reserved_mem.c | 390 +++++++++++++++++++++++++++++++++++++ drivers/of/platform.c | 7 + include/asm-generic/vmlinux.lds.h | 11 ++ include/linux/of_reserved_mem.h | 65 +++++++ 7 files changed, 481 insertions(+) create mode 100644 drivers/of/of_reserved_mem.c create mode 100644 include/linux/of_reserved_mem.h
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index c6973f101a3e..f25931dfc6db 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -75,4 +75,9 @@ config OF_MTD depends on MTD def_bool y +config OF_RESERVED_MEM
- bool
- help
Helpers to allow for reservation of memory regionsendmenu # OF diff --git a/drivers/of/Makefile b/drivers/of/Makefile index efd05102c405..ed9660adad77 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_OF_MDIO) += of_mdio.o obj-$(CONFIG_OF_PCI) += of_pci.o obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o obj-$(CONFIG_OF_MTD) += of_mtd.o +obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
As mentioned previously, parts of this are absolutely non-optional and cannot be compiled out. If a region is marked as reserved with this binding, then the kernel must respect it. That part of the code must be always configured in.
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 758b4f8b30b7..c205c84e51a1 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_fdt.h> +#include <linux/of_reserved_mem.h> #include <linux/string.h> #include <linux/errno.h> #include <linux/slab.h> @@ -907,6 +908,7 @@ void __init unflatten_device_tree(void) /* Get pointer to "/chosen" and "/aliases" nodes for use everywhere */ of_alias_scan(early_init_dt_alloc_memory_arch);
- of_reserved_mem_scan();
} /** diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c new file mode 100644 index 000000000000..074d66e41da8 --- /dev/null +++ b/drivers/of/of_reserved_mem.c @@ -0,0 +1,390 @@ +/*
- Device tree based initialization code for reserved memory.
- Copyright (c) 2013, The Linux Foundation. All Rights Reserved.
- Copyright (c) 2013,2014 Samsung Electronics Co., Ltd.
http://www.samsung.com
- Author: Marek Szyprowski m.szyprowski@samsung.com
- Author: Josh Cartwright joshc@codeaurora.org
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License or (at your optional) any later version of the license.
- */
+#include <linux/err.h> +#include <linux/of.h> +#include <linux/of_fdt.h> +#include <linux/of_platform.h> +#include <linux/mm.h> +#include <linux/sizes.h> +#include <linux/of_reserved_mem.h>
+#define MAX_RESERVED_REGIONS 16 +static struct reserved_mem reserved_mem[MAX_RESERVED_REGIONS]; +static int reserved_mem_count;
+#if defined(CONFIG_HAVE_MEMBLOCK) +#include <linux/memblock.h> +int __init __weak +early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size,
bool nomap)+{
- if (memblock_is_region_reserved(base, size))
return -EBUSY;- if (nomap)
return memblock_remove(base, size);- return memblock_reserve(base, size);
+}
+int __init __weak +early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, phys_addr_t align,
phys_addr_t start, phys_addr_t end,bool nomap, phys_addr_t *res_base)+{
- /*
* We use __memblock_alloc_base() since memblock_alloc_base() panic()s.*/- phys_addr_t base = __memblock_alloc_base(size, align, end);
- if (!base)
return -ENOMEM;
Just realized this; this is actually a problem because an allocated range may end up conflicting with a static range. Reservations must be done in two passes. First pass should handle static ranges. Second pass for doing dynamic allocations.
- if (base < start) {
memblock_free(base, size);return -ENOMEM;- }
- *res_base = base;
- if (nomap)
return memblock_remove(base, size);- return 0;
+} +#else +int __init __weak +early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size,
bool nomap)+{
- pr_error("Reserved memory not supported, ignoring range 0x%llx - 0x%llx%s\n",
base, size, nomap ? " (nomap)" : "");- return -ENOSYS;
+}
+int __init __weak +early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, phys_addr_t align,
phys_addr_t start, phys_addr_t end,bool nomap, phys_addr_t *res_base)+{
- pr_error("Reserved memory not supported, ignoring region 0x%llx%s\n",
size, nomap ? " (nomap)" : "");- return -ENOSYS;
+} +#endif
+/**
- res_mem_reserve_reg() - reserve all memory described in 'reg' property
- */
+static int __init +res_mem_reserve_reg(unsigned long node, const char *uname, int nomap,
phys_addr_t *res_base, phys_addr_t *res_size)+{
- int t_len = (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32);
- phys_addr_t base, size;
- unsigned long len;
- __be32 *prop;
- prop = of_get_flat_dt_prop(node, "reg", &len);
- if (!prop)
return -ENOENT;- if (len && len % t_len != 0) {
pr_err("Reserved memory: invalid reg property in '%s', skipping node.\n",uname);return -EINVAL;- }
- /* store base and size values from the first reg tuple */
- *res_base = 0;
- while (len > 0) {
base = dt_mem_next_cell(dt_root_addr_cells, &prop);size = dt_mem_next_cell(dt_root_size_cells, &prop);if (base && size &&early_init_dt_reserve_memory_arch(base, size, nomap) == 0)pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %ld MiB\n",uname, &base, (unsigned long)size / SZ_1M);elsepr_info("Reserved memory: failed to reserve memory for node '%s': base %pa, size %ld MiB\n",uname, &base, (unsigned long)size / SZ_1M);len -= t_len;if (!(*res_base)) {*res_base = base;*res_size = size;}- }
- return 0;
+}
+/**
- res_mem_alloc_size() - allocate reserved memory described by 'size', 'align'
and 'alloc-ranges' properties- */
+static int __init +res_mem_alloc_size(unsigned long node, const char *uname, int nomap,
phys_addr_t *res_base, phys_addr_t *res_size)+{
- int t_len = (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32);
- phys_addr_t start = 0, end = 0;
- phys_addr_t base = 0, align = 0, size;
- unsigned long len;
- __be32 *prop;
- int ret;
- prop = of_get_flat_dt_prop(node, "size", &len);
- if (!prop)
return -EINVAL;- if (len != dt_root_size_cells * sizeof(__be32)) {
pr_err("Reserved memory: invalid size property in '%s' node.\n",uname);return -EINVAL;- }
- size = dt_mem_next_cell(dt_root_size_cells, &prop);
- prop = of_get_flat_dt_prop(node, "align", &len);
- if (prop) {
if (len != dt_root_addr_cells * sizeof(__be32)) {pr_err("Reserved memory: invalid align property in '%s' node.\n",uname);return -EINVAL;}align = dt_mem_next_cell(dt_root_addr_cells, &prop);- }
- prop = of_get_flat_dt_prop(node, "alloc-ranges", &len);
- if (prop) {
if (len % t_len != 0) {pr_err("Reserved memory: invalid alloc-ranges property in '%s', skipping node.\n",uname);return -EINVAL;}base = 0;while (len > 0) {start = dt_mem_next_cell(dt_root_addr_cells, &prop);end = start + dt_mem_next_cell(dt_root_size_cells,&prop);ret = early_init_dt_alloc_reserved_memory_arch(size,align, start, end, nomap, &base);if (ret == 0) {pr_debug("Reserved memory: allocated memory for '%s' node: base %pa, size %ld MiB\n",uname, &base,(unsigned long)size / SZ_1M);break;}len -= t_len;}- } else {
ret = early_init_dt_alloc_reserved_memory_arch(size, align,0, 0, nomap, &base);if (ret == 0)pr_debug("Reserved memory: allocated memory for '%s' node: base %pa, size %ld MiB\n",uname, &base, (unsigned long)size / SZ_1M);- }
- if (base == 0) {
pr_info("Reserved memory: failed to allocate memory for node '%s'\n",uname);return -ENOMEM;- }
- *res_base = base;
- *res_size = size;
- return 0;
+}
+static const struct of_device_id __rmem_of_table_sentinel
- __used __section(__reservedmem_of_table_end);
+/**
- res_mem_init_node() - call region specific reserved memory init code
- */
+static int __init +res_mem_init_node(unsigned long node, const char *uname, phys_addr_t base,
phys_addr_t size)+{
- struct reserved_mem *rmem = &reserved_mem[reserved_mem_count];
- extern const struct of_device_id __reservedmem_of_table[];
- const struct of_device_id *i;
- if (reserved_mem_count == ARRAY_SIZE(reserved_mem)) {
pr_err("Reserved memory: not enough space all defined regions.\n");return -ENOSPC;- }
- rmem->base = base;
- rmem->size = size;
- for (i = __reservedmem_of_table; i < &__rmem_of_table_sentinel; i++) {
reservedmem_of_init_fn initfn = i->data;const char *compat = i->compatible;if (!of_flat_dt_is_compatible(node, compat))continue;if (initfn(rmem, node, uname) == 0) {pr_info("Reserved memory: initialized node %s, compatible id %s\n",uname, compat);rmem->name = uname;reserved_mem_count++;return 0;}- }
- return -EINVAL;
+}
+/**
- fdt_scan_reserved_mem() - scan a single FDT node for reserved memory
- */
+static int __init +fdt_scan_reserved_mem(unsigned long node, const char *uname, int depth,
void *data)+{
- phys_addr_t base, size;
- const char *status;
- int nomap;
- int err;
- status = of_get_flat_dt_prop(node, "status", NULL);
- if (status && strcmp(status, "okay") != 0 && strcmp(status, "ok") != 0)
return 0;- nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;
- err = res_mem_reserve_reg(node, uname, nomap, &base, &size);
- if (err == -ENOENT)
err = res_mem_alloc_size(node, uname, nomap, &base, &size);- if (err)
goto end;- res_mem_init_node(node, uname, base, size);
+end:
- /* scan next node */
- return 0;
+}
+/**
- early_init_dt_scan_reserved_mem() - create reserved memory regions
- This function grabs memory from early allocator for device exclusive use
- defined in device tree structures. It should be called by arch specific code
- once the early allocator (i.e. memblock) has been fully activated.
- */
+void __init early_init_dt_scan_reserved_mem(void) +{
- of_scan_flat_dt_by_path("/reserved-memory", fdt_scan_reserved_mem,
NULL);+}
Just about everything above this point must be moved to fdt.c. Processing the static reserved regions must be non-optional code. You can factor out the table of reserved regions if you like, but I want the core functionality directly in fdt.c.
The dynamic allocation code can be optional, but that is because it describes dynamic regions that have no possibility of hardware already using them.
+/**
- of_reserved_mem_scan() - scan and create structures required by reserved
memory regions
- This function creates all structures required by reserved memory regions
- management code. It should be called by common code once the device tree
- has been unflattened.
- */
+void __init of_reserved_mem_scan(void) +{
- struct device_node *root, *np;
- root = of_find_node_by_path("/reserved-memory");
- if (of_n_addr_cells(root) != dt_root_addr_cells ||
of_n_size_cells(root) != dt_root_size_cells)panic("Unsupported address or size cells for /reserved-memory node\n");- for (np = NULL;;) {
const char *name;int i;np = of_get_next_available_child(root, np);if (!np)break;name = kbasename(np->full_name);for (i = 0; i < reserved_mem_count; i++)if (strcmp(name, reserved_mem[i].name) == 0)reserved_mem[i].node = np;
I've already commented on the above. kbasename is not a safe match.
- }
+}
+static inline struct reserved_mem *find_rmem(struct device_node *phandle) +{
- unsigned int i;
- for (i = 0; i < reserved_mem_count; i++)
if (reserved_mem[i].node == phandle)return &reserved_mem[i];- return NULL;
+}
+/**
- of_reserved_mem_device_init() - assign reserved memory region to given device
- This function assign memory region pointed by "memory-region" device tree
- property to the given device.
- */
+void of_reserved_mem_device_init(struct device *dev) +{
- struct device_node *np = dev->of_node;
- struct reserved_mem *rmem;
- struct of_phandle_args s;
- unsigned int i;
- for (i = 0; of_parse_phandle_with_args(np, "memory-region",
"#memory-region-cells", i, &s) == 0; i++) {rmem = find_rmem(s.np);if (!rmem || !rmem->ops || !rmem->ops->device_init) {of_node_put(s.np);continue;}rmem->ops->device_init(rmem, dev, &s);dev_info(dev, "assigned reserved memory node %s\n",rmem->name);of_node_put(s.np);break;- }
+}
+/**
- of_reserved_mem_device_release() - release reserved memory device structures
- This function releases structures allocated for memory region handling for
- the given device.
- */
+void of_reserved_mem_device_release(struct device *dev) +{
- struct device_node *np = dev->of_node;
- struct reserved_mem *rmem;
- struct of_phandle_args s;
- unsigned int i;
- for (i = 0; of_parse_phandle_with_args(np, "memory-region",
"#memory-region-cells", i, &s) == 0; i++) {rmem = find_rmem(s.np);if (rmem && rmem->ops && rmem->ops->device_release)rmem->ops->device_release(rmem, dev);of_node_put(s.np);- }
+} diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 404d1daebefa..3df0b1826e8b 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -21,6 +21,7 @@ #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/of_platform.h> +#include <linux/of_reserved_mem.h> #include <linux/platform_device.h> const struct of_device_id of_default_bus_match_table[] = { @@ -220,6 +221,8 @@ static struct platform_device *of_platform_device_create_pdata( dev->dev.bus = &platform_bus_type; dev->dev.platform_data = platform_data;
- of_reserved_mem_device_init(&dev->dev);
- /* We do not fill the DMA ops for platform devices by default.
- This is currently the responsibility of the platform code
- to do such, possibly using a device notifier
@@ -227,6 +230,7 @@ static struct platform_device *of_platform_device_create_pdata( if (of_device_add(dev) != 0) { platform_device_put(dev);
of_reserved_mem_device_release(&dev->dev);@@ -282,6 +286,8 @@ static struct amba_device *of_amba_device_create(struct device_node *node, else of_device_make_bus_id(&dev->dev);
- of_reserved_mem_device_init(&dev->dev);
- /* Allow the HW Peripheral ID to be overridden */ prop = of_get_property(node, "arm,primecell-periphid", NULL); if (prop)
@@ -308,6 +314,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node, return dev; err_free:
- of_reserved_mem_device_release(&dev->dev); amba_device_put(dev); return NULL;
} diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index bc2121fa9132..f10f64fcc815 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -167,6 +167,16 @@ #define CLK_OF_TABLES() #endif +#ifdef CONFIG_OF_RESERVED_MEM +#define RESERVEDMEM_OF_TABLES() \
- . = ALIGN(8); \
- VMLINUX_SYMBOL(__reservedmem_of_table) = .; \
- *(__reservedmem_of_table) \
- *(__reservedmem_of_table_end)
+#else +#define RESERVEDMEM_OF_TABLES() +#endif
#define KERNEL_DTB() \ STRUCT_ALIGN(); \ VMLINUX_SYMBOL(__dtb_start) = .; \ @@ -490,6 +500,7 @@ TRACE_SYSCALLS() \ MEM_DISCARD(init.rodata) \ CLK_OF_TABLES() \
- RESERVEDMEM_OF_TABLES() \ CLKSRC_OF_TABLES() \ KERNEL_DTB() \ IRQCHIP_OF_MATCH_TABLE()
diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h new file mode 100644 index 000000000000..39a4fb17a5ea --- /dev/null +++ b/include/linux/of_reserved_mem.h @@ -0,0 +1,65 @@ +#ifndef __OF_RESERVED_MEM_H +#define __OF_RESERVED_MEM_H
+struct cma; +struct platform_device; +struct of_phandle_args; +struct reserved_mem_ops;
+struct reserved_mem {
- const char *name;
- struct device_node *node;
- const struct reserved_mem_ops *ops;
- phys_addr_t base;
- phys_addr_t size;
- void *priv;
+};
+struct reserved_mem_ops {
- void (*device_init)(struct reserved_mem *rmem,
struct device *dev,struct of_phandle_args *args);- void (*device_release)(struct reserved_mem *rmem,
struct device *dev);+};
+typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem,
unsigned long node, const char *uname);+#ifdef CONFIG_OF_RESERVED_MEM +void of_reserved_mem_device_init(struct device *dev); +void of_reserved_mem_device_release(struct device *dev); +void early_init_dt_scan_reserved_mem(void); +void of_reserved_mem_scan(void);
+int of_parse_flat_dt_reg(unsigned long node, const char *uname,
phys_addr_t *base, phys_addr_t *size);+int of_parse_flat_dt_size(unsigned long node, const char *uname,
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 of_reserved_mem_device_init(struct device *dev) { }
+static inline +void of_reserved_mem_device_release(struct device *pdev) { }
+static inline void early_init_dt_scan_reserved_mem(void) { } +static inline void of_reserved_mem_scan(void) { }
+#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 */
1.7.9.5
Hello,
On 2014-02-18 17:56, Grant Likely wrote:
On Tue, 18 Feb 2014 14:37:57 +0100, Marek Szyprowski m.szyprowski@samsung.com wrote:
This patch adds device tree support for contiguous and reserved memory regions defined in device tree.
Large memory blocks can be reliably reserved only during early boot. This must happen before the whole memory management subsystem is initialized, because we need to ensure that the given contiguous blocks are not yet allocated by kernel. Also it must happen before kernel mappings for the whole low memory are created, to ensure that there will be no mappings (for reserved blocks) or mapping with special properties can be created (for CMA blocks). This all happens before device tree structures are unflattened, so we need to get reserved memory layout directly from fdt.
Later, those reserved memory regions are assigned to devices on each device structure initialization.
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com [joshc: rework to implement new DT binding, provide mechanism for plugging in new reserved-memory node handlers via RESERVEDMEM_OF_DECLARE] Signed-off-by: Josh Cartwright joshc@codeaurora.org [mszyprow: added generic memory reservation code] Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com
drivers/of/Kconfig | 5 + drivers/of/Makefile | 1 + drivers/of/fdt.c | 2 + drivers/of/of_reserved_mem.c | 390 +++++++++++++++++++++++++++++++++++++ drivers/of/platform.c | 7 + include/asm-generic/vmlinux.lds.h | 11 ++ include/linux/of_reserved_mem.h | 65 +++++++ 7 files changed, 481 insertions(+) create mode 100644 drivers/of/of_reserved_mem.c create mode 100644 include/linux/of_reserved_mem.h
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index c6973f101a3e..f25931dfc6db 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -75,4 +75,9 @@ config OF_MTD depends on MTD def_bool y
+config OF_RESERVED_MEM
- bool
- help
Helpers to allow for reservation of memory regionsendmenu # OF diff --git a/drivers/of/Makefile b/drivers/of/Makefile index efd05102c405..ed9660adad77 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_OF_MDIO) += of_mdio.o obj-$(CONFIG_OF_PCI) += of_pci.o obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o obj-$(CONFIG_OF_MTD) += of_mtd.o +obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
As mentioned previously, parts of this are absolutely non-optional and cannot be compiled out. If a region is marked as reserved with this binding, then the kernel must respect it. That part of the code must be always configured in.
How can I make it non-optional if all this code must be called from arch specific early-boot init code to properly reserve memory. Do you want me to add those calls to every architecture which supports OF?
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 758b4f8b30b7..c205c84e51a1 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_fdt.h> +#include <linux/of_reserved_mem.h> #include <linux/string.h> #include <linux/errno.h> #include <linux/slab.h> @@ -907,6 +908,7 @@ void __init unflatten_device_tree(void)
/* Get pointer to "/chosen" and "/aliases" nodes for use everywhere */ of_alias_scan(early_init_dt_alloc_memory_arch);
- of_reserved_mem_scan();
}
/** diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c new file mode 100644 index 000000000000..074d66e41da8 --- /dev/null +++ b/drivers/of/of_reserved_mem.c @@ -0,0 +1,390 @@ +/*
- Device tree based initialization code for reserved memory.
- Copyright (c) 2013, The Linux Foundation. All Rights Reserved.
- Copyright (c) 2013,2014 Samsung Electronics Co., Ltd.
http://www.samsung.com
- Author: Marek Szyprowski m.szyprowski@samsung.com
- Author: Josh Cartwright joshc@codeaurora.org
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License or (at your optional) any later version of the license.
- */
+#include <linux/err.h> +#include <linux/of.h> +#include <linux/of_fdt.h> +#include <linux/of_platform.h> +#include <linux/mm.h> +#include <linux/sizes.h> +#include <linux/of_reserved_mem.h>
+#define MAX_RESERVED_REGIONS 16 +static struct reserved_mem reserved_mem[MAX_RESERVED_REGIONS]; +static int reserved_mem_count;
+#if defined(CONFIG_HAVE_MEMBLOCK) +#include <linux/memblock.h> +int __init __weak +early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size,
bool nomap)+{
- if (memblock_is_region_reserved(base, size))
return -EBUSY;- if (nomap)
return memblock_remove(base, size);- return memblock_reserve(base, size);
+}
+int __init __weak +early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, phys_addr_t align,
phys_addr_t start, phys_addr_t end,bool nomap, phys_addr_t *res_base)+{
- /*
* We use __memblock_alloc_base() since memblock_alloc_base() panic()s.*/- phys_addr_t base = __memblock_alloc_base(size, align, end);
- if (!base)
return -ENOMEM;Just realized this; this is actually a problem because an allocated range may end up conflicting with a static range. Reservations must be done in two passes. First pass should handle static ranges. Second pass for doing dynamic allocations.
Right... I will check if it is possible to avoid dual-pass, because we are already parsing all nodes stored in FDT, what might be time consuming.
- if (base < start) {
memblock_free(base, size);return -ENOMEM;- }
- *res_base = base;
- if (nomap)
return memblock_remove(base, size);- return 0;
+} +#else +int __init __weak +early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size,
bool nomap)+{
- pr_error("Reserved memory not supported, ignoring range 0x%llx - 0x%llx%s\n",
base, size, nomap ? " (nomap)" : "");- return -ENOSYS;
+}
+int __init __weak +early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, phys_addr_t align,
phys_addr_t start, phys_addr_t end,bool nomap, phys_addr_t *res_base)+{
- pr_error("Reserved memory not supported, ignoring region 0x%llx%s\n",
size, nomap ? " (nomap)" : "");- return -ENOSYS;
+} +#endif
+/**
- res_mem_reserve_reg() - reserve all memory described in 'reg' property
- */
+static int __init +res_mem_reserve_reg(unsigned long node, const char *uname, int nomap,
phys_addr_t *res_base, phys_addr_t *res_size)+{
- int t_len = (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32);
- phys_addr_t base, size;
- unsigned long len;
- __be32 *prop;
- prop = of_get_flat_dt_prop(node, "reg", &len);
- if (!prop)
return -ENOENT;- if (len && len % t_len != 0) {
pr_err("Reserved memory: invalid reg property in '%s', skipping node.\n",uname);return -EINVAL;- }
- /* store base and size values from the first reg tuple */
- *res_base = 0;
- while (len > 0) {
base = dt_mem_next_cell(dt_root_addr_cells, &prop);size = dt_mem_next_cell(dt_root_size_cells, &prop);if (base && size &&early_init_dt_reserve_memory_arch(base, size, nomap) == 0)pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %ld MiB\n",uname, &base, (unsigned long)size / SZ_1M);elsepr_info("Reserved memory: failed to reserve memory for node '%s': base %pa, size %ld MiB\n",uname, &base, (unsigned long)size / SZ_1M);len -= t_len;if (!(*res_base)) {*res_base = base;*res_size = size;}- }
- return 0;
+}
+/**
- res_mem_alloc_size() - allocate reserved memory described by 'size', 'align'
and 'alloc-ranges' properties- */
+static int __init +res_mem_alloc_size(unsigned long node, const char *uname, int nomap,
phys_addr_t *res_base, phys_addr_t *res_size)+{
- int t_len = (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32);
- phys_addr_t start = 0, end = 0;
- phys_addr_t base = 0, align = 0, size;
- unsigned long len;
- __be32 *prop;
- int ret;
- prop = of_get_flat_dt_prop(node, "size", &len);
- if (!prop)
return -EINVAL;- if (len != dt_root_size_cells * sizeof(__be32)) {
pr_err("Reserved memory: invalid size property in '%s' node.\n",uname);return -EINVAL;- }
- size = dt_mem_next_cell(dt_root_size_cells, &prop);
- prop = of_get_flat_dt_prop(node, "align", &len);
- if (prop) {
if (len != dt_root_addr_cells * sizeof(__be32)) {pr_err("Reserved memory: invalid align property in '%s' node.\n",uname);return -EINVAL;}align = dt_mem_next_cell(dt_root_addr_cells, &prop);- }
- prop = of_get_flat_dt_prop(node, "alloc-ranges", &len);
- if (prop) {
if (len % t_len != 0) {pr_err("Reserved memory: invalid alloc-ranges property in '%s', skipping node.\n",uname);return -EINVAL;}base = 0;while (len > 0) {start = dt_mem_next_cell(dt_root_addr_cells, &prop);end = start + dt_mem_next_cell(dt_root_size_cells,&prop);ret = early_init_dt_alloc_reserved_memory_arch(size,align, start, end, nomap, &base);if (ret == 0) {pr_debug("Reserved memory: allocated memory for '%s' node: base %pa, size %ld MiB\n",uname, &base,(unsigned long)size / SZ_1M);break;}len -= t_len;}- } else {
ret = early_init_dt_alloc_reserved_memory_arch(size, align,0, 0, nomap, &base);if (ret == 0)pr_debug("Reserved memory: allocated memory for '%s' node: base %pa, size %ld MiB\n",uname, &base, (unsigned long)size / SZ_1M);- }
- if (base == 0) {
pr_info("Reserved memory: failed to allocate memory for node '%s'\n",uname);return -ENOMEM;- }
- *res_base = base;
- *res_size = size;
- return 0;
+}
+static const struct of_device_id __rmem_of_table_sentinel
- __used __section(__reservedmem_of_table_end);
+/**
- res_mem_init_node() - call region specific reserved memory init code
- */
+static int __init +res_mem_init_node(unsigned long node, const char *uname, phys_addr_t base,
phys_addr_t size)+{
- struct reserved_mem *rmem = &reserved_mem[reserved_mem_count];
- extern const struct of_device_id __reservedmem_of_table[];
- const struct of_device_id *i;
- if (reserved_mem_count == ARRAY_SIZE(reserved_mem)) {
pr_err("Reserved memory: not enough space all defined regions.\n");return -ENOSPC;- }
- rmem->base = base;
- rmem->size = size;
- for (i = __reservedmem_of_table; i < &__rmem_of_table_sentinel; i++) {
reservedmem_of_init_fn initfn = i->data;const char *compat = i->compatible;if (!of_flat_dt_is_compatible(node, compat))continue;if (initfn(rmem, node, uname) == 0) {pr_info("Reserved memory: initialized node %s, compatible id %s\n",uname, compat);rmem->name = uname;reserved_mem_count++;return 0;}- }
- return -EINVAL;
+}
+/**
- fdt_scan_reserved_mem() - scan a single FDT node for reserved memory
- */
+static int __init +fdt_scan_reserved_mem(unsigned long node, const char *uname, int depth,
void *data)+{
- phys_addr_t base, size;
- const char *status;
- int nomap;
- int err;
- status = of_get_flat_dt_prop(node, "status", NULL);
- if (status && strcmp(status, "okay") != 0 && strcmp(status, "ok") != 0)
return 0;- nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;
- err = res_mem_reserve_reg(node, uname, nomap, &base, &size);
- if (err == -ENOENT)
err = res_mem_alloc_size(node, uname, nomap, &base, &size);- if (err)
goto end;- res_mem_init_node(node, uname, base, size);
+end:
- /* scan next node */
- return 0;
+}
+/**
- early_init_dt_scan_reserved_mem() - create reserved memory regions
- This function grabs memory from early allocator for device exclusive use
- defined in device tree structures. It should be called by arch specific code
- once the early allocator (i.e. memblock) has been fully activated.
- */
+void __init early_init_dt_scan_reserved_mem(void) +{
- of_scan_flat_dt_by_path("/reserved-memory", fdt_scan_reserved_mem,
NULL);+}
Just about everything above this point must be moved to fdt.c. Processing the static reserved regions must be non-optional code. You can factor out the table of reserved regions if you like, but I want the core functionality directly in fdt.c.
Ok, I will move it then.
The dynamic allocation code can be optional, but that is because it describes dynamic regions that have no possibility of hardware already using them.
+/**
- of_reserved_mem_scan() - scan and create structures required by reserved
memory regions
- This function creates all structures required by reserved memory regions
- management code. It should be called by common code once the device tree
- has been unflattened.
- */
+void __init of_reserved_mem_scan(void) +{
- struct device_node *root, *np;
- root = of_find_node_by_path("/reserved-memory");
- if (of_n_addr_cells(root) != dt_root_addr_cells ||
of_n_size_cells(root) != dt_root_size_cells)panic("Unsupported address or size cells for /reserved-memory node\n");- for (np = NULL;;) {
const char *name;int i;np = of_get_next_available_child(root, np);if (!np)break;name = kbasename(np->full_name);for (i = 0; i < reserved_mem_count; i++)if (strcmp(name, reserved_mem[i].name) == 0)reserved_mem[i].node = np;I've already commented on the above. kbasename is not a safe match.
Then please point me anything better to match FDT node with the unflattened one. There is no need to match the whole path, because both names comes from '/reserved-memory' node (one from FTD, one from unflattened structure).
- }
+}
+static inline struct reserved_mem *find_rmem(struct device_node *phandle) +{
- unsigned int i;
- for (i = 0; i < reserved_mem_count; i++)
if (reserved_mem[i].node == phandle)return &reserved_mem[i];- return NULL;
+}
+/**
- of_reserved_mem_device_init() - assign reserved memory region to given device
- This function assign memory region pointed by "memory-region" device tree
- property to the given device.
- */
+void of_reserved_mem_device_init(struct device *dev) +{
- struct device_node *np = dev->of_node;
- struct reserved_mem *rmem;
- struct of_phandle_args s;
- unsigned int i;
- for (i = 0; of_parse_phandle_with_args(np, "memory-region",
"#memory-region-cells", i, &s) == 0; i++) {rmem = find_rmem(s.np);if (!rmem || !rmem->ops || !rmem->ops->device_init) {of_node_put(s.np);continue;}rmem->ops->device_init(rmem, dev, &s);dev_info(dev, "assigned reserved memory node %s\n",rmem->name);of_node_put(s.np);break;- }
+}
+/**
- of_reserved_mem_device_release() - release reserved memory device structures
- This function releases structures allocated for memory region handling for
- the given device.
- */
+void of_reserved_mem_device_release(struct device *dev) +{
- struct device_node *np = dev->of_node;
- struct reserved_mem *rmem;
- struct of_phandle_args s;
- unsigned int i;
- for (i = 0; of_parse_phandle_with_args(np, "memory-region",
"#memory-region-cells", i, &s) == 0; i++) {rmem = find_rmem(s.np);if (rmem && rmem->ops && rmem->ops->device_release)rmem->ops->device_release(rmem, dev);of_node_put(s.np);- }
+} diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 404d1daebefa..3df0b1826e8b 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -21,6 +21,7 @@ #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/of_platform.h> +#include <linux/of_reserved_mem.h> #include <linux/platform_device.h>
const struct of_device_id of_default_bus_match_table[] = { @@ -220,6 +221,8 @@ static struct platform_device *of_platform_device_create_pdata( dev->dev.bus = &platform_bus_type; dev->dev.platform_data = platform_data;
- of_reserved_mem_device_init(&dev->dev);
- /* We do not fill the DMA ops for platform devices by default.
- This is currently the responsibility of the platform code
- to do such, possibly using a device notifier
@@ -227,6 +230,7 @@ static struct platform_device *of_platform_device_create_pdata(
if (of_device_add(dev) != 0) { platform_device_put(dev);
of_reserved_mem_device_release(&dev->dev);@@ -282,6 +286,8 @@ static struct amba_device *of_amba_device_create(struct device_node *node, else of_device_make_bus_id(&dev->dev);
- of_reserved_mem_device_init(&dev->dev);
- /* Allow the HW Peripheral ID to be overridden */ prop = of_get_property(node, "arm,primecell-periphid", NULL); if (prop)
@@ -308,6 +314,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node, return dev;
err_free:
- of_reserved_mem_device_release(&dev->dev); amba_device_put(dev); return NULL;
} diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index bc2121fa9132..f10f64fcc815 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -167,6 +167,16 @@ #define CLK_OF_TABLES() #endif
+#ifdef CONFIG_OF_RESERVED_MEM +#define RESERVEDMEM_OF_TABLES() \
- . = ALIGN(8); \
- VMLINUX_SYMBOL(__reservedmem_of_table) = .; \
- *(__reservedmem_of_table) \
- *(__reservedmem_of_table_end)
+#else +#define RESERVEDMEM_OF_TABLES() +#endif
#define KERNEL_DTB() \ STRUCT_ALIGN(); \ VMLINUX_SYMBOL(__dtb_start) = .; \ @@ -490,6 +500,7 @@ TRACE_SYSCALLS() \ MEM_DISCARD(init.rodata) \ CLK_OF_TABLES() \
- RESERVEDMEM_OF_TABLES() \ CLKSRC_OF_TABLES() \ KERNEL_DTB() \ IRQCHIP_OF_MATCH_TABLE()
diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h new file mode 100644 index 000000000000..39a4fb17a5ea --- /dev/null +++ b/include/linux/of_reserved_mem.h @@ -0,0 +1,65 @@ +#ifndef __OF_RESERVED_MEM_H +#define __OF_RESERVED_MEM_H
+struct cma; +struct platform_device; +struct of_phandle_args; +struct reserved_mem_ops;
+struct reserved_mem {
- const char *name;
- struct device_node *node;
- const struct reserved_mem_ops *ops;
- phys_addr_t base;
- phys_addr_t size;
- void *priv;
+};
+struct reserved_mem_ops {
- void (*device_init)(struct reserved_mem *rmem,
struct device *dev,struct of_phandle_args *args);- void (*device_release)(struct reserved_mem *rmem,
struct device *dev);+};
+typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem,
unsigned long node, const char *uname);+#ifdef CONFIG_OF_RESERVED_MEM +void of_reserved_mem_device_init(struct device *dev); +void of_reserved_mem_device_release(struct device *dev); +void early_init_dt_scan_reserved_mem(void); +void of_reserved_mem_scan(void);
+int of_parse_flat_dt_reg(unsigned long node, const char *uname,
phys_addr_t *base, phys_addr_t *size);+int of_parse_flat_dt_size(unsigned long node, const char *uname,
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 of_reserved_mem_device_init(struct device *dev) { }
+static inline +void of_reserved_mem_device_release(struct device *pdev) { }
+static inline void early_init_dt_scan_reserved_mem(void) { } +static inline void of_reserved_mem_scan(void) { }
+#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 */
1.7.9.5
Best regards
On Wed, 19 Feb 2014 09:20:05 +0100, Marek Szyprowski m.szyprowski@samsung.com wrote:
Hello,
On 2014-02-18 17:56, Grant Likely wrote:
On Tue, 18 Feb 2014 14:37:57 +0100, Marek Szyprowski m.szyprowski@samsung.com wrote:
This patch adds device tree support for contiguous and reserved memory regions defined in device tree.
Large memory blocks can be reliably reserved only during early boot. This must happen before the whole memory management subsystem is initialized, because we need to ensure that the given contiguous blocks are not yet allocated by kernel. Also it must happen before kernel mappings for the whole low memory are created, to ensure that there will be no mappings (for reserved blocks) or mapping with special properties can be created (for CMA blocks). This all happens before device tree structures are unflattened, so we need to get reserved memory layout directly from fdt.
Later, those reserved memory regions are assigned to devices on each device structure initialization.
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com [joshc: rework to implement new DT binding, provide mechanism for plugging in new reserved-memory node handlers via RESERVEDMEM_OF_DECLARE] Signed-off-by: Josh Cartwright joshc@codeaurora.org [mszyprow: added generic memory reservation code] Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com
drivers/of/Kconfig | 5 + drivers/of/Makefile | 1 + drivers/of/fdt.c | 2 + drivers/of/of_reserved_mem.c | 390 +++++++++++++++++++++++++++++++++++++ drivers/of/platform.c | 7 + include/asm-generic/vmlinux.lds.h | 11 ++ include/linux/of_reserved_mem.h | 65 +++++++ 7 files changed, 481 insertions(+) create mode 100644 drivers/of/of_reserved_mem.c create mode 100644 include/linux/of_reserved_mem.h
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index c6973f101a3e..f25931dfc6db 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -75,4 +75,9 @@ config OF_MTD depends on MTD def_bool y
+config OF_RESERVED_MEM
- bool
- help
Helpers to allow for reservation of memory regionsendmenu # OF diff --git a/drivers/of/Makefile b/drivers/of/Makefile index efd05102c405..ed9660adad77 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_OF_MDIO) += of_mdio.o obj-$(CONFIG_OF_PCI) += of_pci.o obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o obj-$(CONFIG_OF_MTD) += of_mtd.o +obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
As mentioned previously, parts of this are absolutely non-optional and cannot be compiled out. If a region is marked as reserved with this binding, then the kernel must respect it. That part of the code must be always configured in.
How can I make it non-optional if all this code must be called from arch specific early-boot init code to properly reserve memory. Do you want me to add those calls to every architecture which supports OF?
As discussed on IRC, since the static and dynamic regions need to be parsed in separate passes anyway, it would be fine to do the static pass during early_init_dt_scan() and defer the dynamic allocation to later.
That said, it requires Laura's series to get rid of meminfo to be merged first. I'm fine with the calling point to still be done arch specific and I won't ask you to enable every platform in this patch. That can be a fixup after Laura's series goes in and I'll help you with the other architectures.
g.
From: Josh Cartwright joshc@codeaurora.org
Add support for handling 'shared-dma-pool' reserved-memory nodes using dma exclusive driver (dma_alloc_coherent()).
Signed-off-by: Josh Cartwright joshc@codeaurora.org Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com --- drivers/of/Kconfig | 7 ++++ drivers/of/Makefile | 1 + drivers/of/of_reserved_mem_dma.c | 65 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 drivers/of/of_reserved_mem_dma.c
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index f25931dfc6db..7f00b801bcd2 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -80,4 +80,11 @@ config OF_RESERVED_MEM help Helpers to allow for reservation of memory regions
+config OF_RESERVED_MEM_DMA + depends on OF_RESERVED_MEM + depends on HAVE_GENERIC_DMA_COHERENT + def_bool y + help + Helpers for reserving memory regions for DMA use + endmenu # OF diff --git a/drivers/of/Makefile b/drivers/of/Makefile index ed9660adad77..6142227ca854 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_OF_PCI) += of_pci.o obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o obj-$(CONFIG_OF_MTD) += of_mtd.o obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o +obj-$(CONFIG_OF_RESERVED_MEM_DMA) += of_reserved_mem_dma.o diff --git a/drivers/of/of_reserved_mem_dma.c b/drivers/of/of_reserved_mem_dma.c new file mode 100644 index 000000000000..a3e596d1091d --- /dev/null +++ b/drivers/of/of_reserved_mem_dma.c @@ -0,0 +1,65 @@ +/* + * Device tree based initialization code for DMA reserved regions. + * + * Copyright (c) 2013, The Linux Foundation. All Rights Reserved. + * Copyright (c) 2013,2014 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * Author: Marek Szyprowski m.szyprowski@samsung.com + * Author: Josh Cartwright joshc@codeaurora.org + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License or (at your optional) any later version of the license. + */ +#include <linux/memblock.h> +#include <linux/err.h> +#include <linux/of.h> +#include <linux/of_fdt.h> +#include <linux/of_platform.h> +#include <linux/mm.h> +#include <linux/sizes.h> +#include <linux/mm_types.h> +#include <linux/dma-mapping.h> +#include <linux/of_reserved_mem.h> + +static void rmem_dma_device_init(struct reserved_mem *rmem, + struct device *dev, + struct of_phandle_args *args) +{ + dma_declare_coherent_memory(dev, rmem->base, rmem->base, + rmem->size, DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE); +} + +static void rmem_dma_device_release(struct reserved_mem *rmem, + struct device *dev) +{ + dma_release_declared_memory(dev); +} + +static const struct reserved_mem_ops rmem_dma_ops = { + .device_init = rmem_dma_device_init, + .device_release = rmem_dma_device_release, +}; + +static int __init rmem_dma_setup(struct reserved_mem *rmem, + unsigned long node, + const char *uname) +{ + int err; + + if (of_get_flat_dt_prop(node, "reusable", NULL)) + return -EINVAL; + + err = memblock_remove(rmem->base, rmem->size); + if (err == 0) { + rmem->ops = &rmem_dma_ops; + pr_info("Reserved memory: created DMA memory pool at %pa, size %ld MiB\n", + &rmem->base, (unsigned long)rmem->size / SZ_1M); + } else { + pr_err("Reserved memory: unable to setup '%s' memory region for DMA.\n", + uname); + } + return err; +} +RESERVEDMEM_OF_DECLARE(dma, "shared-dma-pool", rmem_dma_setup);
On Tue, 18 Feb 2014 14:37:58 +0100, Marek Szyprowski m.szyprowski@samsung.com wrote:
From: Josh Cartwright joshc@codeaurora.org
Add support for handling 'shared-dma-pool' reserved-memory nodes using dma exclusive driver (dma_alloc_coherent()).
Signed-off-by: Josh Cartwright joshc@codeaurora.org Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com
drivers/of/Kconfig | 7 ++++ drivers/of/Makefile | 1 + drivers/of/of_reserved_mem_dma.c | 65 ++++++++++++++++++++++++++++++++++++++
I don't see any reason to have this separate from of_reserved_mem.c
3 files changed, 73 insertions(+) create mode 100644 drivers/of/of_reserved_mem_dma.c
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index f25931dfc6db..7f00b801bcd2 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -80,4 +80,11 @@ config OF_RESERVED_MEM help Helpers to allow for reservation of memory regions +config OF_RESERVED_MEM_DMA
- depends on OF_RESERVED_MEM
- depends on HAVE_GENERIC_DMA_COHERENT
- def_bool y
- help
Helpers for reserving memory regions for DMA useendmenu # OF diff --git a/drivers/of/Makefile b/drivers/of/Makefile index ed9660adad77..6142227ca854 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_OF_PCI) += of_pci.o obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o obj-$(CONFIG_OF_MTD) += of_mtd.o obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o +obj-$(CONFIG_OF_RESERVED_MEM_DMA) += of_reserved_mem_dma.o diff --git a/drivers/of/of_reserved_mem_dma.c b/drivers/of/of_reserved_mem_dma.c new file mode 100644 index 000000000000..a3e596d1091d --- /dev/null +++ b/drivers/of/of_reserved_mem_dma.c @@ -0,0 +1,65 @@ +/*
- Device tree based initialization code for DMA reserved regions.
- Copyright (c) 2013, The Linux Foundation. All Rights Reserved.
- Copyright (c) 2013,2014 Samsung Electronics Co., Ltd.
http://www.samsung.com
- Author: Marek Szyprowski m.szyprowski@samsung.com
- Author: Josh Cartwright joshc@codeaurora.org
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License or (at your optional) any later version of the license.
- */
+#include <linux/memblock.h> +#include <linux/err.h> +#include <linux/of.h> +#include <linux/of_fdt.h> +#include <linux/of_platform.h> +#include <linux/mm.h> +#include <linux/sizes.h> +#include <linux/mm_types.h> +#include <linux/dma-mapping.h> +#include <linux/of_reserved_mem.h>
+static void rmem_dma_device_init(struct reserved_mem *rmem,
struct device *dev,struct of_phandle_args *args)+{
- dma_declare_coherent_memory(dev, rmem->base, rmem->base,
rmem->size, DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);+}
+static void rmem_dma_device_release(struct reserved_mem *rmem,
struct device *dev)+{
- dma_release_declared_memory(dev);
+}
+static const struct reserved_mem_ops rmem_dma_ops = {
- .device_init = rmem_dma_device_init,
- .device_release = rmem_dma_device_release,
+};
+static int __init rmem_dma_setup(struct reserved_mem *rmem,
unsigned long node,const char *uname)+{
- int err;
- if (of_get_flat_dt_prop(node, "reusable", NULL))
return -EINVAL;- err = memblock_remove(rmem->base, rmem->size);
Isn't the memblock_remove() now handled by the core code? Or am I mis-reading it?
- if (err == 0) {
rmem->ops = &rmem_dma_ops;pr_info("Reserved memory: created DMA memory pool at %pa, size %ld MiB\n",&rmem->base, (unsigned long)rmem->size / SZ_1M);- } else {
pr_err("Reserved memory: unable to setup '%s' memory region for DMA.\n",uname);- }
- return err;
+}
+RESERVEDMEM_OF_DECLARE(dma, "shared-dma-pool", rmem_dma_setup);
1.7.9.5
Hello,
On 2014-02-18 17:58, Grant Likely wrote:
On Tue, 18 Feb 2014 14:37:58 +0100, Marek Szyprowski m.szyprowski@samsung.com wrote:
From: Josh Cartwright joshc@codeaurora.org
Add support for handling 'shared-dma-pool' reserved-memory nodes using dma exclusive driver (dma_alloc_coherent()).
Signed-off-by: Josh Cartwright joshc@codeaurora.org Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com
drivers/of/Kconfig | 7 ++++ drivers/of/Makefile | 1 + drivers/of/of_reserved_mem_dma.c | 65 ++++++++++++++++++++++++++++++++++++++
I don't see any reason to have this separate from of_reserved_mem.c
Some architectures don't have support for dma_declare_coherent_memory() (CONFIG_HAVE_GENERIC_DMA_COHERENT), good examples are arc, c6x, metag and extensa. This code will not work for them.
3 files changed, 73 insertions(+) create mode 100644 drivers/of/of_reserved_mem_dma.c
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index f25931dfc6db..7f00b801bcd2 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -80,4 +80,11 @@ config OF_RESERVED_MEM help Helpers to allow for reservation of memory regions
+config OF_RESERVED_MEM_DMA
- depends on OF_RESERVED_MEM
- depends on HAVE_GENERIC_DMA_COHERENT
- def_bool y
- help
Helpers for reserving memory regions for DMA useendmenu # OF diff --git a/drivers/of/Makefile b/drivers/of/Makefile index ed9660adad77..6142227ca854 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_OF_PCI) += of_pci.o obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o obj-$(CONFIG_OF_MTD) += of_mtd.o obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o +obj-$(CONFIG_OF_RESERVED_MEM_DMA) += of_reserved_mem_dma.o diff --git a/drivers/of/of_reserved_mem_dma.c b/drivers/of/of_reserved_mem_dma.c new file mode 100644 index 000000000000..a3e596d1091d --- /dev/null +++ b/drivers/of/of_reserved_mem_dma.c @@ -0,0 +1,65 @@ +/*
- Device tree based initialization code for DMA reserved regions.
- Copyright (c) 2013, The Linux Foundation. All Rights Reserved.
- Copyright (c) 2013,2014 Samsung Electronics Co., Ltd.
http://www.samsung.com
- Author: Marek Szyprowski m.szyprowski@samsung.com
- Author: Josh Cartwright joshc@codeaurora.org
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License or (at your optional) any later version of the license.
- */
+#include <linux/memblock.h> +#include <linux/err.h> +#include <linux/of.h> +#include <linux/of_fdt.h> +#include <linux/of_platform.h> +#include <linux/mm.h> +#include <linux/sizes.h> +#include <linux/mm_types.h> +#include <linux/dma-mapping.h> +#include <linux/of_reserved_mem.h>
+static void rmem_dma_device_init(struct reserved_mem *rmem,
struct device *dev,struct of_phandle_args *args)+{
- dma_declare_coherent_memory(dev, rmem->base, rmem->base,
rmem->size, DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);+}
+static void rmem_dma_device_release(struct reserved_mem *rmem,
struct device *dev)+{
- dma_release_declared_memory(dev);
+}
+static const struct reserved_mem_ops rmem_dma_ops = {
- .device_init = rmem_dma_device_init,
- .device_release = rmem_dma_device_release,
+};
+static int __init rmem_dma_setup(struct reserved_mem *rmem,
unsigned long node,const char *uname)+{
- int err;
- if (of_get_flat_dt_prop(node, "reusable", NULL))
return -EINVAL;- err = memblock_remove(rmem->base, rmem->size);
Isn't the memblock_remove() now handled by the core code? Or am I mis-reading it?
I forgot to remove it...
- if (err == 0) {
rmem->ops = &rmem_dma_ops;pr_info("Reserved memory: created DMA memory pool at %pa, size %ld MiB\n",&rmem->base, (unsigned long)rmem->size / SZ_1M);- } else {
pr_err("Reserved memory: unable to setup '%s' memory region for DMA.\n",uname);- }
- return err;
+}
+RESERVEDMEM_OF_DECLARE(dma, "shared-dma-pool", rmem_dma_setup);
1.7.9.5
Best regards
From: Josh Cartwright joshc@codeaurora.org
Add support for handling 'shared-dma-pool' reserved-memory nodes using Contiguous Memory Allocator driver.
Signed-off-by: Josh Cartwright joshc@codeaurora.org Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com --- drivers/of/Kconfig | 7 ++++ drivers/of/Makefile | 1 + drivers/of/of_reserved_mem_cma.c | 68 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 drivers/of/of_reserved_mem_cma.c
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 7f00b801bcd2..b0675c666bcd 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -80,6 +80,13 @@ config OF_RESERVED_MEM help Helpers to allow for reservation of memory regions
+config OF_RESERVED_MEM_CMA + depends on OF_RESERVED_MEM + depends on DMA_CMA + def_bool y + help + Helpers for reserving memory regions for DMA use + config OF_RESERVED_MEM_DMA depends on OF_RESERVED_MEM depends on HAVE_GENERIC_DMA_COHERENT diff --git a/drivers/of/Makefile b/drivers/of/Makefile index 6142227ca854..49b9078637b8 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -10,4 +10,5 @@ obj-$(CONFIG_OF_PCI) += of_pci.o obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o obj-$(CONFIG_OF_MTD) += of_mtd.o obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o +obj-$(CONFIG_OF_RESERVED_MEM_CMA) += of_reserved_mem_cma.o obj-$(CONFIG_OF_RESERVED_MEM_DMA) += of_reserved_mem_dma.o diff --git a/drivers/of/of_reserved_mem_cma.c b/drivers/of/of_reserved_mem_cma.c new file mode 100644 index 000000000000..c93c665f06c9 --- /dev/null +++ b/drivers/of/of_reserved_mem_cma.c @@ -0,0 +1,68 @@ +/* + * Device tree based initialization code for DMA reserved regions. + * + * Copyright (c) 2013, The Linux Foundation. All Rights Reserved. + * Copyright (c) 2013,2014 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * Author: Marek Szyprowski m.szyprowski@samsung.com + * Author: Josh Cartwright joshc@codeaurora.org + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License or (at your optional) any later version of the license. + */ +#include <linux/err.h> +#include <linux/of.h> +#include <linux/of_fdt.h> +#include <linux/of_platform.h> +#include <linux/mm.h> +#include <linux/sizes.h> +#include <linux/mm_types.h> +#include <linux/dma-contiguous.h> +#include <linux/of_reserved_mem.h> + +static void rmem_cma_device_init(struct reserved_mem *rmem, + struct device *dev, + struct of_phandle_args *args) +{ + struct cma *cma = rmem->priv; + dev_set_cma_area(dev, cma); +} + +static const struct reserved_mem_ops rmem_cma_ops = { + .device_init = rmem_cma_device_init, +}; + +static int __init rmem_cma_setup(struct reserved_mem *rmem, + unsigned long node, + const char *uname) +{ + phys_addr_t align = PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order); + phys_addr_t mask = align - 1; + struct cma *cma; + int err; + + if (!of_get_flat_dt_prop(node, "reusable", NULL)) + return -EINVAL; + + if ((rmem->base & mask) || (rmem->size & mask)) { + pr_err("Reserved memory: incorrect alignment of CMA region\n"); + return -EINVAL; + } + + err = dma_contiguous_init_reserved_mem(rmem->size, rmem->base, &cma); + if (err) { + pr_err("Reserved memory: unable to setup CMA region\n"); + return err; + } + + if (of_get_flat_dt_prop(node, "linux,cma-default", NULL)) + dma_contiguous_set_default(cma); + + rmem->ops = &rmem_cma_ops; + rmem->priv = cma; + + return 0; +} +RESERVEDMEM_OF_DECLARE(cma, "shared-dma-pool", rmem_cma_setup);
Enable reserved memory initialization from device tree.
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com --- arch/arm/Kconfig | 1 + arch/arm/mm/init.c | 3 +++ 2 files changed, 4 insertions(+)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e25419817791..d0262bea8020 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1918,6 +1918,7 @@ config USE_OF select IRQ_DOMAIN select OF select OF_EARLY_FLATTREE + select OF_RESERVED_MEM help Include support for flattened device tree machine descriptions.
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 804d61566a53..ebafdb479410 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -17,6 +17,7 @@ #include <linux/nodemask.h> #include <linux/initrd.h> #include <linux/of_fdt.h> +#include <linux/of_reserved_mem.h> #include <linux/highmem.h> #include <linux/gfp.h> #include <linux/memblock.h> @@ -323,6 +324,8 @@ void __init arm_memblock_init(struct meminfo *mi, if (mdesc->reserve) mdesc->reserve();
+ early_init_dt_scan_reserved_mem(); + /* * reserve memory for DMA contigouos allocations, * must come from DMA area inside low memory
From: Grant Likely grant.likely@linaro.org
Reserved memory nodes allow for the reservation of static (fixed address) regions, or dynamically allocated regions for a specific purpose.
Signed-off-by: Grant Likely grant.likely@linaro.org [joshc: Based on binding document proposed (in non-patch form) here: http://lkml.kernel.org/g/20131030134702.19B57C402A0@trevor.secretlab.ca adapted to support #memory-region-cells] Signed-off-by: Josh Cartwright joshc@codeaurora.org Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com --- .../bindings/reserved-memory/reserved-memory.txt | 138 ++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt
diff --git a/Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt b/Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt new file mode 100644 index 000000000000..a606ce90c9c4 --- /dev/null +++ b/Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt @@ -0,0 +1,138 @@ +*** Reserved memory regions *** + +Reserved memory is specified as a node under the /reserved-memory node. +The operating system shall exclude reserved memory from normal usage +one can create child nodes describing particular reserved (excluded from +normal use) memory regions. Such memory regions are usually designed for +the special usage by various device drivers. + +Parameters for each memory region can be encoded into the device tree +with the following nodes: + +/reserved-memory node +--------------------- +#address-cells, #size-cells (required) - standard definition + - Should use the same values as the root node +#memory-region-cells (required) - dictates number of cells used in the child + nodes memory-region specifier +ranges (required) - standard definition + - Should be empty + +/reserved-memory/ child nodes +----------------------------- +Each child of the reserved-memory node specifies one or more regions of +reserved memory. Each child node may either use a 'reg' property to +specify a specific range of reserved memory, or a 'size' property with +optional constraints to request a dynamically allocated block of memory. + +Following the generic-names recommended practice, node names should +reflect the purpose of the node (ie. "framebuffer" or "dma-pool"). Unit +address (@<address>) should be appended to the name if the node is a +static allocation. + +Properties: +Requires either a) or b) below. +a) static allocation + reg (required) - standard definition +b) dynamic allocation + size (required) - length based on parent's #size-cells + - Size in bytes of memory to reserve. + alignment (optional) - length based on parent's #size-cells + - Address boundary for alignment of allocation. + alloc-ranges (optional) - prop-encoded-array (address, length pairs). + - Specifies regions of memory that are + acceptable to allocate from. + +If both reg and size are present, then the reg property takes precedence +and size is ignored. + +Additional properties: +compatible (optional) - standard definition + - may contain the following strings: + - shared-dma-pool: This indicates a region of memory meant to be + used as a shared pool of DMA buffers for a set of devices. It can + be used by an operating system to instanciate the necessary pool + management subsystem if necessary. + - vendor specific string in the form <vendor>,[<device>-]<usage> +no-map (optional) - empty property + - Indicates the operating system must not create a virtual mapping + of the region as part of its standard mapping of system memory, + nor permit speculative access to it under any circumstances other + than under the control of the device driver using the region. +reusable (optional) - empty property + - The operating system can use the memory in this region with the + limitation that the device driver(s) owning the region need to be + able to reclaim it back. Typically that means that the operating + system can use that region to store volatile or cached data that + can be otherwise regenerated or migrated elsewhere. + +Linux implementation note: +- If a "linux,cma-default" property is present, then Linux will use the + region for the default pool of the contiguous memory allocator. + +Device node references to reserved memory +----------------------------------------- +Regions in the /reserved-memory node may be referenced by other device +nodes by adding a memory-region property to the device node. + +memory-region (optional) - phandle, specifier pairs to children of /reserved-memory + +Example +------- +This example defines 3 contiguous regions are defined for Linux kernel: +one default of all device drivers (named linux,cma@72000000 and 64MiB in size), +one dedicated to the framebuffer device (named framebuffer@78000000, 8MiB), and +one for multimedia processing (named multimedia-memory@77000000, 64MiB). + +/ { + #address-cells = <1>; + #size-cells = <1>; + + memory { + reg = <0x40000000 0x40000000>; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + /* global autoconfigured region for contiguous allocations */ + linux,cma { + compatible = "shared-dma-pool"; + reusable; + #memory-region-cells = <0>; + size = <0x4000000>; + alignment = <0x2000>; + linux,cma-default; + }; + + display_reserved: framebuffer@78000000 { + #memory-region-cells = <0>; + reg = <0x78000000 0x800000>; + }; + + multimedia_reserved: multimedia@77000000 { + compatible = "acme,multimedia-memory"; + #memory-region-cells = <1>; + reg = <0x77000000 0x4000000>; + }; + }; + + /* ... */ + + fb0: video@12300000 { + memory-region = <&display_reserved>; + /* ... */ + }; + + scaler: scaler@12500000 { + memory-region = <&multimedia_reserved 0xdeadbeef>; + /* ... */ + }; + + codec: codec@12600000 { + memory-region = <&multimedia_reserved 0xfeebdaed>; + /* ... */ + }; +};
linaro-mm-sig@lists.linaro.org
-
Grant Likely -
Marek Szyprowski