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

Commit 28061758 authored by Sudeep Holla's avatar Sudeep Holla
Browse files

ARM/ARM64: arch_timer: add macros for bits in control register 



Add macros to describe the bitfields in the ARM architected timer
control register to make code easy to understand.

Reviewed-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarSudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
parent 4a10c2ac

arch/arm/include/asm/arch_timer.h

+7 −2
Original line number Diff line number Diff line
@@ -93,8 +93,13 @@ static inline void arch_counter_set_user_access(void) 


	asm volatile("mrc p15, 0, %0, c14, c1, 0" : "=r" (cntkctl));



	/* disable user access to everything */

	cntkctl &= ~((3 << 8) | (7 << 0));

	/* Disable user access to both physical/virtual counters/timers */

	/* Also disable virtual event stream */

	cntkctl &= ~(ARCH_TIMER_USR_PT_ACCESS_EN

			| ARCH_TIMER_USR_VT_ACCESS_EN

			| ARCH_TIMER_VIRT_EVT_EN

			| ARCH_TIMER_USR_VCT_ACCESS_EN

			| ARCH_TIMER_USR_PCT_ACCESS_EN);



	asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl));

}

arch/arm64/include/asm/arch_timer.h

+8 −4
Original line number Diff line number Diff line
@@ -96,12 +96,16 @@ static inline void arch_counter_set_user_access(void) 
{

	u32 cntkctl;



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

	asm volatile("mrs	%0, cntkctl_el1" : "=r" (cntkctl));

	cntkctl &= ~((3 << 8) | (1 << 0));



	/* Enable user access to the virtual counter and frequency. */

	cntkctl |= (1 << 1);

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

	cntkctl &= ~(ARCH_TIMER_USR_PT_ACCESS_EN

			| ARCH_TIMER_USR_VT_ACCESS_EN

			| ARCH_TIMER_USR_PCT_ACCESS_EN);



	/* Enable user access to the virtual counter */

	cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN;



	asm volatile("msr	cntkctl_el1, %0" : : "r" (cntkctl));

}

include/clocksource/arm_arch_timer.h

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,14 @@ enum arch_timer_reg { 
#define ARCH_TIMER_MEM_PHYS_ACCESS	2

#define ARCH_TIMER_MEM_VIRT_ACCESS	3



#define ARCH_TIMER_USR_PCT_ACCESS_EN	(1 << 0) /* physical counter */

#define ARCH_TIMER_USR_VCT_ACCESS_EN	(1 << 1) /* virtual counter */

#define ARCH_TIMER_VIRT_EVT_EN		(1 << 2)

#define ARCH_TIMER_EVT_TRIGGER_SHIFT	(4)

#define ARCH_TIMER_EVT_TRIGGER_MASK	(0xF << ARCH_TIMER_EVT_TRIGGER_SHIFT)

#define ARCH_TIMER_USR_VT_ACCESS_EN	(1 << 8) /* virtual timer registers */

#define ARCH_TIMER_USR_PT_ACCESS_EN	(1 << 9) /* physical timer registers */



#ifdef CONFIG_ARM_ARCH_TIMER



extern u32 arch_timer_get_rate(void);