Commit 8b33dfe0 authored by Samuel Holland's avatar Samuel Holland Committed by Daniel Lezcano
Browse files

clocksource/arm_arch_timer: Improve Allwinner A64 timer workaround

Bad counter reads are experienced sometimes when bit 10 or greater rolls
over. Originally, testing showed that at least 10 lower bits would be
set to the same value during these bad reads. However, some users still
reported time skips.

Wider testing revealed that on some chips, occasionally only the lowest
9 bits would read as the anomalous value. During these reads (which
still happen only when bit 10), bit 9 would read as the correct value.

Reduce the mask by one bit to cover these cases as well.

Fixes: c950ca8c

 ("clocksource/drivers/arch_timer: Workaround for Allwinner A64 timer instability")
Reported-by: rsglobal's avatarRoman Stratiienko <>
Signed-off-by: Samuel Holland's avatarSamuel Holland <>
Signed-off-by: Daniel Lezcano's avatarDaniel Lezcano <>
parent f94bc266
......@@ -364,7 +364,7 @@ static u64 notrace arm64_858921_read_cntvct_el0(void)
do { \
_val = read_sysreg(reg); \
_retries--; \
} while (((_val + 1) & GENMASK(9, 0)) <= 1 && _retries); \
} while (((_val + 1) & GENMASK(8, 0)) <= 1 && _retries); \
WARN_ON_ONCE(!_retries); \
_val; \
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment