mirror of
https://github.com/torvalds/linux.git
synced 2024-12-19 01:23:20 +00:00
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>
115 lines
2.6 KiB
C
115 lines
2.6 KiB
C
/*
|
|
* arch/mips/vr41xx/nec-cmbvr4133/irq.c
|
|
*
|
|
* Interrupt routines for the NEC CMB-VR4133 board.
|
|
*
|
|
* Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> and
|
|
* Alex Sapkov <asapkov@ru.mvista.com>
|
|
*
|
|
* 2003-2004 (c) MontaVista, Software, Inc. This file is licensed under
|
|
* the terms of the GNU General Public License version 2. This program
|
|
* is licensed "as is" without any warranty of any kind, whether express
|
|
* or implied.
|
|
*
|
|
* Support for NEC-CMBVR4133 in 2.6
|
|
* Manish Lachwani (mlachwani@mvista.com)
|
|
*/
|
|
#include <linux/bitops.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/init.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <asm/io.h>
|
|
#include <asm/vr41xx/cmbvr4133.h>
|
|
|
|
extern void enable_8259A_irq(unsigned int irq);
|
|
extern void disable_8259A_irq(unsigned int irq);
|
|
extern void mask_and_ack_8259A(unsigned int irq);
|
|
extern void init_8259A(int hoge);
|
|
|
|
extern int vr4133_rockhopper;
|
|
|
|
static unsigned int startup_i8259_irq(unsigned int irq)
|
|
{
|
|
enable_8259A_irq(irq - I8259_IRQ_BASE);
|
|
return 0;
|
|
}
|
|
|
|
static void shutdown_i8259_irq(unsigned int irq)
|
|
{
|
|
disable_8259A_irq(irq - I8259_IRQ_BASE);
|
|
}
|
|
|
|
static void enable_i8259_irq(unsigned int irq)
|
|
{
|
|
enable_8259A_irq(irq - I8259_IRQ_BASE);
|
|
}
|
|
|
|
static void disable_i8259_irq(unsigned int irq)
|
|
{
|
|
disable_8259A_irq(irq - I8259_IRQ_BASE);
|
|
}
|
|
|
|
static void ack_i8259_irq(unsigned int irq)
|
|
{
|
|
mask_and_ack_8259A(irq - I8259_IRQ_BASE);
|
|
}
|
|
|
|
static void end_i8259_irq(unsigned int irq)
|
|
{
|
|
if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
|
|
enable_8259A_irq(irq - I8259_IRQ_BASE);
|
|
}
|
|
|
|
static struct hw_interrupt_type i8259_irq_type = {
|
|
.typename = "XT-PIC",
|
|
.startup = startup_i8259_irq,
|
|
.shutdown = shutdown_i8259_irq,
|
|
.enable = enable_i8259_irq,
|
|
.disable = disable_i8259_irq,
|
|
.ack = ack_i8259_irq,
|
|
.end = end_i8259_irq,
|
|
};
|
|
|
|
static int i8259_get_irq_number(int irq)
|
|
{
|
|
unsigned long isr;
|
|
|
|
isr = inb(0x20);
|
|
irq = ffz(~isr);
|
|
if (irq == 2) {
|
|
isr = inb(0xa0);
|
|
irq = 8 + ffz(~isr);
|
|
}
|
|
|
|
if (irq < 0 || irq > 15)
|
|
return -EINVAL;
|
|
|
|
return I8259_IRQ_BASE + irq;
|
|
}
|
|
|
|
static struct irqaction i8259_slave_cascade = {
|
|
.handler = &no_action,
|
|
.name = "cascade",
|
|
};
|
|
|
|
void __init rockhopper_init_irq(void)
|
|
{
|
|
int i;
|
|
|
|
if(!vr4133_rockhopper) {
|
|
printk(KERN_ERR "Not a Rockhopper Board \n");
|
|
return;
|
|
}
|
|
|
|
for (i = I8259_IRQ_BASE; i <= I8259_IRQ_LAST; i++)
|
|
irq_desc[i].chip = &i8259_irq_type;
|
|
|
|
setup_irq(I8259_SLAVE_IRQ, &i8259_slave_cascade);
|
|
|
|
vr41xx_set_irq_trigger(CMBVR41XX_INTC_PIN, TRIGGER_LEVEL, SIGNAL_THROUGH);
|
|
vr41xx_set_irq_level(CMBVR41XX_INTC_PIN, LEVEL_HIGH);
|
|
vr41xx_cascade_irq(CMBVR41XX_INTC_IRQ, i8259_get_irq_number);
|
|
}
|