Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae0db13b authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 3680e351 15f76e83

drivers/clocksource/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -374,6 +374,14 @@ config ARM64_ERRATUM_858921 
	  The workaround will be dynamically enabled when an affected

	  core is detected.



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

drivers/clocksource/arm_arch_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ static void arch_counter_set_user_access(void) 
	 */

	if (arch_timer_this_cpu_has_cntvct_wa())

		pr_info("CPU%d: Trapping CNTVCT access\n", smp_processor_id());

	else

	else if (IS_ENABLED(CONFIG_ARM_ARCH_TIMER_VCT_ACCESS))

		cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN;



	arch_timer_set_cntkctl(cntkctl);