From: "tip-bot2 for Keqian Zhu" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Marc Zyngier <maz@kernel.org>, Keqian Zhu <zhukeqian1@huawei.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] clocksource/drivers/arm_arch_timer: Use stable count reader in erratum sne
Date: Sat, 12 Dec 2020 12:58:50 -0000 [thread overview]
Message-ID: <160777793055.3364.11955080846892702144.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201204073126.6920-2-zhukeqian1@huawei.com>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: d8cc3905b8073c7cfbff94af889fa8dc71f21dd5
Gitweb: https://git.kernel.org/tip/d8cc3905b8073c7cfbff94af889fa8dc71f21dd5
Author: Keqian Zhu <zhukeqian1@huawei.com>
AuthorDate: Fri, 04 Dec 2020 15:31:25 +08:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Sat, 05 Dec 2020 19:33:55 +01:00
clocksource/drivers/arm_arch_timer: Use stable count reader in erratum sne
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")
Acked-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20201204073126.6920-2-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);
}
next prev parent reply other threads:[~2020-12-12 13:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 7:31 [PATCH v3 0/2] clocksource: arm_arch_timer: Some fixes Keqian Zhu
2020-12-04 7:31 ` Keqian Zhu
2020-12-04 7:31 ` Keqian Zhu
2020-12-04 7:31 ` [PATCH v3 1/2] clocksource: arm_arch_timer: Use stable count reader in erratum sne Keqian Zhu
2020-12-04 7:31 ` Keqian Zhu
2020-12-04 7:31 ` Keqian Zhu
2020-12-12 12:58 ` tip-bot2 for Keqian Zhu [this message]
2020-12-04 7:31 ` [PATCH v3 2/2] clocksource: arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI Keqian Zhu
2020-12-04 7:31 ` Keqian Zhu
2020-12-04 7:31 ` Keqian Zhu
2020-12-05 11:15 ` Daniel Lezcano
2020-12-05 11:15 ` Daniel Lezcano
2020-12-05 11:15 ` Daniel Lezcano
2020-12-05 18:22 ` Marc Zyngier
2020-12-05 18:22 ` Marc Zyngier
2020-12-05 18:22 ` Marc Zyngier
2020-12-05 18:30 ` Daniel Lezcano
2020-12-05 18:30 ` Daniel Lezcano
2020-12-05 18:30 ` Daniel Lezcano
2020-12-12 12:58 ` [tip: timers/core] clocksource/drivers/arm_arch_timer: " tip-bot2 for Keqian Zhu
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=160777793055.3364.11955080846892702144.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=maz@kernel.org \
--cc=x86@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.