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

ARM: arch_timer: add support to configure and enable event stream 



This patch adds support for configuring the event stream frequency
and enabling it.

It also adds the hwcaps definitions to the user to detect this event
stream feature.

Cc: Russell King <linux@arm.linux.org.uk>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarSudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
parent 28061758

arch/arm/include/asm/arch_timer.h

+24 −3
Original line number Diff line number Diff line
@@ -87,11 +87,21 @@ static inline u64 arch_counter_get_cntvct(void) 
	return cval;

}



static inline void arch_counter_set_user_access(void)

static inline u32 arch_timer_get_cntkctl(void)

{

	u32 cntkctl;



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

	return cntkctl;

}



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 */
@@ -100,9 +110,20 @@ static inline void arch_counter_set_user_access(void) 
			| ARCH_TIMER_VIRT_EVT_EN

			| ARCH_TIMER_USR_VCT_ACCESS_EN

			| ARCH_TIMER_USR_PCT_ACCESS_EN);

	arch_timer_set_cntkctl(cntkctl);

}



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

static inline void arch_timer_evtstrm_enable(int divider)

{

	u32 cntkctl = arch_timer_get_cntkctl();

	cntkctl &= ~ARCH_TIMER_EVT_TRIGGER_MASK;

	/* Set the divider and enable virtual event stream */

	cntkctl |= (divider << ARCH_TIMER_EVT_TRIGGER_SHIFT)

			| ARCH_TIMER_VIRT_EVT_EN;

	arch_timer_set_cntkctl(cntkctl);

	elf_hwcap |= HWCAP_EVTSTRM;

}



#endif



#endif

arch/arm/include/uapi/asm/hwcap.h

+1 −0
Original line number Diff line number Diff line
@@ -26,5 +26,6 @@ 
#define HWCAP_VFPD32	(1 << 19)	/* set if VFP has 32 regs (not 16) */

#define HWCAP_IDIV	(HWCAP_IDIVA | HWCAP_IDIVT)

#define HWCAP_LPAE	(1 << 20)

#define HWCAP_EVTSTRM	(1 << 21)



#endif /* _UAPI__ASMARM_HWCAP_H */

arch/arm/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -975,6 +975,7 @@ static const char *hwcap_str[] = { 
	"idivt",

	"vfpd32",

	"lpae",

	"evtstrm",

	NULL

};