diff mbox series

x86 / PCI: Make broadcom_postcore_init() check acpi_disabled

Message ID 3186627.pxZj1QbYNg@aspire.rjw.lan
State Not Applicable
Headers show
Series x86 / PCI: Make broadcom_postcore_init() check acpi_disabled | expand

Commit Message

Rafael J. Wysocki Dec. 1, 2017, 2:08 p.m. UTC 
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

acpi_os_get_root_pointer() may return a valid address even if
acpi_disabled is set, but the host bridge information from the ACPI
tables is not going to be used in that case and the Broadcom host
bridge initialization should not be skipped then, so make
broadcom_postcore_init() check acpi_disabled too to avoid this issue.

Reported-by: Dave Hansen <dave.hansen@linux.intel.com>
Fixes: 6361d72b04d1 (x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan)
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

Resend with the correct address of the x86 list.  Sorry for the duplication.

---
 arch/x86/pci/broadcom_bus.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

Index: linux-pm/arch/x86/pci/broadcom_bus.c
===================================================================
--- linux-pm.orig/arch/x86/pci/broadcom_bus.c
+++ linux-pm/arch/x86/pci/broadcom_bus.c
@@ -97,7 +97,7 @@  static int __init broadcom_postcore_init
 	 * We should get host bridge information from ACPI unless the BIOS
 	 * doesn't support it.
 	 */
-	if (acpi_os_get_root_pointer())
+	if (!acpi_disabled && acpi_os_get_root_pointer())
 		return 0;
 #endif