2005-04-16 22:20:36 +00:00
|
|
|
/*
|
2006-10-03 21:01:26 +00:00
|
|
|
* linux/arch/i386/mach-visws/visws_apic.c
|
2005-04-16 22:20:36 +00:00
|
|
|
*
|
|
|
|
* Copyright (C) 1999 Bent Hagemark, Ingo Molnar
|
|
|
|
*
|
|
|
|
* SGI Visual Workstation interrupt controller
|
|
|
|
*
|
|
|
|
* The Cobalt system ASIC in the Visual Workstation contains a "Cobalt" APIC
|
|
|
|
* which serves as the main interrupt controller in the system. Non-legacy
|
|
|
|
* hardware in the system uses this controller directly. Legacy devices
|
|
|
|
* are connected to the PIIX4 which in turn has its 8259(s) connected to
|
|
|
|
* a of the Cobalt APIC entry.
|
|
|
|
*
|
|
|
|
* 09/02/2000 - Updated for 2.4 by jbarnes@sgi.com
|
|
|
|
*
|
|
|
|
* 25/11/2002 - Updated for 2.5 by Andrey Panin <pazke@orbita1.ru>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel_stat.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
|
|
|
|
#include <asm/io.h>
|
|
|
|
#include <asm/apic.h>
|
|
|
|
#include <asm/i8259.h>
|
|
|
|
|
|
|
|
#include "cobalt.h"
|
|
|
|
#include "irq_vectors.h"
|
|
|
|
|
|
|
|
|
|
|
|
static DEFINE_SPINLOCK(cobalt_lock);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the given Cobalt APIC Redirection Table entry to point
|
|
|
|
* to the given IDT vector/index.
|
|
|
|
*/
|
|
|
|
static inline void co_apic_set(int entry, int irq)
|
|
|
|
{
|
|
|
|
co_apic_write(CO_APIC_LO(entry), CO_APIC_LEVEL | (irq + FIRST_EXTERNAL_VECTOR));
|
|
|
|
co_apic_write(CO_APIC_HI(entry), 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Cobalt (IO)-APIC functions to handle PCI devices.
|
|
|
|
*/
|
|
|
|
static inline int co_apic_ide0_hack(void)
|
|
|
|
{
|
|
|
|
extern char visws_board_type;
|
|
|
|
extern char visws_board_rev;
|
|
|
|
|
|
|
|
if (visws_board_type == VISWS_320 && visws_board_rev == 5)
|
|
|
|
return 5;
|
|
|
|
return CO_APIC_IDE0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int is_co_apic(unsigned int irq)
|
|
|
|
{
|
|
|
|
if (IS_CO_APIC(irq))
|
|
|
|
return CO_APIC(irq);
|
|
|
|
|
|
|
|
switch (irq) {
|
|
|
|
case 0: return CO_APIC_CPU;
|
|
|
|
case CO_IRQ_IDE0: return co_apic_ide0_hack();
|
|
|
|
case CO_IRQ_IDE1: return CO_APIC_IDE1;
|
|
|
|
default: return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is the SGI Cobalt (IO-)APIC:
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void enable_cobalt_irq(unsigned int irq)
|
|
|
|
{
|
|
|
|
co_apic_set(is_co_apic(irq), irq);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void disable_cobalt_irq(unsigned int irq)
|
|
|
|
{
|
|
|
|
int entry = is_co_apic(irq);
|
|
|
|
|
|
|
|
co_apic_write(CO_APIC_LO(entry), CO_APIC_MASK);
|
|
|
|
co_apic_read(CO_APIC_LO(entry));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "irq" really just serves to identify the device. Here is where we
|
|
|
|
* map this to the Cobalt APIC entry where it's physically wired.
|
|
|
|
* This is called via request_irq -> setup_irq -> irq_desc->startup()
|
|
|
|
*/
|
|
|
|
static unsigned int startup_cobalt_irq(unsigned int irq)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&cobalt_lock, flags);
|
|
|
|
if ((irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS | IRQ_WAITING)))
|
|
|
|
irq_desc[irq].status &= ~(IRQ_DISABLED | IRQ_INPROGRESS | IRQ_WAITING);
|
|
|
|
enable_cobalt_irq(irq);
|
|
|
|
spin_unlock_irqrestore(&cobalt_lock, flags);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ack_cobalt_irq(unsigned int irq)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&cobalt_lock, flags);
|
|
|
|
disable_cobalt_irq(irq);
|
|
|
|
apic_write(APIC_EOI, APIC_EIO_ACK);
|
|
|
|
spin_unlock_irqrestore(&cobalt_lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void end_cobalt_irq(unsigned int irq)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&cobalt_lock, flags);
|
|
|
|
if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
|
|
|
|
enable_cobalt_irq(irq);
|
|
|
|
spin_unlock_irqrestore(&cobalt_lock, flags);
|
|
|
|
}
|
|
|
|
|
2006-10-28 17:38:35 +00:00
|
|
|
static struct irq_chip cobalt_irq_type = {
|
2005-04-16 22:20:36 +00:00
|
|
|
.typename = "Cobalt-APIC",
|
|
|
|
.startup = startup_cobalt_irq,
|
|
|
|
.shutdown = disable_cobalt_irq,
|
|
|
|
.enable = enable_cobalt_irq,
|
|
|
|
.disable = disable_cobalt_irq,
|
|
|
|
.ack = ack_cobalt_irq,
|
|
|
|
.end = end_cobalt_irq,
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is the PIIX4-based 8259 that is wired up indirectly to Cobalt
|
|
|
|
* -- not the manner expected by the code in i8259.c.
|
|
|
|
*
|
|
|
|
* there is a 'master' physical interrupt source that gets sent to
|
|
|
|
* the CPU. But in the chipset there are various 'virtual' interrupts
|
|
|
|
* waiting to be handled. We represent this to Linux through a 'master'
|
|
|
|
* interrupt controller type, and through a special virtual interrupt-
|
|
|
|
* controller. Device drivers only see the virtual interrupt sources.
|
|
|
|
*/
|
|
|
|
static unsigned int startup_piix4_master_irq(unsigned int irq)
|
|
|
|
{
|
|
|
|
init_8259A(0);
|
|
|
|
|
|
|
|
return startup_cobalt_irq(irq);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void end_piix4_master_irq(unsigned int irq)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&cobalt_lock, flags);
|
|
|
|
enable_cobalt_irq(irq);
|
|
|
|
spin_unlock_irqrestore(&cobalt_lock, flags);
|
|
|
|
}
|
|
|
|
|
2006-10-28 17:38:35 +00:00
|
|
|
static struct irq_chip piix4_master_irq_type = {
|
2005-04-16 22:20:36 +00:00
|
|
|
.typename = "PIIX4-master",
|
|
|
|
.startup = startup_piix4_master_irq,
|
|
|
|
.ack = ack_cobalt_irq,
|
|
|
|
.end = end_piix4_master_irq,
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2006-10-28 17:38:35 +00:00
|
|
|
static struct irq_chip piix4_virtual_irq_type = {
|
2005-04-16 22:20:36 +00:00
|
|
|
.typename = "PIIX4-virtual",
|
|
|
|
.shutdown = disable_8259A_irq,
|
|
|
|
.enable = enable_8259A_irq,
|
|
|
|
.disable = disable_8259A_irq,
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PIIX4-8259 master/virtual functions to handle interrupt requests
|
|
|
|
* from legacy devices: floppy, parallel, serial, rtc.
|
|
|
|
*
|
|
|
|
* None of these get Cobalt APIC entries, neither do they have IDT
|
|
|
|
* entries. These interrupts are purely virtual and distributed from
|
|
|
|
* the 'master' interrupt source: CO_IRQ_8259.
|
|
|
|
*
|
|
|
|
* When the 8259 interrupts its handler figures out which of these
|
|
|
|
* devices is interrupting and dispatches to its handler.
|
|
|
|
*
|
|
|
|
* CAREFUL: devices see the 'virtual' interrupt only. Thus disable/
|
|
|
|
* enable_irq gets the right irq. This 'master' irq is never directly
|
|
|
|
* manipulated by any driver.
|
|
|
|
*/
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 13:55:46 +00:00
|
|
|
static irqreturn_t piix4_master_intr(int irq, void *dev_id)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
int realirq;
|
|
|
|
irq_desc_t *desc;
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&i8259A_lock, flags);
|
|
|
|
|
|
|
|
/* Find out what's interrupting in the PIIX4 master 8259 */
|
|
|
|
outb(0x0c, 0x20); /* OCW3 Poll command */
|
|
|
|
realirq = inb(0x20);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Bit 7 == 0 means invalid/spurious
|
|
|
|
*/
|
|
|
|
if (unlikely(!(realirq & 0x80)))
|
|
|
|
goto out_unlock;
|
|
|
|
|
|
|
|
realirq &= 7;
|
|
|
|
|
|
|
|
if (unlikely(realirq == 2)) {
|
|
|
|
outb(0x0c, 0xa0);
|
|
|
|
realirq = inb(0xa0);
|
|
|
|
|
|
|
|
if (unlikely(!(realirq & 0x80)))
|
|
|
|
goto out_unlock;
|
|
|
|
|
|
|
|
realirq = (realirq & 7) + 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* mask and ack interrupt */
|
|
|
|
cached_irq_mask |= 1 << realirq;
|
|
|
|
if (unlikely(realirq > 7)) {
|
|
|
|
inb(0xa1);
|
|
|
|
outb(cached_slave_mask, 0xa1);
|
|
|
|
outb(0x60 + (realirq & 7), 0xa0);
|
|
|
|
outb(0x60 + 2, 0x20);
|
|
|
|
} else {
|
|
|
|
inb(0x21);
|
|
|
|
outb(cached_master_mask, 0x21);
|
|
|
|
outb(0x60 + realirq, 0x20);
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&i8259A_lock, flags);
|
|
|
|
|
|
|
|
desc = irq_desc + realirq;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* handle this 'virtual interrupt' as a Cobalt one now.
|
|
|
|
*/
|
|
|
|
kstat_cpu(smp_processor_id()).irqs[realirq]++;
|
|
|
|
|
|
|
|
if (likely(desc->action != NULL))
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 13:55:46 +00:00
|
|
|
handle_IRQ_event(realirq, desc->action);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (!(desc->status & IRQ_DISABLED))
|
|
|
|
enable_8259A_irq(realirq);
|
|
|
|
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
|
|
|
|
out_unlock:
|
|
|
|
spin_unlock_irqrestore(&i8259A_lock, flags);
|
|
|
|
return IRQ_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct irqaction master_action = {
|
|
|
|
.handler = piix4_master_intr,
|
|
|
|
.name = "PIIX4-8259",
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct irqaction cascade_action = {
|
|
|
|
.handler = no_action,
|
|
|
|
.name = "cascade",
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
void init_VISWS_APIC_irqs(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < CO_IRQ_APIC0 + CO_APIC_LAST + 1; i++) {
|
|
|
|
irq_desc[i].status = IRQ_DISABLED;
|
|
|
|
irq_desc[i].action = 0;
|
|
|
|
irq_desc[i].depth = 1;
|
|
|
|
|
|
|
|
if (i == 0) {
|
[PATCH] genirq: rename desc->handler to desc->chip
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>
2006-06-29 09:24:36 +00:00
|
|
|
irq_desc[i].chip = &cobalt_irq_type;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
else if (i == CO_IRQ_IDE0) {
|
[PATCH] genirq: rename desc->handler to desc->chip
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>
2006-06-29 09:24:36 +00:00
|
|
|
irq_desc[i].chip = &cobalt_irq_type;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
else if (i == CO_IRQ_IDE1) {
|
[PATCH] genirq: rename desc->handler to desc->chip
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>
2006-06-29 09:24:36 +00:00
|
|
|
irq_desc[i].chip = &cobalt_irq_type;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
else if (i == CO_IRQ_8259) {
|
[PATCH] genirq: rename desc->handler to desc->chip
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>
2006-06-29 09:24:36 +00:00
|
|
|
irq_desc[i].chip = &piix4_master_irq_type;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
else if (i < CO_IRQ_APIC0) {
|
[PATCH] genirq: rename desc->handler to desc->chip
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>
2006-06-29 09:24:36 +00:00
|
|
|
irq_desc[i].chip = &piix4_virtual_irq_type;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
else if (IS_CO_APIC(i)) {
|
[PATCH] genirq: rename desc->handler to desc->chip
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>
2006-06-29 09:24:36 +00:00
|
|
|
irq_desc[i].chip = &cobalt_irq_type;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
setup_irq(CO_IRQ_8259, &master_action);
|
|
|
|
setup_irq(2, &cascade_action);
|
|
|
|
}
|