forked from luck/tmp_suning_uos_patched
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>
149 lines
2.9 KiB
C
149 lines
2.9 KiB
C
/*
|
|
* Copyright (C) 2000 David J. Mckay (david.mckay@st.com)
|
|
*
|
|
* May be copied or modified under the terms of the GNU General Public
|
|
* License. See linux/COPYING for more information.
|
|
*
|
|
* Looks after interrupts on the HARP board.
|
|
*
|
|
* Bases on the IPR irq system
|
|
*/
|
|
|
|
#include <linux/config.h>
|
|
#include <linux/init.h>
|
|
#include <linux/irq.h>
|
|
|
|
#include <asm/system.h>
|
|
#include <asm/io.h>
|
|
#include <asm/harp/harp.h>
|
|
|
|
|
|
#define NUM_EXTERNAL_IRQS 16
|
|
|
|
// Early versions of the STB1 Overdrive required this nasty frig
|
|
//#define INVERT_INTMASK_WRITES
|
|
|
|
static void enable_harp_irq(unsigned int irq);
|
|
static void disable_harp_irq(unsigned int irq);
|
|
|
|
/* shutdown is same as "disable" */
|
|
#define shutdown_harp_irq disable_harp_irq
|
|
|
|
static void mask_and_ack_harp(unsigned int);
|
|
static void end_harp_irq(unsigned int irq);
|
|
|
|
static unsigned int startup_harp_irq(unsigned int irq)
|
|
{
|
|
enable_harp_irq(irq);
|
|
return 0; /* never anything pending */
|
|
}
|
|
|
|
static struct hw_interrupt_type harp_irq_type = {
|
|
.typename = "Harp-IRQ",
|
|
.startup = startup_harp_irq,
|
|
.shutdown = shutdown_harp_irq,
|
|
.enable = enable_harp_irq,
|
|
.disable = disable_harp_irq,
|
|
.ack = mask_and_ack_harp,
|
|
.end = end_harp_irq
|
|
};
|
|
|
|
static void disable_harp_irq(unsigned int irq)
|
|
{
|
|
unsigned val, flags;
|
|
unsigned maskReg;
|
|
unsigned mask;
|
|
int pri;
|
|
|
|
if (irq < 0 || irq >= NUM_EXTERNAL_IRQS)
|
|
return;
|
|
|
|
pri = 15 - irq;
|
|
|
|
if (pri < 8) {
|
|
maskReg = EPLD_INTMASK0;
|
|
} else {
|
|
maskReg = EPLD_INTMASK1;
|
|
pri -= 8;
|
|
}
|
|
|
|
local_irq_save(flags);
|
|
mask = ctrl_inl(maskReg);
|
|
mask &= (~(1 << pri));
|
|
#if defined(INVERT_INTMASK_WRITES)
|
|
mask ^= 0xff;
|
|
#endif
|
|
ctrl_outl(mask, maskReg);
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
static void enable_harp_irq(unsigned int irq)
|
|
{
|
|
unsigned flags;
|
|
unsigned maskReg;
|
|
unsigned mask;
|
|
int pri;
|
|
|
|
if (irq < 0 || irq >= NUM_EXTERNAL_IRQS)
|
|
return;
|
|
|
|
pri = 15 - irq;
|
|
|
|
if (pri < 8) {
|
|
maskReg = EPLD_INTMASK0;
|
|
} else {
|
|
maskReg = EPLD_INTMASK1;
|
|
pri -= 8;
|
|
}
|
|
|
|
local_irq_save(flags);
|
|
mask = ctrl_inl(maskReg);
|
|
|
|
|
|
mask |= (1 << pri);
|
|
|
|
#if defined(INVERT_INTMASK_WRITES)
|
|
mask ^= 0xff;
|
|
#endif
|
|
ctrl_outl(mask, maskReg);
|
|
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
/* This functions sets the desired irq handler to be an overdrive type */
|
|
static void __init make_harp_irq(unsigned int irq)
|
|
{
|
|
disable_irq_nosync(irq);
|
|
irq_desc[irq].chip = &harp_irq_type;
|
|
disable_harp_irq(irq);
|
|
}
|
|
|
|
static void mask_and_ack_harp(unsigned int irq)
|
|
{
|
|
disable_harp_irq(irq);
|
|
}
|
|
|
|
static void end_harp_irq(unsigned int irq)
|
|
{
|
|
enable_harp_irq(irq);
|
|
}
|
|
|
|
void __init init_harp_irq(void)
|
|
{
|
|
int i;
|
|
|
|
#if !defined(INVERT_INTMASK_WRITES)
|
|
// On the harp these are set to enable an interrupt
|
|
ctrl_outl(0x00, EPLD_INTMASK0);
|
|
ctrl_outl(0x00, EPLD_INTMASK1);
|
|
#else
|
|
// On the Overdrive the data is inverted before being stored in the reg
|
|
ctrl_outl(0xff, EPLD_INTMASK0);
|
|
ctrl_outl(0xff, EPLD_INTMASK1);
|
|
#endif
|
|
|
|
for (i = 0; i < NUM_EXTERNAL_IRQS; i++) {
|
|
make_harp_irq(i);
|
|
}
|
|
}
|