These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / of / of_reserved_mem.c

diff --git a/kernel/drivers/of/of_reserved_mem.c b/kernel/drivers/of/of_reserved_mem.c
index 726ebe7..1a3556a 100644 (file)
--- a/kernel/drivers/of/of_reserved_mem.c
+++ b/kernel/drivers/of/of_reserved_mem.c
@@ -1,7 +1,7 @@
 /*
  * Device tree based initialization code for reserved memory.
  *
- * Copyright (c) 2013, The Linux Foundation. All Rights Reserved.
+ * Copyright (c) 2013, 2015 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>
@@ -20,6 +20,7 @@
 #include <linux/mm.h>
 #include <linux/sizes.h>
 #include <linux/of_reserved_mem.h>
+#include <linux/sort.h>
 
 #define MAX_RESERVED_REGIONS   16
 static struct reserved_mem reserved_mem[MAX_RESERVED_REGIONS];
@@ -123,6 +124,10 @@ static int __init __reserved_mem_alloc_size(unsigned long node,
                align = dt_mem_next_cell(dt_root_addr_cells, &prop);
        }
 
+       /* Need adjust the alignment to satisfy the CMA requirement */
+       if (IS_ENABLED(CONFIG_CMA) && of_flat_dt_is_compatible(node, "shared-dma-pool"))
+               align = max(align, (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order));
+
        prop = of_get_flat_dt_prop(node, "alloc-ranges", &len);
        if (prop) {
 
@@ -197,12 +202,57 @@ static int __init __reserved_mem_init_node(struct reserved_mem *rmem)
        return -ENOENT;
 }
 
+static int __init __rmem_cmp(const void *a, const void *b)
+{
+       const struct reserved_mem *ra = a, *rb = b;
+
+       if (ra->base < rb->base)
+               return -1;
+
+       if (ra->base > rb->base)
+               return 1;
+
+       return 0;
+}
+
+static void __init __rmem_check_for_overlap(void)
+{
+       int i;
+
+       if (reserved_mem_count < 2)
+               return;
+
+       sort(reserved_mem, reserved_mem_count, sizeof(reserved_mem[0]),
+            __rmem_cmp, NULL);
+       for (i = 0; i < reserved_mem_count - 1; i++) {
+               struct reserved_mem *this, *next;
+
+               this = &reserved_mem[i];
+               next = &reserved_mem[i + 1];
+               if (!(this->base && next->base))
+                       continue;
+               if (this->base + this->size > next->base) {
+                       phys_addr_t this_end, next_end;
+
+                       this_end = this->base + this->size;
+                       next_end = next->base + next->size;
+                       pr_err("Reserved memory: OVERLAP DETECTED!\n%s (%pa--%pa) overlaps with %s (%pa--%pa)\n",
+                              this->name, &this->base, &this_end,
+                              next->name, &next->base, &next_end);
+               }
+       }
+}
+
 /**
  * fdt_init_reserved_mem - allocate and init all saved reserved memory regions
  */
 void __init fdt_init_reserved_mem(void)
 {
        int i;
+
+       /* check for overlapping reserved regions */
+       __rmem_check_for_overlap();
+
        for (i = 0; i < reserved_mem_count; i++) {
                struct reserved_mem *rmem = &reserved_mem[i];
                unsigned long node = rmem->fdt_node;