From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752172AbeBWVjh (ORCPT ); Fri, 23 Feb 2018 16:39:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:56906 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751455AbeBWVjf (ORCPT ); Fri, 23 Feb 2018 16:39:35 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B18AE217A9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=helgaas@kernel.org Date: Fri, 23 Feb 2018 15:39:33 -0600 From: Bjorn Helgaas To: Andy Shevchenko Cc: Bjorn Helgaas , linux-pci@vger.kernel.org, "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Jean Delvare , linux-kernel@vger.kernel.org Subject: Re: [PATCH v1 2/4] x86/pci: Re-use new dmi_get_bios_year() helper Message-ID: <20180223213933.GM14632@bhelgaas-glaptop.roam.corp.google.com> References: <20180222125923.57385-1-andriy.shevchenko@linux.intel.com> <20180222125923.57385-2-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180222125923.57385-2-andriy.shevchenko@linux.intel.com> User-Agent: Mutt/1.9.2 (2017-12-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org x86/PCI: Re-use ... would match the arch/x86/pci/* convention. On Thu, Feb 22, 2018 at 02:59:21PM +0200, Andy Shevchenko wrote: > ...instead of open coding its functionality. And I personally like it when changelogs are complete in themselves, i.e., they aren't a continuation of the subject line. It makes things easier to read because the convention in written English is that the title and the body are separate things. > Signed-off-by: Andy Shevchenko Acked-by: Bjorn Helgaas Assuming this goes via some other tree. > --- > 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 >