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

Commit 40c7a512 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: Disable user access to the physical counter"

parents 7f54de41 cdd15826

drivers/clocksource/arm_arch_timer.c

+3 −4
Original line number Diff line number Diff line
@@ -443,13 +443,12 @@ 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_USR_VT_ACCESS_EN

			| ARCH_TIMER_VIRT_EVT_EN);



	cntkctl |= ARCH_TIMER_USR_PCT_ACCESS_EN;

			| ARCH_TIMER_VIRT_EVT_EN

			| ARCH_TIMER_USR_PCT_ACCESS_EN);



	/* Enable user access to the virtual counter */

	if (IS_ENABLED(CONFIG_ARM_ARCH_TIMER_VCT_ACCESS))