From patchwork Thu May 26 07:58:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Chen X-Patchwork-Id: 68673 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp268576qge; Thu, 26 May 2016 01:00:39 -0700 (PDT) X-Received: by 10.31.81.199 with SMTP id f190mr4042719vkb.139.1464249639696; Thu, 26 May 2016 01:00:39 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id u190si10024404vkg.52.2016.05.26.01.00.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2016 01:00:39 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b5qCP-0007Or-SX; Thu, 26 May 2016 07:59:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b5qCP-0007Ok-Ht for xen-devel@lists.xen.org; Thu, 26 May 2016 07:59:21 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 14/E8-17439-8DCA6475; Thu, 26 May 2016 07:59:20 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrAIsWRWlGSWpSXmKPExsVyMfSOju6NNW7 hBq8PiFgs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBlHLz5nLpipWHFm92/GBsadkl2MXBxCAhMZ JfYf2srcxcjJwSIwj1ni27YSkISEQD+rxOR9+1hBEhICMRIrZ59hg7ArJJofPGPqYuQA6laS6 JhQARIWEvjJKNG9yhvEZhNQkfj+ph+q1Uzi/MmZTCC2iIC0xLXPlxlBbGaBTIkbXyayg9jCAl ES595cYoO4QVXi4fKPYPW8AhYSD8/eZYSYoyTx6soxFhCbU8BS4kdzLzPEXguJJY9nM05gFFz AyLCKUaM4tagstUjX0EAvqSgzPaMkNzEzB8gz1ctNLS5OTE/NSUwq1kvOz93ECAw3BiDYwbhm qvMhRkkOJiVRXnFxt3AhvqT8lMqMxOKM+KLSnNTiQ4wyHBxKErwlq4FygkWp6akVaZk5wMCHS Utw8CiJ8JaCpHmLCxJzizPTIVKnGI05tvy+tpaJY9vUe2uZhFjy8vNSpcR59UBKBUBKM0rz4A bBIvISo6yUMC8j0GlCPAWpRbmZJajyrxjFORiVhHmbQKbwZOaVwO17BXQKE9Ap/l+cQU4pSUR ISTUwlj45fjG9+ngXyyWWCT7BVg+vnbh4USvI8MC6vkcWSSmKT7X25gvpZvUVGta/zgi6rf/A 2PLQGjU3kQsrRX9qfn59en5SjfGaLbnGYu9MKs9+mN762jXfN/4lb//mS9d3xZYFbpuR8Hy+W /77b1WCyXE6DXNV5+Q+dSi3r8qbu3z16mXRy9grlViKMxINtZiLihMB8eWcIcMCAAA= X-Env-Sender: wei.chen@linaro.org X-Msg-Ref: server-7.tower-206.messagelabs.com!1464249559!41491178!1 X-Originating-IP: [209.85.220.44] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14109 invoked from network); 26 May 2016 07:59:20 -0000 Received: from mail-pa0-f44.google.com (HELO mail-pa0-f44.google.com) (209.85.220.44) by server-7.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 26 May 2016 07:59:20 -0000 Received: by mail-pa0-f44.google.com with SMTP id fy7so10943873pac.2 for ; Thu, 26 May 2016 00:59:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cTQ60jG88Onw+bSC+FLK7wMxYsn/DiBG1/S68j8qP8Y=; b=Ym+nwWfG+gniQ4hkrtoG/WoA86iauM9zV9V/bZBdG3JPkFiN9oTTIxqpzmXj7WmWEk i15hHBktAuIIfDhewYIJjdP3sjGWFgbOcciwsHS8RuBjTAM6g4k3R+u7Ie6K66poHkg7 IXAd1Zc0DNHFrTy93z5HI79ZlelJIhaETefio= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cTQ60jG88Onw+bSC+FLK7wMxYsn/DiBG1/S68j8qP8Y=; b=bvA3YWlwqHqYXTp9ln1s/Ex7aC+vLO/xst/87caFbDpcRAywAbE1Gkwl8eLSrZamTg sC8RCZfrqBm2T+F6O84uoT3G5nHKcrGbTjp257hy/yeptaylystUGJ3tuBWTXwdwiAMH ZDxgr3qVDjVousPDMYG7gyy/E4z7fywTE9SMbIkVIA+64vC8kgvxuLoUTPfi7EguYN6v uc8XEGFhFKVUOIk8CcLCMZyACdE8iWPaV0hNe2SaLnoerfZyn0JKibp4IdIhplTeNyE5 4f55wG61eo+wwwXmCtibwT48leZfUGB1hdovTH/1rIldky1yWafdJ/kXbPNXkhnWbLjS hbIw== X-Gm-Message-State: ALyK8tJZl26BmbGXoqI2Bo45GTOhek8xh3JluEEavUuZ63GzYD2W53qIMSu1dGaFIYY5q6wp X-Received: by 10.66.240.8 with SMTP id vw8mr12232416pac.62.1464249558806; Thu, 26 May 2016 00:59:18 -0700 (PDT) Received: from localhost.members.linode.com ([2400:8900::f03c:91ff:fe56:1324]) by smtp.gmail.com with ESMTPSA id v27sm3686855pfi.49.2016.05.26.00.59.16 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 May 2016 00:59:18 -0700 (PDT) From: Wei Chen X-Google-Original-From: Wei Chen To: xen-devel@lists.xen.org Date: Thu, 26 May 2016 15:58:40 +0800 Message-Id: <20160526075843.25236-2-Wei.Chen@linaro.org> X-Mailer: git-send-email 2.9.0.rc0 In-Reply-To: <20160526075843.25236-1-Wei.Chen@linaro.org> References: <20160526075843.25236-1-Wei.Chen@linaro.org> Cc: julien.grall@arm.com, sstabellini@kernel.org, Wei Chen , steve.capper@arm.com Subject: [Xen-devel] [PATCH v2 1/4] xen/arm: Change the variable type of cpu_logical_map to register_t X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" The cpu_logical_map is used to store CPU hardware ID from MPIDR_EL1 or from CPU node of DT. Currently, the cpu_logical_map is using the u32 as its variable type. It can work properly while Xen is running on ARM32, because the hardware ID is 32-bits. While Xen is running on ARM64, the hardware ID expands to 64-bits and then the cpu_logical_map will overflow. Change the variable type of cpu_logical_map to register_t will make cpu_logical_map to store hardware IDs correctly on ARM32 and ARM64. Signed-off-by: Wei Chen Acked-by: Julien Grall --- v2: 1. Fix typos in commit messages that were commented by Julien. 2. Add Julien's Acked-by. --- xen/arch/arm/gic-v3.c | 2 +- xen/arch/arm/smpboot.c | 13 +++++++------ xen/include/asm-arm/processor.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index a095064..9910877 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -674,7 +674,7 @@ static int __init gicv3_populate_rdist(void) } while ( !(typer & GICR_TYPER_LAST) ); } - dprintk(XENLOG_ERR, "GICv3: CPU%d: mpidr 0x%x has no re-distributor!\n", + dprintk(XENLOG_ERR, "GICv3: CPU%d: mpidr 0x%"PRIregister" has no re-distributor!\n", smp_processor_id(), cpu_logical_map(smp_processor_id())); return -ENODEV; diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index c5109bf..ba83406 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -40,7 +40,7 @@ cpumask_t cpu_possible_map; struct cpuinfo_arm cpu_data[NR_CPUS]; /* CPU logical map: map xen cpuid to an MPIDR */ -u32 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = MPIDR_INVALID }; +register_t __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = MPIDR_INVALID }; /* Fake one node for now. See also include/asm-arm/numa.h */ nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; @@ -100,7 +100,7 @@ static void __init dt_smp_init_cpus(void) struct dt_device_node *cpu; unsigned int i, j; unsigned int cpuidx = 1; - static u32 tmp_map[NR_CPUS] __initdata = + static register_t tmp_map[NR_CPUS] __initdata = { [0 ... NR_CPUS - 1] = MPIDR_INVALID }; @@ -120,7 +120,8 @@ static void __init dt_smp_init_cpus(void) { const __be32 *prop; u64 addr; - u32 reg_len, hwid; + u32 reg_len; + register_t hwid; if ( !dt_device_type_is_equal(cpu, "cpu") ) continue; @@ -160,7 +161,7 @@ static void __init dt_smp_init_cpus(void) */ if ( hwid & ~MPIDR_HWID_MASK ) { - printk(XENLOG_WARNING "cpu node `%s`: invalid hwid value (0x%x)\n", + printk(XENLOG_WARNING "cpu node `%s`: invalid hwid value (0x%"PRIregister")\n", dt_node_full_name(cpu), hwid); continue; } @@ -176,7 +177,7 @@ static void __init dt_smp_init_cpus(void) if ( tmp_map[j] == hwid ) { printk(XENLOG_WARNING - "cpu node `%s`: duplicate /cpu reg properties %"PRIx32" in the DT\n", + "cpu node `%s`: duplicate /cpu reg properties %"PRIregister" in the DT\n", dt_node_full_name(cpu), hwid); break; } @@ -211,7 +212,7 @@ static void __init dt_smp_init_cpus(void) if ( (rc = arch_cpu_init(i, cpu)) < 0 ) { - printk("cpu%d init failed (hwid %x): %d\n", i, hwid, rc); + printk("cpu%d init failed (hwid %"PRIregister"): %d\n", i, hwid, rc); tmp_map[i] = MPIDR_INVALID; } else diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 6789cd0..7de9c8e 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -348,7 +348,7 @@ extern void identify_cpu(struct cpuinfo_arm *); extern struct cpuinfo_arm cpu_data[]; #define current_cpu_data cpu_data[smp_processor_id()] -extern u32 __cpu_logical_map[]; +extern register_t __cpu_logical_map[]; #define cpu_logical_map(cpu) __cpu_logical_map[cpu] /* HSR data abort size definition */