arm64, NUMA: rework numa_add_memblk()

Rework numa_add_memblk() to update the parameter "u64 size" to "u64
end", this will make it consistent with x86 and simplifies the arm64
ACPI NUMA code to be added later.

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Robert Richter <rrichter@cavium.com>
Signed-off-by: David Daney <david.daney@cavium.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

2 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c
index 98dc1047f2a2..6cb03f9c904d 100644
--- a/arch/arm64/mm/numa.c
+++ b/arch/arm64/mm/numa.c
@@ -131,25 +131,25 @@ void __init early_map_cpu_to_node(unsigned int cpu, int nid)
  * numa_add_memblk - Set node id to memblk
  * @nid: NUMA node ID of the new memblk
  * @start: Start address of the new memblk
- * @size:  Size of the new memblk
+ * @end:  End address of the new memblk
  *
  * RETURNS:
  * 0 on success, -errno on failure.
  */
-int __init numa_add_memblk(int nid, u64 start, u64 size)
+int __init numa_add_memblk(int nid, u64 start, u64 end)
 {
         int ret;
 
-        ret = memblock_set_node(start, size, &memblock.memory, nid);
+        ret = memblock_set_node(start, (end - start), &memblock.memory, nid);
         if (ret < 0) {
                 pr_err("NUMA: memblock [0x%llx - 0x%llx] failed to add on node %d\n",
-                        start, (start + size - 1), nid);
+                        start, (end - 1), nid);
                 return ret;
         }
 
         node_set(nid, numa_nodes_parsed);
         pr_info("NUMA: Adding memblock [0x%llx - 0x%llx] on node %d\n",
-                        start, (start + size - 1), nid);
+                        start, (end - 1), nid);
         return ret;
 }
 
@@ -367,7 +367,7 @@ static int __init dummy_numa_init(void)
                0LLU, PFN_PHYS(max_pfn) - 1);
 
         for_each_memblock(memory, mblk) {
-                ret = numa_add_memblk(0, mblk->base, mblk->size);
+                ret = numa_add_memblk(0, mblk->base, mblk->base + mblk->size);
                 if (!ret)
                         continue;
 
diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c
index 0f2784bc1874..ed5a097f0801 100644
--- a/drivers/of/of_numa.c
+++ b/drivers/of/of_numa.c
@@ -91,8 +91,8 @@ static int __init of_numa_parse_memory_nodes(void)
                 pr_debug("NUMA:  base = %llx len = %llx, node = %u\n",
                          rsrc.start, rsrc.end - rsrc.start + 1, nid);
 
-                r = numa_add_memblk(nid, rsrc.start,
-                                    rsrc.end - rsrc.start + 1);
+
+                r = numa_add_memblk(nid, rsrc.start, rsrc.end + 1);
                 if (r)
                         break;
         }