qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-19 04:18:26 +02:00
Code

ar7: speed up irq handlers, fix asm/ar7/ar7.h

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6723 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
ejka 2007-03-27 14:56:34 +00:00
parent c591f2ff99
commit b647cf8f1c
2 changed files with 79 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
target/linux/ar7-2.6/files/arch/mips/ar7/irq.c
View File

@ -31,14 +31,15 @@
#define PACE_OFFSET 0xA0 #define PACE_OFFSET 0xA0
#define CHNLS_OFFSET 0x200 #define CHNLS_OFFSET 0x200
#define IRQ_NUM(irq) (irq % 40 % 32) #define REG_OFFSET(irq, reg) ((irq) / 32 * 0x4 + reg * 0x10)
#define REG_OFFSET(irq, reg) (((irq) < 40) ? \ #define SEC_REG_OFFSET(reg) (EXCEPT_OFFSET + reg * 0x8)
((irq) / 32 * 0x4 + reg * 0x10) : \ #define SR_OFFSET (SEC_REG_OFFSET(0))
(EXCEPT_OFFSET + reg * 0x8))
#define SR_OFFSET(irq) (REG_OFFSET(irq, 0))
#define CR_OFFSET(irq) (REG_OFFSET(irq, 1)) #define CR_OFFSET(irq) (REG_OFFSET(irq, 1))
#define SEC_CR_OFFSET (SEC_REG_OFFSET(1))
#define ESR_OFFSET(irq) (REG_OFFSET(irq, 2)) #define ESR_OFFSET(irq) (REG_OFFSET(irq, 2))
#define SEC_ESR_OFFSET (SEC_REG_OFFSET(2))
#define ECR_OFFSET(irq) (REG_OFFSET(irq, 3)) #define ECR_OFFSET(irq) (REG_OFFSET(irq, 3))
#define SEC_ECR_OFFSET (SEC_REG_OFFSET(3))
#define PIR_OFFSET (0x40) #define PIR_OFFSET (0x40)
#define MSR_OFFSET (0x44) #define MSR_OFFSET (0x44)
#define PM_OFFSET(irq) (REG_OFFSET(irq, 5)) #define PM_OFFSET(irq) (REG_OFFSET(irq, 5))
@ -50,8 +51,12 @@
static void ar7_unmask_irq(unsigned int irq_nr); static void ar7_unmask_irq(unsigned int irq_nr);
static void ar7_mask_irq(unsigned int irq_nr); static void ar7_mask_irq(unsigned int irq_nr);
static void ar7_unmask_secondary_irq(unsigned int irq_nr);
static void ar7_mask_secondary_irq(unsigned int irq_nr);
static irqreturn_t ar7_cascade(int interrupt, void *dev); static irqreturn_t ar7_cascade(int interrupt, void *dev);
void ar7_irq_init(int); static irqreturn_t ar7_secondary_cascade(int interrupt, void *dev);
static void ar7_irq_init(int base);
static int ar7_irq_base;
static struct irq_chip ar7_irq_type = { static struct irq_chip ar7_irq_type = {
.name = "AR7", .name = "AR7",
@ -59,20 +64,28 @@ static struct irq_chip ar7_irq_type = {
.mask = ar7_mask_irq, .mask = ar7_mask_irq,
}; };
static int ar7_irq_base; static struct irq_chip ar7_secondary_irq_type = {
.name = "AR7",
.unmask = ar7_unmask_secondary_irq,
.mask = ar7_mask_secondary_irq,
};
static struct irqaction ar7_cascade_action = { static struct irqaction ar7_cascade_action = {
.handler = ar7_cascade, .handler = ar7_cascade,
.name = "AR7 cascade interrupt" .name = "AR7 cascade interrupt"
}; };
static struct irqaction ar7_secondary_cascade_action = {
.handler = ar7_secondary_cascade,
.name = "AR7 secondary cascade interrupt"
};
static void ar7_unmask_irq(unsigned int irq) static void ar7_unmask_irq(unsigned int irq)
{ {
unsigned long flags; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
/* enable the interrupt channel bit */ /* enable the interrupt channel bit */
REG(ESR_OFFSET(irq - ar7_irq_base)) = 1 << IRQ_NUM(irq - ar7_irq_base); REG(ESR_OFFSET(irq)) = 1 << ((irq - ar7_irq_base) % 32);
local_irq_restore(flags); local_irq_restore(flags);
} }
@ -81,7 +94,25 @@ static void ar7_mask_irq(unsigned int irq)
unsigned long flags; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
/* disable the interrupt channel bit */ /* disable the interrupt channel bit */
REG(ECR_OFFSET(irq - ar7_irq_base)) = 1 << IRQ_NUM(irq - ar7_irq_base); REG(ECR_OFFSET(irq)) = 1 << ((irq - ar7_irq_base) % 32);
local_irq_restore(flags);
}
static void ar7_unmask_secondary_irq(unsigned int irq)
{
unsigned long flags;
local_irq_save(flags);
/* enable the interrupt channel bit */
REG(SEC_ESR_OFFSET) = 1 << (irq - ar7_irq_base - 40);
local_irq_restore(flags);
}
static void ar7_mask_secondary_irq(unsigned int irq)
{
unsigned long flags;
local_irq_save(flags);
/* disable the interrupt channel bit */
REG(SEC_ECR_OFFSET) = 1 << (irq - ar7_irq_base - 40);
local_irq_restore(flags); local_irq_restore(flags);
} }
@ -90,7 +121,7 @@ void __init arch_init_irq(void) {
ar7_irq_init(8); ar7_irq_init(8);
} }
void __init ar7_irq_init(int base) static void __init ar7_irq_init(int base)
{ {
int i; int i;
/* /*
@ -98,54 +129,67 @@ void __init ar7_irq_init(int base)
*/ */
REG(ECR_OFFSET(0)) = 0xffffffff; REG(ECR_OFFSET(0)) = 0xffffffff;
REG(ECR_OFFSET(32)) = 0xff; REG(ECR_OFFSET(32)) = 0xff;
REG(ECR_OFFSET(40)) = 0xffffffff; REG(SEC_ECR_OFFSET) = 0xffffffff;
REG(CR_OFFSET(0)) = 0xffffffff; REG(CR_OFFSET(0)) = 0xffffffff;
REG(CR_OFFSET(32)) = 0xff; REG(CR_OFFSET(32)) = 0xff;
REG(CR_OFFSET(40)) = 0xffffffff; REG(SEC_CR_OFFSET) = 0xffffffff;
ar7_irq_base = base;
for(i = 0; i < 40; i++) { for(i = 0; i < 40; i++) {
REG(CHNL_OFFSET(i)) = i; REG(CHNL_OFFSET(i)) = i;
/* Primary IRQ's */ /* Primary IRQ's */
irq_desc[i + base].status = IRQ_DISABLED; irq_desc[i + base].status = IRQ_DISABLED;
irq_desc[i + base].action = 0; irq_desc[i + base].action = NULL;
irq_desc[i + base].depth = 1; irq_desc[i + base].depth = 1;
irq_desc[i + base].chip = &ar7_irq_type; irq_desc[i + base].chip = &ar7_irq_type;
/* Secondary IRQ's */ /* Secondary IRQ's */
if (i < 32) { if (i < 32) {
irq_desc[i + base + 40].status = IRQ_DISABLED; irq_desc[i + base + 40].status = IRQ_DISABLED;
irq_desc[i + base + 40].action = 0; irq_desc[i + base + 40].action = NULL;
irq_desc[i + base + 40].depth = 1; irq_desc[i + base + 40].depth = 1;
irq_desc[i + base + 40].chip = irq_desc[i + base + 40].chip = &ar7_secondary_irq_type;
&ar7_irq_type;
} }
} }
ar7_irq_base = base;
setup_irq(2, &ar7_cascade_action); setup_irq(2, &ar7_cascade_action);
setup_irq(ar7_irq_base, &ar7_secondary_cascade_action);
set_c0_status(IE_IRQ0); set_c0_status(IE_IRQ0);
} }
static irqreturn_t ar7_cascade(int interrupt, void *dev) static irqreturn_t ar7_cascade(int interrupt, void *dev)
{ {
int irq, i; int irq;
unsigned long status;
irq = (REG(PIR_OFFSET) & 0x3F); irq = (REG(PIR_OFFSET) & 0x3F);
if (irq == 40) return IRQ_NONE; REG(CR_OFFSET(irq)) = 1 << (irq % 32);
if (irq > 0) {
REG(CR_OFFSET(irq)) = 1 << IRQ_NUM(irq); do_IRQ(irq + ar7_irq_base);
} else {
status = REG(SR_OFFSET(40)); return IRQ_HANDLED;
for (i = 0; i < 32; i++) { }
if (status & (i << 1)) {
irq = i + 40; static irqreturn_t ar7_secondary_cascade(int interrupt, void *dev)
REG(CR_OFFSET(irq)) = 1 << i; {
break; int irq = 0, i;
} unsigned long status;
}
REG(CR_OFFSET(0)) = 1; status = REG(SR_OFFSET);
if (unlikely(!status)) {
spurious_interrupt();
return IRQ_NONE;
} }
return do_IRQ(irq + ar7_irq_base);
for (i = 0; i < 32; i++)
if (status & (i << 1)) {
irq = i + 40;
REG(SEC_CR_OFFSET) = 1 << i;
break;
}
do_IRQ(irq + ar7_irq_base);
return IRQ_HANDLED;
} }
asmlinkage void plat_irq_dispatch(void) asmlinkage void plat_irq_dispatch(void)

3
target/linux/ar7-2.6/files/include/asm-mips/ar7/ar7.h
View File

@ -21,8 +21,9 @@
#ifndef __AR7_H__ #ifndef __AR7_H__
#define __AR7_H__ #define __AR7_H__
#include <asm/addrspace.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/addrspace.h>
#include <asm/io.h>
#define AR7_REGS_BASE 0x08610000 #define AR7_REGS_BASE 0x08610000