Re: [Xen-devel] [PATCH] xen/arm: bootfdt: Use proper default for #address-cells and #size-cells

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Fri, 8 Dec 2017, Julien Grall wrote:
> Hi,
> 
> On 29/11/17 18:12, Stefano Stabellini wrote:
> > On Wed, 29 Nov 2017, Julien Grall wrote:
> > > Per the device-tree specific [1], when the property #address-cells
> > > and  #size-cells are not present, the default value should be resp. 1
> > > and 2.
> > > 
> > > [1]
> > > https://www.devicetree.org/downloads/devicetree-specification-v0.1-20160524.pdf
> > > 
> > > Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
> > 
> > Acked-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> 
> This was acked but not applied to staging. Can you do it please?

It was in my arm-next branch together with a couple of patches from
Andre. I committed all three to staging.



> 
> > 
> > 
> > > ---
> > > 
> > >      This was discovered debugging DT generated by GRUB on ACPI-only
> > >      platform. I am not aware of any DT relying on that for now, but it
> > >      would still be nice to be compliant with the spec and avoid
> > >      surprise.
> > > ---
> > >   xen/arch/arm/bootfdt.c | 4 ++--
> > >   1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c
> > > index 4a687e725d..8eba42c7b9 100644
> > > --- a/xen/arch/arm/bootfdt.c
> > > +++ b/xen/arch/arm/bootfdt.c
> > > @@ -109,8 +109,8 @@ int __init device_tree_for_each_node(const void *fdt,
> > >               continue;
> > >           }
> > >   -        as = depth > 0 ? address_cells[depth-1] : 0;
> > > -        ss = depth > 0 ? size_cells[depth-1] : 0;
> > > +        as = depth > 0 ? address_cells[depth-1] :
> > > DT_ROOT_NODE_ADDR_CELLS_DEFAULT;
> > > +        ss = depth > 0 ? size_cells[depth-1] :
> > > DT_ROOT_NODE_SIZE_CELLS_DEFAULT;
> > >             address_cells[depth] = device_tree_get_u32(fdt, node,
> > >                                                      "#address-cells",
> > > as);
> > > -- 
> > > 2.11.0
> > > 
> 
> -- 
> Julien Grall
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel