xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clocksource/arm_arch_timer: Use arch_timer_read_counter to access stable counters

Browse Source 
Instead of always going via arch_counter_get_cntvct_stable to access the
counter workaround, let's have arch_timer_read_counter point to the
right method.

For that, we need to track whether any CPU in the system has a
workaround for the counter. This is done by having an atomic variable
tracking this.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Marc Zyngier
2019-04-08 16:49:07 +01:00
committed by Will Deacon
parent a862fc2254
commit 0ea415390c
3 changed files with 71 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm64/include/asm/arch_timer.h
View File

@@ -174,18 +174,30 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)
isb();
}
static inline u64 arch_counter_get_cntpct(void)
static inline u64 __arch_counter_get_cntpct_stable(void)
{
isb();
return arch_timer_reg_read_stable(cntpct_el0);
}
static inline u64 arch_counter_get_cntvct(void)
static inline u64 __arch_counter_get_cntpct(void)
{
isb();
return read_sysreg(cntpct_el0);
}
static inline u64 __arch_counter_get_cntvct_stable(void)
{
isb();
return arch_timer_reg_read_stable(cntvct_el0);
}
static inline u64 __arch_counter_get_cntvct(void)
{
isb();
return read_sysreg(cntvct_el0);
}
static inline int arch_timer_arch_init(void)
{
return 0;