From patchwork Wed May 25 02:09:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Chen X-Patchwork-Id: 68544 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp961599qge; Tue, 24 May 2016 19:11:52 -0700 (PDT) X-Received: by 10.55.172.15 with SMTP id v15mr1338272qke.45.1464142312462; Tue, 24 May 2016 19:11:52 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id f128si5356232qkd.91.2016.05.24.19.11.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 May 2016 19:11:52 -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 1b5OG4-0001KB-Q8; Wed, 25 May 2016 02:09:16 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b5OG4-0001K4-BV for xen-devel@lists.xen.org; Wed, 25 May 2016 02:09:16 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 34/4B-20390-B4905475; Wed, 25 May 2016 02:09:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprBIsWRWlGSWpSXmKPExsVyMfSOqa43p2u 4wdWzHBZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bxq8fZCnoUKl4eP8PUwHhQoouRk0NIYCKj xJZ3fF2MXBwsAu3MEne3vmcHcSQE3rFIXDo+gQmkSkIgRmLGrv/sEHaVxIa+GUBxDqBuJYmOC RUg9UICvxkljj97ygpSwyagIvH9TT8rRL2ZxPmTM8HmiAhIS1z7fJkRxGYWyJS48WUi2ExhgX CJJzemsoDYLAKqElvaZoHZvALOElsPzYW6QU7i5LHJrBMY+RcwMqxiVC9OLSpLLdI11ksqykz PKMlNzMzRNTQw08tNLS5OTE/NSUwq1kvOz93ECAwfBiDYwdjxz+kQoyQHk5Io78EnLuFCfEn5 KZUZicUZ8UWlOanFhxhlODiUJHjPcLiGCwkWpaanVqRl5gADGSYtwcGjJMIbCpLmLS5IzC3OT IdInWI05tjy+9paJo5tU++tZRJiycvPS5US5w0EKRUAKc0ozYMbBIuwS4yyUsK8jECnCfEUpB blZpagyr9iFOdgVBLmjQGZwpOZVwK37xXQKUxAp/h/cQY5pSQRISXVwNjbHzst2zjnnUjBwf4 pM2rO/OY9v5vxwCWhRK6W1bcuyd/bPW/TNM2IQw8SRXYms5jvKjL6VF/2YPK0Iu0DnpLL5XYd r46/GCdp25Pwfv2a6wHyGhvDdv97w5oTtPLCMc/Ld05OE1m5R7yQ1/u3P6v0lwzjtoYz/Havh aTjL8hnrH4q92Tt9zlKLMUZiYZazEXFiQCvoqT8qwIAAA== X-Env-Sender: wei.chen@linaro.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1464142153!15705268!1 X-Originating-IP: [209.85.220.53] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5076 invoked from network); 25 May 2016 02:09:14 -0000 Received: from mail-pa0-f53.google.com (HELO mail-pa0-f53.google.com) (209.85.220.53) by server-9.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 25 May 2016 02:09:14 -0000 Received: by mail-pa0-f53.google.com with SMTP id qo8so12397905pab.1 for ; Tue, 24 May 2016 19:09:14 -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; bh=XBOKofES0otDa5QLJ8of2cVd+NpcV4t5pTWpWD8Lhco=; b=fHUQ9DojrbVWKHqR248GF75cPGGL7HmD/2BcwP9thcJFeKpKz3p1LSm2lSM+G0N7qR 1X3qetWdMaNKXEiytIyMvds+DI3BFTbA0Dg9DgjJiyxcfyy+SY2B7Sj7oNI0O9Q7tSNL /5EgMfXl+4EwgyQaxvqFw0i680BtZdAXbGpbQ= 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; bh=XBOKofES0otDa5QLJ8of2cVd+NpcV4t5pTWpWD8Lhco=; b=aMbyzoRquycUnVMsDQ/8BHSFTv6PlURQUoMDv0WWVLBBDT6sanCgvtp04bq8nk6e5A //qJ8uEiWm/PSielCK7+Spx0IwqJumZG5B+91IunRDcirqGRhctojb00lXRLVpFBTOR6 GhWjeAa69tUqtx6dRc29vrgdEklBy1y38dYg3jBtPJKIf9ORNCjiHP+NueJpecf+bzdz m2+X1+7DxLYTqZF3jZJi/sjzabVLrYQyC5o7W3wbhBHghqPNMhA/Atzg3+V+KEMjf4Kx AuRVgKinpYb1WTIMavlmdqtjvZ2UbrNKb8EVG04FRAgRm1I/d3FfZTeyxnGN5jytVZcH SatQ== X-Gm-Message-State: ALyK8tJ7UvGDW5Bh+qFC7CxCtRA+Zabh4N6Cwxb5cogJFZ3L7bWsT4eU/Jwdcl45PrCUsvuJ X-Received: by 10.66.122.175 with SMTP id lt15mr1947709pab.51.1464142153305; Tue, 24 May 2016 19:09:13 -0700 (PDT) Received: from localhost.members.linode.com ([2400:8900::f03c:91ff:fe56:1324]) by smtp.gmail.com with ESMTPSA id w125sm57293537pfb.53.2016.05.24.19.09.11 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 May 2016 19:09:12 -0700 (PDT) From: Wei Chen X-Google-Original-From: Wei Chen To: xen-devel@lists.xen.org Date: Wed, 25 May 2016 10:09:08 +0800 Message-Id: <1464142148-32678-1-git-send-email-Wei.Chen@linaro.org> X-Mailer: git-send-email 1.9.1 Cc: julien.grall@arm.com, sstabellini@kernel.org, Wei Chen , steve.capper@arm.com Subject: [Xen-devel] [PATCH 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 the variable type of cpu_logical_map to register_t will make cpu_logical_map to store hardware ID correctly on ARM32 and ARM64. Signed-off-by: Wei Chen Acked-by: Julien Grall --- 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 */