@@ -134,9 +134,10 @@ int __init device_tree_for_each_node(const void *fdt, int node,
return 0;
}
-static void __init process_memory_node(const void *fdt, int node,
- const char *name,
- u32 address_cells, u32 size_cells)
+static int __init process_memory_node(const void *fdt, int node,
+ const char *name, int depth,
+ u32 address_cells, u32 size_cells,
+ void *data)
{
const struct fdt_property *prop;
int i;
@@ -149,15 +150,12 @@ static void __init process_memory_node(const void *fdt, int node,
{
printk("fdt: node `%s': invalid #address-cells or #size-cells",
name);
- return;
+ return -EINVAL;
}
prop = fdt_get_property(fdt, node, "reg", NULL);
if ( !prop )
- {
- printk("fdt: node `%s': missing `reg' property\n", name);
- return;
- }
+ return -ENOENT;
cell = (const __be32 *)prop->data;
banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32));
@@ -166,11 +164,15 @@ static void __init process_memory_node(const void *fdt, int node,
{
device_tree_get_reg(&cell, address_cells, size_cells, &start, &size);
if ( !size )
- continue;
+ return -EINVAL;
bootinfo.mem.bank[bootinfo.mem.nr_banks].start = start;
bootinfo.mem.bank[bootinfo.mem.nr_banks].size = size;
bootinfo.mem.nr_banks++;
}
+
+ if ( i < banks )
+ return -ENOSPC;
+ return 0;
}
static void __init process_multiboot_node(const void *fdt, int node,
@@ -302,15 +304,20 @@ static int __init early_scan_node(const void *fdt,
u32 address_cells, u32 size_cells,
void *data)
{
+ int rc = 0;
+
if ( device_tree_node_matches(fdt, node, "memory") )
- process_memory_node(fdt, node, name, address_cells, size_cells);
+ rc = process_memory_node(fdt, node, name, depth,
+ address_cells, size_cells, NULL);
else if ( depth <= 3 && (device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) ||
device_tree_node_compatible(fdt, node, "multiboot,module" )))
process_multiboot_node(fdt, node, name, address_cells, size_cells);
else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") )
process_chosen_node(fdt, node, name, address_cells, size_cells);
- return 0;
+ if ( rc < 0 )
+ printk("fdt: node `%s': parsing failed\n", name);
+ return rc;
}
static void __init early_print_info(void)
Change the signature of process_memory_node to match device_tree_node_func. Thanks to this change, the next patch will be able to use device_tree_for_each_node to call process_memory_node on all the children of a provided node. Return error if there is no reg property or if nr_banks is reached. Let the caller deal with the error. Add a printk when device tree parsing fails. Signed-off-by: Stefano Stabellini <stefanos@xilinx.com> --- Changes in v7: - use -EINVAL as return in case size is 0 Changes in v6: - fix out of space check - bring back printk when address_cells or size_cells are not properly set - return -EINVAL in that case (different from reg missing) - add printk when parsing fails - return -ENOENT when memory size is 0 Changes in v5: - return -ENOENT if address_cells or size_cells are not properly set Changes in v4: - return error if there is no reg propery, remove printk - return error if nr_banks is reached Changes in v3: - improve commit message - check return value of process_memory_node Changes in v2: - new --- xen/arch/arm/bootfdt.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)