Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ccbbdaa authored by Hanjun Guo's avatar Hanjun Guo Committed by Rafael J. Wysocki
Browse files

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: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarRobert Richter <rrichter@cavium.com>
Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 6525afdf

arch/arm64/mm/numa.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

drivers/of/of_numa.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}