* [PATCH] x86 / PCI: Make broadcom_postcore_init() check acpi_disabled
@ 2017-12-01 14:01 Rafael J. Wysocki
2017-12-01 14:08 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Rafael J. Wysocki @ 2017-12-01 14:01 UTC (permalink / raw)
To: Linux PCI; +Cc: LKML, Bjorn Helgaas, x86, Dave Hansen
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>
---
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] x86 / PCI: Make broadcom_postcore_init() check acpi_disabled
2017-12-01 14:01 [PATCH] x86 / PCI: Make broadcom_postcore_init() check acpi_disabled Rafael J. Wysocki
@ 2017-12-01 14:08 ` Rafael J. Wysocki
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
0 siblings, 2 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2017-12-01 14:08 UTC (permalink / raw)
To: Linux PCI; +Cc: LKML, Bjorn Helgaas, x86, Dave Hansen
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:x86/urgent] x86 / PCI: Make broadcom_postcore_init() check acpi_disabled
2017-12-01 14:08 ` Rafael J. Wysocki
@ 2017-12-04 22:24 ` tip-bot for Rafael J. Wysocki
2017-12-06 11:35 ` [tip:x86/urgent] x86/PCI: " tip-bot for Rafael J. Wysocki
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Rafael J. Wysocki @ 2017-12-04 22:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: rafael.j.wysocki, tglx, bhelgaas, hpa, mingo, linux-pci,
dave.hansen, linux-kernel
Commit-ID: 2ee90363a838cf41ebf1ad24bad274762e467d8d
Gitweb: https://git.kernel.org/tip/2ee90363a838cf41ebf1ad24bad274762e467d8d
Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
AuthorDate: Fri, 1 Dec 2017 15:08:12 +0100
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 4 Dec 2017 23:20:35 +0100
x86 / PCI: Make broadcom_postcore_init() check acpi_disabled
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 <dave.hansen@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Linux PCI <linux-pci@vger.kernel.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/3186627.pxZj1QbYNg@aspire.rjw.lan
---
arch/x86/pci/broadcom_bus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/pci/broadcom_bus.c b/arch/x86/pci/broadcom_bus.c
index bb461cf..526536c 100644
--- a/arch/x86/pci/broadcom_bus.c
+++ b/arch/x86/pci/broadcom_bus.c
@@ -97,7 +97,7 @@ static int __init broadcom_postcore_init(void)
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip:x86/urgent] x86/PCI: Make broadcom_postcore_init() check acpi_disabled
2017-12-01 14:08 ` Rafael J. Wysocki
2017-12-04 22:24 ` [tip:x86/urgent] " tip-bot for Rafael J. Wysocki
@ 2017-12-06 11:35 ` tip-bot for Rafael J. Wysocki
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Rafael J. Wysocki @ 2017-12-06 11:35 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, dave.hansen, linux-pci, rafael.j.wysocki, mingo,
hpa, bhelgaas, tglx
Commit-ID: ddec3bdee05b06f1dda20ded003c3e10e4184cab
Gitweb: https://git.kernel.org/tip/ddec3bdee05b06f1dda20ded003c3e10e4184cab
Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
AuthorDate: Fri, 1 Dec 2017 15:08:12 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 6 Dec 2017 12:27:47 +0100
x86/PCI: Make broadcom_postcore_init() check acpi_disabled
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 <dave.hansen@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Linux PCI <linux-pci@vger.kernel.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/3186627.pxZj1QbYNg@aspire.rjw.lan
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/pci/broadcom_bus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/pci/broadcom_bus.c b/arch/x86/pci/broadcom_bus.c
index bb461cf..526536c 100644
--- a/arch/x86/pci/broadcom_bus.c
+++ b/arch/x86/pci/broadcom_bus.c
@@ -97,7 +97,7 @@ static int __init broadcom_postcore_init(void)
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-12-06 11:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-01 14:01 [PATCH] x86 / PCI: Make broadcom_postcore_init() check acpi_disabled Rafael J. Wysocki
2017-12-01 14:08 ` Rafael J. Wysocki
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).