From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [PATCH v3 08/13] xen: arm: Handle cpus nodes with #address-cells > 1 Date: Mon, 25 Nov 2013 12:35:57 +0000 Message-ID: <5293442D.5030109@linaro.org> References: <1385377561.22002.22.camel@kazak.uk.xensource.com> <1385377625-20250-8-git-send-email-ian.campbell@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1385377625-20250-8-git-send-email-ian.campbell@citrix.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: Ian Campbell , xen-devel@lists.xen.org Cc: pranavkumar@linaro.org, tim@xen.org, Anup Patel , stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org On 11/25/2013 11:07 AM, Ian Campbell wrote: > The APM X-Gene Mustang board DTS has #address-cells = 2. > > Signed-off-by: Ian Campbell Acked-by: Julien Grall > --- > v3: Correct check for property length (bytes not cells) > v2: Use dt_read_number, check the property length > --- > xen/arch/arm/smpboot.c | 34 +++++++++++++++++++++++++++++----- > 1 file changed, 29 insertions(+), 5 deletions(-) > > diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c > index 6c90fa6..7636ab8 100644 > --- a/xen/arch/arm/smpboot.c > +++ b/xen/arch/arm/smpboot.c > @@ -125,18 +125,42 @@ void __init smp_init_cpus(void) > > dt_for_each_child_node( cpus, cpu ) > { > - u32 hwid; > + const __be32 *prop; > + u64 addr; > + u32 reg_len, hwid; > > if ( !dt_device_type_is_equal(cpu, "cpu") ) > continue; > > - if ( !dt_property_read_u32(cpu, "reg", &hwid) ) > + if ( dt_n_size_cells(cpu) != 0 ) > + printk(XENLOG_WARNING "cpu node `%s`: #size-cells %d\n", > + dt_node_full_name(cpu), dt_n_size_cells(cpu)); > + > + prop = dt_get_property(cpu, "reg", ®_len); > + if ( !prop ) > + { > + printk(XENLOG_WARNING "cpu node `%s`: has no reg property\n", > + dt_node_full_name(cpu)); > + continue; > + } > + > + if ( reg_len < dt_cells_to_size(dt_n_addr_cells(cpu)) ) > { > - printk(XENLOG_WARNING "cpu node `%s`: missing reg property\n", > + printk(XENLOG_WARNING "cpu node `%s`: reg property too short\n", > dt_node_full_name(cpu)); > continue; > } > > + addr = dt_read_number(prop, dt_n_addr_cells(cpu)); > + > + hwid = addr; > + if ( hwid != addr ) > + { > + printk(XENLOG_WARNING "cpu node `%s`: hwid overflow %"PRIx64"\n", > + dt_node_full_name(cpu), addr); > + continue; > + } > + > /* > * 8 MSBs must be set to 0 in the DT since the reg property > * defines the MPIDR[23:0] > @@ -159,8 +183,8 @@ void __init smp_init_cpus(void) > if ( tmp_map[j] == hwid ) > { > printk(XENLOG_WARNING > - "cpu node `%s`: duplicate /cpu reg properties in the DT\n", > - dt_node_full_name(cpu)); > + "cpu node `%s`: duplicate /cpu reg properties %"PRIx32" in the DT\n", > + dt_node_full_name(cpu), hwid); > break; > } > } > -- Julien Grall