Skip to content

Commit

Permalink
ARM: local timers: introduce a new registration interface
Browse files Browse the repository at this point in the history
In order to switch to a runtime selectable local timer,
add a registration interface that timer drivers can use to
register to the core.

local_timer_setup() and local_timer_stop() are made weak symbols
in order not to break existing setups.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
  • Loading branch information
Marc Zyngier committed Mar 13, 2012
1 parent abde710 commit 0ef330e
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 0 deletions.
15 changes: 15 additions & 0 deletions arch/arm/include/asm/localtimer.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@

struct clock_event_device;

struct local_timer_ops {
int (*setup)(struct clock_event_device *);
void (*stop)(struct clock_event_device *);
};

/*
* Setup a per-cpu timer, whether it be a local timer or dummy broadcast
*/
Expand All @@ -38,6 +43,11 @@ void local_timer_stop(struct clock_event_device *);
*/
int local_timer_setup(struct clock_event_device *);

/*
* Register a local timer driver
*/
int local_timer_register(struct local_timer_ops *);

#else

static inline int local_timer_setup(struct clock_event_device *evt)
Expand All @@ -48,6 +58,11 @@ static inline int local_timer_setup(struct clock_event_device *evt)
static inline void local_timer_stop(struct clock_event_device *evt)
{
}

static inline int local_timer_register(struct local_timer_ops *ops)
{
return -ENXIO;
}
#endif

#endif
27 changes: 27 additions & 0 deletions arch/arm/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,33 @@ static void __cpuinit broadcast_timer_setup(struct clock_event_device *evt)
clockevents_register_device(evt);
}

static struct local_timer_ops *lt_ops;

#ifdef CONFIG_LOCAL_TIMERS
int local_timer_register(struct local_timer_ops *ops)
{
if (lt_ops)
return -EBUSY;

lt_ops = ops;
return 0;
}
#endif

int __cpuinit __attribute__ ((weak)) local_timer_setup(struct clock_event_device *clk)
{
if (lt_ops)
return lt_ops->setup(clk);

return -ENXIO;
}

void __attribute__ ((weak)) local_timer_stop(struct clock_event_device *clk)
{
if (lt_ops)
lt_ops->stop(clk);
}

void __cpuinit percpu_timer_setup(void)
{
unsigned int cpu = smp_processor_id();
Expand Down

0 comments on commit 0ef330e

Please sign in to comment.