From patchwork Sat Sep 15 15:39:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 1462071 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id BD2143FC33 for ; Sat, 15 Sep 2012 15:39:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754496Ab2IOPjQ (ORCPT ); Sat, 15 Sep 2012 11:39:16 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:47062 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754433Ab2IOPjP (ORCPT ); Sat, 15 Sep 2012 11:39:15 -0400 Received: by qaas11 with SMTP id s11so602138qaa.19 for ; Sat, 15 Sep 2012 08:39:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:date:message-id:in-reply-to:references:user-agent :mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=CRqBjilX5nVHrRKigXSPMDrInVIBg46MWTarIB55K8A=; b=HL/QwxuqRVXHJ2WepTGuShpy/JT1nXxR7q9Ud+sAOxJZsvIPz3OYfDEmbCgQXlB4RX FvANofIhk+C8OnrsEEGXfKGsllgDmWZndBLx5CxZBRhtHTx93nsX9BoejzQN4Hcn2KJS RDIVEnyFnYbDQ1rU2g/gB30e9P0wKK+2w4OZU5JQa9toydUiZ89mDGAwp35/sDtm5wJQ zQ0AAtzNoazVI7IesmHEVstreTSpFvoheUunq9fUcQhGqKKDiWiTjLD4Wswom3gGdU2/ Cpkoks0h12EmcbADke0olxyConT/ALI8Fq+hqqOVdaKZBThuozh7HxuO7xus8UvaJEUH 8nLw== Received: by 10.229.137.148 with SMTP id w20mr4080924qct.22.1347723554818; Sat, 15 Sep 2012 08:39:14 -0700 (PDT) Received: from [127.0.1.1] (pool-72-80-83-148.nycmny.fios.verizon.net. [72.80.83.148]) by mx.google.com with ESMTPS id eh7sm7010261qab.13.2012.09.15.08.39.14 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 15 Sep 2012 08:39:14 -0700 (PDT) Subject: [PATCH 2/5] ARM: KVM: arch_timers: Add minimal infrastructure To: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu From: Christoffer Dall Date: Sat, 15 Sep 2012 11:39:13 -0400 Message-ID: <20120915153913.21673.19228.stgit@ubuntu> In-Reply-To: <20120915153902.21673.37552.stgit@ubuntu> References: <20120915153902.21673.37552.stgit@ubuntu> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmDdYjSxLyXdgXVcGduCEDSQ4cnNQSMwa8Oq7rN/PipNp8M6ow4ACPQDIxoJrKAKlTXA1SK Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Marc Zyngier Add some very minimal architected timer related infrastructure. For the moment, we just provide empty structures, and enable/disable access to the physical timer across world switch. Signed-off-by: Marc Zyngier Signed-off-by: Christoffer Dall --- arch/arm/include/asm/kvm_arch_timer.h | 45 +++++++++++++++++++++++++++++++++ arch/arm/include/asm/kvm_host.h | 5 ++++ arch/arm/kvm/interrupts.S | 21 +++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 arch/arm/include/asm/kvm_arch_timer.h -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/include/asm/kvm_arch_timer.h b/arch/arm/include/asm/kvm_arch_timer.h new file mode 100644 index 0000000..513b852 --- /dev/null +++ b/arch/arm/include/asm/kvm_arch_timer.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2012 ARM Ltd. + * Author: Marc Zyngier + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __ASM_ARM_KVM_ARCH_TIMER_H +#define __ASM_ARM_KVM_ARCH_TIMER_H + +struct arch_timer_kvm { +}; + +struct arch_timer_cpu { +}; + +#ifndef CONFIG_KVM_ARM_TIMER +static inline int kvm_timer_hyp_init(void) +{ + return 0; +}; + +static inline int kvm_timer_init(struct kvm *kvm) +{ + return 0; +} + +static inline void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) {} +static inline void kvm_timer_sync_to_cpu(struct kvm_vcpu *vcpu) {} +static inline void kvm_timer_sync_from_cpu(struct kvm_vcpu *vcpu) {} +static inline void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) {} +#endif + +#endif diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 97e0e5a..dd40b7c 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -29,6 +29,7 @@ #define KVM_HAVE_ONE_REG #include +#include #define NUM_FEATURES 0 @@ -57,6 +58,9 @@ struct kvm_arch { /* Interrupt controller */ struct vgic_dist vgic; + + /* Timer */ + struct arch_timer_kvm timer; }; #define EXCEPTION_NONE 0 @@ -151,6 +155,7 @@ struct kvm_vcpu_arch { /* VGIC state */ struct vgic_cpu vgic_cpu; + struct arch_timer_cpu timer_cpu; /* * Anything that is not used directly from assembly code goes diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S index bf0f83f..d354bd8 100644 --- a/arch/arm/kvm/interrupts.S +++ b/arch/arm/kvm/interrupts.S @@ -393,6 +393,25 @@ ENDPROC(__kvm_flush_vm_context) #endif .endm +#define CNTHCTL_PL1PCTEN (1 << 0) +#define CNTHCTL_PL1PCEN (1 << 1) + +.macro save_timer_state vcpup + @ Allow physical timer/counter access for the host + mrc p15, 4, r2, c14, c1, 0 @ CNTHCTL + orr r2, r2, #(CNTHCTL_PL1PCEN | CNTHCTL_PL1PCTEN) + mcr p15, 4, r2, c14, c1, 0 @ CNTHCTL +.endm + +.macro restore_timer_state vcpup + @ Disallow physical timer access for the guest + @ Physical counter access is allowed + mrc p15, 4, r2, c14, c1, 0 @ CNTHCTL + orr r2, r2, #CNTHCTL_PL1PCTEN + bic r2, r2, #CNTHCTL_PL1PCEN + mcr p15, 4, r2, c14, c1, 0 @ CNTHCTL +.endm + /* Configures the HSTR (Hyp System Trap Register) on entry/return * (hardware reset value is 0) */ .macro set_hstr entry @@ -471,6 +490,7 @@ ENTRY(__kvm_vcpu_run) store_mode_state sp, fiq restore_vgic_state r0 + restore_timer_state r0 @ Store hardware CP15 state and load guest state read_cp15_state @@ -589,6 +609,7 @@ after_vfp_restore: read_cp15_state 1, r1 write_cp15_state + save_timer_state r1 save_vgic_state r1 load_mode_state sp, fiq