OSDN Git Service

x86/PCI: Fix a potential regression when using dmi_get_bios_year()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 20 Mar 2018 18:08:00 +0000 (20:08 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 27 Mar 2018 09:33:16 +0000 (11:33 +0200)
dmi_get_bios_year() may return 0 when it cannot parse
the BIOS date string. Previously this has been checked in
pci_acpi_crs_quirks().

Update the code to restore old behaviour.

Reported-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J . Wysocki <rjw@rjwysocki.net>
Cc: linux-acpi@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Fixes: 69c42d493db4 ("x86/pci: Simplify code by using the new dmi_get_bios_year() helper")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/pci/acpi.c

index 00e60de..5559dca 100644 (file)
@@ -140,7 +140,9 @@ static const struct dmi_system_id pci_crs_quirks[] __initconst = {
 
 void __init pci_acpi_crs_quirks(void)
 {
-       if ((dmi_get_bios_year() < 2008) && (iomem_resource.end <= 0xffffffff))
+       int year = dmi_get_bios_year();
+
+       if (year >= 0 && year < 2008 && iomem_resource.end <= 0xffffffff)
                pci_use_crs = false;
 
        dmi_check_system(pci_crs_quirks);