diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2013-01-14 12:05:22 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-01-31 16:15:36 -0500 |
| commit | 12ad10004645d38356b14d1fbba379c523a61916 (patch) | |
| tree | fe8b798176191c681c6b2fa1c81aa55dc98568dc | |
| parent | 12572dbb53638c6e454ef831c8fee7de3df24389 (diff) | |
clockevents: Add generic timer broadcast function
Currently, the timer broadcast mechanism is defined by a function
pointer on struct clock_event_device. As the fundamental mechanism for
broadcast is architecture-specific, this means that clock_event_device
drivers cannot be shared across multiple architectures.
This patch adds an (optional) architecture-specific function for timer
tick broadcast, allowing drivers which may require broadcast
functionality to be shared across multiple architectures.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: nico@linaro.org
Cc: Will.Deacon@arm.com
Cc: Marc.Zyngier@arm.com
Cc: john.stultz@linaro.org
Link: http://lkml.kernel.org/r/1358183124-28461-3-git-send-email-mark.rutland@arm.com
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/linux/clockchips.h | 5 | ||||
| -rw-r--r-- | kernel/time/Kconfig | 4 | ||||
| -rw-r--r-- | kernel/time/tick-broadcast.c | 13 |
3 files changed, 22 insertions, 0 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index e1089aa7816d..66346521cb65 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h | |||
| @@ -162,6 +162,11 @@ extern void clockevents_suspend(void); | |||
| 162 | extern void clockevents_resume(void); | 162 | extern void clockevents_resume(void); |
| 163 | 163 | ||
| 164 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | 164 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST |
| 165 | #ifdef CONFIG_ARCH_HAS_TICK_BROADCAST | ||
| 166 | extern void tick_broadcast(const struct cpumask *mask); | ||
| 167 | #else | ||
| 168 | #define tick_broadcast NULL | ||
| 169 | #endif | ||
| 165 | extern int tick_receive_broadcast(void); | 170 | extern int tick_receive_broadcast(void); |
| 166 | #endif | 171 | #endif |
| 167 | 172 | ||
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig index 8601f0db1261..b69692250af4 100644 --- a/kernel/time/Kconfig +++ b/kernel/time/Kconfig | |||
| @@ -38,6 +38,10 @@ config GENERIC_CLOCKEVENTS_BUILD | |||
| 38 | default y | 38 | default y |
| 39 | depends on GENERIC_CLOCKEVENTS | 39 | depends on GENERIC_CLOCKEVENTS |
| 40 | 40 | ||
| 41 | # Architecture can handle broadcast in a driver-agnostic way | ||
| 42 | config ARCH_HAS_TICK_BROADCAST | ||
| 43 | bool | ||
| 44 | |||
| 41 | # Clockevents broadcasting infrastructure | 45 | # Clockevents broadcasting infrastructure |
| 42 | config GENERIC_CLOCKEVENTS_BROADCAST | 46 | config GENERIC_CLOCKEVENTS_BROADCAST |
| 43 | bool | 47 | bool |
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index 7cc81c57eb31..f726537d24eb 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/percpu.h> | 18 | #include <linux/percpu.h> |
| 19 | #include <linux/profile.h> | 19 | #include <linux/profile.h> |
| 20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 21 | #include <linux/smp.h> | ||
| 21 | 22 | ||
| 22 | #include "tick-internal.h" | 23 | #include "tick-internal.h" |
| 23 | 24 | ||
| @@ -86,6 +87,11 @@ int tick_is_broadcast_device(struct clock_event_device *dev) | |||
| 86 | return (dev && tick_broadcast_device.evtdev == dev); | 87 | return (dev && tick_broadcast_device.evtdev == dev); |
| 87 | } | 88 | } |
| 88 | 89 | ||
| 90 | static void err_broadcast(const struct cpumask *mask) | ||
| 91 | { | ||
| 92 | pr_crit_once("Failed to broadcast timer tick. Some CPUs may be unresponsive.\n"); | ||
| 93 | } | ||
| 94 | |||
| 89 | /* | 95 | /* |
| 90 | * Check, if the device is disfunctional and a place holder, which | 96 | * Check, if the device is disfunctional and a place holder, which |
| 91 | * needs to be handled by the broadcast device. | 97 | * needs to be handled by the broadcast device. |
| @@ -105,6 +111,13 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu) | |||
| 105 | */ | 111 | */ |
| 106 | if (!tick_device_is_functional(dev)) { | 112 | if (!tick_device_is_functional(dev)) { |
| 107 | dev->event_handler = tick_handle_periodic; | 113 | dev->event_handler = tick_handle_periodic; |
| 114 | if (!dev->broadcast) | ||
| 115 | dev->broadcast = tick_broadcast; | ||
| 116 | if (!dev->broadcast) { | ||
| 117 | pr_warn_once("%s depends on broadcast, but no broadcast function available\n", | ||
| 118 | dev->name); | ||
| 119 | dev->broadcast = err_broadcast; | ||
| 120 | } | ||
| 108 | cpumask_set_cpu(cpu, tick_get_broadcast_mask()); | 121 | cpumask_set_cpu(cpu, tick_get_broadcast_mask()); |
| 109 | tick_broadcast_start_periodic(tick_broadcast_device.evtdev); | 122 | tick_broadcast_start_periodic(tick_broadcast_device.evtdev); |
| 110 | ret = 1; | 123 | ret = 1; |
