aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2011-07-02 12:47:12 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-07-22 11:25:39 -0400
commit43d786ed4df4c54cb8802a523748a7d78130a2cb (patch)
treee6e1f68497cc48da6e4b26ad85c57baf522755e1 /arch/x86/pci
parentb1a98b695b4efe10067d0e1cb5b66146a4e517bf (diff)
x86/PCI: reduce severity of host bridge window conflict warnings
Host bridge windows are top-level resources, so if we find a host bridge window conflict, it's probably with a hard-coded legacy reservation. Moving host bridge windows is theoretically possible, but we don't support it; we just ignore windows with conflicts, and it's not worth making this a user-visible error. Reported-and-tested-by: Jools Wills <jools@oxfordinspire.co.uk> References: https://bugzilla.kernel.org/show_bug.cgi?id=38522 Reported-by: Das <dasfox@gmail.com> References: https://bugzilla.kernel.org/show_bug.cgi?id=16497 Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/pci')
-rw-r--r--arch/x86/pci/acpi.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 68c3c1395202..ae3cb23cd89b 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -246,10 +246,9 @@ static void add_resources(struct pci_root_info *info)
246 246
247 conflict = insert_resource_conflict(root, res); 247 conflict = insert_resource_conflict(root, res);
248 if (conflict) 248 if (conflict)
249 dev_err(&info->bridge->dev, 249 dev_info(&info->bridge->dev,
250 "address space collision: host bridge window %pR " 250 "ignoring host bridge window %pR (conflicts with %s %pR)\n",
251 "conflicts with %s %pR\n", 251 res, conflict->name, conflict);
252 res, conflict->name, conflict);
253 else 252 else
254 pci_bus_add_resource(info->bus, res, 0); 253 pci_bus_add_resource(info->bus, res, 0);
255 } 254 }