Merge "clocksource: arch_timer: Disable user access to the physical counter"

This commit is contained in:
Linux Build Service Account 2018-01-27 09:18:26 -08:00 committed by Gerrit - the friendly Code Review server
commit be8409dbb6
1 changed files with 3 additions and 5 deletions

View File

@ -313,14 +313,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);
/* Enable user access to the physical counter */
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))