From 7a35c108b35b7e008e5a2bf521b24515c5f8a910 Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Fri, 13 Sep 2013 13:49:15 +0100 Subject: xen/dts: Check the CPU ID is not greater than NR_CPUS On some board CPU IDs are not contiguous (for instance the Versatile Express with big.LITTLE supports). If the CPU ID is greater than NR_CPUS Xen will hang without any message. This is because console driver is not yet initialized and hypervisor data abort uses printk. For the moment check the CPU ID and print an warning if an error occured. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'xen/common') diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 9d300ecb8f..d2262ce31f 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -445,6 +445,13 @@ static void __init process_cpu_node(const void *fdt, int node, cpuid = dt_read_number((const __be32 *)prop->data, 1); + /* TODO: handle non-contiguous CPU ID */ + if ( cpuid >= NR_CPUS ) + { + dt_printk("fdt: node `%s': reg(0x%x) >= NR_CPUS(%d)\n", + name, cpuid, NR_CPUS); + return; + } cpumask_set_cpu(cpuid, &cpu_possible_map); } -- cgit v1.2.3