| Message ID | 20230110180243.1590045-2-helgaas@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | PCI: Fix extended config space regression | expand |
Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > is_mmconf_reserved() takes a "with_e820" parameter that only determines the > message logged if it finds the MMCONFIG region is reserved. Pass the > message directly, which will simplify a future patch that adds a new way of > looking for that reservation. No functional change intended. > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > --- > arch/x86/pci/mmconfig-shared.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c > index 758cbfe55daa..cd16bef5f2d9 100644 > --- a/arch/x86/pci/mmconfig-shared.c > +++ b/arch/x86/pci/mmconfig-shared.c > @@ -446,13 +446,12 @@ typedef bool (*check_reserved_t)(u64 start, u64 end, enum e820_type type); > > static bool __ref is_mmconf_reserved(check_reserved_t is_reserved, > struct pci_mmcfg_region *cfg, > - struct device *dev, int with_e820) > + struct device *dev, char *method) @method could be 'const char *', but either way: Reviewed-by: Dan Williams <dan.j.williams@intel.com>
On Tue, Jan 10, 2023 at 10:07:39AM -0800, Dan Williams wrote: > Bjorn Helgaas wrote: > > From: Bjorn Helgaas <bhelgaas@google.com> > > > > is_mmconf_reserved() takes a "with_e820" parameter that only determines the > > message logged if it finds the MMCONFIG region is reserved. Pass the > > message directly, which will simplify a future patch that adds a new way of > > looking for that reservation. No functional change intended. > > > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > > --- > > arch/x86/pci/mmconfig-shared.c | 13 +++++++------ > > 1 file changed, 7 insertions(+), 6 deletions(-) > > > > diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c > > index 758cbfe55daa..cd16bef5f2d9 100644 > > --- a/arch/x86/pci/mmconfig-shared.c > > +++ b/arch/x86/pci/mmconfig-shared.c > > @@ -446,13 +446,12 @@ typedef bool (*check_reserved_t)(u64 start, u64 end, enum e820_type type); > > > > static bool __ref is_mmconf_reserved(check_reserved_t is_reserved, > > struct pci_mmcfg_region *cfg, > > - struct device *dev, int with_e820) > > + struct device *dev, char *method) > > @method could be 'const char *', but either way: Of course, thanks! Folded in.
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 758cbfe55daa..cd16bef5f2d9 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c @@ -446,13 +446,12 @@ typedef bool (*check_reserved_t)(u64 start, u64 end, enum e820_type type); static bool __ref is_mmconf_reserved(check_reserved_t is_reserved, struct pci_mmcfg_region *cfg, - struct device *dev, int with_e820) + struct device *dev, char *method) { u64 addr = cfg->res.start; u64 size = resource_size(&cfg->res); u64 old_size = size; int num_buses; - char *method = with_e820 ? "E820" : "ACPI motherboard resources"; while (!is_reserved(addr, addr + size, E820_TYPE_RESERVED)) { size >>= 1; @@ -464,10 +463,10 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved, return false; if (dev) - dev_info(dev, "MMCONFIG at %pR reserved in %s\n", + dev_info(dev, "MMCONFIG at %pR reserved as %s\n", &cfg->res, method); else - pr_info(PREFIX "MMCONFIG at %pR reserved in %s\n", + pr_info(PREFIX "MMCONFIG at %pR reserved as %s\n", &cfg->res, method); if (old_size != size) { @@ -500,7 +499,8 @@ static bool __ref pci_mmcfg_check_reserved(struct device *dev, struct pci_mmcfg_region *cfg, int early) { if (!early && !acpi_disabled) { - if (is_mmconf_reserved(is_acpi_reserved, cfg, dev, 0)) + if (is_mmconf_reserved(is_acpi_reserved, cfg, dev, + "ACPI motherboard resource")) return true; if (dev) @@ -527,7 +527,8 @@ pci_mmcfg_check_reserved(struct device *dev, struct pci_mmcfg_region *cfg, int e /* Don't try to do this check unless configuration type 1 is available. how about type 2 ?*/ if (raw_pci_ops) - return is_mmconf_reserved(e820__mapped_all, cfg, dev, 1); + return is_mmconf_reserved(e820__mapped_all, cfg, dev, + "E820 entry"); return false; }