x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1
cover x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1
These patches fix a "pci=use_crs" regression and print a little more debug information for resource allocation conflicts.
---
Bjorn Helgaas (2):
x86/PCI: for host bridge address space collisions, show conflicting resource x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1
arch/x86/pci/acpi.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-)
PATCH 1/2 x86/PCI: for host bridge address space collisions, show conflicting resource
With insert_resource_conflict(), we can learn what the actual conflict is, so print that info for debugging purposes.
---
arch/x86/pci/acpi.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
arch/x86/pci/acpi.c +6 -3
@@ -122,7 +122,7 @@ setup_resource(struct acpi_resource *acpi_res, void *data)struct acpi_resource_address64 addr;acpi_status status;unsigned long flags; -struct resource *root; +struct resource *root, *conflict;u64 start, end; status =resource_to_addr (acpi_res, &addr);
@@ -157,9 +157,12 @@ setup_resource(struct acpi_resource *acpi_res, void *data)return AE_OK ; } -if (insert_resource (root, res)) { + conflict =insert_resource_conflict (root, res); +if (conflict) {dev_err (&info->bridge->dev, -"can't allocate host bridge window %pR\n" , res); +"address space collision: host bridge window %pR " +"conflicts with %s %pR\n" , + res, conflict->name, conflict); }else {pci_bus_add_resource (info->bus, res,0 ); info->res_num++;
Re: [PATCH 1/2] x86/PCI: for host bridge address space collisions, show conflicting resource
Quoted 6 lines · On Thu, 25 Mar 2010 09:28:24 -0600 Bjorn Helgaas <[email protected]> wrote:
With
insert_resource_conflict(), we can learn what the actual conflict is, so print that info for debugging purposes.Signed-off-by Bjorn Helgaas <[email protected]>---
Pushed these two to my for-linus branch, thanks.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
PATCH 2/2 x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1
In reply to Bjorn HelgaasYanko's GA-MA78GM-S2H (BIOS F11) reports the following resource in a PCI host bridge _CRS:
[07] 32-Bit DWORD Address Space Resource
Min Relocatability : MinFixed
Max Relocatability : MaxFixed
Address Minimum : CFF00000 (_MIN)
Address Maximum : FEBFFFFF (_MAX)
Address Length : 3EE10000 (_LEN)
This is invalid per spec (ACPI 4.0, 6.4.3.5) because it's a fixed size, fixed location descriptor, but _LEN != _MAX - _MIN + 1.
Based on https://bugzilla.kernel.org/show_bug.cgi?id=15480#c15, I think Windows handles this by truncating the window so it fits between _MIN and _MAX. I also verified this by modifying the SeaBIOS DSDT and booting Windows 2008 R2 with qemu.
This patch makes Linux truncate the window, too, which fixes:
http://bugzilla.kernel.org/show_bug.cgi?id=15480
---
arch/x86/pci/acpi.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-)
arch/x86/pci/acpi.c +12 -1
@@ -123,7 +123,7 @@ setup_resource(struct acpi_resource *acpi_res, void *data)acpi_status status;unsigned long flags;struct resource *root, *conflict; -u64 start, end; +u64 start, end, max_len; status =resource_to_addr (acpi_res, &addr);if (!ACPI_SUCCESS (status))
@@ -140,6 +140,17 @@ setup_resource(struct acpi_resource *acpi_res, void *data) }else return AE_OK ; + max_len = addr.maximum - addr.minimum +1 ; +if (addr.address_length > max_len) { +dev_printk (KERN_DEBUG , &info->bridge->dev, +"host bridge window length %#llx doesn't fit in " +"%#llx-%#llx, trimming\n" , + (unsigned long long ) addr.address_length, + (unsigned long long ) addr.minimum, + (unsigned long long ) addr.maximum); + addr.address_length = max_len; + } + start = addr.minimum + addr.translation_offset; end = start + addr.address_length -1 ;