From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: Re: [PATCH 2/5] kvmtool: ARM64: Fix compile error for aarch64 Date: Thu, 7 Aug 2014 10:12:12 +0100 Message-ID: <20140807091212.GF13703@arm.com> References: <1407228599-25065-1-git-send-email-anup.patel@linaro.org> <1407228599-25065-3-git-send-email-anup.patel@linaro.org> <20140806125021.GN25953@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "kvmarm@lists.cs.columbia.edu" , "kvm@vger.kernel.org" , "patches@apm.com" , Marc Zyngier , "penberg@kernel.org" , "christoffer.dall@linaro.org" , "pranavkumar@linaro.org" To: Anup Patel , penberg@kernel.org Return-path: Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:41354 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754057AbaHGJML (ORCPT ); Thu, 7 Aug 2014 05:12:11 -0400 Content-Disposition: inline In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: On Thu, Aug 07, 2014 at 09:50:52AM +0100, Anup Patel wrote: > On 6 August 2014 18:20, Will Deacon wrote: > > On Tue, Aug 05, 2014 at 09:49:56AM +0100, Anup Patel wrote: > >> The __ARM64_SYS_REG() macro is already defined in uapi/asm/kvm.h > >> of Linux-3.16-rcX hence remove it from arm/aarch64/kvm-cpu.c > > > > I've been carrying a similar patch in my kvmtool/arm branch, but upstream > > kvmtool is still based on 3.13, so this isn't needed at the moment. > > > > Do you have a need for Pekka to merge in the latest kernel sources? > > > > Will > > Yes, we should syncup KVMTOOL with latest kernel sources. > > I want to be able to shutdown VM when using KVMTOOL. To do > this we need to use PSCI-v0.2 from Guest kernel. Ok. Pekka, could you merge in 3.16 to the kvmtool master branch please? You'll need my patch below to resolve some ARM build fallout. Cheers, Will --->8 >>From e780359998667e3eb08d9d002398618a06a861b9 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Tue, 13 May 2014 12:06:06 +0100 Subject: [PATCH] kvm tools: arm: remove register accessor macros now that they are in uapi The kernel now exposes register accessor macros in the uapi/ headers for arm and arm64, so use those instead (and avoid the compile failure from the duplicate definitions). Signed-off-by: Will Deacon --- tools/kvm/arm/aarch32/kvm-cpu.c | 15 +-------------- tools/kvm/arm/aarch64/kvm-cpu.c | 15 --------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/tools/kvm/arm/aarch32/kvm-cpu.c b/tools/kvm/arm/aarch32/kvm-cpu.c index 464b473dc936..95fb1da5ba3d 100644 --- a/tools/kvm/arm/aarch32/kvm-cpu.c +++ b/tools/kvm/arm/aarch32/kvm-cpu.c @@ -7,25 +7,12 @@ #define ARM_CORE_REG(x) (KVM_REG_ARM | KVM_REG_SIZE_U32 | KVM_REG_ARM_CORE | \ KVM_REG_ARM_CORE_REG(x)) -#define ARM_CP15_REG_SHIFT_MASK(x,n) \ - (((x) << KVM_REG_ARM_ ## n ## _SHIFT) & KVM_REG_ARM_ ## n ## _MASK) - -#define __ARM_CP15_REG(op1,crn,crm,op2) \ - (KVM_REG_ARM | KVM_REG_SIZE_U32 | \ - (15 << KVM_REG_ARM_COPROC_SHIFT) | \ - ARM_CP15_REG_SHIFT_MASK(op1, OPC1) | \ - ARM_CP15_REG_SHIFT_MASK(crn, 32_CRN) | \ - ARM_CP15_REG_SHIFT_MASK(crm, CRM) | \ - ARM_CP15_REG_SHIFT_MASK(op2, 32_OPC2)) - -#define ARM_CP15_REG(...) __ARM_CP15_REG(__VA_ARGS__) - unsigned long kvm_cpu__get_vcpu_mpidr(struct kvm_cpu *vcpu) { struct kvm_one_reg reg; u32 mpidr; - reg.id = ARM_CP15_REG(ARM_CPU_ID, ARM_CPU_ID_MPIDR); + reg.id = ARM_CP15_REG32(ARM_CPU_ID, ARM_CPU_ID_MPIDR); reg.addr = (u64)(unsigned long)&mpidr; if (ioctl(vcpu->vcpu_fd, KVM_GET_ONE_REG, ®) < 0) die("KVM_GET_ONE_REG failed (get_mpidr vcpu%ld", vcpu->cpu_id); diff --git a/tools/kvm/arm/aarch64/kvm-cpu.c b/tools/kvm/arm/aarch64/kvm-cpu.c index 71a2a3a7789d..1b293748efd6 100644 --- a/tools/kvm/arm/aarch64/kvm-cpu.c +++ b/tools/kvm/arm/aarch64/kvm-cpu.c @@ -15,21 +15,6 @@ #define ARM64_CORE_REG(x) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ KVM_REG_ARM_CORE | KVM_REG_ARM_CORE_REG(x)) -#define ARM64_SYS_REG_SHIFT_MASK(x,n) \ - (((x) << KVM_REG_ARM64_SYSREG_ ## n ## _SHIFT) & \ - KVM_REG_ARM64_SYSREG_ ## n ## _MASK) - -#define __ARM64_SYS_REG(op0,op1,crn,crm,op2) \ - (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ - KVM_REG_ARM64_SYSREG | \ - ARM64_SYS_REG_SHIFT_MASK(op0, OP0) | \ - ARM64_SYS_REG_SHIFT_MASK(op1, OP1) | \ - ARM64_SYS_REG_SHIFT_MASK(crn, CRN) | \ - ARM64_SYS_REG_SHIFT_MASK(crm, CRM) | \ - ARM64_SYS_REG_SHIFT_MASK(op2, OP2)) - -#define ARM64_SYS_REG(...) __ARM64_SYS_REG(__VA_ARGS__) - unsigned long kvm_cpu__get_vcpu_mpidr(struct kvm_cpu *vcpu) { struct kvm_one_reg reg; -- 2.0.1