|
@@ -474,39 +474,38 @@ static int __init is_mmconf_reserved(check_reserved_t is_reserved,
|
|
|
return valid;
|
|
|
}
|
|
|
|
|
|
+static int __devinit pci_mmcfg_check_reserved(struct pci_mmcfg_region *cfg,
|
|
|
+ int early)
|
|
|
+{
|
|
|
+ if (!early && !acpi_disabled) {
|
|
|
+ if (is_mmconf_reserved(is_acpi_reserved, cfg, 0))
|
|
|
+ return 1;
|
|
|
+ else
|
|
|
+ printk(KERN_ERR FW_BUG PREFIX
|
|
|
+ "MMCONFIG at %pR not reserved in "
|
|
|
+ "ACPI motherboard resources\n",
|
|
|
+ &cfg->res);
|
|
|
+ }
|
|
|
+
|
|
|
+ /* 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_all_mapped, cfg, 1);
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static void __init pci_mmcfg_reject_broken(int early)
|
|
|
{
|
|
|
struct pci_mmcfg_region *cfg;
|
|
|
|
|
|
list_for_each_entry(cfg, &pci_mmcfg_list, list) {
|
|
|
- int valid = 0;
|
|
|
-
|
|
|
- if (!early && !acpi_disabled) {
|
|
|
- valid = is_mmconf_reserved(is_acpi_reserved, cfg, 0);
|
|
|
-
|
|
|
- if (valid)
|
|
|
- continue;
|
|
|
- else
|
|
|
- printk(KERN_ERR FW_BUG PREFIX
|
|
|
- "MMCONFIG at %pR not reserved in "
|
|
|
- "ACPI motherboard resources\n",
|
|
|
- &cfg->res);
|
|
|
+ if (pci_mmcfg_check_reserved(cfg, early) == 0) {
|
|
|
+ printk(KERN_INFO PREFIX "not using MMCONFIG\n");
|
|
|
+ free_all_mmcfg();
|
|
|
+ return;
|
|
|
}
|
|
|
-
|
|
|
- /* Don't try to do this check unless configuration
|
|
|
- type 1 is available. how about type 2 ?*/
|
|
|
- if (raw_pci_ops)
|
|
|
- valid = is_mmconf_reserved(e820_all_mapped, cfg, 1);
|
|
|
-
|
|
|
- if (!valid)
|
|
|
- goto reject;
|
|
|
}
|
|
|
-
|
|
|
- return;
|
|
|
-
|
|
|
-reject:
|
|
|
- printk(KERN_INFO PREFIX "not using MMCONFIG\n");
|
|
|
- free_all_mmcfg();
|
|
|
}
|
|
|
|
|
|
static int __initdata known_bridge;
|