1 files changed, 25 insertions, 24 deletions

diff --git a/drivers/pci/msi-altix.c b/drivers/pci/msi-altix.c
index bed4183a5e39..7aedc2ac8c28 100644
--- a/drivers/pci/msi-altix.c
+++ b/drivers/pci/msi-altix.c
@@ -26,7 +26,7 @@ struct sn_msi_info {
 static struct sn_msi_info *sn_msi_info;
 
 static void
-sn_msi_teardown(unsigned int vector)
+sn_msi_teardown(unsigned int irq)
 {
         nasid_t nasid;
         int widget;
@@ -36,7 +36,7 @@ sn_msi_teardown(unsigned int vector)
         struct pcibus_bussoft *bussoft;
         struct sn_pcibus_provider *provider;
 
-        sn_irq_info = sn_msi_info[vector].sn_irq_info;
+        sn_irq_info = sn_msi_info[irq].sn_irq_info;
         if (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0)
                 return;
 
@@ -45,9 +45,9 @@ sn_msi_teardown(unsigned int vector)
         provider = SN_PCIDEV_BUSPROVIDER(pdev);
 
         (*provider->dma_unmap)(pdev,
-                               sn_msi_info[vector].pci_addr,
+                               sn_msi_info[irq].pci_addr,
                                PCI_DMA_FROMDEVICE);
-        sn_msi_info[vector].pci_addr = 0;
+        sn_msi_info[irq].pci_addr = 0;
 
         bussoft = SN_PCIDEV_BUSSOFT(pdev);
         nasid = NASID_GET(bussoft->bs_base);
@@ -56,14 +56,13 @@ sn_msi_teardown(unsigned int vector)
                         SWIN_WIDGETNUM(bussoft->bs_base);
 
         sn_intr_free(nasid, widget, sn_irq_info);
-        sn_msi_info[vector].sn_irq_info = NULL;
+        sn_msi_info[irq].sn_irq_info = NULL;
 
         return;
 }
 
 int
-sn_msi_setup(struct pci_dev *pdev, unsigned int vector,
-             u32 *addr_hi, u32 *addr_lo, u32 *data)
+sn_msi_setup(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg)
 {
         int widget;
         int status;
@@ -93,7 +92,7 @@ sn_msi_setup(struct pci_dev *pdev, unsigned int vector,
         if (! sn_irq_info)
                 return -ENOMEM;
 
-        status = sn_intr_alloc(nasid, widget, sn_irq_info, vector, -1, -1);
+        status = sn_intr_alloc(nasid, widget, sn_irq_info, irq, -1, -1);
         if (status) {
                 kfree(sn_irq_info);
                 return -ENOMEM;
@@ -119,28 +118,27 @@ sn_msi_setup(struct pci_dev *pdev, unsigned int vector,
                 return -ENOMEM;
         }
 
-        sn_msi_info[vector].sn_irq_info = sn_irq_info;
-        sn_msi_info[vector].pci_addr = bus_addr;
+        sn_msi_info[irq].sn_irq_info = sn_irq_info;
+        sn_msi_info[irq].pci_addr = bus_addr;
 
-        *addr_hi = (u32)(bus_addr >> 32);
-        *addr_lo = (u32)(bus_addr & 0x00000000ffffffff);
+        msg->address_hi = (u32)(bus_addr >> 32);
+        msg->address_lo = (u32)(bus_addr & 0x00000000ffffffff);
 
         /*
          * In the SN platform, bit 16 is a "send vector" bit which
          * must be present in order to move the vector through the system.
          */
-        *data = 0x100 + (unsigned int)vector;
+        msg->data = 0x100 + irq;
 
 #ifdef CONFIG_SMP
-        set_irq_affinity_info((vector & 0xff), sn_irq_info->irq_cpuid, 0);
+        set_irq_affinity_info(irq, sn_irq_info->irq_cpuid, 0);
 #endif
 
         return 0;
 }
 
 static void
-sn_msi_target(unsigned int vector, unsigned int cpu,
-              u32 *addr_hi, u32 *addr_lo)
+sn_msi_target(unsigned int irq, cpumask_t cpu_mask, struct msi_msg *msg)
 {
         int slice;
         nasid_t nasid;
@@ -150,8 +148,10 @@ sn_msi_target(unsigned int vector, unsigned int cpu,
         struct sn_irq_info *sn_irq_info;
         struct sn_irq_info *new_irq_info;
         struct sn_pcibus_provider *provider;
+        unsigned int cpu;
 
-        sn_irq_info = sn_msi_info[vector].sn_irq_info;
+        cpu = first_cpu(cpu_mask);
+        sn_irq_info = sn_msi_info[irq].sn_irq_info;
         if (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0)
                 return;
 
@@ -163,15 +163,15 @@ sn_msi_target(unsigned int vector, unsigned int cpu,
         pdev = sn_pdev->pdi_linux_pcidev;
         provider = SN_PCIDEV_BUSPROVIDER(pdev);
 
-        bus_addr = (u64)(*addr_hi) << 32 | (u64)(*addr_lo);
+        bus_addr = (u64)(msg->address_hi) << 32 | (u64)(msg->address_lo);
         (*provider->dma_unmap)(pdev, bus_addr, PCI_DMA_FROMDEVICE);
-        sn_msi_info[vector].pci_addr = 0;
+        sn_msi_info[irq].pci_addr = 0;
 
         nasid = cpuid_to_nasid(cpu);
         slice = cpuid_to_slice(cpu);
 
         new_irq_info = sn_retarget_vector(sn_irq_info, nasid, slice);
-        sn_msi_info[vector].sn_irq_info = new_irq_info;
+        sn_msi_info[irq].sn_irq_info = new_irq_info;
         if (new_irq_info == NULL)
                 return;
 
@@ -184,12 +184,13 @@ sn_msi_target(unsigned int vector, unsigned int cpu,
                                         sizeof(new_irq_info->irq_xtalkaddr),
                                         SN_DMA_MSI|SN_DMA_ADDR_XIO);
 
-        sn_msi_info[vector].pci_addr = bus_addr;
-        *addr_hi = (u32)(bus_addr >> 32);
-        *addr_lo = (u32)(bus_addr & 0x00000000ffffffff);
+        sn_msi_info[irq].pci_addr = bus_addr;
+        msg->address_hi = (u32)(bus_addr >> 32);
+        msg->address_lo = (u32)(bus_addr & 0x00000000ffffffff);
 }
 
 struct msi_ops sn_msi_ops = {
+        .needs_64bit_address = 1,
         .setup = sn_msi_setup,
         .teardown = sn_msi_teardown,
 #ifdef CONFIG_SMP
@@ -201,7 +202,7 @@ int
 sn_msi_init(void)
 {
         sn_msi_info =
-                kzalloc(sizeof(struct sn_msi_info) * NR_VECTORS, GFP_KERNEL);
+                kzalloc(sizeof(struct sn_msi_info) * NR_IRQS, GFP_KERNEL);
         if (! sn_msi_info)
                 return -ENOMEM;