From patchwork Mon Oct 22 06:53:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 1624241 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id E10FD400E8 for ; Mon, 22 Oct 2012 07:09:26 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TQC5G-0001sq-Lo; Mon, 22 Oct 2012 07:05:59 +0000 Received: from mail-vc0-f177.google.com ([209.85.220.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TQBsq-00018M-5b for linux-arm-kernel@lists.infradead.org; Mon, 22 Oct 2012 06:53:11 +0000 Received: by mail-vc0-f177.google.com with SMTP id p16so2568870vcq.36 for ; Sun, 21 Oct 2012 23:53:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=5MuGMTCsiQwlkFxS01FbgoLu6iKzllcq4FLWg1QF6q8=; b=BpGONyv7yHA2qZ/FtAxm28gVZsz9qfo+vGV3vHrLNJm1iVS2WN4qLAdWC37Y1yvT4v TCV4QW9JesWfmzLY2WfmAtDBTsvjvtaH6+2Dulvqj2Y3+qISC/fm6QmvE56sezvB/FTO HwEf5cnXELzNeYNdTYJLkBsagghBPUL4N69vU0ydTcNGh3snzG4rpmkRkNJCKQYh9r4Z 2UrI3M/14X+g8PHzot1nivEFZIp4M+wzFaUTJ/4s6kRfsA+dJZE2+sjTS/4OOGb4XQb2 +VDhS7nvwzB+SIYjZNgo4RMrMGAkvHtvYA+VRarYcEEUBjcmcK/XadH2or0syBMcqYWg ckwQ== Received: by 10.220.205.198 with SMTP id fr6mr13371484vcb.63.1350888786347; Sun, 21 Oct 2012 23:53:06 -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 r17sm9495343vdj.12.2012.10.21.23.53.05 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 21 Oct 2012 23:53:06 -0700 (PDT) Subject: [PATCH v3 1/5] ARM: arch_timers: switch to physical timers if HYP mode is available To: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu From: Christoffer Dall Date: Mon, 22 Oct 2012 02:53:15 -0400 Message-ID: <20121022065315.18883.10095.stgit@ubuntu> In-Reply-To: <20121022065301.18883.35308.stgit@ubuntu> References: <20121022065301.18883.35308.stgit@ubuntu> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnc/Id0RfVoU1LSLs+EiqgdSp6eFoNFj0PLkqaMzg5FtcH/0PwATqUBwU/vfpTU5DbUovX/ X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Marc Zyngier X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Marc Zyngier If we're booted in HYP mode, it is possible that we'll run some kind of virtualized environment. In this case, it is a better to switch to the physical timers, and leave the virtual timers to guests. Signed-off-by: Marc Zyngier --- arch/arm/kernel/arch_timer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c index c8ef207..8adcd04 100644 --- a/arch/arm/kernel/arch_timer.c +++ b/arch/arm/kernel/arch_timer.c @@ -26,6 +26,7 @@ #include #include #include +#include static unsigned long arch_timer_rate; @@ -489,10 +490,14 @@ int __init arch_timer_of_register(void) arch_timer_ppi[i] = irq_of_parse_and_map(np, i); /* + * If HYP mode is available, we know that the physical timer + * has been configured to be accessible from PL1. Use it, so + * that a guest can use the virtual timer instead. + * * If no interrupt provided for virtual timer, we'll have to * stick to the physical timer. It'd better be accessible... */ - if (!arch_timer_ppi[VIRT_PPI]) { + if (is_hyp_mode_available() || !arch_timer_ppi[VIRT_PPI]) { arch_timer_use_virtual = false; if (!arch_timer_ppi[PHYS_SECURE_PPI] ||