From nobody Mon Apr 6 16:24:00 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AF72C433F5 for ; Tue, 4 Oct 2022 09:30:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231243AbiJDJaz (ORCPT ); Tue, 4 Oct 2022 05:30:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229678AbiJDJ1t (ORCPT ); Tue, 4 Oct 2022 05:27:49 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56A04138; Tue, 4 Oct 2022 02:27:10 -0700 (PDT) Date: Tue, 04 Oct 2022 09:27:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1664875627; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hDk/cIXklCsgbZlgH72/a8e3sdQyIG1XRO+Qx2Hma2U=; b=IRrD9AL/6Jh1Z759f7sknrPc95WYkANU+P8xJrnm73EIQ7SRDc6bbcwjnSk8DDCQrHby+e ZpwBJK5mumfo2CZIp+bJQeaRhUrsdDPeoDfpxgoMd1v+LpZnCslrjRp6V5FwLsIwATJyA2 A8ba5tS1K8A5O+RktdWTB/gvpopLjkoYH1qhtTsY80VXZNpQeRS8aCQmKu93JYH/fhkyyZ fkuPT2QlpeVRqew6kCXOvm9bMdqPcInDhn+CVQoYu00dYOr79DjgYr0PI+43p8w644ZPHC YQHywE9Hd6GwHPYX82JBWwcnjqnwFzr25DejDpmlZJijkMGxnuAomkeJIj1K5w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1664875627; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hDk/cIXklCsgbZlgH72/a8e3sdQyIG1XRO+Qx2Hma2U=; b=Pk4ODwz54jXlqQ27h/qgjIk07FoHJl2LVz7EYmPcwckjckovdScrLe06QKjxTd76KKKD+S 3jzSvxG/mTwIUHAw== From: "tip-bot2 for Yang Guo" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value Cc: stable@vger.kernel.org, Daniel Lezcano , Thomas Gleixner , Marc Zyngier , Mark Rutland , Yang Guo , Shaokun Zhang , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220927033221.49589-1-zhangshaokun@hisilicon.com> References: <20220927033221.49589-1-zhangshaokun@hisilicon.com> MIME-Version: 1.0 Message-ID: <166487562575.401.15454181207950068300.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the timers/core branch of tip: Commit-ID: af246cc6d0ed11318223606128bb0b09866c4c08 Gitweb: https://git.kernel.org/tip/af246cc6d0ed11318223606128bb0b098= 66c4c08 Author: Yang Guo AuthorDate: Tue, 27 Sep 2022 11:32:21 +08:00 Committer: Daniel Lezcano CommitterDate: Tue, 27 Sep 2022 11:30:53 +02:00 clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value CNTPCT_LO and CNTVCT_LO are defined by mistake in commit '8b82c4f883a7', so fix them according to the Arm ARM DDI 0487I.a, Table I2-4 "CNTBaseN memory map" as follows: Offset Register Type Description 0x000 CNTPCT[31:0] RO Physical Count register. 0x004 CNTPCT[63:32] RO 0x008 CNTVCT[31:0] RO Virtual Count register. 0x00C CNTVCT[63:32] RO Fixes: 8b82c4f883a7 ("clocksource/drivers/arm_arch_timer: Move MMIO timer p= rogramming over to CVAL") Cc: stable@vger.kernel.org Cc: Daniel Lezcano Cc: Thomas Gleixner Cc: Marc Zyngier Cc: Mark Rutland Acked-by: Marc Zyngier Signed-off-by: Yang Guo Signed-off-by: Shaokun Zhang Link: https://lore.kernel.org/r/20220927033221.49589-1-zhangshaokun@hisilic= on.com Signed-off-by: Daniel Lezcano --- drivers/clocksource/arm_arch_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm= _arch_timer.c index ff935ef..a7ff775 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -44,8 +44,8 @@ #define CNTACR_RWVT BIT(4) #define CNTACR_RWPT BIT(5) =20 -#define CNTVCT_LO 0x00 -#define CNTPCT_LO 0x08 +#define CNTPCT_LO 0x00 +#define CNTVCT_LO 0x08 #define CNTFRQ 0x10 #define CNTP_CVAL_LO 0x20 #define CNTP_CTL 0x2c