Merge branch 'linux-2.6' into for-2.6.24

3 files changed, 43 insertions, 16 deletions

diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 384abf410cf0..23956096b3bf 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -217,8 +217,27 @@ struct irq_handler_data {
         void            (*pre_handler)(unsigned int, void *, void *);
         void            *pre_handler_arg1;
         void            *pre_handler_arg2;
+
+        u32             msi;
 };
 
+void sparc64_set_msi(unsigned int virt_irq, u32 msi)
+{
+        struct irq_handler_data *data = get_irq_chip_data(virt_irq);
+
+        if (data)
+                data->msi = msi;
+}
+
+u32 sparc64_get_msi(unsigned int virt_irq)
+{
+        struct irq_handler_data *data = get_irq_chip_data(virt_irq);
+
+        if (data)
+                return data->msi;
+        return 0xffffffff;
+}
+
 static inline struct ino_bucket *virt_irq_to_bucket(unsigned int virt_irq)
 {
         unsigned int real_irq = virt_to_real_irq(virt_irq);
@@ -308,7 +327,7 @@ static void sun4u_irq_disable(unsigned int virt_irq)
 
         if (likely(data)) {
                 unsigned long imap = data->imap;
-                u32 tmp = upa_readq(imap);
+                unsigned long tmp = upa_readq(imap);
 
                 tmp &= ~IMAP_VALID;
                 upa_writeq(tmp, imap);
@@ -741,7 +760,7 @@ unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p,
                         break;
         }
         if (devino >= msi_end)
-                return 0;
+                return -ENOSPC;
 
         sysino = sun4v_devino_to_sysino(devhandle, devino);
         bucket = &ivector_table[sysino];
@@ -755,8 +774,8 @@ unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p,
 
         data = kzalloc(sizeof(struct irq_handler_data), GFP_ATOMIC);
         if (unlikely(!data)) {
-                prom_printf("IRQ: kzalloc(irq_handler_data) failed.\n");
-                prom_halt();
+                virt_irq_free(*virt_irq_p);
+                return -ENOMEM;
         }
         set_irq_chip_data(bucket->virt_irq, data);
 
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 3d93e9203ba2..e8dac81d8a0d 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -393,7 +393,6 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
         sd->host_controller = pbm;
         sd->prom_node = node;
         sd->op = of_find_device_by_node(node);
-        sd->msi_num = 0xffffffff;
 
         sd = &sd->op->dev.archdata;
         sd->iommu = pbm->iommu;
@@ -745,7 +744,7 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
 {
         struct device_node *child;
         const u32 *reg;
-        int reglen, devfn;
+        int reglen, devfn, prev_devfn;
         struct pci_dev *dev;
 
         if (ofpci_verbose)
@@ -753,14 +752,25 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
                        node->full_name, bus->number);
 
         child = NULL;
+        prev_devfn = -1;
         while ((child = of_get_next_child(node, child)) != NULL) {
                 if (ofpci_verbose)
                         printk("  * %s\n", child->full_name);
                 reg = of_get_property(child, "reg", &reglen);
                 if (reg == NULL || reglen < 20)
                         continue;
+
                 devfn = (reg[0] >> 8) & 0xff;
 
+                /* This is a workaround for some device trees
+                 * which list PCI devices twice.  On the V100
+                 * for example, device number 3 is listed twice.
+                 * Once as "pm" and once again as "lomp".
+                 */
+                if (devfn == prev_devfn)
+                        continue;
+                prev_devfn = devfn;
+
                 /* create a new pci_dev for this device */
                 dev = of_create_pci_dev(pbm, child, bus, devfn, 0);
                 if (!dev)
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index 466f4aa8fc82..da724b13e89e 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -940,13 +940,13 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p,
         if (msi_num < 0)
                 return msi_num;
 
-        devino = sun4v_build_msi(pbm->devhandle, virt_irq_p,
-                                 pbm->msiq_first_devino,
-                                 (pbm->msiq_first_devino +
-                                  pbm->msiq_num));
-        err = -ENOMEM;
-        if (!devino)
+        err = sun4v_build_msi(pbm->devhandle, virt_irq_p,
+                              pbm->msiq_first_devino,
+                              (pbm->msiq_first_devino +
+                               pbm->msiq_num));
+        if (err < 0)
                 goto out_err;
+        devino = err;
 
         msiqid = ((devino - pbm->msiq_first_devino) +
                   pbm->msiq_first);
@@ -971,7 +971,7 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p,
         if (pci_sun4v_msi_setvalid(pbm->devhandle, msi_num, HV_MSIVALID_VALID))
                 goto out_err;
 
-        pdev->dev.archdata.msi_num = msi_num;
+        sparc64_set_msi(*virt_irq_p, msi_num);
 
         if (entry->msi_attrib.is_64) {
                 msg.address_hi = pbm->msi64_start >> 32;
@@ -993,8 +993,6 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p,
 
 out_err:
         free_msi(pbm, msi_num);
-        sun4v_destroy_msi(*virt_irq_p);
-        *virt_irq_p = 0;
         return err;
 
 }
@@ -1006,7 +1004,7 @@ static void pci_sun4v_teardown_msi_irq(unsigned int virt_irq,
         unsigned long msiqid, err;
         unsigned int msi_num;
 
-        msi_num = pdev->dev.archdata.msi_num;
+        msi_num = sparc64_get_msi(virt_irq);
         err = pci_sun4v_msi_getmsiq(pbm->devhandle, msi_num, &msiqid);
         if (err) {
                 printk(KERN_ERR "%s: getmsiq gives error %lu\n",