From patchwork Wed Oct 19 08:22:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4573 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp205070wrs; Wed, 19 Oct 2022 01:48:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM58BLMUuFHI9WmhEDZpSMlx+gxYKbZKuWwy1j+yMuNpfcupL6kRcWZqxny8VtNyHkALUH7i X-Received: by 2002:a17:90b:4b42:b0:20d:954e:28d with SMTP id mi2-20020a17090b4b4200b0020d954e028dmr41508313pjb.93.1666169299833; Wed, 19 Oct 2022 01:48:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666169299; cv=none; d=google.com; s=arc-20160816; b=hgdDcovR+wnOQfVmK5VXq/qYcV5roGxSgUmduLDz4761ZrxnxKw/XQZSyGG6wLiSwL GeykwrxEt6/JG4xxbDC5DZL7+i43z1DPTouCUvGoqNXmYXnJXBfr/vCCJb8Rxmm9Kqqb o8WMdYyAfqkMxJSRSdjDqZZ2yPbYVD3SRYIjZex4iNUQm0CthR1HiEoASnTsFX/5HeQU Ir1JAlBOfOrpBewFJcFP5ln4dc/RWL2Fv5SJHHS1IQZ11O00DBVpVR937utNIEQOwYD7 M4INRkqty/J1pl0bQImQw7wlfSqSmroYFCaOaAHYktGdFuJmhS06GyKcK8VjOxIJn5mv dL9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=f1H1hKr2UijXs6Wuu+8G8FiM68vTXKmq9zmWrDR8tCQ=; b=pLYlOQJ4B5PLnx9vSM+94wEykeeKMViP2b4RcrbcF9j/2LL4LOGqwxJ2FqdeAmEvyZ 3Nd0OEf9L2ce5rC4YVkhPSsAJCvHlSleqoaDNtdDAIPKDD827USFFNDmnt1Zp9fm2VSl s+8vNF5dJ8Od/bgbteRyCsWSuAGQ1zUDu6JesKsz344b/fSda+dwC8DO4/ssQzJX1YNU lINwpRLRWr6aYG26EEYpz2w+f06gtcwIGnkeKX1SLHE1HW//2c+opHm247RxyBW+88Vr vFoJg+sw5+vXfdHHSjJDpG/mwxOgKuLJMd8aTbZCmMmANhQztz3EoWrTzC9vnem7dnHV 2Pgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yOmNk8VK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 192-20020a6302c9000000b00462f77bcd26si16335275pgc.768.2022.10.19.01.48.07; Wed, 19 Oct 2022 01:48:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yOmNk8VK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231518AbiJSIrS (ORCPT + 99 others); Wed, 19 Oct 2022 04:47:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231383AbiJSIqa (ORCPT ); Wed, 19 Oct 2022 04:46:30 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5216AE56; Wed, 19 Oct 2022 01:44:25 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C596F61800; Wed, 19 Oct 2022 08:41:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D53F2C433D6; Wed, 19 Oct 2022 08:41:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666168871; bh=UzWcRCSCGAHYUtnLJmb+NhEh2plIKFuHU5nHeprqRTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yOmNk8VKHdGSdLDriZPyth2B5hN7k2PTWrxcvIEQts0ZnekKrtYegRaGAFZbgWp7b PjBJth/i90MthZLvlgyqfUWzL+wwwfQsRwdgO5cmTb3URMNw51eo5otUlCAozXvTIh PPp8v51hspq/ngqbMIZItc6b8417YGiycxyCAvuQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Lezcano , Thomas Gleixner , Marc Zyngier , Mark Rutland , Yang Guo , Shaokun Zhang Subject: [PATCH 6.0 082/862] clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value Date: Wed, 19 Oct 2022 10:22:49 +0200 Message-Id: <20221019083253.559428691@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747105139528684712?= X-GMAIL-MSGID: =?utf-8?q?1747105139528684712?= From: Yang Guo commit af246cc6d0ed11318223606128bb0b09866c4c08 upstream. 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 programming 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@hisilicon.com Signed-off-by: Daniel Lezcano Signed-off-by: Greg Kroah-Hartman --- drivers/clocksource/arm_arch_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- 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) -#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