d1bef4ed5f
This patch-queue improves the generic IRQ layer to be truly generic, by adding various abstractions and features to it, without impacting existing functionality. While the queue can be best described as "fix and improve everything in the generic IRQ layer that we could think of", and thus it consists of many smaller features and lots of cleanups, the one feature that stands out most is the new 'irq chip' abstraction. The irq-chip abstraction is about describing and coding and IRQ controller driver by mapping its raw hardware capabilities [and quirks, if needed] in a straightforward way, without having to think about "IRQ flow" (level/edge/etc.) type of details. This stands in contrast with the current 'irq-type' model of genirq architectures, which 'mixes' raw hardware capabilities with 'flow' details. The patchset supports both types of irq controller designs at once, and converts i386 and x86_64 to the new irq-chip design. As a bonus side-effect of the irq-chip approach, chained interrupt controllers (master/slave PIC constructs, etc.) are now supported by design as well. The end result of this patchset intends to be simpler architecture-level code and more consolidation between architectures. We reused many bits of code and many concepts from Russell King's ARM IRQ layer, the merging of which was one of the motivations for this patchset. This patch: rename desc->handler to desc->chip. Originally i did not want to do this, because it's a big patch. But having both "desc->handler", "desc->handle_irq" and "action->handler" caused a large degree of confusion and made the code appear alot less clean than it truly is. I have also attempted a dual approach as well by introducing a desc->chip alias - but that just wasnt robust enough and broke frequently. So lets get over with this quickly. The conversion was done automatically via scripts and converts all the code in the kernel. This renaming patch is the first one amongst the patches, so that the remaining patches can stay flexible and can be merged and split up without having some big monolithic patch act as a merge barrier. [akpm@osdl.org: build fix] [akpm@osdl.org: another build fix] Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
99 lines
2.2 KiB
C
99 lines
2.2 KiB
C
/*
|
|
* Copyright (C) 2003 Ralf Baechle
|
|
*
|
|
* 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.
|
|
*
|
|
* Handler for RM7000 extended interrupts. These are a non-standard
|
|
* feature so we handle them separately from standard interrupts.
|
|
*/
|
|
#include <linux/init.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/kernel.h>
|
|
|
|
#include <asm/irq_cpu.h>
|
|
#include <asm/mipsregs.h>
|
|
#include <asm/system.h>
|
|
|
|
static int irq_base;
|
|
|
|
static inline void unmask_rm7k_irq(unsigned int irq)
|
|
{
|
|
set_c0_intcontrol(0x100 << (irq - irq_base));
|
|
}
|
|
|
|
static inline void mask_rm7k_irq(unsigned int irq)
|
|
{
|
|
clear_c0_intcontrol(0x100 << (irq - irq_base));
|
|
}
|
|
|
|
static inline void rm7k_cpu_irq_enable(unsigned int irq)
|
|
{
|
|
unsigned long flags;
|
|
|
|
local_irq_save(flags);
|
|
unmask_rm7k_irq(irq);
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
static void rm7k_cpu_irq_disable(unsigned int irq)
|
|
{
|
|
unsigned long flags;
|
|
|
|
local_irq_save(flags);
|
|
mask_rm7k_irq(irq);
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
static unsigned int rm7k_cpu_irq_startup(unsigned int irq)
|
|
{
|
|
rm7k_cpu_irq_enable(irq);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#define rm7k_cpu_irq_shutdown rm7k_cpu_irq_disable
|
|
|
|
/*
|
|
* While we ack the interrupt interrupts are disabled and thus we don't need
|
|
* to deal with concurrency issues. Same for rm7k_cpu_irq_end.
|
|
*/
|
|
static void rm7k_cpu_irq_ack(unsigned int irq)
|
|
{
|
|
mask_rm7k_irq(irq);
|
|
}
|
|
|
|
static void rm7k_cpu_irq_end(unsigned int irq)
|
|
{
|
|
if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
|
|
unmask_rm7k_irq(irq);
|
|
}
|
|
|
|
static hw_irq_controller rm7k_irq_controller = {
|
|
.typename = "RM7000",
|
|
.startup = rm7k_cpu_irq_startup,
|
|
.shutdown = rm7k_cpu_irq_shutdown,
|
|
.enable = rm7k_cpu_irq_enable,
|
|
.disable = rm7k_cpu_irq_disable,
|
|
.ack = rm7k_cpu_irq_ack,
|
|
.end = rm7k_cpu_irq_end,
|
|
};
|
|
|
|
void __init rm7k_cpu_irq_init(int base)
|
|
{
|
|
int i;
|
|
|
|
clear_c0_intcontrol(0x00000f00); /* Mask all */
|
|
|
|
for (i = base; i < base + 4; i++) {
|
|
irq_desc[i].status = IRQ_DISABLED;
|
|
irq_desc[i].action = NULL;
|
|
irq_desc[i].depth = 1;
|
|
irq_desc[i].chip = &rm7k_irq_controller;
|
|
}
|
|
|
|
irq_base = base;
|
|
}
|