evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linux Build Service Account 2018-01-12 15:34:04 -08:00 • committed by Gerrit - the friendly Code Review server
commit ee6f575089
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/clocksource/Kconfig
View file

@ -167,6 +167,14 @@ config MSM_TIMER_LEAP
counter rollover. On every counter read if least significant
32 bits are set, reread counter.
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
select CLKSRC_OF if OF

8
drivers/clocksource/arm_arch_timer.c
View file

@ -332,8 +332,12 @@ static void arch_counter_set_user_access(void)
| ARCH_TIMER_VIRT_EVT_EN);
/* Enable user access to the virtual and physical counters */
cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN | ARCH_TIMER_USR_PCT_ACCESS_EN
| ARCH_TIMER_USR_VT_ACCESS_EN;
cntkctl |= ARCH_TIMER_USR_PCT_ACCESS_EN | ARCH_TIMER_USR_VT_ACCESS_EN;
if (IS_ENABLED(CONFIG_ARM_ARCH_TIMER_VCT_ACCESS))
cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN;
else
cntkctl &= ~ARCH_TIMER_USR_VCT_ACCESS_EN;
arch_timer_set_cntkctl(cntkctl);
}