From 571a588fec2de4efd6043805ab0b017c67b63a4d Mon Sep 17 00:00:00 2001 From: Zhen Lei Date: Thu, 1 Sep 2016 14:54:54 +0800 Subject: [PATCH] of/numa: add nid check for memory block If the numa-id which was configured in memory@ devicetree node is greater than MAX_NUMNODES, we should report a warning. We have done this for cpus and distance-map dt nodes, this patch help them to be consistent. Acked-by: Rob Herring Signed-off-by: Zhen Lei Signed-off-by: Will Deacon --- drivers/of/of_numa.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c index 7b3fbdc0b278..c1bd62ce3144 100644 --- a/drivers/of/of_numa.c +++ b/drivers/of/of_numa.c @@ -75,6 +75,11 @@ static int __init of_numa_parse_memory_nodes(void) */ continue; + if (nid >= MAX_NUMNODES) { + pr_warn("NUMA: Node id %u exceeds maximum value\n", nid); + r = -EINVAL; + } + for (i = 0; !r && !of_address_to_resource(np, i, &rsrc); i++) r = numa_add_memblk(nid, rsrc.start, rsrc.end + 1); -- 2.34.1