aa02cd2d9b
Commit d3d74453c3
("hrtimer: fixup the
HRTIMER_CB_IRQSAFE_NO_SOFTIRQ fallback") broke several archs, and since
only Russell bothered to merge the fix, and Greg to ACK his arch, I'm
sending this for merger.
I have confirmation that the Alpha bit results in a booting kernel.
That leaves: blackfin, frv, sh and sparc untested.
The deadlock in question was found by Russell:
IRQ handle
-> timer_tick() - xtime seqlock held for write
-> update_process_times()
-> run_local_timers()
-> hrtimer_run_queues()
-> hrtimer_get_softirq_time() - tries to get a read lock
Now, Thomas assures me the fix is trivial, only do_timer() needs to be
done under the xtime_lock, and update_process_times() can savely be
removed from under it.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Greg Ungerer <gerg@uclinux.org>
CC: Richard Henderson <rth@twiddle.net>
CC: Bryan Wu <bryan.wu@analog.com>
CC: David Howells <dhowells@redhat.com>
CC: Paul Mundt <lethal@linux-sh.org>
CC: William Irwin <wli@holomorphy.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
190 lines
4.2 KiB
C
190 lines
4.2 KiB
C
/*
|
|
* arch/sh/kernel/timers/timer-cmt.c - CMT Timer Support
|
|
*
|
|
* Copyright (C) 2005 Yoshinori Sato
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/seqlock.h>
|
|
#include <asm/timer.h>
|
|
#include <asm/rtc.h>
|
|
#include <asm/io.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/clock.h>
|
|
|
|
#if defined(CONFIG_CPU_SUBTYPE_SH7619)
|
|
#define CMT_CMSTR 0xf84a0070
|
|
#define CMT_CMCSR_0 0xf84a0072
|
|
#define CMT_CMCNT_0 0xf84a0074
|
|
#define CMT_CMCOR_0 0xf84a0076
|
|
#define CMT_CMCSR_1 0xf84a0078
|
|
#define CMT_CMCNT_1 0xf84a007a
|
|
#define CMT_CMCOR_1 0xf84a007c
|
|
|
|
#define STBCR3 0xf80a0000
|
|
#define cmt_clock_enable() do { ctrl_outb(ctrl_inb(STBCR3) & ~0x10, STBCR3); } while(0)
|
|
#define CMT_CMCSR_INIT 0x0040
|
|
#define CMT_CMCSR_CALIB 0x0000
|
|
#elif defined(CONFIG_CPU_SUBTYPE_SH7203) || \
|
|
defined(CONFIG_CPU_SUBTYPE_SH7206) || \
|
|
defined(CONFIG_CPU_SUBTYPE_SH7263)
|
|
#define CMT_CMSTR 0xfffec000
|
|
#define CMT_CMCSR_0 0xfffec002
|
|
#define CMT_CMCNT_0 0xfffec004
|
|
#define CMT_CMCOR_0 0xfffec006
|
|
|
|
#define STBCR4 0xfffe040c
|
|
#define cmt_clock_enable() do { ctrl_outb(ctrl_inb(STBCR4) & ~0x04, STBCR4); } while(0)
|
|
#define CMT_CMCSR_INIT 0x0040
|
|
#define CMT_CMCSR_CALIB 0x0000
|
|
#else
|
|
#error "Unknown CPU SUBTYPE"
|
|
#endif
|
|
|
|
static unsigned long cmt_timer_get_offset(void)
|
|
{
|
|
int count;
|
|
static unsigned short count_p = 0xffff; /* for the first call after boot */
|
|
static unsigned long jiffies_p = 0;
|
|
|
|
/*
|
|
* cache volatile jiffies temporarily; we have IRQs turned off.
|
|
*/
|
|
unsigned long jiffies_t;
|
|
|
|
/* timer count may underflow right here */
|
|
count = ctrl_inw(CMT_CMCOR_0);
|
|
count -= ctrl_inw(CMT_CMCNT_0);
|
|
|
|
jiffies_t = jiffies;
|
|
|
|
/*
|
|
* avoiding timer inconsistencies (they are rare, but they happen)...
|
|
* there is one kind of problem that must be avoided here:
|
|
* 1. the timer counter underflows
|
|
*/
|
|
|
|
if (jiffies_t == jiffies_p) {
|
|
if (count > count_p) {
|
|
/* the nutcase */
|
|
if (ctrl_inw(CMT_CMCSR_0) & 0x80) { /* Check CMF bit */
|
|
count -= LATCH;
|
|
} else {
|
|
printk("%s (): hardware timer problem?\n",
|
|
__FUNCTION__);
|
|
}
|
|
}
|
|
} else
|
|
jiffies_p = jiffies_t;
|
|
|
|
count_p = count;
|
|
|
|
count = ((LATCH-1) - count) * TICK_SIZE;
|
|
count = (count + LATCH/2) / LATCH;
|
|
|
|
return count;
|
|
}
|
|
|
|
static irqreturn_t cmt_timer_interrupt(int irq, void *dev_id)
|
|
{
|
|
unsigned long timer_status;
|
|
|
|
/* Clear CMF bit */
|
|
timer_status = ctrl_inw(CMT_CMCSR_0);
|
|
timer_status &= ~0x80;
|
|
ctrl_outw(timer_status, CMT_CMCSR_0);
|
|
|
|
handle_timer_tick();
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static struct irqaction cmt_irq = {
|
|
.name = "timer",
|
|
.handler = cmt_timer_interrupt,
|
|
.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
|
|
.mask = CPU_MASK_NONE,
|
|
};
|
|
|
|
static void cmt_clk_init(struct clk *clk)
|
|
{
|
|
u8 divisor = CMT_CMCSR_INIT & 0x3;
|
|
ctrl_inw(CMT_CMCSR_0);
|
|
ctrl_outw(CMT_CMCSR_INIT, CMT_CMCSR_0);
|
|
clk->parent = clk_get(NULL, "module_clk");
|
|
clk->rate = clk->parent->rate / (8 << (divisor << 1));
|
|
}
|
|
|
|
static void cmt_clk_recalc(struct clk *clk)
|
|
{
|
|
u8 divisor = ctrl_inw(CMT_CMCSR_0) & 0x3;
|
|
clk->rate = clk->parent->rate / (8 << (divisor << 1));
|
|
}
|
|
|
|
static struct clk_ops cmt_clk_ops = {
|
|
.init = cmt_clk_init,
|
|
.recalc = cmt_clk_recalc,
|
|
};
|
|
|
|
static struct clk cmt0_clk = {
|
|
.name = "cmt0_clk",
|
|
.ops = &cmt_clk_ops,
|
|
};
|
|
|
|
static int cmt_timer_start(void)
|
|
{
|
|
ctrl_outw(ctrl_inw(CMT_CMSTR) | 0x01, CMT_CMSTR);
|
|
return 0;
|
|
}
|
|
|
|
static int cmt_timer_stop(void)
|
|
{
|
|
ctrl_outw(ctrl_inw(CMT_CMSTR) & ~0x01, CMT_CMSTR);
|
|
return 0;
|
|
}
|
|
|
|
static int cmt_timer_init(void)
|
|
{
|
|
unsigned long interval;
|
|
|
|
cmt_clock_enable();
|
|
|
|
setup_irq(CONFIG_SH_TIMER_IRQ, &cmt_irq);
|
|
|
|
cmt0_clk.parent = clk_get(NULL, "module_clk");
|
|
|
|
cmt_timer_stop();
|
|
|
|
interval = cmt0_clk.parent->rate / 8 / HZ;
|
|
printk(KERN_INFO "Interval = %ld\n", interval);
|
|
|
|
ctrl_outw(interval, CMT_CMCOR_0);
|
|
|
|
clk_register(&cmt0_clk);
|
|
clk_enable(&cmt0_clk);
|
|
|
|
cmt_timer_start();
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct sys_timer_ops cmt_timer_ops = {
|
|
.init = cmt_timer_init,
|
|
.start = cmt_timer_start,
|
|
.stop = cmt_timer_stop,
|
|
#ifndef CONFIG_GENERIC_TIME
|
|
.get_offset = cmt_timer_get_offset,
|
|
#endif
|
|
};
|
|
|
|
struct sys_timer cmt_timer = {
|
|
.name = "cmt",
|
|
.ops = &cmt_timer_ops,
|
|
};
|