From patchwork Sat Aug 7 19:14:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12424497 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1410FC4338F for ; Sat, 7 Aug 2021 19:16:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CE79C60E96 for ; Sat, 7 Aug 2021 19:16:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CE79C60E96 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Mime-Version: Message-Id:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=p7jGsWZ3UtwreSeV6b4zWrqB8uJrW+JFOjt8lRMgDHU=; b=CA8 iJmTNyruGkcxCREPjMOyiFuwJzj05fcb0VY7X00/UBX5VffaEueLSvEeMWYs30Qi7WEst2PJRK2AB h6zhopFzPUbXW3Ydio69L4YU7+Zorb5ZCtR292QoIDcFSeyjvxWeuEB4Qysg0NJp0tqK3+HsYrLDB wns5xCP+y06TpfeLiEkwxRaxtPBwkm4KfGyCmT3tXUSdhposCMAm35ekIF4LELJdm0tSf1oSB6Duf mcUVUL3ddCrTpQ4j6qMrWnaKJjP9lx870+Qm0IKdWUQHpQle00Mtkg0uBNyXfI3RrpJytsGVA8kDb Urxe6ZIgFv+kLYwKWd1RNqvCUce9MTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mCRmI-00F6OI-PX; Sat, 07 Aug 2021 19:14:38 +0000 Received: from mail-io1-xd4a.google.com ([2607:f8b0:4864:20::d4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mCRmE-00F6No-W5 for linux-arm-kernel@lists.infradead.org; Sat, 07 Aug 2021 19:14:36 +0000 Received: by mail-io1-xd4a.google.com with SMTP id j22-20020a5d9d160000b0290583f3b421c0so7627685ioj.2 for ; Sat, 07 Aug 2021 12:14:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=ch4+rbPUJmHH8DosrW567IDIn+nflyhDIsZ9mYXBdfs=; b=dVkBm548MK64m+dZUmust+2D2P6VZffiXHvIVy21engZx2i11OHGA6reT9H64M/t8g ib5euvY/t40m1kMFSyGtmDKKHN1hdTw+/FjiU0zYSf598mikoZuTUu1XVy/wMnaENxej NO8gtaaDvld2an6mwTvC9BjiRW01Qmv4RU/P0xy+U2vf8OHVecx/7mCzGJ8kOFf6WRAr 4EDqcB21FE2lxKk/BECqujPr+fdHJQ3pWMNZtYfV+KBE1H+AYYV6kRJENU6fnF++LeDk 5VAWQi0bnI5n3yz0gR23NNNQ2bGkwJa+iEt8EXZnnjaOrxAHvq/BBLfGmHbVbVxeHORU C+NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=ch4+rbPUJmHH8DosrW567IDIn+nflyhDIsZ9mYXBdfs=; b=Mr/wlqc7TwAvplqOGzNdq0YvfDoWGl6VHHVNEggXRD74qdwEnlgKqrXqIMe7qc1iWn MZFtrUqV0uPrC2txfZq8AgR/jaDsJbDVLXE7FzfX0Rki01QRzvKL/GG4gio1KEHdtPyd xqbEnzLOlyYj/yrv2UmO9CbbO/Ak0C09iSGH2EYFlqmc9kFraOD7TZB4U07aXRkuQPOA ylbR5ddbaT99gRul35w+bs5UjH3HjUGfC8WKsq+jKgSBFTV5L9/WzUmiPg2SVod/XZhk iqIm+o0kX9+Xr9fV13wDeIPTBv99ZmTUadoUGZXILS+1mXrG/S0bYlvyCqT+dXOAzXZF DYng== X-Gm-Message-State: AOAM531lKZediTqQIwUhYareVESolGXTGzFvSjY+GdjE/Wdr7MKl5Gw9 v5Tgb8ooAMYwCIfmE/eAstj3IZ8uexIPBBgxS+HlGa/ue0m0yYAAzGj3Ul++hUy5VhEiWHtJrFu TEU5sVsDwLae6hBCBAAOKb85l1hxxu03dSXoQ5HVvXr5RGiEOOYVb87gO59TK9u4BionxQn5Kcn eJ+5dt X-Google-Smtp-Source: ABdhPJysNcmmYAybHutaRNHL/WX6BYvD9prOvInMPt5PUjzVNf9xbVLalvZK9ut97lcWGPngcmNzX7bkNoI= X-Received: from oupton.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:404]) (user=oupton job=sendgmr) by 2002:a5e:a914:: with SMTP id c20mr175366iod.188.1628363673010; Sat, 07 Aug 2021 12:14:33 -0700 (PDT) Date: Sat, 7 Aug 2021 19:14:28 +0000 Message-Id: <20210807191428.3488948-1-oupton@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog Subject: [PATCH v2] clocksource/arm_arch_timer: Fix masking for high freq counters From: Oliver Upton To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Mark Rutland , Marc Zyngier , Daniel Lezcano , Thomas Gleixner , Peter Shier , Raghavendra Rao Ananta , Ricardo Koller , Oliver Upton X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210807_121435_161621_52E53088 X-CRM114-Status: GOOD ( 20.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Unfortunately, the architecture provides no means to determine the bit width of the system counter. However, we do know the following from the specification: - the system counter is at least 56 bits wide - Roll-over time of not less than 40 years To date, the arch timer driver has depended on the first property, assuming any system counter to be 56 bits wide and masking off the rest. However, combining a narrow clocksource mask with a high frequency counter could result in prematurely wrapping the system counter by a significant margin. For example, a 56 bit wide, 1GHz system counter would wrap in a mere 2.28 years! This is a problem for two reasons: v8.6+ implementations are required to provide a 64 bit, 1GHz system counter. Furthermore, before v8.6, implementers may select a counter frequency of their choosing. Fix the issue by deriving a valid clock mask based on the second property from above. Set the floor at 56 bits, since we know no system counter is narrower than that. Suggested-by: Marc Zyngier Signed-off-by: Oliver Upton Reviewed-by: Linus Walleij --- This patch was tested on QEMU, tweaked to provide a 1GHz system counter frequency. The 'bp.refcounter.base_frequency' property does not seem to have any affect on the 'ARMvA Base RevC AEM FVP', and instead provides a 100MHz counter. Parent commit: 0c32706dac1b ("arm64: stacktrace: avoid tracing arch_stack_walk()") drivers/clocksource/arm_arch_timer.c | 32 ++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index be6d741d404c..f4816b22213c 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -52,6 +52,12 @@ #define CNTV_TVAL 0x38 #define CNTV_CTL 0x3c +/* + * The minimum amount of time a generic counter is guaranteed to not roll over + * (40 years) + */ +#define MIN_ROLLOVER_SECS (40ULL * 365 * 24 * 3600) + static unsigned arch_timers_present __initdata; static void __iomem *arch_counter_base __ro_after_init; @@ -205,13 +211,11 @@ static struct clocksource clocksource_counter = { .id = CSID_ARM_ARCH_COUNTER, .rating = 400, .read = arch_counter_read, - .mask = CLOCKSOURCE_MASK(56), .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static struct cyclecounter cyclecounter __ro_after_init = { .read = arch_counter_read_cc, - .mask = CLOCKSOURCE_MASK(56), }; struct ate_acpi_oem_info { @@ -1004,9 +1008,26 @@ struct arch_timer_kvm_info *arch_timer_get_kvm_info(void) return &arch_timer_kvm_info; } +/* + * Makes an educated guess at a valid counter width based on the Generic Timer + * specification. Of note: + * 1) the system counter is at least 56 bits wide + * 2) a roll-over time of not less than 40 years + * + * See 'ARM DDI 0487G.a D11.1.2 ("The system counter")' for more details. + */ +static int __init arch_counter_get_width(void) +{ + u64 min_cycles = MIN_ROLLOVER_SECS * arch_timer_rate; + + /* guarantee the returned width is within the valid range */ + return clamp_val(ilog2(min_cycles), 56, 64); +} + static void __init arch_counter_register(unsigned type) { u64 start_count; + int width; /* Register the CP15 based counter if we have one */ if (type & ARCH_TIMER_TYPE_CP15) { @@ -1031,6 +1052,10 @@ static void __init arch_counter_register(unsigned type) arch_timer_read_counter = arch_counter_get_cntvct_mem; } + width = arch_counter_get_width(); + clocksource_counter.mask = CLOCKSOURCE_MASK(width); + cyclecounter.mask = CLOCKSOURCE_MASK(width); + if (!arch_counter_suspend_stop) clocksource_counter.flags |= CLOCK_SOURCE_SUSPEND_NONSTOP; start_count = arch_timer_read_counter(); @@ -1040,8 +1065,7 @@ static void __init arch_counter_register(unsigned type) timecounter_init(&arch_timer_kvm_info.timecounter, &cyclecounter, start_count); - /* 56 bits minimum, so we assume worst case rollover */ - sched_clock_register(arch_timer_read_counter, 56, arch_timer_rate); + sched_clock_register(arch_timer_read_counter, width, arch_timer_rate); } static void arch_timer_stop(struct clock_event_device *clk)