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>
100 lines
2.7 KiB
C
100 lines
2.7 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* Galileo Technology chip interrupt handler
|
|
*/
|
|
#include <linux/interrupt.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/kernel_stat.h>
|
|
#include <asm/ptrace.h>
|
|
#include <asm/gt64120.h>
|
|
|
|
/*
|
|
* These are interrupt handlers for the GT on-chip interrupts. They all come
|
|
* in to the MIPS on a single interrupt line, and have to be handled and ack'ed
|
|
* differently than other MIPS interrupts.
|
|
*/
|
|
|
|
static void gt64120_irq(int irq, void *dev_id, struct pt_regs *regs)
|
|
{
|
|
unsigned int irq_src, int_high_src, irq_src_mask, int_high_src_mask;
|
|
int handled = 0;
|
|
|
|
irq_src = GT_READ(GT_INTRCAUSE_OFS);
|
|
irq_src_mask = GT_READ(GT_INTRMASK_OFS);
|
|
int_high_src = GT_READ(GT_HINTRCAUSE_OFS);
|
|
int_high_src_mask = GT_READ(GT_HINTRMASK_OFS);
|
|
irq_src = irq_src & irq_src_mask;
|
|
int_high_src = int_high_src & int_high_src_mask;
|
|
|
|
if (irq_src & 0x00000800) { /* Check for timer interrupt */
|
|
handled = 1;
|
|
irq_src &= ~0x00000800;
|
|
do_timer(1);
|
|
#ifndef CONFIG_SMP
|
|
update_process_times(user_mode(regs));
|
|
#endif
|
|
}
|
|
|
|
GT_WRITE(GT_INTRCAUSE_OFS, 0);
|
|
GT_WRITE(GT_HINTRCAUSE_OFS, 0);
|
|
}
|
|
|
|
/*
|
|
* Initializes timer using galileo's built in timer.
|
|
*/
|
|
#ifdef CONFIG_SYSCLK_100
|
|
#define Sys_clock (100 * 1000000) // 100 MHz
|
|
#endif
|
|
#ifdef CONFIG_SYSCLK_83
|
|
#define Sys_clock (83.333 * 1000000) // 83.333 MHz
|
|
#endif
|
|
#ifdef CONFIG_SYSCLK_75
|
|
#define Sys_clock (75 * 1000000) // 75 MHz
|
|
#endif
|
|
|
|
/*
|
|
* This will ignore the standard MIPS timer interrupt handler that is passed in
|
|
* as *irq (=irq0 in ../kernel/time.c). We will do our own timer interrupt
|
|
* handling.
|
|
*/
|
|
void gt64120_time_init(void)
|
|
{
|
|
static struct irqaction timer;
|
|
|
|
/* Disable timer first */
|
|
GT_WRITE(GT_TC_CONTROL_OFS, 0);
|
|
/* Load timer value for 100 Hz */
|
|
GT_WRITE(GT_TC3_OFS, Sys_clock / 100);
|
|
|
|
/*
|
|
* Create the IRQ structure entry for the timer. Since we're too early
|
|
* in the boot process to use the "request_irq()" call, we'll hard-code
|
|
* the values to the correct interrupt line.
|
|
*/
|
|
timer.handler = gt64120_irq;
|
|
timer.flags = IRQF_SHARED | IRQF_DISABLED;
|
|
timer.name = "timer";
|
|
timer.dev_id = NULL;
|
|
timer.next = NULL;
|
|
timer.mask = CPU_MASK_NONE;
|
|
irq_desc[GT_TIMER].action = &timer;
|
|
|
|
enable_irq(GT_TIMER);
|
|
|
|
/* Enable timer ints */
|
|
GT_WRITE(GT_TC_CONTROL_OFS, 0xc0);
|
|
/* clear Cause register first */
|
|
GT_WRITE(GT_INTRCAUSE_OFS, 0x0);
|
|
/* Unmask timer int */
|
|
GT_WRITE(GT_INTRMASK_OFS, 0x800);
|
|
/* Clear High int register */
|
|
GT_WRITE(GT_HINTRCAUSE_OFS, 0x0);
|
|
/* Mask All interrupts at High cause interrupt */
|
|
GT_WRITE(GT_HINTRMASK_OFS, 0x0);
|
|
}
|