Commit d8cc3905 authored by Keqian Zhu's avatar Keqian Zhu Committed by Daniel Lezcano
Browse files

clocksource/drivers/arm_arch_timer: Use stable count reader in erratum sne 



In commit 0ea41539 ("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: 0ea41539 ("clocksource/arm_arch_timer: Use arch_timer_read_counter to access stable counters")
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarKeqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20201204073126.6920-2-zhukeqian1@huawei.com
parent 5d9814df

drivers/clocksource/arm_arch_timer.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}