MIPS: Fix build breakage if CONFIG_DEBUG_FS is enabled.

[safe/jmp/linux-2.6] / arch / x86 / pci / acpi.c

diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index b53f048..c7b1ebf 100644 (file)
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -3,6 +3,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/dmi.h>
+#include <linux/slab.h>
 #include <asm/numa.h>
 #include <asm/pci_x86.h>
 
@@ -15,6 +16,51 @@ struct pci_root_info {
        int busnum;
 };
 
+static bool pci_use_crs = true;
+
+static int __init set_use_crs(const struct dmi_system_id *id)
+{
+       pci_use_crs = true;
+       return 0;
+}
+
+static const struct dmi_system_id pci_use_crs_table[] __initconst = {
+       /* http://bugzilla.kernel.org/show_bug.cgi?id=14183 */
+       {
+               .callback = set_use_crs,
+               .ident = "IBM System x3800",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "x3800"),
+               },
+       },
+       {}
+};
+
+void __init pci_acpi_crs_quirks(void)
+{
+       int year;
+
+       if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) && year < 2008)
+               pci_use_crs = false;
+
+       dmi_check_system(pci_use_crs_table);
+
+       /*
+        * If the user specifies "pci=use_crs" or "pci=nocrs" explicitly, that
+        * takes precedence over anything we figured out above.
+        */
+       if (pci_probe & PCI_ROOT_NO_CRS)
+               pci_use_crs = false;
+       else if (pci_probe & PCI_USE__CRS)
+               pci_use_crs = true;
+
+       printk(KERN_INFO "PCI: %s host bridge windows from ACPI; "
+              "if necessary, use \"pci=%s\" and report a bug\n",
+              pci_use_crs ? "Using" : "Ignoring",
+              pci_use_crs ? "nocrs" : "use_crs");
+}
+
 static acpi_status
 resource_to_addr(struct acpi_resource *resource,
                        struct acpi_resource_address64 *addr)
@@ -45,20 +91,6 @@ count_resource(struct acpi_resource *acpi_res, void *data)
        return AE_OK;
 }
 
-static int
-bus_has_transparent_bridge(struct pci_bus *bus)
-{
-       struct pci_dev *dev;
-
-       list_for_each_entry(dev, &bus->devices, bus_list) {
-               u16 class = dev->class >> 8;
-
-               if (class == PCI_CLASS_BRIDGE_PCI && dev->transparent)
-                       return true;
-       }
-       return false;
-}
-
 static void
 align_resource(struct acpi_device *bridge, struct resource *res)
 {
@@ -91,12 +123,8 @@ setup_resource(struct acpi_resource *acpi_res, void *data)
        struct acpi_resource_address64 addr;
        acpi_status status;
        unsigned long flags;
-       struct resource *root;
-       int max_root_bus_resources = PCI_BUS_NUM_RESOURCES;
-       u64 start, end;
-
-       if (bus_has_transparent_bridge(info->bus))
-               max_root_bus_resources -= 3;
+       struct resource *root, *conflict;
+       u64 start, end, max_len;
 
        status = resource_to_addr(acpi_res, &addr);
        if (!ACPI_SUCCESS(status))
@@ -113,17 +141,19 @@ setup_resource(struct acpi_resource *acpi_res, void *data)
        } else
                return AE_OK;
 
+       max_len = addr.maximum - addr.minimum + 1;
+       if (addr.address_length > max_len) {
+               dev_printk(KERN_DEBUG, &info->bridge->dev,
+                          "host bridge window length %#llx doesn't fit in "
+                          "%#llx-%#llx, trimming\n",
+                          (unsigned long long) addr.address_length,
+                          (unsigned long long) addr.minimum,
+                          (unsigned long long) addr.maximum);
+               addr.address_length = max_len;
+       }
+
        start = addr.minimum + addr.translation_offset;
        end = start + addr.address_length - 1;
-       if (info->res_num >= max_root_bus_resources) {
-               if (pci_probe & PCI_USE__CRS)
-                       printk(KERN_WARNING "PCI: Failed to allocate "
-                              "0x%lx-0x%lx from %s for %s due to _CRS "
-                              "returning more than %d resource descriptors\n",
-                              (unsigned long) start, (unsigned long) end,
-                              root->name, info->name, max_root_bus_resources);
-               return AE_OK;
-       }
 
        res = &info->res[info->res_num];
        res->name = info->name;
@@ -133,17 +163,20 @@ setup_resource(struct acpi_resource *acpi_res, void *data)
        res->child = NULL;
        align_resource(info->bridge, res);
 
-       if (!(pci_probe & PCI_USE__CRS)) {
+       if (!pci_use_crs) {
                dev_printk(KERN_DEBUG, &info->bridge->dev,
                           "host bridge window %pR (ignored)\n", res);
                return AE_OK;
        }
 
-       if (insert_resource(root, res)) {
+       conflict = insert_resource_conflict(root, res);
+       if (conflict) {
                dev_err(&info->bridge->dev,
-                       "can't allocate host bridge window %pR\n", res);
+                       "address space collision: host bridge window %pR "
+                       "conflicts with %s %pR\n",
+                       res, conflict->name, conflict);
        } else {
-               info->bus->resource[info->res_num] = res;
+               pci_bus_add_resource(info->bus, res, 0);
                info->res_num++;
                if (addr.translation_offset)
                        dev_info(&info->bridge->dev, "host bridge window %pR "
@@ -164,10 +197,8 @@ get_current_resources(struct acpi_device *device, int busnum,
        struct pci_root_info info;
        size_t size;
 
-       if (!(pci_probe & PCI_USE__CRS))
-               dev_info(&device->dev,
-                        "ignoring host bridge windows from ACPI; "
-                        "boot with \"pci=use_crs\" to use them\n");
+       if (pci_use_crs)
+               pci_bus_remove_resources(bus);
 
        info.bridge = device;
        info.bus = bus;