Extend the verification for PCI-X/PCI-Express extended config
space pointer. This patch checks whether the MCFG address range
is listed as a motherboard resource, per the PCI firmware spec.
The old check only looked in int 15 e820 memory map, causing
several systems to fail the verification and lose extended
config space.
Signed-off-by: Rajesh Shah <[email protected]>
arch/x86_64/pci/mmconfig.c | 112 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 109 insertions(+), 3 deletions(-)
Index: linux-2.6.17-mm1/arch/x86_64/pci/mmconfig.c
===================================================================
--- linux-2.6.17-mm1.orig/arch/x86_64/pci/mmconfig.c
+++ linux-2.6.17-mm1/arch/x86_64/pci/mmconfig.c
@@ -164,6 +164,107 @@ static __init void unreachable_devices(v
}
}
+static int __init is_motherboard_resource(acpi_handle handle)
+{
+ acpi_status status;
+ struct acpi_device_info *info;
+ struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+ int i;
+
+ status = acpi_get_object_info(handle, &buffer);
+ if (ACPI_FAILURE(status))
+ return 0;
+ info = buffer.pointer;
+ if ((info->valid & ACPI_VALID_HID) &&
+ (!strcmp(ACPI_MB_HID1, info->hardware_id.value) ||
+ !strcmp(ACPI_MB_HID2, info->hardware_id.value))) {
+ kfree(buffer.pointer);
+ return 1;
+ }
+ if (info->valid & ACPI_VALID_CID) {
+ for (i=0; i < info->compatibility_id.count; i++) {
+ if (!strcmp(ACPI_MB_HID1,
+ info->compatibility_id.id[i].value) ||
+ !strcmp(ACPI_MB_HID2,
+ info->compatibility_id.id[i].value)) {
+ kfree(buffer.pointer);
+ return 1;
+ }
+ }
+ }
+ kfree(buffer.pointer);
+ return 0;
+}
+
+static acpi_status __init check_mcfg_resource(struct acpi_resource *res,
+ void *data)
+{
+ struct resource *mcfg_res = data;
+ struct acpi_resource_address64 address;
+ acpi_status status;
+
+ if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) {
+ struct acpi_resource_fixed_memory32 *fixmem32;
+
+ fixmem32 = &res->data.fixed_memory32;
+ if (!fixmem32)
+ return AE_OK;
+ if ((mcfg_res->start >= fixmem32->address) &&
+ (mcfg_res->end <= (fixmem32->address +
+ fixmem32->address_length))) {
+ mcfg_res->flags = 1;
+ return AE_CTRL_TERMINATE;
+ }
+ }
+ if ((res->type != ACPI_RESOURCE_TYPE_ADDRESS32) &&
+ (res->type != ACPI_RESOURCE_TYPE_ADDRESS64))
+ return AE_OK;
+
+ status = acpi_resource_to_address64(res, &address);
+ if (ACPI_FAILURE(status) || (address.address_length <= 0) ||
+ (address.resource_type != ACPI_MEMORY_RANGE))
+ return AE_OK;
+
+ if ((mcfg_res->start >= address.minimum) &&
+ (mcfg_res->end <=
+ (address.minimum +address.address_length))) {
+ mcfg_res->flags = 1;
+ return AE_CTRL_TERMINATE;
+ }
+ return AE_OK;
+}
+
+static acpi_status __init find_mboard_resource(acpi_handle handle, u32 lvl,
+ void *context, void **rv)
+{
+ struct resource *mcfg_res = context;
+ acpi_status status = AE_OK;
+
+ /* Stop namespace scanning if we've already verified MMCONFIG */
+ if (mcfg_res->flags)
+ return AE_CTRL_TERMINATE;
+
+ if (is_motherboard_resource(handle)) {
+ status = acpi_walk_resources(handle, METHOD_NAME__CRS,
+ check_mcfg_resource, context);
+ }
+ return status;
+}
+
+int __init is_acpi_reserved(unsigned long start, unsigned long end)
+{
+ struct resource mcfg_res;
+
+ mcfg_res.start = start;
+ mcfg_res.end = end;
+ mcfg_res.flags = 0;
+
+ acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+ ACPI_UINT32_MAX, find_mboard_resource,
+ (void *)&mcfg_res, NULL);
+ return mcfg_res.flags;
+}
+
void __init pci_mmcfg_init(void)
{
int i;
@@ -180,10 +281,15 @@ void __init pci_mmcfg_init(void)
if (!e820_all_mapped(pci_mmcfg_config[0].base_address,
pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,
E820_RESERVED)) {
- printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",
+ if (!is_acpi_reserved(pci_mmcfg_config[0].base_address,
+ pci_mmcfg_config[0].base_address +
+ MMCONFIG_APER_MIN)) {
+ printk(KERN_ERR
+ "PCI: BIOS Bug: MCFG area at %x is not reserved\n",
pci_mmcfg_config[0].base_address);
- printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
- return;
+ printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
+ return;
+ }
}
/* RED-PEN i386 doesn't do _nocache right now */
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
