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;
Message-ID: <68389021-ffcc-9554-f874-98cc8379df5b@linaro.org>
Date:   Tue, 27 Sep 2022 11:32:17 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Subject: Re: [PATCH v2] clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and
 CNTVCT_LO value
Content-Language: en-US
To:     Shaokun Zhang <zhangshaokun@hisilicon.com>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc:     Yang Guo <guoyang2@huawei.com>, stable@vger.kernel.org,
        Thomas Gleixner <tglx@linutronix.de>,
        Marc Zyngier <maz@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>
References: <20220927033221.49589-1-zhangshaokun@hisilicon.com>
From:   Daniel Lezcano <daniel.lezcano@linaro.org>
In-Reply-To: <20220927033221.49589-1-zhangshaokun@hisilicon.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

On 27/09/2022 05:32, Shaokun Zhang wrote:
> From: Yang Guo <guoyang2@huawei.com>
> 
> 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 <daniel.lezcano@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Marc Zyngier <maz@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Acked-by: Marc Zyngier <maz@kernel.org>
> Signed-off-by: Yang Guo <guoyang2@huawei.com>
> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
> ---

Applied, thanks

>   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 9ab8221ee3c6..8122a1646925 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)
>   
> -#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


-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog