From: Marc Zyngier <maz@kernel.org>
To: Keqian Zhu <zhukeqian1@huawei.com>
Cc: Andrew Jones <drjones@redhat.com>,
kvm@vger.kernel.org, Suzuki K Poulose <suzuki.poulose@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
linux-kernel@vger.kernel.org, Steven Price <steven.price@arm.com>,
James Morse <james.morse@arm.com>,
wanghaibin.wang@huawei.com, Will Deacon <will@kernel.org>,
kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2 1/2] clocksource: arm_arch_timer: Use stable count reader in erratum sne
Date: Thu, 03 Dec 2020 14:58:27 +0000 [thread overview]
Message-ID: <c8e0506a7976deef0427a30b0d10e35b@kernel.org> (raw)
In-Reply-To: <20200818032814.15968-2-zhukeqian1@huawei.com>
On 2020-08-18 04:28, Keqian Zhu wrote:
> In commit 0ea415390cd3 ("clocksource/arm_arch_timer: Use
> arch_timer_read_counter
> to access stable counters"), we separate stable and normal count reader
> to omit
> unnecessary overhead on systems that have no timer erratum.
>
> However, in erratum_set_next_event_tval_generic(), count reader becomes
> normal
> reader. This converts it to stable reader.
>
> Fixes: 0ea415390cd3 ("clocksource/arm_arch_timer: Use
> arch_timer_read_counter to access stable counters")
On a single line.
> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
> ---
> 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 6c3e841..777d38c 100644
> --- a/drivers/clocksource/arm_arch_timer.c
> +++ b/drivers/clocksource/arm_arch_timer.c
> @@ -396,10 +396,10 @@ static void
> erratum_set_next_event_tval_generic(const int access, unsigned long
> ctrl &= ~ARCH_TIMER_CTRL_IT_MASK;
>
> if (access == ARCH_TIMER_PHYS_ACCESS) {
> - cval = evt + arch_counter_get_cntpct();
> + cval = evt + arch_counter_get_cntpct_stable();
> write_sysreg(cval, cntp_cval_el0);
> } else {
> - cval = evt + arch_counter_get_cntvct();
> + cval = evt + arch_counter_get_cntvct_stable();
> write_sysreg(cval, cntv_cval_el0);
> }
With that fixed:
Acked-by: Marc Zyngier <maz@kernel.org>
This should go via the clocksource tree.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-12-03 14:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-18 3:28 [PATCH v2 0/2] clocksource: arm_arch_timer: Some fixes Keqian Zhu
2020-08-18 3:28 ` [PATCH v2 1/2] clocksource: arm_arch_timer: Use stable count reader in erratum sne Keqian Zhu
2020-12-03 14:58 ` Marc Zyngier [this message]
2020-12-04 7:35 ` zhukeqian
2020-08-18 3:28 ` [PATCH v2 2/2] clocksource: arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI Keqian Zhu
2020-12-03 14:57 ` Marc Zyngier
2020-12-04 7:02 ` zhukeqian
2020-12-03 14:18 ` [PATCH v2 0/2] clocksource: arm_arch_timer: Some fixes zhukeqian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c8e0506a7976deef0427a30b0d10e35b@kernel.org \
--to=maz@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=drjones@redhat.com \
--cc=james.morse@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=steven.price@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=wanghaibin.wang@huawei.com \
--cc=will@kernel.org \
--cc=zhukeqian1@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).