mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 09:02:00 +00:00
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>
260 lines
6.1 KiB
C
260 lines
6.1 KiB
C
/*
|
|
* linux/arch/parisc/kernel/time.c
|
|
*
|
|
* Copyright (C) 1991, 1992, 1995 Linus Torvalds
|
|
* Modifications for ARM (C) 1994, 1995, 1996,1997 Russell King
|
|
* Copyright (C) 1999 SuSE GmbH, (Philipp Rumpf, prumpf@tux.org)
|
|
*
|
|
* 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/errno.h>
|
|
#include <linux/module.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/param.h>
|
|
#include <linux/string.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/time.h>
|
|
#include <linux/init.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/profile.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
#include <asm/io.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/param.h>
|
|
#include <asm/pdc.h>
|
|
#include <asm/led.h>
|
|
|
|
#include <linux/timex.h>
|
|
|
|
/* xtime and wall_jiffies keep wall-clock time */
|
|
extern unsigned long wall_jiffies;
|
|
|
|
static long clocktick __read_mostly; /* timer cycles per tick */
|
|
static long halftick __read_mostly;
|
|
|
|
#ifdef CONFIG_SMP
|
|
extern void smp_do_timer(struct pt_regs *regs);
|
|
#endif
|
|
|
|
irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
|
{
|
|
long now;
|
|
long next_tick;
|
|
int nticks;
|
|
int cpu = smp_processor_id();
|
|
|
|
profile_tick(CPU_PROFILING, regs);
|
|
|
|
now = mfctl(16);
|
|
/* initialize next_tick to time at last clocktick */
|
|
next_tick = cpu_data[cpu].it_value;
|
|
|
|
/* since time passes between the interrupt and the mfctl()
|
|
* above, it is never true that last_tick + clocktick == now. If we
|
|
* never miss a clocktick, we could set next_tick = last_tick + clocktick
|
|
* but maybe we'll miss ticks, hence the loop.
|
|
*
|
|
* Variables are *signed*.
|
|
*/
|
|
|
|
nticks = 0;
|
|
while((next_tick - now) < halftick) {
|
|
next_tick += clocktick;
|
|
nticks++;
|
|
}
|
|
mtctl(next_tick, 16);
|
|
cpu_data[cpu].it_value = next_tick;
|
|
|
|
while (nticks--) {
|
|
#ifdef CONFIG_SMP
|
|
smp_do_timer(regs);
|
|
#else
|
|
update_process_times(user_mode(regs));
|
|
#endif
|
|
if (cpu == 0) {
|
|
write_seqlock(&xtime_lock);
|
|
do_timer(1);
|
|
write_sequnlock(&xtime_lock);
|
|
}
|
|
}
|
|
|
|
/* check soft power switch status */
|
|
if (cpu == 0 && !atomic_read(&power_tasklet.count))
|
|
tasklet_schedule(&power_tasklet);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
|
|
unsigned long profile_pc(struct pt_regs *regs)
|
|
{
|
|
unsigned long pc = instruction_pointer(regs);
|
|
|
|
if (regs->gr[0] & PSW_N)
|
|
pc -= 4;
|
|
|
|
#ifdef CONFIG_SMP
|
|
if (in_lock_functions(pc))
|
|
pc = regs->gr[2];
|
|
#endif
|
|
|
|
return pc;
|
|
}
|
|
EXPORT_SYMBOL(profile_pc);
|
|
|
|
|
|
/*** converted from ia64 ***/
|
|
/*
|
|
* Return the number of micro-seconds that elapsed since the last
|
|
* update to wall time (aka xtime aka wall_jiffies). The xtime_lock
|
|
* must be at least read-locked when calling this routine.
|
|
*/
|
|
static inline unsigned long
|
|
gettimeoffset (void)
|
|
{
|
|
#ifndef CONFIG_SMP
|
|
/*
|
|
* FIXME: This won't work on smp because jiffies are updated by cpu 0.
|
|
* Once parisc-linux learns the cr16 difference between processors,
|
|
* this could be made to work.
|
|
*/
|
|
long last_tick;
|
|
long elapsed_cycles;
|
|
|
|
/* it_value is the intended time of the next tick */
|
|
last_tick = cpu_data[smp_processor_id()].it_value;
|
|
|
|
/* Subtract one tick and account for possible difference between
|
|
* when we expected the tick and when it actually arrived.
|
|
* (aka wall vs real)
|
|
*/
|
|
last_tick -= clocktick * (jiffies - wall_jiffies + 1);
|
|
elapsed_cycles = mfctl(16) - last_tick;
|
|
|
|
/* the precision of this math could be improved */
|
|
return elapsed_cycles / (PAGE0->mem_10msec / 10000);
|
|
#else
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
void
|
|
do_gettimeofday (struct timeval *tv)
|
|
{
|
|
unsigned long flags, seq, usec, sec;
|
|
|
|
do {
|
|
seq = read_seqbegin_irqsave(&xtime_lock, flags);
|
|
usec = gettimeoffset();
|
|
sec = xtime.tv_sec;
|
|
usec += (xtime.tv_nsec / 1000);
|
|
} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
|
|
|
|
if (unlikely(usec > LONG_MAX)) {
|
|
/* This can happen if the gettimeoffset adjustment is
|
|
* negative and xtime.tv_nsec is smaller than the
|
|
* adjustment */
|
|
printk(KERN_ERR "do_gettimeofday() spurious xtime.tv_nsec of %ld\n", usec);
|
|
usec += USEC_PER_SEC;
|
|
--sec;
|
|
/* This should never happen, it means the negative
|
|
* time adjustment was more than a second, so there's
|
|
* something seriously wrong */
|
|
BUG_ON(usec > LONG_MAX);
|
|
}
|
|
|
|
|
|
while (usec >= USEC_PER_SEC) {
|
|
usec -= USEC_PER_SEC;
|
|
++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
|
|
* done, and then undo it!
|
|
*/
|
|
nsec -= gettimeoffset() * 1000;
|
|
|
|
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);
|
|
|
|
/*
|
|
* XXX: We can do better than this.
|
|
* Returns nanoseconds
|
|
*/
|
|
|
|
unsigned long long sched_clock(void)
|
|
{
|
|
return (unsigned long long)jiffies * (1000000000 / HZ);
|
|
}
|
|
|
|
|
|
void __init time_init(void)
|
|
{
|
|
unsigned long next_tick;
|
|
static struct pdc_tod tod_data;
|
|
|
|
clocktick = (100 * PAGE0->mem_10msec) / HZ;
|
|
halftick = clocktick / 2;
|
|
|
|
/* Setup clock interrupt timing */
|
|
|
|
next_tick = mfctl(16);
|
|
next_tick += clocktick;
|
|
cpu_data[smp_processor_id()].it_value = next_tick;
|
|
|
|
/* kick off Itimer (CR16) */
|
|
mtctl(next_tick, 16);
|
|
|
|
if(pdc_tod_read(&tod_data) == 0) {
|
|
write_seqlock_irq(&xtime_lock);
|
|
xtime.tv_sec = tod_data.tod_sec;
|
|
xtime.tv_nsec = tod_data.tod_usec * 1000;
|
|
set_normalized_timespec(&wall_to_monotonic,
|
|
-xtime.tv_sec, -xtime.tv_nsec);
|
|
write_sequnlock_irq(&xtime_lock);
|
|
} else {
|
|
printk(KERN_ERR "Error reading tod clock\n");
|
|
xtime.tv_sec = 0;
|
|
xtime.tv_nsec = 0;
|
|
}
|
|
}
|
|
|