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

Commit 567740aa authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents f5bfb681 261ef84f

drivers/clocksource/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -110,6 +110,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 !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

drivers/clocksource/arm_arch_timer.c

+6 −2
Original line number Diff line number Diff line
@@ -340,8 +340,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);

}