Skip to content

Commit 037f637

Browse files
wildea01Sudeep KarkadaNagesha
authored andcommitted
drivers: clocksource: add support for ARM architected timer event stream
The ARM architected timer can generate events (used for waking up CPUs executing the wfe instruction) at a frequency represented as a power-of-2 divisor of the clock rate. An event stream might be used: - To implement wfe-based timeouts for userspace locking implementations. - To impose a timeout on a wfe for safeguarding against any programming error in case an expected event is not generated. This patch computes the event stream frequency aiming for a period of 100us between events. It uses ARM/ARM64 specific backends to configure and enable the event stream. Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Olof Johansson <olof@lixom.net> Signed-off-by: Will Deacon <will.deacon@arm.com> [sudeep: moving ARM/ARM64 changes into separate patches and adding Kconfig option] Signed-off-by: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
1 parent 46efe54 commit 037f637

3 files changed

Lines changed: 32 additions & 0 deletions

File tree

drivers/clocksource/Kconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,21 @@ config ARM_ARCH_TIMER
7474
bool
7575
select CLKSRC_OF if OF
7676

77+
config ARM_ARCH_TIMER_EVTSTREAM
78+
bool "Support for ARM architected timer event stream generation"
79+
default y if ARM_ARCH_TIMER
80+
help
81+
This option enables support for event stream generation based on
82+
the ARM architected timer. It is used for waking up CPUs executing
83+
the wfe instruction at a frequency represented as a power-of-2
84+
divisor of the clock rate.
85+
The main use of the event stream is wfe-based timeouts of userspace
86+
locking implementations. It might also be useful for imposing timeout
87+
on wfe to safeguard against any programming errors in case an expected
88+
event is not generated.
89+
This must be disabled for hardware validation purposes to detect any
90+
hardware anomalies of missing events.
91+
7792
config ARM_GLOBAL_TIMER
7893
bool
7994
select CLKSRC_OF if OF

drivers/clocksource/arm_arch_timer.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,19 @@ static void __arch_timer_setup(unsigned type,
294294
clockevents_config_and_register(clk, arch_timer_rate, 0xf, 0x7fffffff);
295295
}
296296

297+
static void arch_timer_configure_evtstream(void)
298+
{
299+
int evt_stream_div, pos;
300+
301+
/* Find the closest power of two to the divisor */
302+
evt_stream_div = arch_timer_rate / ARCH_TIMER_EVT_STREAM_FREQ;
303+
pos = fls(evt_stream_div);
304+
if (pos > 1 && !(evt_stream_div & (1 << (pos - 2))))
305+
pos--;
306+
/* enable event stream */
307+
arch_timer_evtstrm_enable(min(pos, 15));
308+
}
309+
297310
static int arch_timer_setup(struct clock_event_device *clk)
298311
{
299312
__arch_timer_setup(ARCH_CP15_TIMER, clk);
@@ -307,6 +320,8 @@ static int arch_timer_setup(struct clock_event_device *clk)
307320
}
308321

309322
arch_counter_set_user_access();
323+
if (IS_ENABLED(CONFIG_ARM_ARCH_TIMER_EVTSTREAM))
324+
arch_timer_configure_evtstream();
310325

311326
return 0;
312327
}

include/clocksource/arm_arch_timer.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ enum arch_timer_reg {
4141
#define ARCH_TIMER_USR_VT_ACCESS_EN (1 << 8) /* virtual timer registers */
4242
#define ARCH_TIMER_USR_PT_ACCESS_EN (1 << 9) /* physical timer registers */
4343

44+
#define ARCH_TIMER_EVT_STREAM_FREQ 10000 /* 100us */
45+
4446
#ifdef CONFIG_ARM_ARCH_TIMER
4547

4648
extern u32 arch_timer_get_rate(void);

0 commit comments

Comments
 (0)