From: Chen Baozi Date: Tue, 30 Jun 2015 08:00:20 +0000 (+0800) Subject: xen/arm: Set 'reg' of cpu node for dom0 to match MPIDR's affinity X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2951 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c81a791d34bbe42beda40bcb157a144af1733f29;p=xen.git xen/arm: Set 'reg' of cpu node for dom0 to match MPIDR's affinity According to ARM CPUs bindings, the reg field should match the MPIDR's affinity bits. We will use AFF0 and AFF1 when constructing the reg value of the guest at the moment, for it is enough for the current max vcpu number. Signed-off-by: Chen Baozi Acked-by: Ian Campbell Reviewed-by: Julien Grall [ ijc -- use PRIx64 to format mpidr_aff in node name, fixing 32-bit build ] --- diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 3faf96099f..04460b022b 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -711,6 +711,7 @@ static int make_cpus_node(const struct domain *d, void *fdt, char buf[15]; u32 clock_frequency; bool_t clock_valid; + uint64_t mpidr_aff; DPRINT("Create cpus node\n"); @@ -760,9 +761,16 @@ static int make_cpus_node(const struct domain *d, void *fdt, for ( cpu = 0; cpu < d->max_vcpus; cpu++ ) { - DPRINT("Create cpu@%u node\n", cpu); + /* + * According to ARM CPUs bindings, the reg field should match + * the MPIDR's affinity bits. We will use AFF0 and AFF1 when + * constructing the reg value of the guest at the moment, for it + * is enough for the current max vcpu number. + */ + mpidr_aff = vcpuid_to_vaffinity(cpu); + DPRINT("Create cpu@%"PRIx64" (logical CPUID: %d) node\n", mpidr_aff, cpu); - snprintf(buf, sizeof(buf), "cpu@%u", cpu); + snprintf(buf, sizeof(buf), "cpu@%"PRIx64, mpidr_aff); res = fdt_begin_node(fdt, buf); if ( res ) return res; @@ -775,7 +783,7 @@ static int make_cpus_node(const struct domain *d, void *fdt, if ( res ) return res; - res = fdt_property_cell(fdt, "reg", cpu); + res = fdt_property_cell(fdt, "reg", mpidr_aff); if ( res ) return res;