linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] arm64: arch_timer: Ensure timer is enabled before using istatus
@ 2020-07-24  9:47 Shaokun Zhang
  2020-07-24 10:22 ` Marc Zyngier
  0 siblings, 1 reply; 6+ messages in thread
From: Shaokun Zhang @ 2020-07-24  9:47 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Mark Rutland, Marc Zyngier, Daniel Lezcano, Shaokun Zhang,
	Nianyao Tang

From: Nianyao Tang <tangnianyao@huawei.com>

In Arm ARM spec, there is a description for timer control register, when
the value of the ENABLE bit is 0, the ISTATUS field is UNKNOWN. We shall
only read and use ISTATUS when ENABLE is 1, otherwise ISTATUS may be
invalid.

Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Nianyao Tang <tangnianyao@huawei.com>
Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
---
 drivers/clocksource/arm_arch_timer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 6c3e84180146..0bbc2715de79 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -641,7 +641,8 @@ static __always_inline irqreturn_t timer_handler(const int access,
 	unsigned long ctrl;
 
 	ctrl = arch_timer_reg_read(access, ARCH_TIMER_REG_CTRL, evt);
-	if (ctrl & ARCH_TIMER_CTRL_IT_STAT) {
+	if ((ctrl & ARCH_TIMER_CTRL_ENABLE) &&
+		(ctrl & ARCH_TIMER_CTRL_IT_STAT)) {
 		ctrl |= ARCH_TIMER_CTRL_IT_MASK;
 		arch_timer_reg_write(access, ARCH_TIMER_REG_CTRL, ctrl, evt);
 		evt->event_handler(evt);
-- 
2.7.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-07-28  8:00 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-24  9:47 [PATCH] arm64: arch_timer: Ensure timer is enabled before using istatus Shaokun Zhang
2020-07-24 10:22 ` Marc Zyngier
2020-07-25  8:49   ` Shaokun Zhang
2020-07-25  9:23     ` Marc Zyngier
2020-07-28  2:18       ` Shaokun Zhang
2020-07-28  7:59         ` Marc Zyngier

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).