forked from Minki/linux
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>
285 lines
8.8 KiB
C
285 lines
8.8 KiB
C
/*
|
|
* Interrupt handling for INTC2-based IRQ.
|
|
*
|
|
* Copyright (C) 2001 David J. Mckay (david.mckay@st.com)
|
|
* Copyright (C) 2005, 2006 Paul Mundt (lethal@linux-sh.org)
|
|
*
|
|
* May be copied or modified under the terms of the GNU General Public
|
|
* License. See linux/COPYING for more information.
|
|
*
|
|
* These are the "new Hitachi style" interrupts, as present on the
|
|
* Hitachi 7751, the STM ST40 STB1, SH7760, and SH7780.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/irq.h>
|
|
#include <asm/system.h>
|
|
#include <asm/io.h>
|
|
#include <asm/machvec.h>
|
|
|
|
struct intc2_data {
|
|
unsigned char msk_offset;
|
|
unsigned char msk_shift;
|
|
|
|
int (*clear_irq) (int);
|
|
};
|
|
|
|
static struct intc2_data intc2_data[NR_INTC2_IRQS];
|
|
|
|
static void enable_intc2_irq(unsigned int irq);
|
|
static void disable_intc2_irq(unsigned int irq);
|
|
|
|
/* shutdown is same as "disable" */
|
|
#define shutdown_intc2_irq disable_intc2_irq
|
|
|
|
static void mask_and_ack_intc2(unsigned int);
|
|
static void end_intc2_irq(unsigned int irq);
|
|
|
|
static unsigned int startup_intc2_irq(unsigned int irq)
|
|
{
|
|
enable_intc2_irq(irq);
|
|
return 0; /* never anything pending */
|
|
}
|
|
|
|
static struct hw_interrupt_type intc2_irq_type = {
|
|
.typename = "INTC2-IRQ",
|
|
.startup = startup_intc2_irq,
|
|
.shutdown = shutdown_intc2_irq,
|
|
.enable = enable_intc2_irq,
|
|
.disable = disable_intc2_irq,
|
|
.ack = mask_and_ack_intc2,
|
|
.end = end_intc2_irq
|
|
};
|
|
|
|
static void disable_intc2_irq(unsigned int irq)
|
|
{
|
|
int irq_offset = irq - INTC2_FIRST_IRQ;
|
|
int msk_shift, msk_offset;
|
|
|
|
/* Sanity check */
|
|
if (unlikely(irq_offset < 0 || irq_offset >= NR_INTC2_IRQS))
|
|
return;
|
|
|
|
msk_shift = intc2_data[irq_offset].msk_shift;
|
|
msk_offset = intc2_data[irq_offset].msk_offset;
|
|
|
|
ctrl_outl(1 << msk_shift,
|
|
INTC2_BASE + INTC2_INTMSK_OFFSET + msk_offset);
|
|
}
|
|
|
|
static void enable_intc2_irq(unsigned int irq)
|
|
{
|
|
int irq_offset = irq - INTC2_FIRST_IRQ;
|
|
int msk_shift, msk_offset;
|
|
|
|
/* Sanity check */
|
|
if (unlikely(irq_offset < 0 || irq_offset >= NR_INTC2_IRQS))
|
|
return;
|
|
|
|
msk_shift = intc2_data[irq_offset].msk_shift;
|
|
msk_offset = intc2_data[irq_offset].msk_offset;
|
|
|
|
ctrl_outl(1 << msk_shift,
|
|
INTC2_BASE + INTC2_INTMSKCLR_OFFSET + msk_offset);
|
|
}
|
|
|
|
static void mask_and_ack_intc2(unsigned int irq)
|
|
{
|
|
disable_intc2_irq(irq);
|
|
}
|
|
|
|
static void end_intc2_irq(unsigned int irq)
|
|
{
|
|
if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
|
|
enable_intc2_irq(irq);
|
|
|
|
if (unlikely(intc2_data[irq - INTC2_FIRST_IRQ].clear_irq))
|
|
intc2_data[irq - INTC2_FIRST_IRQ].clear_irq(irq);
|
|
}
|
|
|
|
/*
|
|
* Setup an INTC2 style interrupt.
|
|
* NOTE: Unlike IPR interrupts, parameters are not shifted by this code,
|
|
* allowing the use of the numbers straight out of the datasheet.
|
|
* For example:
|
|
* PIO1 which is INTPRI00[19,16] and INTMSK00[13]
|
|
* would be: ^ ^ ^ ^
|
|
* | | | |
|
|
* make_intc2_irq(84, 0, 16, 0, 13);
|
|
*/
|
|
void make_intc2_irq(unsigned int irq,
|
|
unsigned int ipr_offset, unsigned int ipr_shift,
|
|
unsigned int msk_offset, unsigned int msk_shift,
|
|
unsigned int priority)
|
|
{
|
|
int irq_offset = irq - INTC2_FIRST_IRQ;
|
|
unsigned int flags;
|
|
unsigned long ipr;
|
|
|
|
if (unlikely(irq_offset < 0 || irq_offset >= NR_INTC2_IRQS))
|
|
return;
|
|
|
|
disable_irq_nosync(irq);
|
|
|
|
/* Fill the data we need */
|
|
intc2_data[irq_offset].msk_offset = msk_offset;
|
|
intc2_data[irq_offset].msk_shift = msk_shift;
|
|
intc2_data[irq_offset].clear_irq = NULL;
|
|
|
|
/* Set the priority level */
|
|
local_irq_save(flags);
|
|
|
|
ipr = ctrl_inl(INTC2_BASE + INTC2_INTPRI_OFFSET + ipr_offset);
|
|
ipr &= ~(0xf << ipr_shift);
|
|
ipr |= priority << ipr_shift;
|
|
ctrl_outl(ipr, INTC2_BASE + INTC2_INTPRI_OFFSET + ipr_offset);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
irq_desc[irq].chip = &intc2_irq_type;
|
|
|
|
disable_intc2_irq(irq);
|
|
}
|
|
|
|
static struct intc2_init {
|
|
unsigned short irq;
|
|
unsigned char ipr_offset, ipr_shift;
|
|
unsigned char msk_offset, msk_shift;
|
|
unsigned char priority;
|
|
} intc2_init_data[] __initdata = {
|
|
#if defined(CONFIG_CPU_SUBTYPE_ST40)
|
|
{64, 0, 0, 0, 0, 13}, /* PCI serr */
|
|
{65, 0, 4, 0, 1, 13}, /* PCI err */
|
|
{66, 0, 4, 0, 2, 13}, /* PCI ad */
|
|
{67, 0, 4, 0, 3, 13}, /* PCI pwd down */
|
|
{72, 0, 8, 0, 5, 13}, /* DMAC INT0 */
|
|
{73, 0, 8, 0, 6, 13}, /* DMAC INT1 */
|
|
{74, 0, 8, 0, 7, 13}, /* DMAC INT2 */
|
|
{75, 0, 8, 0, 8, 13}, /* DMAC INT3 */
|
|
{76, 0, 8, 0, 9, 13}, /* DMAC INT4 */
|
|
{78, 0, 8, 0, 11, 13}, /* DMAC ERR */
|
|
{80, 0, 12, 0, 12, 13}, /* PIO0 */
|
|
{84, 0, 16, 0, 13, 13}, /* PIO1 */
|
|
{88, 0, 20, 0, 14, 13}, /* PIO2 */
|
|
{112, 4, 0, 4, 0, 13}, /* Mailbox */
|
|
#ifdef CONFIG_CPU_SUBTYPE_ST40GX1
|
|
{116, 4, 4, 4, 4, 13}, /* SSC0 */
|
|
{120, 4, 8, 4, 8, 13}, /* IR Blaster */
|
|
{124, 4, 12, 4, 12, 13}, /* USB host */
|
|
{128, 4, 16, 4, 16, 13}, /* Video processor BLITTER */
|
|
{132, 4, 20, 4, 20, 13}, /* UART0 */
|
|
{134, 4, 20, 4, 22, 13}, /* UART2 */
|
|
{136, 4, 24, 4, 24, 13}, /* IO_PIO0 */
|
|
{140, 4, 28, 4, 28, 13}, /* EMPI */
|
|
{144, 8, 0, 8, 0, 13}, /* MAFE */
|
|
{148, 8, 4, 8, 4, 13}, /* PWM */
|
|
{152, 8, 8, 8, 8, 13}, /* SSC1 */
|
|
{156, 8, 12, 8, 12, 13}, /* IO_PIO1 */
|
|
{160, 8, 16, 8, 16, 13}, /* USB target */
|
|
{164, 8, 20, 8, 20, 13}, /* UART1 */
|
|
{168, 8, 24, 8, 24, 13}, /* Teletext */
|
|
{172, 8, 28, 8, 28, 13}, /* VideoSync VTG */
|
|
{173, 8, 28, 8, 29, 13}, /* VideoSync DVP0 */
|
|
{174, 8, 28, 8, 30, 13}, /* VideoSync DVP1 */
|
|
#endif
|
|
#elif defined(CONFIG_CPU_SUBTYPE_SH7760)
|
|
/*
|
|
* SH7760 INTC2-Style interrupts, vectors IRQ48-111 INTEVT 0x800-0xFE0
|
|
*/
|
|
/* INTPRIO0 | INTMSK0 */
|
|
{48, 0, 28, 0, 31, 3}, /* IRQ 4 */
|
|
{49, 0, 24, 0, 30, 3}, /* IRQ 3 */
|
|
{50, 0, 20, 0, 29, 3}, /* IRQ 2 */
|
|
{51, 0, 16, 0, 28, 3}, /* IRQ 1 */
|
|
/* 52-55 (INTEVT 0x880-0x8E0) unused/reserved */
|
|
/* INTPRIO4 | INTMSK0 */
|
|
{56, 4, 28, 0, 25, 3}, /* HCAN2_CHAN0 */
|
|
{57, 4, 24, 0, 24, 3}, /* HCAN2_CHAN1 */
|
|
{58, 4, 20, 0, 23, 3}, /* I2S_CHAN0 */
|
|
{59, 4, 16, 0, 22, 3}, /* I2S_CHAN1 */
|
|
{60, 4, 12, 0, 21, 3}, /* AC97_CHAN0 */
|
|
{61, 4, 8, 0, 20, 3}, /* AC97_CHAN1 */
|
|
{62, 4, 4, 0, 19, 3}, /* I2C_CHAN0 */
|
|
{63, 4, 0, 0, 18, 3}, /* I2C_CHAN1 */
|
|
/* INTPRIO8 | INTMSK0 */
|
|
{52, 8, 16, 0, 11, 3}, /* SCIF0_ERI_IRQ */
|
|
{53, 8, 16, 0, 10, 3}, /* SCIF0_RXI_IRQ */
|
|
{54, 8, 16, 0, 9, 3}, /* SCIF0_BRI_IRQ */
|
|
{55, 8, 16, 0, 8, 3}, /* SCIF0_TXI_IRQ */
|
|
{64, 8, 28, 0, 17, 3}, /* USBHI_IRQ */
|
|
{65, 8, 24, 0, 16, 3}, /* LCDC */
|
|
/* 66, 67 unused */
|
|
{68, 8, 20, 0, 14, 13}, /* DMABRGI0_IRQ */
|
|
{69, 8, 20, 0, 13, 13}, /* DMABRGI1_IRQ */
|
|
{70, 8, 20, 0, 12, 13}, /* DMABRGI2_IRQ */
|
|
/* 71 unused */
|
|
{72, 8, 12, 0, 7, 3}, /* SCIF1_ERI_IRQ */
|
|
{73, 8, 12, 0, 6, 3}, /* SCIF1_RXI_IRQ */
|
|
{74, 8, 12, 0, 5, 3}, /* SCIF1_BRI_IRQ */
|
|
{75, 8, 12, 0, 4, 3}, /* SCIF1_TXI_IRQ */
|
|
{76, 8, 8, 0, 3, 3}, /* SCIF2_ERI_IRQ */
|
|
{77, 8, 8, 0, 2, 3}, /* SCIF2_RXI_IRQ */
|
|
{78, 8, 8, 0, 1, 3}, /* SCIF2_BRI_IRQ */
|
|
{79, 8, 8, 0, 0, 3}, /* SCIF2_TXI_IRQ */
|
|
/* | INTMSK4 */
|
|
{80, 8, 4, 4, 23, 3}, /* SIM_ERI */
|
|
{81, 8, 4, 4, 22, 3}, /* SIM_RXI */
|
|
{82, 8, 4, 4, 21, 3}, /* SIM_TXI */
|
|
{83, 8, 4, 4, 20, 3}, /* SIM_TEI */
|
|
{84, 8, 0, 4, 19, 3}, /* HSPII */
|
|
/* INTPRIOC | INTMSK4 */
|
|
/* 85-87 unused/reserved */
|
|
{88, 12, 20, 4, 18, 3}, /* MMCI0 */
|
|
{89, 12, 20, 4, 17, 3}, /* MMCI1 */
|
|
{90, 12, 20, 4, 16, 3}, /* MMCI2 */
|
|
{91, 12, 20, 4, 15, 3}, /* MMCI3 */
|
|
{92, 12, 12, 4, 6, 3}, /* MFI (unsure, bug? in my 7760 manual*/
|
|
/* 93-107 reserved/undocumented */
|
|
{108,12, 4, 4, 1, 3}, /* ADC */
|
|
{109,12, 0, 4, 0, 3}, /* CMTI */
|
|
/* 110-111 reserved/unused */
|
|
#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
|
|
{ TIMER_IRQ, 0, 24, 0, INTC_TMU0_MSK, 2},
|
|
#ifdef CONFIG_SH_RTC
|
|
{ RTC_IRQ, 4, 0, 0, INTC_RTC_MSK, TIMER_PRIORITY },
|
|
#endif
|
|
{ SCIF0_ERI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
|
|
{ SCIF0_RXI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
|
|
{ SCIF0_BRI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
|
|
{ SCIF0_TXI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
|
|
|
|
{ SCIF1_ERI_IRQ, 8, 16, 0, INTC_SCIF1_MSK, SCIF1_PRIORITY },
|
|
{ SCIF1_RXI_IRQ, 8, 16, 0, INTC_SCIF1_MSK, SCIF1_PRIORITY },
|
|
{ SCIF1_BRI_IRQ, 8, 16, 0, INTC_SCIF1_MSK, SCIF1_PRIORITY },
|
|
{ SCIF1_TXI_IRQ, 8, 16, 0, INTC_SCIF1_MSK, SCIF1_PRIORITY },
|
|
|
|
{ PCIC0_IRQ, 0x10, 8, 0, INTC_PCIC0_MSK, PCIC0_PRIORITY },
|
|
{ PCIC1_IRQ, 0x10, 0, 0, INTC_PCIC1_MSK, PCIC1_PRIORITY },
|
|
{ PCIC2_IRQ, 0x14, 24, 0, INTC_PCIC2_MSK, PCIC2_PRIORITY },
|
|
{ PCIC3_IRQ, 0x14, 16, 0, INTC_PCIC3_MSK, PCIC3_PRIORITY },
|
|
{ PCIC4_IRQ, 0x14, 8, 0, INTC_PCIC4_MSK, PCIC4_PRIORITY },
|
|
#endif
|
|
};
|
|
|
|
void __init init_IRQ_intc2(void)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(intc2_init_data); i++) {
|
|
struct intc2_init *p = intc2_init_data + i;
|
|
make_intc2_irq(p->irq, p->ipr_offset, p->ipr_shift,
|
|
p-> msk_offset, p->msk_shift, p->priority);
|
|
}
|
|
}
|
|
|
|
/* Adds a termination callback to the interrupt */
|
|
void intc2_add_clear_irq(int irq, int (*fn)(int))
|
|
{
|
|
if (unlikely(irq < INTC2_FIRST_IRQ))
|
|
return;
|
|
|
|
intc2_data[irq - INTC2_FIRST_IRQ].clear_irq = fn;
|
|
}
|
|
|