Commit bd0493ea authored by Marc Zyngier's avatar Marc Zyngier Committed by Russell King

ARM: 7413/1: move read_{boot,persistent}_clock to the architecture level

At the moment, read_persistent_clock is implemented at the
platform level, which makes it impossible to compile these
platforms in a single kernel.

Implement these two functions at the architecture level, and
provide a thin registration interface for both read_boot_clock
and read_persistent_clock. The two affected platforms (OMAP and
Tegra) are converted at the same time.
Reported-by: default avatarJeff Ohlstein <johlstei@codeaurora.org>
Tested-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f67860a7
...@@ -42,4 +42,9 @@ struct sys_timer { ...@@ -42,4 +42,9 @@ struct sys_timer {
extern void timer_tick(void); extern void timer_tick(void);
struct timespec;
typedef void (*clock_access_fn)(struct timespec *);
extern int register_persistent_clock(clock_access_fn read_boot,
clock_access_fn read_persistent);
#endif #endif
...@@ -110,6 +110,42 @@ void timer_tick(void) ...@@ -110,6 +110,42 @@ void timer_tick(void)
} }
#endif #endif
static void dummy_clock_access(struct timespec *ts)
{
ts->tv_sec = 0;
ts->tv_nsec = 0;
}
static clock_access_fn __read_persistent_clock = dummy_clock_access;
static clock_access_fn __read_boot_clock = dummy_clock_access;;
void read_persistent_clock(struct timespec *ts)
{
__read_persistent_clock(ts);
}
void read_boot_clock(struct timespec *ts)
{
__read_boot_clock(ts);
}
int __init register_persistent_clock(clock_access_fn read_boot,
clock_access_fn read_persistent)
{
/* Only allow the clockaccess functions to be registered once */
if (__read_persistent_clock == dummy_clock_access &&
__read_boot_clock == dummy_clock_access) {
if (read_boot)
__read_boot_clock = read_boot;
if (read_persistent)
__read_persistent_clock = read_persistent;
return 0;
}
return -EINVAL;
}
#if defined(CONFIG_PM) && !defined(CONFIG_GENERIC_CLOCKEVENTS) #if defined(CONFIG_PM) && !defined(CONFIG_GENERIC_CLOCKEVENTS)
static int timer_suspend(void) static int timer_suspend(void)
{ {
......
...@@ -124,7 +124,7 @@ static u64 tegra_rtc_read_ms(void) ...@@ -124,7 +124,7 @@ static u64 tegra_rtc_read_ms(void)
} }
/* /*
* read_persistent_clock - Return time from a persistent clock. * tegra_read_persistent_clock - Return time from a persistent clock.
* *
* Reads the time from a source which isn't disabled during PM, the * Reads the time from a source which isn't disabled during PM, the
* 32k sync timer. Convert the cycles elapsed since last read into * 32k sync timer. Convert the cycles elapsed since last read into
...@@ -133,7 +133,7 @@ static u64 tegra_rtc_read_ms(void) ...@@ -133,7 +133,7 @@ static u64 tegra_rtc_read_ms(void)
* tegra_rtc driver could be executing to avoid race conditions * tegra_rtc driver could be executing to avoid race conditions
* on the RTC shadow register * on the RTC shadow register
*/ */
void read_persistent_clock(struct timespec *ts) static void tegra_read_persistent_clock(struct timespec *ts)
{ {
u64 delta; u64 delta;
struct timespec *tsp = &persistent_ts; struct timespec *tsp = &persistent_ts;
...@@ -243,6 +243,7 @@ static void __init tegra_init_timer(void) ...@@ -243,6 +243,7 @@ static void __init tegra_init_timer(void)
tegra_clockevent.irq = tegra_timer_irq.irq; tegra_clockevent.irq = tegra_timer_irq.irq;
clockevents_register_device(&tegra_clockevent); clockevents_register_device(&tegra_clockevent);
tegra_twd_init(); tegra_twd_init();
register_persistent_clock(NULL, tegra_read_persistent_clock);
} }
struct sys_timer tegra_timer = { struct sys_timer tegra_timer = {
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/clocksource.h> #include <linux/clocksource.h>
#include <asm/mach/time.h>
#include <asm/sched_clock.h> #include <asm/sched_clock.h>
#include <plat/hardware.h> #include <plat/hardware.h>
...@@ -43,7 +44,7 @@ static u32 notrace omap_32k_read_sched_clock(void) ...@@ -43,7 +44,7 @@ static u32 notrace omap_32k_read_sched_clock(void)
} }
/** /**
* read_persistent_clock - Return time from a persistent clock. * omap_read_persistent_clock - Return time from a persistent clock.
* *
* Reads the time from a source which isn't disabled during PM, the * Reads the time from a source which isn't disabled during PM, the
* 32k sync timer. Convert the cycles elapsed since last read into * 32k sync timer. Convert the cycles elapsed since last read into
...@@ -52,7 +53,7 @@ static u32 notrace omap_32k_read_sched_clock(void) ...@@ -52,7 +53,7 @@ static u32 notrace omap_32k_read_sched_clock(void)
static struct timespec persistent_ts; static struct timespec persistent_ts;
static cycles_t cycles, last_cycles; static cycles_t cycles, last_cycles;
static unsigned int persistent_mult, persistent_shift; static unsigned int persistent_mult, persistent_shift;
void read_persistent_clock(struct timespec *ts) static void omap_read_persistent_clock(struct timespec *ts)
{ {
unsigned long long nsecs; unsigned long long nsecs;
cycles_t delta; cycles_t delta;
...@@ -116,6 +117,7 @@ int __init omap_init_clocksource_32k(void) ...@@ -116,6 +117,7 @@ int __init omap_init_clocksource_32k(void)
printk(err, "32k_counter"); printk(err, "32k_counter");
setup_sched_clock(omap_32k_read_sched_clock, 32, 32768); setup_sched_clock(omap_32k_read_sched_clock, 32, 32768);
register_persistent_clock(NULL, omap_read_persistent_clock);
} }
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment