system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-07-22 11:10:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MIPS: DEC: Convert to new irq_chip functions

Browse source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2178/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Thomas Gleixner 2011-03-23 21:08:51 +00:00 committed by Ralf Baechle
parent 93f2936104
commit 009c200a66
2 changed files with 24 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
arch/mips/dec/ioasic-irq.c
View file

@ -17,80 +17,48 @@
#include <asm/dec/ioasic_addrs.h> #include <asm/dec/ioasic_addrs.h>
#include <asm/dec/ioasic_ints.h> #include <asm/dec/ioasic_ints.h>
static int ioasic_irq_base; static int ioasic_irq_base;
static void unmask_ioasic_irq(struct irq_data *d)
static inline void unmask_ioasic_irq(unsigned int irq)
{ {
u32 simr; u32 simr;
simr = ioasic_read(IO_REG_SIMR); simr = ioasic_read(IO_REG_SIMR);
simr |= (1 << (irq - ioasic_irq_base)); simr |= (1 << (d->irq - ioasic_irq_base));
ioasic_write(IO_REG_SIMR, simr); ioasic_write(IO_REG_SIMR, simr);
} }
static inline void mask_ioasic_irq(unsigned int irq) static void mask_ioasic_irq(struct irq_data *d)
{ {
u32 simr; u32 simr;
simr = ioasic_read(IO_REG_SIMR); simr = ioasic_read(IO_REG_SIMR);
simr &= ~(1 << (irq - ioasic_irq_base)); simr &= ~(1 << (d->irq - ioasic_irq_base));
ioasic_write(IO_REG_SIMR, simr); ioasic_write(IO_REG_SIMR, simr);
} }
static inline void clear_ioasic_irq(unsigned int irq) static void ack_ioasic_irq(struct irq_data *d)
{ {
u32 sir; mask_ioasic_irq(d);
sir = ~(1 << (irq - ioasic_irq_base));
ioasic_write(IO_REG_SIR, sir);
}
static inline void ack_ioasic_irq(unsigned int irq)
{
mask_ioasic_irq(irq);
fast_iob(); fast_iob();
} }
static inline void end_ioasic_irq(unsigned int irq)
{
if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
unmask_ioasic_irq(irq);
}
static struct irq_chip ioasic_irq_type = { static struct irq_chip ioasic_irq_type = {
.name = "IO-ASIC", .name = "IO-ASIC",
.ack = ack_ioasic_irq, .irq_ack = ack_ioasic_irq,
.mask = mask_ioasic_irq, .irq_mask = mask_ioasic_irq,
.mask_ack = ack_ioasic_irq, .irq_mask_ack = ack_ioasic_irq,
.unmask = unmask_ioasic_irq, .irq_unmask = unmask_ioasic_irq,
}; };
#define unmask_ioasic_dma_irq unmask_ioasic_irq
#define mask_ioasic_dma_irq mask_ioasic_irq
#define ack_ioasic_dma_irq ack_ioasic_irq
static inline void end_ioasic_dma_irq(unsigned int irq)
{
clear_ioasic_irq(irq);
fast_iob();
end_ioasic_irq(irq);
}
static struct irq_chip ioasic_dma_irq_type = { static struct irq_chip ioasic_dma_irq_type = {
.name = "IO-ASIC-DMA", .name = "IO-ASIC-DMA",
.ack = ack_ioasic_dma_irq, .irq_ack = ack_ioasic_irq,
.mask = mask_ioasic_dma_irq, .irq_mask = mask_ioasic_irq,
.mask_ack = ack_ioasic_dma_irq, .irq_mask_ack = ack_ioasic_irq,
.unmask = unmask_ioasic_dma_irq, .irq_unmask = unmask_ioasic_irq,
.end = end_ioasic_dma_irq,
}; };
void __init init_ioasic_irqs(int base) void __init init_ioasic_irqs(int base)
{ {
int i; int i;

23
arch/mips/dec/kn02-irq.c
View file

@ -27,43 +27,40 @@
*/ */
u32 cached_kn02_csr; u32 cached_kn02_csr;
static int kn02_irq_base; static int kn02_irq_base;
static void unmask_kn02_irq(struct irq_data *d)
static inline void unmask_kn02_irq(unsigned int irq)
{ {
volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE + volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +
KN02_CSR); KN02_CSR);
cached_kn02_csr |= (1 << (irq - kn02_irq_base + 16)); cached_kn02_csr |= (1 << (d->irq - kn02_irq_base + 16));
*csr = cached_kn02_csr; *csr = cached_kn02_csr;
} }
static inline void mask_kn02_irq(unsigned int irq) static void mask_kn02_irq(struct irq_data *d)
{ {
volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE + volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +
KN02_CSR); KN02_CSR);
cached_kn02_csr &= ~(1 << (irq - kn02_irq_base + 16)); cached_kn02_csr &= ~(1 << (d->irq - kn02_irq_base + 16));
*csr = cached_kn02_csr; *csr = cached_kn02_csr;
} }
static void ack_kn02_irq(unsigned int irq) static void ack_kn02_irq(struct irq_data *d)
{ {
mask_kn02_irq(irq); mask_kn02_irq(d);
iob(); iob();
} }
static struct irq_chip kn02_irq_type = { static struct irq_chip kn02_irq_type = {
.name = "KN02-CSR", .name = "KN02-CSR",
.ack = ack_kn02_irq, .irq_ack = ack_kn02_irq,
.mask = mask_kn02_irq, .irq_mask = mask_kn02_irq,
.mask_ack = ack_kn02_irq, .irq_mask_ack = ack_kn02_irq,
.unmask = unmask_kn02_irq, .irq_unmask = unmask_kn02_irq,
}; };
void __init init_kn02_irqs(int base) void __init init_kn02_irqs(int base)
{ {
volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE + volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +