From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PCI <linux-pci@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>, x86 <x86@kernel.org>,
Dave Hansen <dave.hansen@linux.intel.com>
Subject: [PATCH] x86 / PCI: Make broadcom_postcore_init() check acpi_disabled
Date: Fri, 01 Dec 2017 15:08:12 +0100 [thread overview]
Message-ID: <3186627.pxZj1QbYNg@aspire.rjw.lan> (raw)
In-Reply-To: <1593230.4rVA5fLXq5@aspire.rjw.lan>
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(-)
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
next prev parent reply other threads:[~2017-12-01 14:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-01 14:01 Rafael J. Wysocki
2017-12-01 14:08 ` Rafael J. Wysocki [this message]
2017-12-04 22:24 ` [tip:x86/urgent] " tip-bot for Rafael J. Wysocki
2017-12-06 11:35 ` [tip:x86/urgent] x86/PCI: " tip-bot for Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3186627.pxZj1QbYNg@aspire.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=bhelgaas@google.com \
--cc=dave.hansen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®