time: sh: convert to use arch_getoffset() infrastructure
Convert sh to use GENERIC_TIME via the arch_getoffset() infrastructure. Signed-off-by: John Stultz <johnstul@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
d804983982
commit
7563431107
5 changed files with 11 additions and 113 deletions
|
@ -75,7 +75,7 @@ config GENERIC_IOMAP
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config GENERIC_TIME
|
config GENERIC_TIME
|
||||||
def_bool n
|
def_bool y
|
||||||
|
|
||||||
config GENERIC_CLOCKEVENTS
|
config GENERIC_CLOCKEVENTS
|
||||||
def_bool n
|
def_bool n
|
||||||
|
|
|
@ -9,7 +9,7 @@ struct sys_timer_ops {
|
||||||
int (*init)(void);
|
int (*init)(void);
|
||||||
int (*start)(void);
|
int (*start)(void);
|
||||||
int (*stop)(void);
|
int (*stop)(void);
|
||||||
#ifndef CONFIG_GENERIC_TIME
|
#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
|
||||||
unsigned long (*get_offset)(void);
|
unsigned long (*get_offset)(void);
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
@ -26,7 +26,7 @@ struct sys_timer {
|
||||||
extern struct sys_timer tmu_timer, mtu2_timer;
|
extern struct sys_timer tmu_timer, mtu2_timer;
|
||||||
extern struct sys_timer *sys_timer;
|
extern struct sys_timer *sys_timer;
|
||||||
|
|
||||||
#ifndef CONFIG_GENERIC_TIME
|
#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
|
||||||
static inline unsigned long get_timer_offset(void)
|
static inline unsigned long get_timer_offset(void)
|
||||||
{
|
{
|
||||||
return sys_timer->ops->get_offset();
|
return sys_timer->ops->get_offset();
|
||||||
|
|
|
@ -83,65 +83,12 @@ static int __init rtc_generic_init(void)
|
||||||
}
|
}
|
||||||
module_init(rtc_generic_init);
|
module_init(rtc_generic_init);
|
||||||
|
|
||||||
#ifndef CONFIG_GENERIC_TIME
|
#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
|
||||||
void do_gettimeofday(struct timeval *tv)
|
u32 arch_gettimeoffset(void)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
return get_timer_offset() * 1000;
|
||||||
unsigned long seq;
|
|
||||||
unsigned long usec, sec;
|
|
||||||
|
|
||||||
do {
|
|
||||||
/*
|
|
||||||
* Turn off IRQs when grabbing xtime_lock, so that
|
|
||||||
* the sys_timer get_offset code doesn't have to handle it.
|
|
||||||
*/
|
|
||||||
seq = read_seqbegin_irqsave(&xtime_lock, flags);
|
|
||||||
usec = get_timer_offset();
|
|
||||||
sec = xtime.tv_sec;
|
|
||||||
usec += xtime.tv_nsec / NSEC_PER_USEC;
|
|
||||||
} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
|
|
||||||
|
|
||||||
while (usec >= 1000000) {
|
|
||||||
usec -= 1000000;
|
|
||||||
sec++;
|
|
||||||
}
|
|
||||||
|
|
||||||
tv->tv_sec = sec;
|
|
||||||
tv->tv_usec = usec;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(do_gettimeofday);
|
#endif /* CONFIG_ARCH_USES_GETTIMEOFFSET */
|
||||||
|
|
||||||
int do_settimeofday(struct timespec *tv)
|
|
||||||
{
|
|
||||||
time_t wtm_sec, sec = tv->tv_sec;
|
|
||||||
long wtm_nsec, nsec = tv->tv_nsec;
|
|
||||||
|
|
||||||
if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
write_seqlock_irq(&xtime_lock);
|
|
||||||
/*
|
|
||||||
* This is revolting. We need to set "xtime" correctly. However, the
|
|
||||||
* value in this location is the value at the most recent update of
|
|
||||||
* wall time. Discover what correction gettimeofday() would have
|
|
||||||
* made, and then undo it!
|
|
||||||
*/
|
|
||||||
nsec -= get_timer_offset() * NSEC_PER_USEC;
|
|
||||||
|
|
||||||
wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
|
|
||||||
wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
|
|
||||||
|
|
||||||
set_normalized_timespec(&xtime, sec, nsec);
|
|
||||||
set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
|
|
||||||
|
|
||||||
ntp_clear();
|
|
||||||
write_sequnlock_irq(&xtime_lock);
|
|
||||||
clock_was_set();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(do_settimeofday);
|
|
||||||
#endif /* !CONFIG_GENERIC_TIME */
|
|
||||||
|
|
||||||
/* last time the RTC clock got updated */
|
/* last time the RTC clock got updated */
|
||||||
static long last_rtc_update;
|
static long last_rtc_update;
|
||||||
|
@ -238,7 +185,7 @@ struct clocksource clocksource_sh = {
|
||||||
.name = "SuperH",
|
.name = "SuperH",
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_GENERIC_TIME
|
#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
|
||||||
unsigned long long sched_clock(void)
|
unsigned long long sched_clock(void)
|
||||||
{
|
{
|
||||||
unsigned long long cycles;
|
unsigned long long cycles;
|
||||||
|
|
|
@ -144,59 +144,10 @@ static unsigned long usecs_since_tick(void)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void do_gettimeofday(struct timeval *tv)
|
u32 arch_gettimeoffset(void)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
return usecs_since_tick() * 1000;
|
||||||
unsigned long seq;
|
|
||||||
unsigned long usec, sec;
|
|
||||||
|
|
||||||
do {
|
|
||||||
seq = read_seqbegin_irqsave(&xtime_lock, flags);
|
|
||||||
usec = usecs_since_tick();
|
|
||||||
sec = xtime.tv_sec;
|
|
||||||
usec += xtime.tv_nsec / 1000;
|
|
||||||
} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
|
|
||||||
|
|
||||||
while (usec >= 1000000) {
|
|
||||||
usec -= 1000000;
|
|
||||||
sec++;
|
|
||||||
}
|
|
||||||
|
|
||||||
tv->tv_sec = sec;
|
|
||||||
tv->tv_usec = usec;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(do_gettimeofday);
|
|
||||||
|
|
||||||
int do_settimeofday(struct timespec *tv)
|
|
||||||
{
|
|
||||||
time_t wtm_sec, sec = tv->tv_sec;
|
|
||||||
long wtm_nsec, nsec = tv->tv_nsec;
|
|
||||||
|
|
||||||
if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
write_seqlock_irq(&xtime_lock);
|
|
||||||
/*
|
|
||||||
* This is revolting. We need to set "xtime" correctly. However, the
|
|
||||||
* value in this location is the value at the most recent update of
|
|
||||||
* wall time. Discover what correction gettimeofday() would have
|
|
||||||
* made, and then undo it!
|
|
||||||
*/
|
|
||||||
nsec -= 1000 * usecs_since_tick();
|
|
||||||
|
|
||||||
wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
|
|
||||||
wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
|
|
||||||
|
|
||||||
set_normalized_timespec(&xtime, sec, nsec);
|
|
||||||
set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
|
|
||||||
|
|
||||||
ntp_clear();
|
|
||||||
write_sequnlock_irq(&xtime_lock);
|
|
||||||
clock_was_set();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(do_settimeofday);
|
|
||||||
|
|
||||||
/* Dummy RTC ops */
|
/* Dummy RTC ops */
|
||||||
static void null_rtc_get_time(struct timespec *tv)
|
static void null_rtc_get_time(struct timespec *tv)
|
||||||
|
|
|
@ -191,7 +191,7 @@ struct sys_timer_ops mtu2_timer_ops = {
|
||||||
.init = mtu2_timer_init,
|
.init = mtu2_timer_init,
|
||||||
.start = mtu2_timer_start,
|
.start = mtu2_timer_start,
|
||||||
.stop = mtu2_timer_stop,
|
.stop = mtu2_timer_stop,
|
||||||
#ifndef CONFIG_GENERIC_TIME
|
#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
|
||||||
.get_offset = mtu2_timer_get_offset,
|
.get_offset = mtu2_timer_get_offset,
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
Reference in a new issue