Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 08:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

fdt: fix fdtdec_setup_memory_banksize()

Browse source 
Prior to this patch is fdtdec_setup_memory_banksize() incorrectly
ignoring the "status" field. This patch fixes that by testing the status
with fdtdec_get_is_enabled() before using a memory node.

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Jens Wiklander 2018-07-13 12:12:11 +02:00 committed by Simon Glass
parent 09b8d67f31
commit 452bc12102
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/fdtdec.c
View file

@ -1181,13 +1181,25 @@ int fdtdec_setup_mem_size_base(void)
} }
#if defined(CONFIG_NR_DRAM_BANKS) #if defined(CONFIG_NR_DRAM_BANKS)
static int get_next_memory_node(const void *blob, int startoffset)
{
int mem = -1;
do {
mem = fdt_node_offset_by_prop_value(gd->fdt_blob, mem,
"device_type", "memory", 7);
} while (!fdtdec_get_is_enabled(blob, mem));
return mem;
}
int fdtdec_setup_memory_banksize(void) int fdtdec_setup_memory_banksize(void)
{ {
int bank, ret, mem, reg = 0; int bank, ret, mem, reg = 0;
struct fdt_resource res; struct fdt_resource res;
mem = fdt_node_offset_by_prop_value(gd->fdt_blob, -1, "device_type", mem = get_next_memory_node(gd->fdt_blob, -1);
"memory", 7);
if (mem < 0) { if (mem < 0) {
debug("%s: Missing /memory node\n", __func__); debug("%s: Missing /memory node\n", __func__);
return -EINVAL; return -EINVAL;
@ -1197,9 +1209,7 @@ int fdtdec_setup_memory_banksize(void)
ret = fdt_get_resource(gd->fdt_blob, mem, "reg", reg++, &res); ret = fdt_get_resource(gd->fdt_blob, mem, "reg", reg++, &res);
if (ret == -FDT_ERR_NOTFOUND) { if (ret == -FDT_ERR_NOTFOUND) {
reg = 0; reg = 0;
mem = fdt_node_offset_by_prop_value(gd->fdt_blob, mem, mem = get_next_memory_node(gd->fdt_blob, mem);
"device_type",
"memory", 7);
if (mem == -FDT_ERR_NOTFOUND) if (mem == -FDT_ERR_NOTFOUND)
break; break;