forked from luck/tmp_suning_uos_patched
3171a0305d
Pass ticks to do_timer() and update_times(), and adjust x86_64 and s390
timer interrupt handler with this change.
Currently update_times() calculates ticks by "jiffies - wall_jiffies", but
callers of do_timer() should know how many ticks to update. Passing ticks
get rid of this redundant calculation. Also there are another redundancy
pointed out by Martin Schwidefsky.
This cleanup make a barrier added by
5aee405c66
needless. So this patch removes
it.
As a bonus, this cleanup make wall_jiffies can be removed easily, since now
wall_jiffies is always synced with jiffies. (This patch does not really
remove wall_jiffies. It would be another cleanup patch)
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Andi Kleen <ak@muc.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Acked-by: Russell King <rmk@arm.linux.org.uk>
Cc: Ian Molton <spyro@f2s.com>
Cc: Mikael Starvik <starvik@axis.com>
Acked-by: David Howells <dhowells@redhat.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Hirokazu Takata <takata.hirokazu@renesas.com>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Cc: Richard Curnow <rc@rc0.org.uk>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp>
Cc: Chris Zankel <chris@zankel.net>
Acked-by: "Luck, Tony" <tony.luck@intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
227 lines
5.4 KiB
C
227 lines
5.4 KiB
C
/*
|
|
* linux/arch/arm26/kernel/time.c
|
|
*
|
|
* Copyright (C) 1991, 1992, 1995 Linus Torvalds
|
|
* Modifications for ARM (C) 1994-2001 Russell King
|
|
* Mods for ARM26 (C) 2003 Ian Molton
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This file contains the ARM-specific time handling details:
|
|
* reading the RTC at bootup, etc...
|
|
*
|
|
* 1994-07-02 Alan Modra
|
|
* fixed set_rtc_mmss, fixed time.year for >= 2000, new mktime
|
|
* 1998-12-20 Updated NTP code according to technical memorandum Jan '96
|
|
* "A Kernel Model for Precision Timekeeping" by Dave Mills
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/time.h>
|
|
#include <linux/init.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/timex.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/profile.h>
|
|
|
|
#include <asm/hardware.h>
|
|
#include <asm/io.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/ioc.h>
|
|
|
|
extern unsigned long wall_jiffies;
|
|
|
|
/* this needs a better home */
|
|
DEFINE_SPINLOCK(rtc_lock);
|
|
|
|
/* change this if you have some constant time drift */
|
|
#define USECS_PER_JIFFY (1000000/HZ)
|
|
|
|
static int dummy_set_rtc(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* hook for setting the RTC's idea of the current time.
|
|
*/
|
|
int (*set_rtc)(void) = dummy_set_rtc;
|
|
|
|
/*
|
|
* Get time offset based on IOCs timer.
|
|
* FIXME - if this is called with interrutps off, why the shennanigans
|
|
* below ?
|
|
*/
|
|
static unsigned long gettimeoffset(void)
|
|
{
|
|
unsigned int count1, count2, status;
|
|
long offset;
|
|
|
|
ioc_writeb (0, IOC_T0LATCH);
|
|
barrier ();
|
|
count1 = ioc_readb(IOC_T0CNTL) | (ioc_readb(IOC_T0CNTH) << 8);
|
|
barrier ();
|
|
status = ioc_readb(IOC_IRQREQA);
|
|
barrier ();
|
|
ioc_writeb (0, IOC_T0LATCH);
|
|
barrier ();
|
|
count2 = ioc_readb(IOC_T0CNTL) | (ioc_readb(IOC_T0CNTH) << 8);
|
|
|
|
offset = count2;
|
|
if (count2 < count1) {
|
|
/*
|
|
* We have not had an interrupt between reading count1
|
|
* and count2.
|
|
*/
|
|
if (status & (1 << 5))
|
|
offset -= LATCH;
|
|
} else if (count2 > count1) {
|
|
/*
|
|
* We have just had another interrupt between reading
|
|
* count1 and count2.
|
|
*/
|
|
offset -= LATCH;
|
|
}
|
|
|
|
offset = (LATCH - offset) * (tick_nsec / 1000);
|
|
return (offset + LATCH/2) / LATCH;
|
|
}
|
|
|
|
/*
|
|
* Scheduler clock - returns current time in nanosec units.
|
|
*/
|
|
unsigned long long sched_clock(void)
|
|
{
|
|
return (unsigned long long)jiffies * (1000000000 / HZ);
|
|
}
|
|
|
|
static unsigned long next_rtc_update;
|
|
|
|
/*
|
|
* If we have an externally synchronized linux clock, then update
|
|
* CMOS clock accordingly every ~11 minutes. set_rtc() has to be
|
|
* called as close as possible to 500 ms before the new second
|
|
* starts.
|
|
*/
|
|
static inline void do_set_rtc(void)
|
|
{
|
|
if (!ntp_synced() || set_rtc == NULL)
|
|
return;
|
|
|
|
//FIXME - timespec.tv_sec is a time_t not unsigned long
|
|
if (next_rtc_update &&
|
|
time_before((unsigned long)xtime.tv_sec, next_rtc_update))
|
|
return;
|
|
|
|
if (xtime.tv_nsec < 500000000 - ((unsigned) tick_nsec >> 1) &&
|
|
xtime.tv_nsec >= 500000000 + ((unsigned) tick_nsec >> 1))
|
|
return;
|
|
|
|
if (set_rtc())
|
|
/*
|
|
* rtc update failed. Try again in 60s
|
|
*/
|
|
next_rtc_update = xtime.tv_sec + 60;
|
|
else
|
|
next_rtc_update = xtime.tv_sec + 660;
|
|
}
|
|
|
|
#define do_leds()
|
|
|
|
void do_gettimeofday(struct timeval *tv)
|
|
{
|
|
unsigned long flags;
|
|
unsigned long seq;
|
|
unsigned long usec, sec, lost;
|
|
|
|
do {
|
|
seq = read_seqbegin_irqsave(&xtime_lock, flags);
|
|
usec = gettimeoffset();
|
|
|
|
lost = jiffies - wall_jiffies;
|
|
if (lost)
|
|
usec += lost * USECS_PER_JIFFY;
|
|
|
|
sec = xtime.tv_sec;
|
|
usec += xtime.tv_nsec / 1000;
|
|
} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
|
|
|
|
/* usec may have gone up a lot: be safe */
|
|
while (usec >= 1000000) {
|
|
usec -= 1000000;
|
|
sec++;
|
|
}
|
|
|
|
tv->tv_sec = sec;
|
|
tv->tv_usec = usec;
|
|
}
|
|
|
|
EXPORT_SYMBOL(do_gettimeofday);
|
|
|
|
int do_settimeofday(struct timespec *tv)
|
|
{
|
|
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
|
|
* done, and then undo it!
|
|
*/
|
|
tv->tv_nsec -= 1000 * (gettimeoffset() +
|
|
(jiffies - wall_jiffies) * USECS_PER_JIFFY);
|
|
|
|
while (tv->tv_nsec < 0) {
|
|
tv->tv_nsec += NSEC_PER_SEC;
|
|
tv->tv_sec--;
|
|
}
|
|
|
|
xtime.tv_sec = tv->tv_sec;
|
|
xtime.tv_nsec = tv->tv_nsec;
|
|
ntp_clear();
|
|
write_sequnlock_irq(&xtime_lock);
|
|
clock_was_set();
|
|
return 0;
|
|
}
|
|
|
|
EXPORT_SYMBOL(do_settimeofday);
|
|
|
|
static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
|
{
|
|
do_timer(1);
|
|
#ifndef CONFIG_SMP
|
|
update_process_times(user_mode(regs));
|
|
#endif
|
|
do_set_rtc(); //FIME - EVERY timer IRQ?
|
|
profile_tick(CPU_PROFILING, regs);
|
|
return IRQ_HANDLED; //FIXME - is this right?
|
|
}
|
|
|
|
static struct irqaction timer_irq = {
|
|
.name = "timer",
|
|
.flags = IRQF_DISABLED,
|
|
.handler = timer_interrupt,
|
|
};
|
|
|
|
extern void ioctime_init(void);
|
|
|
|
/*
|
|
* Set up timer interrupt.
|
|
*/
|
|
void __init time_init(void)
|
|
{
|
|
ioc_writeb(LATCH & 255, IOC_T0LTCHL);
|
|
ioc_writeb(LATCH >> 8, IOC_T0LTCHH);
|
|
ioc_writeb(0, IOC_T0GO);
|
|
|
|
|
|
setup_irq(IRQ_TIMER, &timer_irq);
|
|
}
|
|
|