From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [PATCH V2 8/8] xen/arm: Set logical CPUID in DT node for dom0 the same as MPIDR Date: Tue, 26 May 2015 16:50:19 +0200 Message-ID: <5564882B.1040205@citrix.com> References: <1432389153-28207-1-git-send-email-cbz@baozis.org> <1432389153-28207-9-git-send-email-cbz@baozis.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YxGCI-00022V-K8 for xen-devel@lists.xenproject.org; Tue, 26 May 2015 14:51:14 +0000 In-Reply-To: <1432389153-28207-9-git-send-email-cbz@baozis.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Chen Baozi , xen-devel@lists.xenproject.org Cc: Julien Grall , Chen Baozi , Ian Campbell List-Id: xen-devel@lists.xenproject.org Hi Chen, On 23/05/2015 15:52, Chen Baozi wrote: > From: Chen Baozi > > This patch does the same thing as the previous one but for dom0 kernel. Please be explicit, the 2 patches may not be contiguous in Xen upstream. > > Signed-off-by: Chen Baozi > --- > xen/arch/arm/domain_build.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c > index a156de9..28b4f75 100644 > --- a/xen/arch/arm/domain_build.c > +++ b/xen/arch/arm/domain_build.c > @@ -712,6 +712,7 @@ static int make_cpus_node(const struct domain *d, void *fdt, > char buf[15]; > u32 clock_frequency; > bool_t clock_valid; > + uint32_t cpu_id; > > DPRINT("Create cpus node\n"); > > @@ -761,9 +762,13 @@ 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); > + /* > + * Linux kernel assumes that MPIDR is equal to logical CPUID > + */ Same remark as patch #7. > + cpu_id = vcpuid_to_vaffinity(cpu); > + DPRINT("Create cpu@%x node\n", cpu_id); > > - snprintf(buf, sizeof(buf), "cpu@%u", cpu); > + snprintf(buf, sizeof(buf), "cpu@%x", cpu_id); > res = fdt_begin_node(fdt, buf); > if ( res ) > return res; > @@ -776,7 +781,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", cpu_id); > if ( res ) > return res; > > Regards, -- Julien Grall