From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 1/4] dtb: correct handling of #address-cells and #size-cells. Date: Wed, 30 Jan 2013 14:26:27 +0000 Message-ID: <1359555990-12186-1-git-send-email-ian.campbell@citrix.com> References: <1359555969.12252.231.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1359555969.12252.231.camel@zakaz.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Anthony Perard , tim@xen.org, stefano.stabellini@citrix.com, Ian Campbell List-Id: xen-devel@lists.xenproject.org If a node does not have #*-cells then the parent's value should be used. Currently we were asssuming zero which is useless. Signed-off-by: Ian Campbell --- xen/arch/arm/domain_build.c | 6 ++++-- xen/common/device_tree.c | 12 ++++++++---- xen/include/xen/device_tree.h | 3 ++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 7403f1a..bfbe7c7 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -198,8 +198,10 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, while ( last_depth-- >= depth ) fdt_end_node(kinfo->fdt); - address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells"); - size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells"); + address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells", + depth > 0 ? address_cells[depth-1] : 0); + size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells", + depth > 0 ? size_cells[depth-1] : 0); fdt_begin_node(kinfo->fdt, name); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 260c2d4..f10ba1b 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -120,13 +120,14 @@ void device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, set_val(cell, size_cells, size); } -u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name) +u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name, + u32 dflt) { const struct fdt_property *prop; prop = fdt_get_property(fdt, node, prop_name, NULL); if ( !prop || prop->len < sizeof(u32) ) - return 0; /* default to 0 */ + return dflt; return fdt32_to_cpu(*(uint32_t*)prop->data); } @@ -164,8 +165,11 @@ int device_tree_for_each_node(const void *fdt, continue; } - address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells"); - size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells"); + address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells", + depth > 0 ? address_cells[depth-1] : 0); + size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells", + depth > 0 ? size_cells[depth-1] : 0); + ret = func(fdt, node, name, depth, address_cells[depth-1], size_cells[depth-1], data); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 52ef258..a8df493 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -66,7 +66,8 @@ void device_tree_get_reg(const u32 **cell, u32 address_cells, u32 size_cells, u64 *start, u64 *size); void device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, u64 start, u64 size); -u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name); +u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name, + u32 dflt); bool_t device_tree_node_matches(const void *fdt, int node, const char *match); int device_tree_for_each_node(const void *fdt, device_tree_node_func func, void *data); -- 1.7.9.1