1 files changed, 27 insertions, 67 deletions

diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index 015cf4bb51dd..56235412cbb7 100644
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -11,15 +11,17 @@
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 
+#include <asm/irq_cpu.h>
 #include <asm/i8259.h>
 #include <asm/io.h>
 #include <asm/jazz.h>
+#include <asm/pgtable.h>
 
 static DEFINE_SPINLOCK(r4030_lock);
 
 static void enable_r4030_irq(unsigned int irq)
 {
-        unsigned int mask = 1 << (irq - JAZZ_PARALLEL_IRQ);
+        unsigned int mask = 1 << (irq - JAZZ_IRQ_START);
         unsigned long flags;
 
         spin_lock_irqsave(&r4030_lock, flags);
@@ -30,7 +32,7 @@ static void enable_r4030_irq(unsigned int irq)
 
 void disable_r4030_irq(unsigned int irq)
 {
-        unsigned int mask = ~(1 << (irq - JAZZ_PARALLEL_IRQ));
+        unsigned int mask = ~(1 << (irq - JAZZ_IRQ_START));
         unsigned long flags;
 
         spin_lock_irqsave(&r4030_lock, flags);
@@ -51,7 +53,7 @@ void __init init_r4030_ints(void)
 {
         int i;
 
-        for (i = JAZZ_PARALLEL_IRQ; i <= JAZZ_TIMER_IRQ; i++)
+        for (i = JAZZ_IRQ_START; i <= JAZZ_IRQ_END; i++)
                 set_irq_chip_and_handler(i, &r4030_irq_type, handle_level_irq);
 
         r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, 0);
@@ -66,82 +68,40 @@ void __init init_r4030_ints(void)
  */
 void __init arch_init_irq(void)
 {
+        /*
+         * this is a hack to get back the still needed wired mapping
+         * killed by init_mm()
+         */
+
+        /* Map 0xe0000000 -> 0x0:800005C0, 0xe0010000 -> 0x1:30000580 */
+        add_wired_entry(0x02000017, 0x03c00017, 0xe0000000, PM_64K);
+        /* Map 0xe2000000 -> 0x0:900005C0, 0xe3010000 -> 0x0:910005C0 */
+        add_wired_entry(0x02400017, 0x02440017, 0xe2000000, PM_16M);
+        /* Map 0xe4000000 -> 0x0:600005C0, 0xe4100000 -> 400005C0 */
+        add_wired_entry(0x01800017, 0x01000017, 0xe4000000, PM_4M);
+
         init_i8259_irqs();                      /* Integrated i8259  */
+        mips_cpu_irq_init();
         init_r4030_ints();
 
-        change_c0_status(ST0_IM, IE_IRQ4 | IE_IRQ3 | IE_IRQ2 | IE_IRQ1);
-}
-
-static void loc_call(unsigned int irq, unsigned int mask)
-{
-        r4030_write_reg16(JAZZ_IO_IRQ_ENABLE,
-                          r4030_read_reg16(JAZZ_IO_IRQ_ENABLE) & mask);
-        do_IRQ(irq);
-        r4030_write_reg16(JAZZ_IO_IRQ_ENABLE,
-                          r4030_read_reg16(JAZZ_IO_IRQ_ENABLE) | mask);
-}
-
-static void ll_local_dev(void)
-{
-        switch (r4030_read_reg32(JAZZ_IO_IRQ_SOURCE)) {
-        case 0:
-                panic("Unimplemented loc_no_irq handler");
-                break;
-        case 4:
-                loc_call(JAZZ_PARALLEL_IRQ, JAZZ_IE_PARALLEL);
-                break;
-        case 8:
-                loc_call(JAZZ_PARALLEL_IRQ, JAZZ_IE_FLOPPY);
-                break;
-        case 12:
-                panic("Unimplemented loc_sound handler");
-                break;
-        case 16:
-                panic("Unimplemented loc_video handler");
-                break;
-        case 20:
-                loc_call(JAZZ_ETHERNET_IRQ, JAZZ_IE_ETHERNET);
-                break;
-        case 24:
-                loc_call(JAZZ_SCSI_IRQ, JAZZ_IE_SCSI);
-                break;
-        case 28:
-                loc_call(JAZZ_KEYBOARD_IRQ, JAZZ_IE_KEYBOARD);
-                break;
-        case 32:
-                loc_call(JAZZ_MOUSE_IRQ, JAZZ_IE_MOUSE);
-                break;
-        case 36:
-                loc_call(JAZZ_SERIAL1_IRQ, JAZZ_IE_SERIAL1);
-                break;
-        case 40:
-                loc_call(JAZZ_SERIAL2_IRQ, JAZZ_IE_SERIAL2);
-                break;
-        }
+        change_c0_status(ST0_IM, IE_IRQ2 | IE_IRQ1);
 }
 
 asmlinkage void plat_irq_dispatch(void)
 {
         unsigned int pending = read_c0_cause() & read_c0_status();
+        unsigned int irq;
 
-        if (pending & IE_IRQ5)
-                write_c0_compare(0);
-        else if (pending & IE_IRQ4) {
+        if (pending & IE_IRQ4) {
                 r4030_read_reg32(JAZZ_TIMER_REGISTER);
                 do_IRQ(JAZZ_TIMER_IRQ);
-        } else if (pending & IE_IRQ3)
-                panic("Unimplemented ISA NMI handler");
-        else if (pending & IE_IRQ2)
+        } else if (pending & IE_IRQ2)
                 do_IRQ(r4030_read_reg32(JAZZ_EISA_IRQ_ACK));
         else if (pending & IE_IRQ1) {
-                ll_local_dev();
-        } else if (unlikely(pending & IE_IRQ0))
-                panic("Unimplemented local_dma handler");
-        else if (pending & IE_SW1) {
-                clear_c0_cause(IE_SW1);
-                panic("Unimplemented sw1 handler");
-        } else if (pending & IE_SW0) {
-                clear_c0_cause(IE_SW0);
-                panic("Unimplemented sw0 handler");
+                irq = *(volatile u8 *)JAZZ_IO_IRQ_SOURCE >> 2;
+                if (likely(irq > 0))
+                        do_IRQ(irq + JAZZ_IRQ_START - 1);
+                else
+                        panic("Unimplemented loc_no_irq handler");
         }
 }