diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-07-18 16:21:18 -0700 |
|---|---|---|
| committer | Ajay Nandakumar <anandakumarm@nvidia.com> | 2014-01-13 12:03:37 +0530 |
| commit | 6220dca122e5d31ff3a167d14680e424664b8c7a (patch) | |
| tree | 4082e26409646a83a22b410ac1ba1fa0028addff /drivers/clocksource | |
| parent | 9677b59f55e348c330eeb8cd9a6f7b2f613839a5 (diff) | |
arch_timer: Move to generic sched_clock framework
Register with the generic sched_clock framework now that it
supports 64 bits. This fixes two problems with the current
sched_clock support for machines using the architected timers.
First off, we don't subtract the start value from subsequent
sched_clock calls so we can potentially start off with
sched_clock returning gigantic numbers. Second, there is no
support for suspend/resume handling so problems such as discussed
in 6a4dae5 (ARM: 7565/1: sched: stop sched_clock() during
suspend, 2012-10-23) can happen without this patch. Finally, it
allows us to move the sched_clock setup into drivers clocksource
out of the arch ports.
Bug 1399318
Cc: Christopher Covington <cov@codeaurora.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
(cherry picked from commit 65cd4f6c99c1170bd0114dbd71b978012ea44d28)
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Change-Id: I77dde73ba0c325c67275e72220419fd47faf4206
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index a2b254189782..09fe4831e34d 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -17,6 +17,8 @@ #include <linux/interrupt.h> #include <linux/of_irq.h> #include <linux/io.h> +#include <linux/slab.h> +#include <linux/sched_clock.h> #include <asm/arch_timer.h> #include <asm/virt.h> @@ -287,7 +289,10 @@ static int __init arch_timer_register(void) cyclecounter.mult = clocksource_counter.mult; cyclecounter.shift = clocksource_counter.shift; timecounter_init(&timecounter, &cyclecounter, - arch_counter_get_cntpct()); + arch_counter_get_cntvct()); + + /* 56 bits minimum, so we assume worst case rollover */ + sched_clock_register(arch_timer_read_counter, 56, arch_timer_rate); if (arch_timer_use_virtual) { ppi = arch_timer_ppi[VIRT_PPI]; |