Commit cb850717 authored by Xunlei Pang's avatar Xunlei Pang Committed by Ingo Molnar

ARM, clocksource/drivers: Provide read_boot_clock64() and read_persistent_clock64() and use them

As part of addressing "y2038 problem" for in-kernel uses, this
patch converts read_boot_clock() to read_boot_clock64() and
read_persistent_clock() to read_persistent_clock64() using
timespec64 by converting clock_access_fn to use timespec64.
Signed-off-by: default avatarXunlei Pang <pang.xunlei@linaro.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Acked-by: Thierry Reding <treding@nvidia.com> (for tegra part)
Cc: Russell King <rmk@dyn-67.arm.linux.org.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1427945681-29972-7-git-send-email-john.stultz@linaro.orgSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a0c2998f
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
extern void timer_tick(void); extern void timer_tick(void);
struct timespec; typedef void (*clock_access_fn)(struct timespec64 *);
typedef void (*clock_access_fn)(struct timespec *);
extern int register_persistent_clock(clock_access_fn read_boot, extern int register_persistent_clock(clock_access_fn read_boot,
clock_access_fn read_persistent); clock_access_fn read_persistent);
......
...@@ -76,7 +76,7 @@ void timer_tick(void) ...@@ -76,7 +76,7 @@ void timer_tick(void)
} }
#endif #endif
static void dummy_clock_access(struct timespec *ts) static void dummy_clock_access(struct timespec64 *ts)
{ {
ts->tv_sec = 0; ts->tv_sec = 0;
ts->tv_nsec = 0; ts->tv_nsec = 0;
...@@ -85,12 +85,12 @@ static void dummy_clock_access(struct timespec *ts) ...@@ -85,12 +85,12 @@ static void dummy_clock_access(struct timespec *ts)
static clock_access_fn __read_persistent_clock = dummy_clock_access; static clock_access_fn __read_persistent_clock = dummy_clock_access;
static clock_access_fn __read_boot_clock = dummy_clock_access;; static clock_access_fn __read_boot_clock = dummy_clock_access;;
void read_persistent_clock(struct timespec *ts) void read_persistent_clock64(struct timespec64 *ts)
{ {
__read_persistent_clock(ts); __read_persistent_clock(ts);
} }
void read_boot_clock(struct timespec *ts) void read_boot_clock64(struct timespec64 *ts)
{ {
__read_boot_clock(ts); __read_boot_clock(ts);
} }
......
...@@ -70,14 +70,6 @@ static void omap_read_persistent_clock64(struct timespec64 *ts) ...@@ -70,14 +70,6 @@ static void omap_read_persistent_clock64(struct timespec64 *ts)
*ts = persistent_ts; *ts = persistent_ts;
} }
static void omap_read_persistent_clock(struct timespec *ts)
{
struct timespec64 ts64;
omap_read_persistent_clock64(&ts64);
*ts = timespec64_to_timespec(ts64);
}
/** /**
* omap_init_clocksource_32k - setup and register counter 32k as a * omap_init_clocksource_32k - setup and register counter 32k as a
* kernel clocksource * kernel clocksource
...@@ -118,7 +110,7 @@ int __init omap_init_clocksource_32k(void __iomem *vbase) ...@@ -118,7 +110,7 @@ int __init omap_init_clocksource_32k(void __iomem *vbase)
} }
sched_clock_register(omap_32k_read_sched_clock, 32, 32768); sched_clock_register(omap_32k_read_sched_clock, 32, 32768);
register_persistent_clock(NULL, omap_read_persistent_clock); register_persistent_clock(NULL, omap_read_persistent_clock64);
pr_info("OMAP clocksource: 32k_counter at 32768 Hz\n"); pr_info("OMAP clocksource: 32k_counter at 32768 Hz\n");
return 0; return 0;
......
...@@ -141,14 +141,6 @@ static void tegra_read_persistent_clock64(struct timespec64 *ts) ...@@ -141,14 +141,6 @@ static void tegra_read_persistent_clock64(struct timespec64 *ts)
*ts = persistent_ts; *ts = persistent_ts;
} }
static void tegra_read_persistent_clock(struct timespec *ts)
{
struct timespec ts64;
tegra_read_persistent_clock64(&ts64);
*ts = timespec64_to_timespec(ts64);
}
static unsigned long tegra_delay_timer_read_counter_long(void) static unsigned long tegra_delay_timer_read_counter_long(void)
{ {
return readl(timer_reg_base + TIMERUS_CNTR_1US); return readl(timer_reg_base + TIMERUS_CNTR_1US);
...@@ -259,7 +251,7 @@ static void __init tegra20_init_rtc(struct device_node *np) ...@@ -259,7 +251,7 @@ static void __init tegra20_init_rtc(struct device_node *np)
else else
clk_prepare_enable(clk); clk_prepare_enable(clk);
register_persistent_clock(NULL, tegra_read_persistent_clock); register_persistent_clock(NULL, tegra_read_persistent_clock64);
} }
CLOCKSOURCE_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc); CLOCKSOURCE_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc);
......
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