Received: by 10.223.185.116 with SMTP id b49csp6379067wrg; Wed, 28 Feb 2018 08:26:44 -0800 (PST) X-Google-Smtp-Source: AH8x2264lDrfZCb4U9zDgQppQMhD80xpxCv6gDLE5juui6Dj3IDdhA733jTTwrRtw3ydcPf+p3tX X-Received: by 10.98.18.70 with SMTP id a67mr18283046pfj.213.1519835204444; Wed, 28 Feb 2018 08:26:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519835204; cv=none; d=google.com; s=arc-20160816; b=I4/+iB7qNZkpGcAV+L8nNsx+DY6bAkn266VKQpIv4VXVxAy09vwcq+XZzuoplq9DCg hFleW0ot5e1iguYGuryVVEQThOcmR39QuE+amMQwl9dyTD9vaj9yiC+aOyO6BmqTZt11 7wLEalensmbEWjq85N0djPb1jah7el4AD/lsI4ph6Unljc4kt8uoRsvKgvCnRupAmmiI YfrIAZFvqM/2jK3QnitvdLdUjIJSBcP1Jj/g0kJcv5/1yny2vUd4ri0gvWzUUMkEbhbY 2Y8dNMyMfhkC5rkSK7rrwQaTbckl9S+UyEmKHeBXRZ5tgKJ5FOXxCciyBRGRi4m4e1Cc fqeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition :arc-authentication-results; bh=J7KiIdM2io/aqi05fmC6eWF/QbgnhCRPQP/INt+TbUI=; b=fcDj65nZLf4tl4aa/Qy/kfze1tPhACBfWUZLvQ1ZS+AirmsTX/hWHfMTCp842S8EmI fuJuSW+oNwcXX1QSLVcMIaKH/hYGxG/DjbWPYXTsFLxxYnWzioWrdqx3uN+hppK8vpf7 qRh8aZCzuzDpw4wwylY8GCe/5jKI/F9tBYattGyN3ZVDYRTyfMnyBsSUK4ZAZ9Pe43Uw 8bK3C+sVQ65YsWXsRUp1ji80k90uHG1CyTJ6w+N/GXncA7Ml6A8vVFdOYXkOPExwRC3Q ZvQ9G8sIeE0h1Ef6lZ2Xtgv+6uezyEHmB3gB+r4Rd8HMagNa+oHyT5j8Zb2tyqhIrD+g Hnvw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z188si1160436pgb.592.2018.02.28.08.26.29; Wed, 28 Feb 2018 08:26:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934944AbeB1QZa (ORCPT + 99 others); Wed, 28 Feb 2018 11:25:30 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:35346 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935089AbeB1QUZ (ORCPT ); Wed, 28 Feb 2018 11:20:25 -0500 Received: from [2a02:8011:400e:2:6f00:88c8:c921:d332] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1er3Yt-0006Xl-Vj; Wed, 28 Feb 2018 15:22:32 +0000 Received: from ben by deadeye with local (Exim 4.90_1) (envelope-from ) id 1er3Ye-0008Ru-Pg; Wed, 28 Feb 2018 15:22:16 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Dave Hansen" , "Thomas Gleixner" , "Bjorn Helgaas" , "Rafael J. Wysocki" , "Ingo Molnar" , "Linux PCI" Date: Wed, 28 Feb 2018 15:20:18 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 059/254] x86/PCI: Make broadcom_postcore_init() check acpi_disabled In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.55-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: "Rafael J. Wysocki" commit ddec3bdee05b06f1dda20ded003c3e10e4184cab upstream. 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. Fixes: 6361d72b04d1 (x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan) Reported-by: Dave Hansen Signed-off-by: Rafael J. Wysocki Signed-off-by: Thomas Gleixner Cc: Bjorn Helgaas Cc: Linux PCI Link: https://lkml.kernel.org/r/3186627.pxZj1QbYNg@aspire.rjw.lan Signed-off-by: Ingo Molnar Signed-off-by: Ben Hutchings --- arch/x86/pci/broadcom_bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/pci/broadcom_bus.c +++ b/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