Commit 69c42d49 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ingo Molnar

x86/pci: Simplify code by using the new dmi_get_bios_year() helper

...instead of open coding its functionality.

No changes in functionality.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-acpi@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Link: http://lkml.kernel.org/r/20180222125923.57385-2-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 492a1abd
...@@ -140,12 +140,8 @@ static const struct dmi_system_id pci_crs_quirks[] __initconst = { ...@@ -140,12 +140,8 @@ static const struct dmi_system_id pci_crs_quirks[] __initconst = {
void __init pci_acpi_crs_quirks(void) void __init pci_acpi_crs_quirks(void)
{ {
int year; if ((dmi_get_bios_year() < 2008) && (iomem_resource.end <= 0xffffffff))
if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) && year < 2008) {
if (iomem_resource.end <= 0xffffffff)
pci_use_crs = false; pci_use_crs = false;
}
dmi_check_system(pci_crs_quirks); dmi_check_system(pci_crs_quirks);
......
...@@ -195,14 +195,13 @@ static const struct pci_raw_ops pci_direct_conf2 = { ...@@ -195,14 +195,13 @@ static const struct pci_raw_ops pci_direct_conf2 = {
static int __init pci_sanity_check(const struct pci_raw_ops *o) static int __init pci_sanity_check(const struct pci_raw_ops *o)
{ {
u32 x = 0; u32 x = 0;
int year, devfn; int devfn;
if (pci_probe & PCI_NO_CHECKS) if (pci_probe & PCI_NO_CHECKS)
return 1; return 1;
/* Assume Type 1 works for newer systems. /* Assume Type 1 works for newer systems.
This handles machines that don't have anything on PCI Bus 0. */ This handles machines that don't have anything on PCI Bus 0. */
dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL); if (dmi_get_bios_year() >= 2001)
if (year >= 2001)
return 1; return 1;
for (devfn = 0; devfn < 0x100; devfn++) { for (devfn = 0; devfn < 0x100; devfn++) {
......
...@@ -547,19 +547,14 @@ static void __init pci_mmcfg_reject_broken(int early) ...@@ -547,19 +547,14 @@ static void __init pci_mmcfg_reject_broken(int early)
static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg, static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,
struct acpi_mcfg_allocation *cfg) struct acpi_mcfg_allocation *cfg)
{ {
int year;
if (cfg->address < 0xFFFFFFFF) if (cfg->address < 0xFFFFFFFF)
return 0; return 0;
if (!strncmp(mcfg->header.oem_id, "SGI", 3)) if (!strncmp(mcfg->header.oem_id, "SGI", 3))
return 0; return 0;
if (mcfg->header.revision >= 1) { if ((mcfg->header.revision >= 1) && (dmi_get_bios_year() >= 2010))
if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) &&
year >= 2010)
return 0; return 0;
}
pr_err(PREFIX "MCFG region for %04x [bus %02x-%02x] at %#llx " pr_err(PREFIX "MCFG region for %04x [bus %02x-%02x] at %#llx "
"is above 4GB, ignored\n", cfg->pci_segment, "is above 4GB, ignored\n", cfg->pci_segment,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment