From patchwork Sat Sep 15 15:39:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 1462061 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 1BBDC3FC33 for ; Sat, 15 Sep 2012 15:39:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754491Ab2IOPjG (ORCPT ); Sat, 15 Sep 2012 11:39:06 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:39118 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754458Ab2IOPjD (ORCPT ); Sat, 15 Sep 2012 11:39:03 -0400 Received: by mail-qc0-f174.google.com with SMTP id o28so3527231qcr.19 for ; Sat, 15 Sep 2012 08:39:03 -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:user-agent:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=IUmq+0eY2t1ZCKLsTSpXRMimHj2bwgZM4EnZlDIo8BE=; b=KlrQEjvkXuselDTpdGvB3RU0N1U3I+cwJ+bF17ts09gvlR1YROZ0EBrd60EhfBJX09 hJiUDTmKDGb/t9JVBHO49pQ9e7CYaECQ4N6C/lb4bEZPtVw8oQCjE6IT4L9+ceUxNeTC aqFKZCaCSlKiU01ci++/BTnWSgRNu3C+poidF0dXcjRGCe+vZHSHn7NeSSg6Z3S94lT1 F+Tajj/uWB7OqLPtQfVo7skihAy4ykttyVWH/Pl0IHqjWzTVOXEmcEWlLGwbZg5tKJja StK+OimjZq5fs6oZsD1pYrIoLTDgqHekOfVfGKSCwkd0p1v1C6depQ4RAypNd1jySN+h bu7g== Received: by 10.224.70.138 with SMTP id d10mr15458667qaj.12.1347723543452; Sat, 15 Sep 2012 08:39:03 -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 ha5sm7025980qab.1.2012.09.15.08.39.02 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 15 Sep 2012 08:39:03 -0700 (PDT) Subject: [PATCH 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: Sat, 15 Sep 2012 11:39:02 -0400 Message-ID: <20120915153902.21673.37552.stgit@ubuntu> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQk1ZKKdwnyTwAf34CcIqR/28l6EcbAAXL4jjjzLWmX5pWhoC+lHNkBMZgZcowX7vgcjaqjf Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.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(-) -- 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/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] ||