2016-12-15 21:54 GMT+08:00 Rob Herring <robh+dt@xxxxxxxxxx>: > On Wed, Dec 14, 2016 at 4:21 PM, Laura Abbott <labbott@xxxxxxxxxx> wrote: >> On 12/14/2016 12:45 PM, Rob Herring wrote: >>> On Wed, Nov 23, 2016 at 5:37 AM, Jason Liu <jason.hui.liu@xxxxxxx> wrote: >>>> 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. >>> >>> The kernel command line code setting CMA already deals with this. Why >>> don't we just call the CMA code (cma_declare_contiguous) to deal with >>> this? >>> >>> Rob >>> >> >> That was proposed in the first version[1] but I think this is a generic >> problem not specific to CMA. Even non-CMA reservations trying to span >> zones could cause problems so the devicetree allocation code should >> restrict reservations to a single zone. > > Fair enough, but that's not what this patch does. It's only for CMA. I'm only certain that the CMA reservation from the device-tree is not working now. and if you guys think that this is not only the CMA but also other non-CMA reservations should also have this restriction on the device-tree method. I can change the patch the patch as the followings. diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 366d8c3..7b8857d 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -31,11 +31,15 @@ static int reserved_mem_count; #if defined(CONFIG_HAVE_MEMBLOCK) #include <linux/memblock.h> -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. @@ -53,15 +57,29 @@ int __init __weak early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, return -ENOMEM; } + /* + * Sanity check for the reserved region:If the reserved region + * crosses the low/high memory boundary, try to fix it up and then + * fall back to allocate region from the low mememory space. + */ + + 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; + } + if you guys have good idea, please share or post your patch. This is really an issue that reserve memory from the device-tree is broken. > > Rob -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html