From 27c34bda59f39f96e1d82b91f463e20547dfa64b Mon Sep 17 00:00:00 2001 From: Jason Liu Date: Wed, 23 Nov 2016 15:42:54 +0800 Subject: [PATCH] of: of_reserved_mem: Ensure cma reserved region not cross the low/high memory Need ensure the cma reserved region not cross the low/high memory boundary when using the dynamic allocation methond through device-tree, otherwise, kernel will fail to boot up when cma reserved region cross how/high mem. Signed-off-by: Jason Liu Cc: Laura Abbott Cc: Frank Rowand Cc: Rob Herring Cc: stable@vger.kernel.org Signed-off-by: Arulpandiyan Vadivel --- drivers/of/of_reserved_mem.c | 43 +++++++++++++++++++++++++-------- include/linux/of_reserved_mem.h | 4 +-- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 895c83e0c7b6..0c5ae32b6d73 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -27,11 +27,15 @@ static int reserved_mem_count; #if defined(CONFIG_HAVE_MEMBLOCK) #include -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) +int __init __weak early_init_dt_alloc_reserved_memory_arch(unsigned long node, + phys_addr_t size, phys_addr_t align, phys_addr_t start, phys_addr_t end, + bool nomap, phys_addr_t *res_base) { phys_addr_t base; + phys_addr_t highmem_start; + + highmem_start = __pa(high_memory - 1) + 1; + /* * We use __memblock_alloc_base() because memblock_alloc_base() * panic()s on allocation failure. @@ -49,15 +53,34 @@ int __init __weak early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, return -ENOMEM; } + /* + * Sanity check for the cma reserved region:If the reserved region + * crosses the low/high memory boundary, try to fix it up and then + * fall back to allocate the cma region from the low mememory space. + */ + + if (IS_ENABLED(CONFIG_CMA) + && of_flat_dt_is_compatible(node, "shared-dma-pool") + && of_get_flat_dt_prop(node, "reusable", NULL) && !nomap) { + if (base < highmem_start && (base + size) > highmem_start) { + memblock_free(base, size); + base = memblock_alloc_range(size, align, start, + highmem_start, + MEMBLOCK_NONE); + if (!base) + return -ENOMEM; + } + } + *res_base = base; if (nomap) return memblock_remove(base, size); return 0; } #else -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) +int __init __weak early_init_dt_alloc_reserved_memory_arch(unsigned long node, + phys_addr_t size, phys_addr_t align, phys_addr_t start, phys_addr_t end, + bool nomap, phys_addr_t *res_base) { pr_err("Reserved memory not supported, ignoring region 0x%llx%s\n", size, nomap ? " (nomap)" : ""); @@ -151,8 +174,8 @@ static int __init __reserved_mem_alloc_size(unsigned long node, 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); + ret = early_init_dt_alloc_reserved_memory_arch(node, + size, align, start, end, nomap, &base); if (ret == 0) { pr_debug("allocated memory for '%s' node: base %pa, size %ld MiB\n", uname, &base, @@ -163,8 +186,8 @@ static int __init __reserved_mem_alloc_size(unsigned long node, } } else { - ret = early_init_dt_alloc_reserved_memory_arch(size, align, - 0, 0, nomap, &base); + ret = early_init_dt_alloc_reserved_memory_arch(node, + size, align, 0, 0, nomap, &base); if (ret == 0) pr_debug("allocated memory for '%s' node: base %pa, size %ld MiB\n", uname, &base, (unsigned long)size / SZ_1M); diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h index 67ab8d271df3..6d366963bfad 100644 --- a/include/linux/of_reserved_mem.h +++ b/include/linux/of_reserved_mem.h @@ -35,13 +35,13 @@ int of_reserved_mem_device_init_by_idx(struct device *dev, struct device_node *np, int idx); void of_reserved_mem_device_release(struct device *dev); -int early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, +int early_init_dt_alloc_reserved_memory_arch(unsigned long node, + phys_addr_t size, phys_addr_t align, phys_addr_t start, phys_addr_t end, bool nomap, phys_addr_t *res_base); - void fdt_init_reserved_mem(void); void fdt_reserved_mem_save_node(unsigned long node, const char *uname, phys_addr_t base, phys_addr_t size); -- 2.17.1