From patchwork Tue Oct 7 06:37:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sonny Rao X-Patchwork-Id: 397114 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 23C6D14008F for ; Tue, 7 Oct 2014 17:37:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752036AbaJGGhj (ORCPT ); Tue, 7 Oct 2014 02:37:39 -0400 Received: from mail-ig0-f202.google.com ([209.85.213.202]:34347 "EHLO mail-ig0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751214AbaJGGhi (ORCPT ); Tue, 7 Oct 2014 02:37:38 -0400 Received: by mail-ig0-f202.google.com with SMTP id r10so766786igi.1 for ; Mon, 06 Oct 2014 23:37:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DUTC8MR7ci54+p9mx8zj1icA/C63wJtztVxH65e445c=; b=kgGXgzzxwM2kbqvDN13nGXTXCWIyBRHr68h5A3Afu/xfrt9/6nyCOLyGIxUlDcXSyh TM0D0wLN6U3Dm4ahOFR9NJWtx/j4AMP35f2NV/97CujEmfWYYhqwmorCK8dBbtwOzefC ddtaAZyDL4ghoOakYOWGkmeGhYI8WKVcT9m27F2chqH+3yIJYeBiUG92B8JUaq+hBopJ WMGH+xmsf47ZGCcfbit65HEy1n2YZIMceQRgNSlZLoXarkI6J0jZOtqj5Rtf5D8ookNP OHWE/mb/FhIidg1PXqcM6/vSqZqu7msA1rfXyOiMmWex8reK2WHtLGkL5+/zwFpU3VCV lINg== X-Gm-Message-State: ALoCoQmABtjdOiYsI4eFCnrgdfcSNj4YJPAahyTahDILCgCF/o+zcIgrL18sXA75aM3mIfwtmC9T X-Received: by 10.50.43.168 with SMTP id x8mr14210413igl.4.1412663858013; Mon, 06 Oct 2014 23:37:38 -0700 (PDT) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id j25si824698yhb.0.2014.10.06.23.37.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Oct 2014 23:37:37 -0700 (PDT) Received: from sonnyrao.mtv.corp.google.com ([172.22.162.1]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id 6qRnrObd.1; Mon, 06 Oct 2014 23:37:37 -0700 Received: by sonnyrao.mtv.corp.google.com (Postfix, from userid 129445) id 1B6CEA0BFB; Mon, 6 Oct 2014 23:37:36 -0700 (PDT) From: Sonny Rao To: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Doug Anderson , Lorenzo Pieralisi , Olof Johansson , Thomas Gleixner , Daniel Lezcano , Will Deacon , Catalin Marinas , Sudeep Holla , Mark Rutland , Stephen Boyd , Marc Zyngier , pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, Nathan Lynch , robh+dt@kernel.org, Sonny Rao Subject: [PATCH v3] clocksource: arch_timer: Allow the device tree to specify uninitialized CNTVOFF Date: Mon, 6 Oct 2014 23:37:32 -0700 Message-Id: <1412663852-32681-1-git-send-email-sonnyrao@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Doug Anderson Some 32-bit (ARMv7) systems are architected like this: * The firmware doesn't know and doesn't care about hypervisor mode and we don't want to add the complexity of hypervisor there. * The firmware isn't involved in SMP bringup or resume. * The ARCH timer come up with an uninitialized offset (CNTVOFF) between the virtual and physical counters. Each core gets a different random offset. * The device boots in "Secure SVC" mode. * Nothing has touched the reset value of CNTHCTL.PL1PCEN or CNTHCTL.PL1PCTEN (both default to 1 at reset) On systems like the above, it doesn't make sense to use the virtual counter. There's nobody managing the offset and each time a core goes down and comes back up it will get reinitialized to some other random value. This adds an optional property which can inform the kernel of this situation, and firmware is free to remove the property if it is going to initialize the CNTVOFF registers when each CPU comes out of reset. Currently, the best course of action in this case is to use the physical timer, which is why it is important that CNTHCTL hasn't been changed from its reset value and it's a reasonable assumption given that the firmware has never entered HYP mode. Note that it's been said that ARM64 (ARMv8) systems the firmware and kernel really can't be architected as described above. That means using the physical timer like this really only makes sense for ARMv7 systems. Signed-off-by: Doug Anderson Signed-off-by: Sonny Rao Reviewed-by: Mark Rutland --- Changes in v2: - Add "#ifdef CONFIG_ARM" as per Will Deacon Changes in v3: - change property name to arm,cntvoff-not-fw-configured and specify that the value of CNTHCTL.PL1PC(T)EN must still be the reset value of 1 as per Mark Rutland --- Documentation/devicetree/bindings/arm/arch_timer.txt | 8 ++++++++ drivers/clocksource/arm_arch_timer.c | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/arch_timer.txt b/Documentation/devicetree/bindings/arm/arch_timer.txt index 37b2caf..67837c9 100644 --- a/Documentation/devicetree/bindings/arm/arch_timer.txt +++ b/Documentation/devicetree/bindings/arm/arch_timer.txt @@ -22,6 +22,14 @@ to deliver its interrupts via SPIs. - always-on : a boolean property. If present, the timer is powered through an always-on power domain, therefore it never loses context. +** Optional properties: + +- arm,cntvoff-not-fw-configured : Firmware does not initialize + CNTVOFF, which may reset to arbitrary and different values on each + CPU. CNTHCTL.PL1PC(T)EN must both be 1, which is the reset value + specificed by the architecture. Only supported for ARM (not ARM64). + + Example: timer { diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index bd8da15..234d7b9 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -668,6 +668,15 @@ static void __init arch_timer_init(struct device_node *np) arch_timer_ppi[i] = irq_of_parse_and_map(np, i); arch_timer_detect_rate(NULL, np); +#ifdef CONFIG_ARM + /* + * If we cannot rely on firmware initializing the CNTVOFF then + * we should use the physical timers instead. + */ + if (of_property_read_bool(np, "arm,cntvoff-not-fw-configured")) + arch_timer_use_virtual = false; +#endif + /* * If HYP mode is available, we know that the physical timer * has been configured to be accessible from PL1. Use it, so