Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / arch / ia64 / sn / kernel / msi_sn.c

diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c
index b3a435fd70fbc717d8c819e3f253aa50612d09f1..83f190ffe35078dd062266727c20025d00b3a7fa 100644 (file)
--- a/arch/ia64/sn/kernel/msi_sn.c
+++ b/arch/ia64/sn/kernel/msi_sn.c
@@ -59,13 +59,12 @@ void sn_teardown_msi_irq(unsigned int irq)
        sn_intr_free(nasid, widget, sn_irq_info);
        sn_msi_info[irq].sn_irq_info = NULL;
 
-       return;
+       destroy_irq(irq);
 }
 
-int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
+int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry)
 {
        struct msi_msg msg;
-       struct msi_desc *entry;
        int widget;
        int status;
        nasid_t nasid;
@@ -73,8 +72,8 @@ int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
        struct sn_irq_info *sn_irq_info;
        struct pcibus_bussoft *bussoft = SN_PCIDEV_BUSSOFT(pdev);
        struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
+       int irq;
 
-       entry = get_irq_data(irq);
        if (!entry->msi_attrib.is_64)
                return -EINVAL;
 
@@ -84,6 +83,10 @@ int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
        if (provider == NULL || provider->dma_map_consistent == NULL)
                return -EINVAL;
 
+       irq = create_irq();
+       if (irq < 0)
+               return irq;
+
        /*
         * Set up the vector plumbing.  Let the prom (via sn_intr_alloc)
         * decide which cpu to direct this msi at by default.
@@ -95,12 +98,15 @@ int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
                        SWIN_WIDGETNUM(bussoft->bs_base);
 
        sn_irq_info = kzalloc(sizeof(struct sn_irq_info), GFP_KERNEL);
-       if (! sn_irq_info)
+       if (! sn_irq_info) {
+               destroy_irq(irq);
                return -ENOMEM;
+       }
 
        status = sn_intr_alloc(nasid, widget, sn_irq_info, irq, -1, -1);
        if (status) {
                kfree(sn_irq_info);
+               destroy_irq(irq);
                return -ENOMEM;
        }
 
@@ -121,6 +127,7 @@ int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
        if (! bus_addr) {
                sn_intr_free(nasid, widget, sn_irq_info);
                kfree(sn_irq_info);
+               destroy_irq(irq);
                return -ENOMEM;
        }
 
@@ -136,6 +143,7 @@ int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
         */
        msg.data = 0x100 + irq;
 
+       set_irq_msi(irq, entry);
        write_msi_msg(irq, &msg);
        set_irq_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);
 
@@ -196,7 +204,7 @@ static void sn_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask)
        msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff);
 
        write_msi_msg(irq, &msg);
-       set_native_irq_info(irq, cpu_mask);
+       irq_desc[irq].affinity = cpu_mask;
 }
 #endif /* CONFIG_SMP */