1 files changed, 27 insertions, 8 deletions

diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index e47938899a92..f74fe26b787e 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -612,12 +612,11 @@ static inline void mpic_eoi(struct mpic *mpic)
 }
 
 #ifdef CONFIG_SMP
-static irqreturn_t mpic_ipi_action(int irq, void *dev_id)
+static irqreturn_t mpic_ipi_action(int irq, void *data)
 {
-        struct mpic *mpic;
+        long ipi = (long)data;
 
-        mpic = mpic_find(irq, NULL);
-        smp_message_recv(mpic_irq_to_hw(irq) - mpic->ipi_vecs[0]);
+        smp_message_recv(ipi);
 
         return IRQ_HANDLED;
 }
@@ -842,6 +841,24 @@ int mpic_set_irq_type(unsigned int virq, unsigned int flow_type)
         return 0;
 }
 
+void mpic_set_vector(unsigned int virq, unsigned int vector)
+{
+        struct mpic *mpic = mpic_from_irq(virq);
+        unsigned int src = mpic_irq_to_hw(virq);
+        unsigned int vecpri;
+
+        DBG("mpic: set_vector(mpic:@%p,virq:%d,src:%d,vector:0x%x)\n",
+            mpic, virq, src, vector);
+
+        if (src >= mpic->irq_count)
+                return;
+
+        vecpri = mpic_irq_read(src, MPIC_INFO(IRQ_VECTOR_PRI));
+        vecpri = vecpri & ~MPIC_INFO(VECPRI_VECTOR_MASK);
+        vecpri |= vector;
+        mpic_irq_write(src, MPIC_INFO(IRQ_VECTOR_PRI), vecpri);
+}
+
 static struct irq_chip mpic_irq_chip = {
         .mask           = mpic_mask_irq,
         .unmask         = mpic_unmask_irq,
@@ -1230,6 +1247,8 @@ void __init mpic_init(struct mpic *mpic)
                 mpic_u3msi_init(mpic);
         }
 
+        mpic_pasemi_msi_init(mpic);
+
         for (i = 0; i < mpic->num_sources; i++) {
                 /* start with vector = source number, and masked */
                 u32 vecpri = MPIC_VECPRI_MASK | i |
@@ -1457,7 +1476,7 @@ unsigned int mpic_get_irq(void)
 void mpic_request_ipis(void)
 {
         struct mpic *mpic = mpic_primary;
-        int i, err;
+        long i, err;
         static char *ipi_names[] = {
                 "IPI0 (call function)",
                 "IPI1 (reschedule)",
@@ -1472,14 +1491,14 @@ void mpic_request_ipis(void)
                 unsigned int vipi = irq_create_mapping(mpic->irqhost,
                                                        mpic->ipi_vecs[0] + i);
                 if (vipi == NO_IRQ) {
-                        printk(KERN_ERR "Failed to map IPI %d\n", i);
+                        printk(KERN_ERR "Failed to map IPI %ld\n", i);
                         break;
                 }
                 err = request_irq(vipi, mpic_ipi_action,
                                   IRQF_DISABLED|IRQF_PERCPU,
-                                  ipi_names[i], mpic);
+                                  ipi_names[i], (void *)i);
                 if (err) {
-                        printk(KERN_ERR "Request of irq %d for IPI %d failed\n",
+                        printk(KERN_ERR "Request of irq %d for IPI %ld failed\n",
                                vipi, i);
                         break;
                 }