1 files changed, 33 insertions, 279 deletions

diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c
index 7d2c203cb406..1187b44a3dd4 100644
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/jmr3927/rbhma3100/irq.c
@@ -30,53 +30,21 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <linux/init.h>
-
-#include <linux/errno.h>
-#include <linux/irq.h>
-#include <linux/kernel_stat.h>
-#include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/timex.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/bitops.h>
 
-#include <asm/irq_regs.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 
-#include <asm/ptrace.h>
 #include <asm/processor.h>
-#include <asm/jmr3927/irq.h>
-#include <asm/debug.h>
 #include <asm/jmr3927/jmr3927.h>
 
 #if JMR3927_IRQ_END > NR_IRQS
 #error JMR3927_IRQ_END > NR_IRQS
 #endif
 
-struct tb_irq_space* tb_irq_spaces;
-
-static int jmr3927_irq_base = -1;
-
-#ifdef CONFIG_PCI
-static int jmr3927_gen_iack(void)
-{
-        /* generate ACK cycle */
-#ifdef __BIG_ENDIAN
-        return (tx3927_pcicptr->iiadp >> 24) & 0xff;
-#else
-        return tx3927_pcicptr->iiadp & 0xff;
-#endif
-}
-#endif
-
 #define irc_dlevel      0
 #define irc_elevel      1
 
@@ -87,89 +55,24 @@ static unsigned char irc_level[TX3927_NUM_IR] = {
         6, 6, 6                 /* TMR */
 };
 
-static void jmr3927_irq_disable(unsigned int irq_nr);
-static void jmr3927_irq_enable(unsigned int irq_nr);
-
-static void jmr3927_irq_ack(unsigned int irq)
-{
-        if (irq == JMR3927_IRQ_IRC_TMR0)
-                jmr3927_tmrptr->tisr = 0;       /* ack interrupt */
-
-        jmr3927_irq_disable(irq);
-}
-
-static void jmr3927_irq_end(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-                jmr3927_irq_enable(irq);
-}
-
-static void jmr3927_irq_disable(unsigned int irq_nr)
-{
-        struct tb_irq_space* sp;
-
-        for (sp = tb_irq_spaces; sp; sp = sp->next) {
-                if (sp->start_irqno <= irq_nr &&
-                    irq_nr < sp->start_irqno + sp->nr_irqs) {
-                        if (sp->mask_func)
-                                sp->mask_func(irq_nr - sp->start_irqno,
-                                              sp->space_id);
-                        break;
-                }
-        }
-}
-
-static void jmr3927_irq_enable(unsigned int irq_nr)
-{
-        struct tb_irq_space* sp;
-
-        for (sp = tb_irq_spaces; sp; sp = sp->next) {
-                if (sp->start_irqno <= irq_nr &&
-                    irq_nr < sp->start_irqno + sp->nr_irqs) {
-                        if (sp->unmask_func)
-                                sp->unmask_func(irq_nr - sp->start_irqno,
-                                                sp->space_id);
-                        break;
-                }
-        }
-}
-
 /*
  * CP0_STATUS is a thread's resource (saved/restored on context switch).
- * So disable_irq/enable_irq MUST handle IOC/ISAC/IRC registers.
+ * So disable_irq/enable_irq MUST handle IOC/IRC registers.
  */
-static void mask_irq_isac(int irq_nr, int space_id)
-{
-        /* 0: mask */
-        unsigned char imask =
-                jmr3927_isac_reg_in(JMR3927_ISAC_INTM_ADDR);
-        unsigned int bit  = 1 << irq_nr;
-        jmr3927_isac_reg_out(imask & ~bit, JMR3927_ISAC_INTM_ADDR);
-        /* flush write buffer */
-        (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);
-}
-static void unmask_irq_isac(int irq_nr, int space_id)
-{
-        /* 0: mask */
-        unsigned char imask = jmr3927_isac_reg_in(JMR3927_ISAC_INTM_ADDR);
-        unsigned int bit  = 1 << irq_nr;
-        jmr3927_isac_reg_out(imask | bit, JMR3927_ISAC_INTM_ADDR);
-        /* flush write buffer */
-        (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);
-}
-
-static void mask_irq_ioc(int irq_nr, int space_id)
+static void mask_irq_ioc(unsigned int irq)
 {
         /* 0: mask */
+        unsigned int irq_nr = irq - JMR3927_IRQ_IOC;
         unsigned char imask = jmr3927_ioc_reg_in(JMR3927_IOC_INTM_ADDR);
         unsigned int bit = 1 << irq_nr;
         jmr3927_ioc_reg_out(imask & ~bit, JMR3927_IOC_INTM_ADDR);
         /* flush write buffer */
         (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);
 }
-static void unmask_irq_ioc(int irq_nr, int space_id)
+static void unmask_irq_ioc(unsigned int irq)
 {
         /* 0: mask */
+        unsigned int irq_nr = irq - JMR3927_IRQ_IOC;
         unsigned char imask = jmr3927_ioc_reg_in(JMR3927_IOC_INTM_ADDR);
         unsigned int bit = 1 << irq_nr;
         jmr3927_ioc_reg_out(imask | bit, JMR3927_IOC_INTM_ADDR);
@@ -177,8 +80,9 @@ static void unmask_irq_ioc(int irq_nr, int space_id)
         (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);
 }
 
-static void mask_irq_irc(int irq_nr, int space_id)
+static void mask_irq_irc(unsigned int irq)
 {
+        unsigned int irq_nr = irq - JMR3927_IRQ_IRC;
         volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];
         if (irq_nr & 1)
                 *ilrp = (*ilrp & 0x00ff) | (irc_dlevel << 8);
@@ -191,8 +95,9 @@ static void mask_irq_irc(int irq_nr, int space_id)
         (void)tx3927_ircptr->ssr;
 }
 
-static void unmask_irq_irc(int irq_nr, int space_id)
+static void unmask_irq_irc(unsigned int irq)
 {
+        unsigned int irq_nr = irq - JMR3927_IRQ_IRC;
         volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];
         if (irq_nr & 1)
                 *ilrp = (*ilrp & 0x00ff) | (irc_level[irq_nr] << 8);
@@ -203,98 +108,14 @@ static void unmask_irq_irc(int irq_nr, int space_id)
         tx3927_ircptr->imr = irc_elevel;
 }
 
-struct tb_irq_space jmr3927_isac_irqspace = {
-        .next = NULL,
-        .start_irqno = JMR3927_IRQ_ISAC,
-        nr_irqs : JMR3927_NR_IRQ_ISAC,
-        .mask_func = mask_irq_isac,
-        .unmask_func = unmask_irq_isac,
-        .name = "ISAC",
-        .space_id = 0,
-        can_share : 0
-};
-struct tb_irq_space jmr3927_ioc_irqspace = {
-        .next = NULL,
-        .start_irqno = JMR3927_IRQ_IOC,
-        nr_irqs : JMR3927_NR_IRQ_IOC,
-        .mask_func = mask_irq_ioc,
-        .unmask_func = unmask_irq_ioc,
-        .name = "IOC",
-        .space_id = 0,
-        can_share : 1
-};
-
-struct tb_irq_space jmr3927_irc_irqspace = {
-        .next           = NULL,
-        .start_irqno    = JMR3927_IRQ_IRC,
-        .nr_irqs        = JMR3927_NR_IRQ_IRC,
-        .mask_func      = mask_irq_irc,
-        .unmask_func    = unmask_irq_irc,
-        .name           = "on-chip",
-        .space_id       = 0,
-        .can_share      = 0
-};
-
-
-#ifdef CONFIG_TX_BRANCH_LIKELY_BUG_WORKAROUND
-static int tx_branch_likely_bug_count = 0;
-static int have_tx_branch_likely_bug = 0;
-
-static void tx_branch_likely_bug_fixup(void)
-{
-        struct pt_regs *regs = get_irq_regs();
-
-        /* TX39/49-BUG: Under this condition, the insn in delay slot
-           of the branch likely insn is executed (not nullified) even
-           the branch condition is false. */
-        if (!have_tx_branch_likely_bug)
-                return;
-        if ((regs->cp0_epc & 0xfff) == 0xffc &&
-            KSEGX(regs->cp0_epc) != KSEG0 &&
-            KSEGX(regs->cp0_epc) != KSEG1) {
-                unsigned int insn = *(unsigned int*)(regs->cp0_epc - 4);
-                /* beql,bnel,blezl,bgtzl */
-                /* bltzl,bgezl,blezall,bgezall */
-                /* bczfl, bcztl */
-                if ((insn & 0xf0000000) == 0x50000000 ||
-                    (insn & 0xfc0e0000) == 0x04020000 ||
-                    (insn & 0xf3fe0000) == 0x41020000) {
-                        regs->cp0_epc -= 4;
-                        tx_branch_likely_bug_count++;
-                        printk(KERN_INFO
-                               "fix branch-likery bug in %s (insn %08x)\n",
-                               current->comm, insn);
-                }
-        }
-}
-#endif
-
-static void jmr3927_spurious(void)
-{
-        struct pt_regs * regs = get_irq_regs();
-
-#ifdef CONFIG_TX_BRANCH_LIKELY_BUG_WORKAROUND
-        tx_branch_likely_bug_fixup();
-#endif
-        printk(KERN_WARNING "spurious interrupt (cause 0x%lx, pc 0x%lx, ra 0x%lx).\n",
-               regs->cp0_cause, regs->cp0_epc, regs->regs[31]);
-}
-
 asmlinkage void plat_irq_dispatch(void)
 {
-        struct pt_regs * regs = get_irq_regs();
+        unsigned long cp0_cause = read_c0_cause();
         int irq;
 
-#ifdef CONFIG_TX_BRANCH_LIKELY_BUG_WORKAROUND
-        tx_branch_likely_bug_fixup();
-#endif
-        if ((regs->cp0_cause & CAUSEF_IP7) == 0) {
-#if 0
-                jmr3927_spurious();
-#endif
+        if ((cp0_cause & CAUSEF_IP7) == 0)
                 return;
-        }
-        irq = (regs->cp0_cause >> CAUSEB_IP2) & 0x0f;
+        irq = (cp0_cause >> CAUSEB_IP2) & 0x0f;
 
         do_IRQ(irq + JMR3927_IRQ_IRC);
 }
@@ -317,35 +138,6 @@ static struct irqaction ioc_action = {
         jmr3927_ioc_interrupt, 0, CPU_MASK_NONE, "IOC", NULL, NULL,
 };
 
-static irqreturn_t jmr3927_isac_interrupt(int irq, void *dev_id)
-{
-        unsigned char istat = jmr3927_isac_reg_in(JMR3927_ISAC_INTS2_ADDR);
-        int i;
-
-        for (i = 0; i < JMR3927_NR_IRQ_ISAC; i++) {
-                if (istat & (1 << i)) {
-                        irq = JMR3927_IRQ_ISAC + i;
-                        do_IRQ(irq);
-                }
-        }
-        return IRQ_HANDLED;
-}
-
-static struct irqaction isac_action = {
-        jmr3927_isac_interrupt, 0, CPU_MASK_NONE, "ISAC", NULL, NULL,
-};
-
-
-static irqreturn_t jmr3927_isaerr_interrupt(int irq, void *dev_id)
-{
-        printk(KERN_WARNING "ISA error interrupt (irq 0x%x).\n", irq);
-
-        return IRQ_HANDLED;
-}
-static struct irqaction isaerr_action = {
-        jmr3927_isaerr_interrupt, 0, CPU_MASK_NONE, "ISA error", NULL, NULL,
-};
-
 static irqreturn_t jmr3927_pcierr_interrupt(int irq, void *dev_id)
 {
         printk(KERN_WARNING "PCI error interrupt (irq 0x%x).\n", irq);
@@ -358,54 +150,19 @@ static struct irqaction pcierr_action = {
         jmr3927_pcierr_interrupt, 0, CPU_MASK_NONE, "PCI error", NULL, NULL,
 };
 
-int jmr3927_ether1_irq = 0;
-
-void jmr3927_irq_init(u32 irq_base);
+static void __init jmr3927_irq_init(void);
 
 void __init arch_init_irq(void)
 {
-        /* look for io board's presence */
-        int have_isac = jmr3927_have_isac();
-
         /* Now, interrupt control disabled, */
         /* all IRC interrupts are masked, */
         /* all IRC interrupt mode are Low Active. */
 
-        if (have_isac) {
-
-                /* ETHER1 (NE2000 compatible 10M-Ether) parameter setup */
-                /* temporary enable interrupt control */
-                tx3927_ircptr->cer = 1;
-                /* ETHER1 Int. Is High-Active. */
-                if (tx3927_ircptr->ssr & (1 << 0))
-                        jmr3927_ether1_irq = JMR3927_IRQ_IRC_INT0;
-#if 0   /* INT3 may be asserted by ether0 (even after reboot...) */
-                else if (tx3927_ircptr->ssr & (1 << 3))
-                        jmr3927_ether1_irq = JMR3927_IRQ_IRC_INT3;
-#endif
-                /* disable interrupt control */
-                tx3927_ircptr->cer = 0;
-
-                /* Ether1: High Active */
-                if (jmr3927_ether1_irq) {
-                        int ether1_irc = jmr3927_ether1_irq - JMR3927_IRQ_IRC;
-                        tx3927_ircptr->cr[ether1_irc / 8] |=
-                                TX3927_IRCR_HIGH << ((ether1_irc % 8) * 2);
-                }
-        }
-
         /* mask all IOC interrupts */
         jmr3927_ioc_reg_out(0, JMR3927_IOC_INTM_ADDR);
         /* setup IOC interrupt mode (SOFT:High Active, Others:Low Active) */
         jmr3927_ioc_reg_out(JMR3927_IOC_INTF_SOFT, JMR3927_IOC_INTP_ADDR);
 
-        if (have_isac) {
-                /* mask all ISAC interrupts */
-                jmr3927_isac_reg_out(0, JMR3927_ISAC_INTM_ADDR);
-                /* setup ISAC interrupt mode (ISAIRQ3,ISAIRQ5:Low Active ???) */
-                jmr3927_isac_reg_out(JMR3927_ISAC_INTF_IRQ3|JMR3927_ISAC_INTF_IRQ5, JMR3927_ISAC_INTP_ADDR);
-        }
-
         /* clear PCI Soft interrupts */
         jmr3927_ioc_reg_out(0, JMR3927_IOC_INTS1_ADDR);
         /* clear PCI Reset interrupts */
@@ -415,21 +172,11 @@ void __init arch_init_irq(void)
         tx3927_ircptr->cer = TX3927_IRCER_ICE;
         tx3927_ircptr->imr = irc_elevel;
 
-        jmr3927_irq_init(NR_ISA_IRQS);
-
-        /* setup irq space */
-        add_tb_irq_space(&jmr3927_isac_irqspace);
-        add_tb_irq_space(&jmr3927_ioc_irqspace);
-        add_tb_irq_space(&jmr3927_irc_irqspace);
+        jmr3927_irq_init();
 
         /* setup IOC interrupt 1 (PCI, MODEM) */
         setup_irq(JMR3927_IRQ_IOCINT, &ioc_action);
 
-        if (have_isac) {
-                setup_irq(JMR3927_IRQ_ISACINT, &isac_action);
-                setup_irq(JMR3927_IRQ_ISAC_ISAER, &isaerr_action);
-        }
-
 #ifdef CONFIG_PCI
         setup_irq(JMR3927_IRQ_IRC_PCI, &pcierr_action);
 #endif
@@ -438,21 +185,28 @@ void __init arch_init_irq(void)
         set_c0_status(ST0_IM);  /* IE bit is still 0. */
 }
 
-static struct irq_chip jmr3927_irq_controller = {
-        .name = "jmr3927_irq",
-        .ack = jmr3927_irq_ack,
-        .mask = jmr3927_irq_disable,
-        .mask_ack = jmr3927_irq_ack,
-        .unmask = jmr3927_irq_enable,
-        .end = jmr3927_irq_end,
+static struct irq_chip jmr3927_irq_ioc = {
+        .name = "jmr3927_ioc",
+        .ack = mask_irq_ioc,
+        .mask = mask_irq_ioc,
+        .mask_ack = mask_irq_ioc,
+        .unmask = unmask_irq_ioc,
 };
 
-void jmr3927_irq_init(u32 irq_base)
+static struct irq_chip jmr3927_irq_irc = {
+        .name = "jmr3927_irc",
+        .ack = mask_irq_irc,
+        .mask = mask_irq_irc,
+        .mask_ack = mask_irq_irc,
+        .unmask = unmask_irq_irc,
+};
+
+static void __init jmr3927_irq_init(void)
 {
         u32 i;
 
-        for (i= irq_base; i< irq_base + JMR3927_NR_IRQ_IRC + JMR3927_NR_IRQ_IOC; i++)
-                set_irq_chip(i, &jmr3927_irq_controller);
-
-        jmr3927_irq_base = irq_base;
+        for (i = JMR3927_IRQ_IRC; i < JMR3927_IRQ_IRC + JMR3927_NR_IRQ_IRC; i++)
+                set_irq_chip_and_handler(i, &jmr3927_irq_irc, handle_level_irq);
+        for (i = JMR3927_IRQ_IOC; i < JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++)
+                set_irq_chip_and_handler(i, &jmr3927_irq_ioc, handle_level_irq);
 }