PCI/ACPI: improve _CRS debug, validate host bridge windows
cover PCI/ACPI: improve _CRS debug, validate host bridge windows
The first patch only adds some debug output; the second is a workaround for BIOS bugs in _CRS descriptions (currently only used when booting with "pci=use_crs").
---
Bjorn Helgaas (2):
x86/PCI: for debuggability, show host bridge windows even when ignoring _CRS x86/PCI: fix bogus host bridge window start/end alignment from _CRS
arch/x86/pci/acpi.c | 51 +++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 43 insertions(+), 8 deletions(-)
Signature · 1 line
Bjorn
PATCH 1/2 x86/PCI: for debuggability, show host bridge windows even when ignoring _CRS
We have occasional problems with PCI resource allocation, and sometimes they could be avoided by paying attention to what ACPI tells us about the host bridges. This patch doesn't change the behavior, but it prints window information that should make debugging easier.
--- arch/x86/pci/acpi.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-)
arch/x86/pci/acpi.c +18 -8
@@ -92,11 +92,12 @@ setup_resource(struct acpi_resource *acpi_res, void *data) start = addr.minimum + addr.translation_offset; end = start + addr.address_length -1 ;if (info->res_num >= max_root_bus_resources) { -printk (KERN_WARNING "PCI: Failed to allocate 0x%lx-0x%lx " -"from %s for %s due to _CRS returning more than " -"%d resource descriptors\n" , (unsigned long ) start, - (unsigned long ) end, root->name, info->name, - max_root_bus_resources); +if (pci_probe &PCI_USE__CRS ) +printk (KERN_WARNING "PCI: Failed to allocate " +"0x%lx-0x%lx from %s for %s due to _CRS " +"returning more than %d resource descriptors\n" , + (unsigned long ) start, (unsigned long ) end, + root->name, info->name, max_root_bus_resources);return AE_OK ; }
@@ -107,6 +108,12 @@ setup_resource(struct acpi_resource *acpi_res, void *data) res->end = end; res->child =NULL ; +if (!(pci_probe &PCI_USE__CRS )) { +dev_printk (KERN_DEBUG , &info->bridge->dev, +"host bridge window %pR (ignored)\n" , res); +return AE_OK ; + } +if (insert_resource (root, res)) {dev_err (&info->bridge->dev,"can't allocate host bridge window %pR\n" , res);
@@ -132,6 +139,11 @@ get_current_resources(struct acpi_device *device, int busnum,struct pci_root_info info;size_t size; +if (!(pci_probe &PCI_USE__CRS )) +dev_info (&device->dev, +"ignoring host bridge windows from ACPI; " +"boot with \"pci=use_crs\" to use them\n" ); + info.bridge = device; info.bus = bus; info.res_num =0 ;
@@ -220,9 +232,7 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do }else { bus =pci_create_bus (NULL , busnum, &pci_root_ops, sd);if (bus) { -if (pci_probe &PCI_USE__CRS ) -get_current_resources (device, busnum, domain, - bus); +get_current_resources (device, busnum, domain, bus); bus->subordinate =pci_scan_child_bus (bus); } }
Re: [PATCH 1/2] x86/PCI: for debuggability, show host bridge windows even when ignoring _CRS
Quoted 7 lines · On Wed, 04 Nov 2009 10:39:13 -0700 Bjorn Helgaas <[email protected]> wrote:
We have occasional problems with PCI resource allocation, and sometimes they could be avoided by paying attention to what ACPI tells us about the host bridges. This patch doesn't change the behavior, but it prints window information that should make debugging easier.
Signed-off-by Bjorn Helgaas <[email protected]>
Nice, applied these two to linux-next.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
PATCH 2/2 x86/PCI: fix bogus host bridge window start/end alignment from _CRS
In reply to Bjorn HelgaasPCI device BARs are guaranteed to start and end on at least a four-byte (I/O) or a sixteen-byte (MMIO) boundary because they're aligned on their size and the low BAR bits are reserved. PCI-to-PCI bridge apertures have even larger alignment restrictions.
However, some BIOSes (e.g., HP DL360 BIOS P31) report host bridge windows like "[io 0x0000-0x2cfe]". This is wrong because it excludes the last port at 0x2cff: it's impossible for a downstream device to claim 0x2cfe without also claiming 0x2cff. In fact, this BIOS configures a device behind the bridge to "[io 0x2c00-0x2cff]", so we know the window actually does include 0x2cff.
This patch rounds the start and end of apertures to the appropriate boundary. I experimentally determined that Windows contains a similar workaround; details here:
http://bugzilla.kernel.org/show_bug.cgi?id=14337
--- arch/x86/pci/acpi.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-)
arch/x86/pci/acpi.c +25 -0
@@ -59,6 +59,30 @@ bus_has_transparent_bridge(struct pci_bus *bus)return false; } +static void +align_resource (struct acpi_device *bridge,struct resource *res) +{ +int align = (res->flags &IORESOURCE_MEM ) ?16 :4 ; + +/* +* Host bridge windows are not BARs, but the decoders on the PCI side +* that claim this address space have starting alignment and length +* constraints, so fix any obvious BIOS goofs. +*/ +if (res->start & (align -1 )) { +dev_printk (KERN_DEBUG , &bridge->dev, +"host bridge window %pR invalid; " +"aligning start to %d-byte boundary\n" , res, align); + res->start &= ~(align -1 ); + } +if ((res->end +1 ) & (align -1 )) { +dev_printk (KERN_DEBUG , &bridge->dev, +"host bridge window %pR invalid; " +"aligning end to %d-byte boundary\n" , res, align); + res->end =roundup (res->end, align) -1 ; + } +} +static acpi_status setup_resource (struct acpi_resource *acpi_res,void *data) {
@@ -107,6 +131,7 @@ setup_resource(struct acpi_resource *acpi_res, void *data) res->start = start; res->end = end; res->child =NULL ; +align_resource (info->bridge, res);if (!(pci_probe &PCI_USE__CRS )) { dev_printk(KERN_DEBUG, &info->bridge->dev,