From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> 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@xxxxxxxxxxxxxxx> Fixes: 6361d72b04d1 (x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan) Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> --- arch/x86/pci/broadcom_bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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
