diff options
| author | Greg Hackmann <ghackmann@google.com> | 2017-09-19 10:55:17 -0700 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2017-11-09 14:51:18 -0800 |
| commit | 4b55b71501d5c42c397389d957f5b622f60d63ad (patch) | |
| tree | 00518a88e22c9d15d113fb9020f40531891fce79 | |
| parent | 29d25ddf6ac17988fdac143700bedc03bda12aae (diff) | |
| download | tegra-4b55b71501d5c42c397389d957f5b622f60d63ad.tar.gz | |
clocksource: arch_timer: make virtual counter access configurableandroid-8.1.0_r0.15
Bug: 68266545
Change-Id: Ibdb1fd768b748002b90bfc165612c12c8311f8a2
| -rw-r--r-- | drivers/clocksource/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 86d6fc2008f2..32a115a551f6 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -116,6 +116,14 @@ config ARM_ARCH_TIMER_EVTSTREAM This must be disabled for hardware validation purposes to detect any hardware anomalies of missing events. +config ARM_ARCH_TIMER_VCT_ACCESS + bool "Support for ARM architected timer virtual counter access in userspace" + default n + 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 diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 407aa6396a31..f349d374d9a5 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -340,7 +340,10 @@ static void arch_counter_set_user_access(void) | ARCH_TIMER_USR_PCT_ACCESS_EN); /* Enable user access to the virtual counter */ - cntkctl |= ARCH_TIMER_USR_VCT_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); } |