pnpacpi: fix IRQ flag decoding
[safe/jmp/linux-2.6] / drivers / pnp / quirks.c
index 4065139..1ff3bb5 100644 (file)
@@ -17,7 +17,6 @@
 #include <linux/slab.h>
 #include <linux/pnp.h>
 #include <linux/io.h>
-#include <linux/dmi.h>
 #include <linux/kallsyms.h>
 #include "base.h"
 
@@ -50,8 +49,11 @@ static void quirk_awe32_resources(struct pnp_dev *dev)
                port2->max += 0x400;
                port3->min += 0x800;
                port3->max += 0x800;
+               dev_info(&dev->dev,
+                       "AWE32 quirk - added ioports 0x%lx and 0x%lx\n",
+                       (unsigned long)port2->min,
+                       (unsigned long)port3->min);
        }
-       printk(KERN_INFO "pnp: AWE32 quirk - adding two ports\n");
 }
 
 static void quirk_cmi8330_resources(struct pnp_dev *dev)
@@ -74,7 +76,8 @@ static void quirk_cmi8330_resources(struct pnp_dev *dev)
                            IORESOURCE_DMA_8BIT)
                                dma->map = 0x000A;
        }
-       printk(KERN_INFO "pnp: CMI8330 quirk - fixing interrupts and dma\n");
+       dev_info(&dev->dev, "CMI8330 quirk - forced possible IRQs to 5, 7, 10 "
+               "and DMA channels to 1, 3\n");
 }
 
 static void quirk_sb16audio_resources(struct pnp_dev *dev)
@@ -105,46 +108,186 @@ static void quirk_sb16audio_resources(struct pnp_dev *dev)
                changed = 1;
        }
        if (changed)
-               printk(KERN_INFO
-                      "pnp: SB audio device quirk - increasing port range\n");
+               dev_info(&dev->dev, "SB audio device quirk - increased port range\n");
 }
 
-static void quirk_supermicro_h8dce_system(struct pnp_dev *dev)
+static struct pnp_option *quirk_isapnp_mpu_options(struct pnp_dev *dev)
 {
-       int i;
-       static struct dmi_system_id supermicro_h8dce[] = {
-               {
-                       .ident = "Supermicro H8DCE",
-                       .matches = {
-                               DMI_MATCH(DMI_SYS_VENDOR, "Supermicro"),
-                               DMI_MATCH(DMI_PRODUCT_NAME, "H8DCE"),
-                       },
-               },
-               { }
-       };
-
-       if (!dmi_check_system(supermicro_h8dce))
+       struct pnp_option *head = NULL;
+       struct pnp_option *prev = NULL;
+       struct pnp_option *res;
+
+       /*
+        * Build a functional IRQ-less variant of each MPU option.
+        */
+
+       for (res = dev->dependent; res; res = res->next) {
+               struct pnp_option *curr;
+               struct pnp_port *port;
+               struct pnp_port *copy;
+
+               port = res->port;
+               if (!port || !res->irq)
+                       continue;
+
+               copy = pnp_alloc(sizeof *copy);
+               if (!copy)
+                       break;
+
+               copy->min = port->min;
+               copy->max = port->max;
+               copy->align = port->align;
+               copy->size = port->size;
+               copy->flags = port->flags;
+
+               curr = pnp_build_option(PNP_RES_PRIORITY_FUNCTIONAL);
+               if (!curr) {
+                       kfree(copy);
+                       break;
+               }
+               curr->port = copy;
+
+               if (prev)
+                       prev->next = curr;
+               else
+                       head = curr;
+               prev = curr;
+       }
+       if (head)
+               dev_info(&dev->dev, "adding IRQ-less MPU options\n");
+
+       return head;
+}
+
+static void quirk_ad1815_mpu_resources(struct pnp_dev *dev)
+{
+       struct pnp_option *res;
+       struct pnp_irq *irq;
+
+       /*
+        * Distribute the independent IRQ over the dependent options
+        */
+
+       res = dev->independent;
+       if (!res)
+               return;
+
+       irq = res->irq;
+       if (!irq || irq->next)
+               return;
+
+       res = dev->dependent;
+       if (!res)
+               return;
+
+       while (1) {
+               struct pnp_irq *copy;
+
+               copy = pnp_alloc(sizeof *copy);
+               if (!copy)
+                       break;
+
+               memcpy(copy->map, irq->map, sizeof copy->map);
+               copy->flags = irq->flags;
+
+               copy->next = res->irq; /* Yes, this is NULL */
+               res->irq = copy;
+
+               if (!res->next)
+                       break;
+               res = res->next;
+       }
+       kfree(irq);
+
+       res->next = quirk_isapnp_mpu_options(dev);
+
+       res = dev->independent;
+       res->irq = NULL;
+}
+
+static void quirk_isapnp_mpu_resources(struct pnp_dev *dev)
+{
+       struct pnp_option *res;
+
+       res = dev->dependent;
+       if (!res)
                return;
 
+       while (res->next)
+               res = res->next;
+
+       res->next = quirk_isapnp_mpu_options(dev);
+}
+
+#include <linux/pci.h>
+
+static void quirk_system_pci_resources(struct pnp_dev *dev)
+{
+       struct pci_dev *pdev = NULL;
+       struct resource *res;
+       resource_size_t pnp_start, pnp_end, pci_start, pci_end;
+       int i, j;
+
        /*
-        * On the Supermicro H8DCE, there's a system device with resources
-        * that overlap BAR 6 of the built-in SATA PCI adapter.  If the PNP
-        * system device claims them, the sata_nv driver won't be able to.
-        * More details at:
-        *     https://bugzilla.redhat.com/show_bug.cgi?id=280641
-        *     https://bugzilla.redhat.com/show_bug.cgi?id=313491
-        *     http://lkml.org/lkml/2008/1/9/449
-        *     http://thread.gmane.org/gmane.linux.acpi.devel/27312
+        * Some BIOSes have PNP motherboard devices with resources that
+        * partially overlap PCI BARs.  The PNP system driver claims these
+        * motherboard resources, which prevents the normal PCI driver from
+        * requesting them later.
+        *
+        * This patch disables the PNP resources that conflict with PCI BARs
+        * so they won't be claimed by the PNP system driver.
         */
-       for (i = 0; i < PNP_MAX_MEM; i++) {
-               if (pnp_mem_valid(dev, i) && pnp_mem_len(dev, i) &&
-                   (pnp_mem_start(dev, i) & 0xdfef0000) == 0xdfef0000) {
-                       dev_warn(&dev->dev, "disabling 0x%llx-0x%llx to prevent"
-                               " conflict with sata_nv PCI device\n",
-                               (unsigned long long) pnp_mem_start(dev, i),
-                               (unsigned long long) (pnp_mem_start(dev, i) +
-                                       pnp_mem_len(dev, i) - 1));
-                       pnp_mem_flags(dev, i) = 0;
+       for_each_pci_dev(pdev) {
+               for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+                       if (!(pci_resource_flags(pdev, i) & IORESOURCE_MEM) ||
+                           pci_resource_len(pdev, i) == 0)
+                               continue;
+
+                       pci_start = pci_resource_start(pdev, i);
+                       pci_end = pci_resource_end(pdev, i);
+                       for (j = 0;
+                            (res = pnp_get_resource(dev, IORESOURCE_MEM, j));
+                            j++) {
+                               if (res->flags & IORESOURCE_UNSET ||
+                                   (res->start == 0 && res->end == 0))
+                                       continue;
+
+                               pnp_start = res->start;
+                               pnp_end = res->end;
+
+                               /*
+                                * If the PNP region doesn't overlap the PCI
+                                * region at all, there's no problem.
+                                */
+                               if (pnp_end < pci_start || pnp_start > pci_end)
+                                       continue;
+
+                               /*
+                                * If the PNP region completely encloses (or is
+                                * at least as large as) the PCI region, that's
+                                * also OK.  For example, this happens when the
+                                * PNP device describes a bridge with PCI
+                                * behind it.
+                                */
+                               if (pnp_start <= pci_start &&
+                                   pnp_end >= pci_end)
+                                       continue;
+
+                               /*
+                                * Otherwise, the PNP region overlaps *part* of
+                                * the PCI region, and that might prevent a PCI
+                                * driver from requesting its resources.
+                                */
+                               dev_warn(&dev->dev, "mem resource "
+                                       "(0x%llx-0x%llx) overlaps %s BAR %d "
+                                       "(0x%llx-0x%llx), disabling\n",
+                                       (unsigned long long) pnp_start,
+                                       (unsigned long long) pnp_end,
+                                       pci_name(pdev), i,
+                                       (unsigned long long) pci_start,
+                                       (unsigned long long) pci_end);
+                               res->flags |= IORESOURCE_DISABLED;
+                       }
                }
        }
 }
@@ -169,27 +312,27 @@ static struct pnp_fixup pnp_fixups[] = {
        {"CTL0043", quirk_sb16audio_resources},
        {"CTL0044", quirk_sb16audio_resources},
        {"CTL0045", quirk_sb16audio_resources},
-       {"PNP0c01", quirk_supermicro_h8dce_system},
-       {"PNP0c02", quirk_supermicro_h8dce_system},
+       /* Add IRQ-less MPU options */
+       {"ADS7151", quirk_ad1815_mpu_resources},
+       {"ADS7181", quirk_isapnp_mpu_resources},
+       {"AZT0002", quirk_isapnp_mpu_resources},
+       /* PnP resources that might overlap PCI BARs */
+       {"PNP0c01", quirk_system_pci_resources},
+       {"PNP0c02", quirk_system_pci_resources},
        {""}
 };
 
 void pnp_fixup_device(struct pnp_dev *dev)
 {
-       int i = 0;
-       void (*quirk)(struct pnp_dev *);
-
-       while (*pnp_fixups[i].id) {
-               if (compare_pnp_id(dev->id, pnp_fixups[i].id)) {
-                       quirk = pnp_fixups[i].quirk_function;
+       struct pnp_fixup *f;
 
+       for (f = pnp_fixups; *f->id; f++) {
+               if (!compare_pnp_id(dev->id, f->id))
+                       continue;
 #ifdef DEBUG
-                       dev_dbg(&dev->dev, "calling quirk 0x%p", quirk);
-                       print_fn_descriptor_symbol(": %s()\n",
-                               (unsigned long) *quirk);
+               dev_dbg(&dev->dev, "%s: calling ", f->id);
+               print_fn_descriptor_symbol("%s\n", f->quirk_function);
 #endif
-                       (*quirk)(dev);
-               }
-               i++;
+               f->quirk_function(dev);
        }
 }