From patchwork Mon May 30 06:10:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Chen X-Patchwork-Id: 68827 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp1240111qge; Sun, 29 May 2016 23:12:46 -0700 (PDT) X-Received: by 10.31.16.166 with SMTP id 38mr13790865vkq.63.1464588762611; Sun, 29 May 2016 23:12:42 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id r190si21113177vkg.115.2016.05.29.23.12.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 May 2016 23:12:42 -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 1b7GQ4-0008N2-Cq; Mon, 30 May 2016 06:11:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b7GQ2-0008Mt-PT for xen-devel@lists.xen.org; Mon, 30 May 2016 06:11:18 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id AB/5F-21906-689DB475; Mon, 30 May 2016 06:11:18 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrPIsWRWlGSWpSXmKPExsVyMfSOnm7rTe9 wgwl3lS2WfFzM4sDocXT3b6YAxijWzLyk/IoE1ow9vS3sBZMUK7b/msLewLhRsouRk0NIYCKj xOtduV2MXBwsAvOYJd7umcsO4kgI9LNKnL31kAWkSkIgRmLhsW2MEHaVxIaWJiCbA6hbSaJjQ gXEoF+MEgsmFYPYbAIqEt/f9LNClJtJnD85kwnEFhGQlrj2+TLYGGaBTIkbXyayg9jCAlESD8 8vZgOxWQRUJdqa94Ct5RWwkDiw6y8TxBwliVdXjoHFOQUsJeYveMMIsddC4u/0q2wTGAUXMDK sYlQvTi0qSy3SNdJLKspMzyjJTczM0TU0MNXLTS0uTkxPzUlMKtZLzs/dxAgMNgYg2MH4/Y/T IUZJDiYlUV43Du9wIb6k/JTKjMTijPii0pzU4kOMMhwcShK8nTeAcoJFqempFWmZOcCwh0lLc PAoifDygqR5iwsSc4sz0yFSpxiNObb8vraWiWPb1HtrmYRY8vLzUqXEeV1BSgVASjNK8+AGwe LxEqOslDAvI9BpQjwFqUW5mSWo8q8YxTkYlYR5A0Gm8GTmlcDtewV0ChPQKWbnvEBOKUlESEk 1MDJwflvefsP2+UrbB47TT1nNP28lId+j1lcb/izdNXz6YxNV1s8T7RbkhzfMUtmeUuTEKHrM +NlCYX+96K2MgtNkHxgm9PtKs5q1ln5X/3RBUETrBeOlc3//iSzqM+C3VTnn9d4zsfh6//bvP +w78zqVhc++sP1sop5jZ1Oxe9MHHhurw2pWSizFGYmGWsxFxYkAnJBqdsICAAA= X-Env-Sender: wei.chen@linaro.org X-Msg-Ref: server-14.tower-206.messagelabs.com!1464588676!5789876!1 X-Originating-IP: [209.85.220.46] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58651 invoked from network); 30 May 2016 06:11:17 -0000 Received: from mail-pa0-f46.google.com (HELO mail-pa0-f46.google.com) (209.85.220.46) by server-14.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 30 May 2016 06:11:17 -0000 Received: by mail-pa0-f46.google.com with SMTP id fy7so42326922pac.2 for ; Sun, 29 May 2016 23:11:17 -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=Rzeb/bUxr4yviYNQbH0mOh7MjKnqv+BAWasRFnxURWY=; b=JIZM7MqG94Fyo6qvQFY3RGO3ES++cWrw4V2X5YYikACbFVQmiLvATffjXKxp7rNfVL Ho5+107pCldYVXK5RSRcl2LpH6MEvZ1GN6+RINBdutmatEoRvu6aTYPznhAZARN2xFnA Mta80oMWY5JGenHGntx4zXCW7lu+ulswf76Dw= 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=Rzeb/bUxr4yviYNQbH0mOh7MjKnqv+BAWasRFnxURWY=; b=FJZr4KG405Pn8oFuwfHG1RbV/DIk7YAr5YuDQC/n4GjDkfdNrKFkEKt79bK1Wj4qsH hb4YSk2NA2KlmNvxkK6/sNv6lk8luIZNbsI+8khD9DRtjc+6Nd1p9g41siT1SpS61C5w Gr+tAgSVI6b4RhKFWM5fgYkxv3kZxT6kshMqxOK2iIdlcqKR4+lK7vuK7lqhyDpA0CYJ QLEbo8LqEXo11f5A0MZniiKudbrzIJzUy1cDx+ChftrmDSOLypJP5L1dRNvRxG+zNJ+p X/lDraNV3WQR/FtsZCkFQ6lcGP8PB4yCqvE14RQVsFi7bjbYql/tQuoL/VXxxz8R4Pzm kn7w== X-Gm-Message-State: ALyK8tJAYXPEUDQ22uBQtXGBUXEATb5TiXkJxDZ1qKPQrwCIaDxSfG0RM3S8yrdCmNr6RnEU X-Received: by 10.66.132.37 with SMTP id or5mr44008616pab.144.1464588675991; Sun, 29 May 2016 23:11:15 -0700 (PDT) Received: from localhost.members.linode.com ([2400:8900::f03c:91ff:fe56:1324]) by smtp.gmail.com with ESMTPSA id r86sm29679366pfb.21.2016.05.29.23.11.14 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 29 May 2016 23:11:15 -0700 (PDT) From: Wei Chen X-Google-Original-From: Wei Chen To: xen-devel@lists.xen.org Date: Mon, 30 May 2016 14:10:47 +0800 Message-Id: <20160530061050.10771-2-Wei.Chen@linaro.org> X-Mailer: git-send-email 2.9.0.rc0 In-Reply-To: <20160530061050.10771-1-Wei.Chen@linaro.org> References: <20160530061050.10771-1-Wei.Chen@linaro.org> Cc: julien.grall@arm.com, sstabellini@kernel.org, Wei Chen , steve.capper@arm.com Subject: [Xen-devel] [PATCH v3 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 --- v2-->v3: 1. Update verion number. v1-->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 */