A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "clocksource: arch_timer: make virtual counter access configurable"

Browse source
This commit is contained in:
qctecmdr 2021-03-31 10:40:10 -07:00 • committed by Gerrit - the friendly Code Review server
commit eb08f541c1
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/clocksource/Kconfig
View file

@ -385,6 +385,14 @@ config SUN50I_ERRATUM_UNKNOWN1
the Allwinner A64 SoC. The workaround will only be active if the
allwinner,erratum-unknown1 property is found in the timer node.
config ARM_ARCH_TIMER_VCT_ACCESS
bool "Support for ARM architected timer virtual counter access in userspace"
default !ARM64
depends on ARM_ARCH_TIMER
help
This option enables support for reading the ARM architected timer's
virtual counter in userspace.
config ARM_GLOBAL_TIMER
bool "Support for the ARM global timer" if COMPILE_TEST
select TIMER_OF if OF

3
drivers/clocksource/arm_arch_timer.c
View file

@ -853,7 +853,8 @@ static void arch_counter_set_user_access(void)
* need to be workaround. The vdso may have been already
* disabled though.
*/
if (arch_timer_this_cpu_has_cntvct_wa())
if (arch_timer_this_cpu_has_cntvct_wa() ||
!IS_ENABLED(CONFIG_ARM_ARCH_TIMER_VCT_ACCESS))
pr_info("CPU%d: Trapping CNTVCT access\n", smp_processor_id());
else
cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN;