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>
72 lines
1.8 KiB
C
72 lines
1.8 KiB
C
/*
|
|
* linux/include/asm-arm/arch-l7200/time.h
|
|
*
|
|
* Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net)
|
|
* Steve Hill (sjhill@cotw.com)
|
|
*
|
|
* Changelog:
|
|
* 01-02-2000 RS Created l7200 version, derived from rpc code
|
|
* 05-03-2000 SJH Complete rewrite
|
|
*/
|
|
#ifndef _ASM_ARCH_TIME_H
|
|
#define _ASM_ARCH_TIME_H
|
|
|
|
#include <asm/arch/irqs.h>
|
|
|
|
/*
|
|
* RTC base register address
|
|
*/
|
|
#define RTC_BASE (IO_BASE_2 + 0x2000)
|
|
|
|
/*
|
|
* RTC registers
|
|
*/
|
|
#define RTC_RTCDR (*(volatile unsigned char *) (RTC_BASE + 0x000))
|
|
#define RTC_RTCMR (*(volatile unsigned char *) (RTC_BASE + 0x004))
|
|
#define RTC_RTCS (*(volatile unsigned char *) (RTC_BASE + 0x008))
|
|
#define RTC_RTCC (*(volatile unsigned char *) (RTC_BASE + 0x008))
|
|
#define RTC_RTCDV (*(volatile unsigned char *) (RTC_BASE + 0x00c))
|
|
#define RTC_RTCCR (*(volatile unsigned char *) (RTC_BASE + 0x010))
|
|
|
|
/*
|
|
* RTCCR register values
|
|
*/
|
|
#define RTC_RATE_32 0x00 /* 32 Hz tick */
|
|
#define RTC_RATE_64 0x10 /* 64 Hz tick */
|
|
#define RTC_RATE_128 0x20 /* 128 Hz tick */
|
|
#define RTC_RATE_256 0x30 /* 256 Hz tick */
|
|
#define RTC_EN_ALARM 0x01 /* Enable alarm */
|
|
#define RTC_EN_TIC 0x04 /* Enable counter */
|
|
#define RTC_EN_STWDOG 0x08 /* Enable watchdog */
|
|
|
|
/*
|
|
* Handler for RTC timer interrupt
|
|
*/
|
|
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_profile(regs);
|
|
RTC_RTCC = 0; /* Clear interrupt */
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
/*
|
|
* Set up RTC timer interrupt, and return the current time in seconds.
|
|
*/
|
|
void __init time_init(void)
|
|
{
|
|
RTC_RTCC = 0; /* Clear interrupt */
|
|
|
|
timer_irq.handler = timer_interrupt;
|
|
|
|
setup_irq(IRQ_RTC_TICK, &timer_irq);
|
|
|
|
RTC_RTCCR = RTC_RATE_128 | RTC_EN_TIC; /* Set rate and enable timer */
|
|
}
|
|
|
|
#endif
|