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

Commit 10c842af authored by Neeraj Upadhyay's avatar Neeraj Upadhyay Committed by Gerrit - the friendly Code Review server
Browse files

clocksource: arch_timer: Disable user access to the physical counter 



Disable user access to physical counter. This reverts
commit 63cb2598 ("clocksource: arch_timer: Enable
user access to the physical counter").

This could potentially break the userspace applications
using physical counters; but all those usages should
move to using virtual counter, to get the timing
information.

Change-Id: I653816a93515507a400ff23dbaa4442bf614a79b
Signed-off-by: default avatarNeeraj Upadhyay <neeraju@codeaurora.org>
parent 18d74871

drivers/clocksource/arm_arch_timer.c

+5 −4
Original line number Diff line number Diff line
@@ -334,13 +334,14 @@ static void arch_counter_set_user_access(void) 
{

	u32 cntkctl = arch_timer_get_cntkctl();



	/* Disable user access to the timers */

	/* Disable user access to the timers and the physical counter */

	/* Also disable virtual event stream */

	cntkctl &= ~(ARCH_TIMER_USR_PT_ACCESS_EN

			| ARCH_TIMER_VIRT_EVT_EN);

			| ARCH_TIMER_VIRT_EVT_EN

			| ARCH_TIMER_USR_PCT_ACCESS_EN);



	/* Enable user access to the virtual and physical counters */

	cntkctl |= ARCH_TIMER_USR_PCT_ACCESS_EN | ARCH_TIMER_USR_VT_ACCESS_EN;

	/* Enable user access to the virtual counter */

	cntkctl |= ARCH_TIMER_USR_VT_ACCESS_EN;



	if (IS_ENABLED(CONFIG_ARM_ARCH_TIMER_VCT_ACCESS))

		cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN;