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

Commit 8b8dde00 authored by Nathan Lynch's avatar Nathan Lynch Committed by Daniel Lezcano
Browse files

clocksource: arm_arch_timer: Enable counter access for 32-bit ARM 



The only difference between arm and arm64's implementations of
arch_counter_set_user_access is that 32-bit ARM does not enable user
access to the virtual counter.  We want to enable this access for the
32-bit ARM VDSO, so copy the arm64 version to the driver itself, and
remove the arch-specific implementations.

Signed-off-by: default avatarNathan Lynch <nathan_lynch@mentor.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
parent 423bd69e

arch/arm/include/asm/arch_timer.h

+0 −14
Original line number Diff line number Diff line
@@ -99,20 +99,6 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl) 
	asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl));

}



static inline void arch_counter_set_user_access(void)

{

	u32 cntkctl = arch_timer_get_cntkctl();



	/* 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);

	arch_timer_set_cntkctl(cntkctl);

}



static inline void arch_timer_evtstrm_enable(int divider)

{

	u32 cntkctl = arch_timer_get_cntkctl();

arch/arm64/include/asm/arch_timer.h

+0 −17
Original line number Diff line number Diff line
@@ -104,23 +104,6 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl) 
	asm volatile("msr	cntkctl_el1, %0" : : "r" (cntkctl));

}



static inline void arch_counter_set_user_access(void)

{

	u32 cntkctl = arch_timer_get_cntkctl();



	/* 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

			| ARCH_TIMER_USR_PCT_ACCESS_EN);



	/* Enable user access to the virtual counter */

	cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN;



	arch_timer_set_cntkctl(cntkctl);

}



static inline void arch_timer_evtstrm_enable(int divider)

{

	u32 cntkctl = arch_timer_get_cntkctl();

drivers/clocksource/arm_arch_timer.c

+17 −0
Original line number Diff line number Diff line
@@ -312,6 +312,23 @@ static void arch_timer_configure_evtstream(void) 
	arch_timer_evtstrm_enable(min(pos, 15));

}



static void arch_counter_set_user_access(void)

{

	u32 cntkctl = arch_timer_get_cntkctl();



	/* 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

			| ARCH_TIMER_USR_PCT_ACCESS_EN);



	/* Enable user access to the virtual counter */

	cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN;



	arch_timer_set_cntkctl(cntkctl);

}



static int arch_timer_setup(struct clock_event_device *clk)

{

	__arch_timer_setup(ARCH_CP15_TIMER, clk);