x86/PCI: make ACPI MCFG reserved error messages ACPI specific
authorFeng Tang <feng.tang@intel.com>
Wed, 5 May 2010 09:08:49 +0000 (17:08 +0800)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 18 May 2010 22:03:27 +0000 (15:03 -0700)
Both ACPI and SFI firmwares will have MCFG space, but the error message
isn't valid on SFI, so don't print the message in that case.

Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
arch/x86/pci/mmconfig-shared.c

index 39b9ebe8f8863d598345991c90942b5aed70ae21..a918553ebc759d6b7f43dc220d04f893adf60875 100644 (file)
@@ -483,16 +483,17 @@ static void __init pci_mmcfg_reject_broken(int early)
        list_for_each_entry(cfg, &pci_mmcfg_list, list) {
                int valid = 0;
 
-               if (!early && !acpi_disabled)
+               if (!early && !acpi_disabled) {
                        valid = is_mmconf_reserved(is_acpi_reserved, cfg, 0);
 
-               if (valid)
-                       continue;
-
-               if (!early)
-                       printk(KERN_ERR FW_BUG PREFIX
-                              "MMCONFIG at %pR not reserved in "
-                              "ACPI motherboard resources\n", &cfg->res);
+                       if (valid)
+                               continue;
+                       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 ?*/