| Message ID | 1346102319-24497-1-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 27, 2012 at 10:18:39PM +0100, Stephen Boyd wrote: > Setup the same timer used as the clocksource to be used as the > read_current_timer implementation. This allows us to support a > stable udelay implementation on MSMs where it's possible for the > CPUs to scale speeds independently of one another. > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > > I have some patches to send that add DT support to the MSM timer that > this conflicts with slightly. I'm not too concerned though, but we may > want to decide what tree this goes through when I send out those patches. Cheers Stephen, this looks good to me. After looking at this code some more I think I'll change the read_current_timer function pointer type to be: unsigned long (*read_current_timer)(void); since it doesn't make sense to return an error code from the platform implementation (in fact, it will cause havoc in the delay loop). I'll post a new patch -- rebasing your code should be trivial. Cheers, Will
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index 81280825..1997ab1 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c @@ -25,6 +25,7 @@ #include <asm/hardware/gic.h> #include <asm/localtimer.h> #include <asm/sched_clock.h> +#include <asm/delay.h> #include <mach/msm_iomap.h> #include <mach/cpu.h> @@ -172,6 +173,16 @@ static notrace u32 msm_sched_clock_read(void) return msm_clocksource.read(&msm_clocksource); } +static int msm_read_current_timer(unsigned long *timer_val) +{ + *timer_val = msm_clocksource.read(&msm_clocksource); + return 0; +} + +static struct delay_timer msm_delay_timer = { + .read_current_timer = msm_read_current_timer, +}; + static void __init msm_timer_init(void) { struct clock_event_device *ce = &msm_clockevent; @@ -240,6 +251,8 @@ err: pr_err("clocksource_register failed\n"); setup_sched_clock(msm_sched_clock_read, cpu_is_msm7x01() ? 32 - MSM_DGT_SHIFT : 32, dgt_hz); + msm_delay_timer.freq = dgt_hz; + register_current_timer_delay(&msm_delay_timer); } struct sys_timer msm_timer = {
Setup the same timer used as the clocksource to be used as the read_current_timer implementation. This allows us to support a stable udelay implementation on MSMs where it's possible for the CPUs to scale speeds independently of one another. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- I have some patches to send that add DT support to the MSM timer that this conflicts with slightly. I'm not too concerned though, but we may want to decide what tree this goes through when I send out those patches. arch/arm/mach-msm/timer.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)