From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 07/16] xen: arm: Handle cpus nodes with #address-calls > 1 Date: Wed, 20 Nov 2013 14:48:08 +0000 Message-ID: <1384958897-13074-7-git-send-email-ian.campbell@citrix.com> References: <1384958746.6071.64.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1384958746.6071.64.camel@kazak.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: Ian Campbell , Anup Patel , stefano.stabellini@eu.citrix.com, julien.grall@linaro.org, tim@xen.org, pranavkumar@linaro.org List-Id: xen-devel@lists.xenproject.org The APM X-Gene Mustang board DTS has #address-cells = 2. Signed-off-by: Ian Campbell --- xen/arch/arm/smpboot.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 6c90fa6..ce832ae 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -125,18 +125,35 @@ void __init smp_init_cpus(void) dt_for_each_child_node( cpus, cpu ) { + const __be32 *prop; + u64 addr, size; u32 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", NULL); + if ( !prop ) { - printk(XENLOG_WARNING "cpu node `%s`: missing reg property\n", + printk(XENLOG_WARNING "cpu node `%s`: has no reg property\n", dt_node_full_name(cpu)); continue; } + dt_get_range(&prop, cpu, &addr, &size); + + 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 +176,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; } } -- 1.7.10.4