From patchwork Fri Dec 1 14:01:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 10087213 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C5911603B4 for ; Fri, 1 Dec 2017 14:01:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA90B2842A for ; Fri, 1 Dec 2017 14:01:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF58B2A3D6; Fri, 1 Dec 2017 14:01:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37E43285AB for ; Fri, 1 Dec 2017 14:01:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752565AbdLAOB6 (ORCPT ); Fri, 1 Dec 2017 09:01:58 -0500 Received: from cloudserver094114.home.net.pl ([79.96.170.134]:42006 "EHLO cloudserver094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752553AbdLAOB5 (ORCPT ); Fri, 1 Dec 2017 09:01:57 -0500 Received: from 79.184.254.73.ipv4.supernova.orange.pl (79.184.254.73) (HELO aspire.rjw.lan) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.82) id 3d1cc08bcca7df9a; Fri, 1 Dec 2017 15:01:55 +0100 From: "Rafael J. Wysocki" To: Linux PCI Cc: LKML , Bjorn Helgaas , x86@vger.kernel.org, Dave Hansen Subject: [PATCH] x86 / PCI: Make broadcom_postcore_init() check acpi_disabled Date: Fri, 01 Dec 2017 15:01:25 +0100 Message-ID: <1593230.4rVA5fLXq5@aspire.rjw.lan> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rafael J. Wysocki 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 Fixes: 6361d72b04d1 (x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan) Signed-off-by: Rafael J. Wysocki --- 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