x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1

[firefly-linux-kernel-4.4.55.git] / arch / x86 / pci / acpi.c

diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 75ac3f856ea54bf07382d1d577b5b6820b4c4d06..e31160216efb382c0541dd838298c59d7702ac55 100644 (file)
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -123,7 +123,7 @@ setup_resource(struct acpi_resource *acpi_res, void *data)
        acpi_status status;
        unsigned long flags;
        struct resource *root, *conflict;
-       u64 start, end;
+       u64 start, end, max_len;
 
        status = resource_to_addr(acpi_res, &addr);
        if (!ACPI_SUCCESS(status))
@@ -140,6 +140,17 @@ 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;