mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
7b0c873f4d
* sunxi-5.18: add megous patches: tag: orange-pi-5.18-20220627-1924 * tools: mk_format_patch: ignore-matching-lines git version * sunxi-5.18: re-extracted armbian patches after being applied to 5.18.8 * sunxi-5.18: switch to version tag=v5.18.8
49 lines
2.4 KiB
Diff
49 lines
2.4 KiB
Diff
From 41ab7031f9d587a8364b79e77307af9e4808395f Mon Sep 17 00:00:00 2001
|
|
From: The-going <48602507+The-going@users.noreply.github.com>
|
|
Date: Fri, 28 Jan 2022 14:18:17 +0300
|
|
Subject: [PATCH 044/169] drv:clocksource:arm_arch_timer fix a64 timejump
|
|
|
|
---
|
|
drivers/clocksource/arm_arch_timer.c | 25 ++++++++++++++-----------
|
|
1 file changed, 14 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
|
|
index 9ab8221ee..e72f822d5 100644
|
|
--- a/drivers/clocksource/arm_arch_timer.c
|
|
+++ b/drivers/clocksource/arm_arch_timer.c
|
|
@@ -364,17 +364,20 @@ static u64 notrace arm64_858921_read_cntvct_el0(void)
|
|
* with all ones or all zeros in the low bits. Bound the loop by the maximum
|
|
* number of CPU cycles in 3 consecutive 24 MHz counter periods.
|
|
*/
|
|
-#define __sun50i_a64_read_reg(reg) ({ \
|
|
- u64 _val; \
|
|
- int _retries = 150; \
|
|
- \
|
|
- do { \
|
|
- _val = read_sysreg(reg); \
|
|
- _retries--; \
|
|
- } while (((_val + 1) & GENMASK(8, 0)) <= 1 && _retries); \
|
|
- \
|
|
- WARN_ON_ONCE(!_retries); \
|
|
- _val; \
|
|
+#define __sun50i_a64_read_reg(reg) ({ \
|
|
+ register u64 _tries = 5, _old, _new; \
|
|
+ \
|
|
+ do { \
|
|
+ if (unlikely(_tries < 3)) \
|
|
+ isb(); \
|
|
+ _old = read_sysreg(reg); \
|
|
+ _new = read_sysreg(reg); \
|
|
+ } while (unlikely((_new - _old) >> 4) && --_tries); \
|
|
+ \
|
|
+ if (unlikely(!_tries)) \
|
|
+ pr_err("(cpu %d) returning possibly incorrect counter value %llx (%llx)\n", \
|
|
+ smp_processor_id() + 1, _new, _old); \
|
|
+ _new; \
|
|
})
|
|
|
|
static u64 notrace sun50i_a64_read_cntpct_el0(void)
|
|
--
|
|
2.35.3
|
|
|