3 files changed, 49 insertions, 1 deletions

diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index 64b7690c664..90d63aefd27 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -106,7 +106,7 @@ asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs)
         }
 #endif
 
-        irq = irq_demux(evt2irq(irq));
+        irq = irq_demux(intc_evt2irq(irq));
 
 #ifdef CONFIG_IRQSTACKS
         curctx = (union irq_ctx *)current_thread_info();
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index 58d24c5a76c..d7b8959d9d9 100644
--- a/drivers/sh/intc.c
+++ b/drivers/sh/intc.c
@@ -568,6 +568,10 @@ static void __init intc_register_irq(struct intc_desc *desc,
         if (!data[0] && data[1])
                 primary = 1;
 
+        if (!data[0] && !data[1])
+                pr_warning("intc: missing unique irq mask for 0x%04x\n",
+                           irq2evt(irq));
+
         data[0] = data[0] ? data[0] : intc_mask_data(desc, d, enum_id, 1);
         data[1] = data[1] ? data[1] : intc_prio_data(desc, d, enum_id, 1);
 
@@ -641,6 +645,17 @@ static unsigned int __init save_reg(struct intc_desc_int *d,
         return 0;
 }
 
+static unsigned char *intc_evt2irq_table;
+
+unsigned int intc_evt2irq(unsigned int vector)
+{
+        unsigned int irq = evt2irq(vector);
+
+        if (intc_evt2irq_table && intc_evt2irq_table[irq])
+                irq = intc_evt2irq_table[irq];
+
+        return irq;
+}
 
 void __init register_intc_controller(struct intc_desc *desc)
 {
@@ -705,9 +720,41 @@ void __init register_intc_controller(struct intc_desc *desc)
 
         BUG_ON(k > 256); /* _INTC_ADDR_E() and _INTC_ADDR_D() are 8 bits */
 
+        /* keep the first vector only if same enum is used multiple times */
+        for (i = 0; i < desc->nr_vectors; i++) {
+                struct intc_vect *vect = desc->vectors + i;
+                int first_irq = evt2irq(vect->vect);
+
+                if (!vect->enum_id)
+                        continue;
+
+                for (k = i + 1; k < desc->nr_vectors; k++) {
+                        struct intc_vect *vect2 = desc->vectors + k;
+
+                        if (vect->enum_id != vect2->enum_id)
+                                continue;
+
+                        vect2->enum_id = 0;
+
+                        if (!intc_evt2irq_table)
+                                intc_evt2irq_table = alloc_bootmem(NR_IRQS);
+
+                        if (!intc_evt2irq_table) {
+                                pr_warning("intc: cannot allocate evt2irq!\n");
+                                continue;
+                        }
+
+                        intc_evt2irq_table[evt2irq(vect2->vect)] = first_irq;
+                }
+        }
+
+        /* register the vectors one by one */
         for (i = 0; i < desc->nr_vectors; i++) {
                 struct intc_vect *vect = desc->vectors + i;
 
+                if (!vect->enum_id)
+                        continue;
+
                 intc_register_irq(desc, d, vect->enum_id, evt2irq(vect->vect));
         }
 }
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index 68e212ff9dd..eb1423a0078 100644
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -85,6 +85,7 @@ struct intc_desc symbol __initdata = {					\
 }
 #endif
 
+unsigned int intc_evt2irq(unsigned int vector);
 void __init register_intc_controller(struct intc_desc *desc);
 int intc_set_priority(unsigned int irq, unsigned int prio);