mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 07:04:24 +00:00
Code Issues Releases Wiki Activity

of/numa: fix a memory@ node can only contains one memory block

Browse source 
For a normal memory@ devicetree node, its reg property can contains more
memory blocks.

Because we don't known how many memory blocks maybe contained, so we try
from index=0, increase 1 until error returned(the end).

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Zhen Lei 2016-09-01 14:54:53 +08:00 committed by Will Deacon
parent 16a82f06c4
commit 84b14256c1
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/of/of_numa.c
View file

@ -63,13 +63,9 @@ static int __init of_numa_parse_memory_nodes(void)
struct device_node *np = NULL;
struct resource rsrc;
u32 nid;
int r = 0;
for (;;) {
np = of_find_node_by_type(np, "memory");
if (!np)
break;
int i, r;
for_each_node_by_type(np, "memory") {
r = of_property_read_u32(np, "numa-node-id", &nid);
if (r == -EINVAL)
/*
@ -78,23 +74,18 @@ static int __init of_numa_parse_memory_nodes(void)
* "numa-node-id" property
*/
continue;
else if (r)
/* some other error */
break;
r = of_address_to_resource(np, 0, &rsrc);
if (r) {
pr_err("NUMA: bad reg property in memory node\n");
break;
for (i = 0; !r && !of_address_to_resource(np, i, &rsrc); i++)
r = numa_add_memblk(nid, rsrc.start, rsrc.end + 1);
if (!i || r) {
of_node_put(np);
pr_err("NUMA: bad property in memory node\n");
return r ? : -EINVAL;
}
r = numa_add_memblk(nid, rsrc.start, rsrc.end + 1);
if (r)
break;
}
of_node_put(np);
return r;
return 0;
}
static int __init of_numa_parse_distance_map_v1(struct device_node *map)