From patchwork Mon Oct 1 09:15:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 1530491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id BB029DF24C for ; Mon, 1 Oct 2012 09:57:40 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TIciX-0005yJ-3g; Mon, 01 Oct 2012 09:55:13 +0000 Received: from mail-qc0-f177.google.com ([209.85.216.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TIc6O-00072Z-8x for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2012 09:15:48 +0000 Received: by qcsu28 with SMTP id u28so4193345qcs.36 for ; Mon, 01 Oct 2012 02:15:47 -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=IUmq+0eY2t1ZCKLsTSpXRMimHj2bwgZM4EnZlDIo8BE=; b=nK7gMWrnCtEG3uy+peIlqJj3s7ArbxkbNAryehcU4gXEu5a4iKQ/YMsTguAuyPcNn/ xVQp8tyDvU0gyKQSimXSvq0wtzRtDAQk3iUCZUdVS35mE1GaZHvYsLuUiWq1KubraQF5 r9aR/0m20L+2+3iVtZwBwIWPN8SG/2uX3ud2Qm8qrmj2QUrdvk+IYMtZOxQ9Va/1v0ao fKNCY19XkUSco8A1KFTMt8sorNvtfzuRdXcSyEf888ZqTM82J/ItzMfzBl/jgy/eJcc0 Hm+HvEsfhhn4CHBn0xg/Z/5f3j/GDkZDdfeZFeO/59FA8LUDlFr4+VipSyfhqEZpvcqw iwGw== Received: by 10.224.58.134 with SMTP id g6mr35331291qah.40.1349082947402; Mon, 01 Oct 2012 02:15:47 -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 fy1sm23789880qab.10.2012.10.01.02.15.46 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 02:15:46 -0700 (PDT) Subject: [PATCH v2 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, 01 Oct 2012 05:15:45 -0400 Message-ID: <20121001091545.49694.51281.stgit@ubuntu> In-Reply-To: <20121001091528.49694.69990.stgit@ubuntu> References: <20121001091528.49694.69990.stgit@ubuntu> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkVDAOFoRgKwqn4lfodhCGFyqP5dk7aqYsp+kNnZ6/OJ3sb3qHvE93mn9+cjaG4BmbUQx/V 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.216.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 c04c2a6..8a30186 100644 --- a/arch/arm/kernel/arch_timer.c +++ b/arch/arm/kernel/arch_timer.c @@ -25,6 +25,7 @@ #include #include #include +#include static unsigned long arch_timer_rate; @@ -490,10 +491,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] ||