Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

[linux-2.6-omap-h63xx.git] / drivers / pnp / quirks.c

diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 6b0cf0c2a0888483cbc220c54e2528ba2337c791..e4daf4635c48e44646d3f6de5f6fb939ae4f4930 100644 (file)
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/pnp.h>
 #include <linux/io.h>
+#include <linux/kallsyms.h>
 #include "base.h"
 
 static void quirk_awe32_resources(struct pnp_dev *dev)
@@ -48,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)
@@ -72,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)
@@ -103,8 +108,78 @@ 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");
+}
+
+
+#include <linux/pci.h>
+
+static void quirk_system_pci_resources(struct pnp_dev *dev)
+{
+       struct pci_dev *pdev = NULL;
+       resource_size_t pnp_start, pnp_end, pci_start, pci_end;
+       int i, j;
+
+       /*
+        * 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_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; j < PNP_MAX_MEM; j++) {
+                               if (!pnp_mem_valid(dev, j) ||
+                                   pnp_mem_len(dev, j) == 0)
+                                       continue;
+
+                               pnp_start = pnp_mem_start(dev, j);
+                               pnp_end = pnp_mem_end(dev, j);
+
+                               /*
+                                * 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);
+                               pnp_mem_flags(dev, j) = 0;
+                       }
+               }
+       }
 }
 
 /*
@@ -127,17 +202,26 @@ static struct pnp_fixup pnp_fixups[] = {
        {"CTL0043", quirk_sb16audio_resources},
        {"CTL0044", quirk_sb16audio_resources},
        {"CTL0045", quirk_sb16audio_resources},
+       {"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)) {
-                       pnp_dbg("Calling quirk for %s", dev->dev.bus_id);
-                       pnp_fixups[i].quirk_function(dev);
+                       quirk = pnp_fixups[i].quirk_function;
+
+#ifdef DEBUG
+                       dev_dbg(&dev->dev, "calling ");
+                       print_fn_descriptor_symbol("%s()\n",
+                               (unsigned long) *quirk);
+#endif
+                       (*quirk)(dev);
                }
                i++;
        }