lkml.org 
[lkml]   [2018]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 2/4] x86/pci: Re-use new dmi_get_bios_year() helper
    Date
    ...instead of open coding its functionality.

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    arch/x86/pci/acpi.c | 8 ++------
    arch/x86/pci/direct.c | 5 ++---
    arch/x86/pci/mmconfig-shared.c | 9 ++-------
    3 files changed, 6 insertions(+), 16 deletions(-)

    diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
    index 7df49c40665e..00e60de30328 100644
    --- a/arch/x86/pci/acpi.c
    +++ b/arch/x86/pci/acpi.c
    @@ -140,12 +140,8 @@ static const struct dmi_system_id pci_crs_quirks[] __initconst = {

    void __init pci_acpi_crs_quirks(void)
    {
    - int year;
    -
    - if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) && year < 2008) {
    - if (iomem_resource.end <= 0xffffffff)
    - pci_use_crs = false;
    - }
    + if ((dmi_get_bios_year() < 2008) && (iomem_resource.end <= 0xffffffff))
    + pci_use_crs = false;

    dmi_check_system(pci_crs_quirks);

    diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c
    index 2d9503323d10..a51074c55982 100644
    --- a/arch/x86/pci/direct.c
    +++ b/arch/x86/pci/direct.c
    @@ -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)
    {
    u32 x = 0;
    - int year, devfn;
    + int devfn;

    if (pci_probe & PCI_NO_CHECKS)
    return 1;
    /* Assume Type 1 works for newer systems.
    This handles machines that don't have anything on PCI Bus 0. */
    - dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL);
    - if (year >= 2001)
    + if (dmi_get_bios_year() >= 2001)
    return 1;

    for (devfn = 0; devfn < 0x100; devfn++) {
    diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
    index 96684d0adcf9..0b40482578b8 100644
    --- a/arch/x86/pci/mmconfig-shared.c
    +++ b/arch/x86/pci/mmconfig-shared.c
    @@ -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,
    struct acpi_mcfg_allocation *cfg)
    {
    - int year;
    -
    if (cfg->address < 0xFFFFFFFF)
    return 0;

    if (!strncmp(mcfg->header.oem_id, "SGI", 3))
    return 0;

    - if (mcfg->header.revision >= 1) {
    - if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) &&
    - year >= 2010)
    - return 0;
    - }
    + if ((mcfg->header.revision >= 1) && (dmi_get_bios_year() >= 2010))
    + return 0;

    pr_err(PREFIX "MCFG region for %04x [bus %02x-%02x] at %#llx "
    "is above 4GB, ignored\n", cfg->pci_segment,
    --
    2.16.1
    \
     
     \ /
      Last update: 2018-02-22 14:01    [W:2.133 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site