[PATCH 0/2] ACPI / PCI: Post-merge fixes

[PATCH 0/2] ACPI / PCI: Post-merge fixes

[Rafael J. Wysocki]

Jesse, Len,

The following two patches fix issues introduced by the last PCI merge.
The both of them have been tested by the respective reporters.  Please push
them to Linus or let me know if I should push.

[1/2] - Fix build problem in the PCIe AER driver for !CONFIG_ACPI

[2/2] - Fix boot crash on XO-1 related to APEI

Thanks,
Rafael

[PATCH 1/2] PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset

[Rafael J. Wysocki]

From: Rafael J. Wysocki <rjw@sisk.pl>

After commit 415e12b (PCI/ACPI: Request _OSC control once for each
root bridge (v3)) include/linux/pci-acpi.h is included by
drivers/pci/pcie/aer/aerdrv.c and if CONFIG_ACPI is unset, the
bogus and unnecessary alternative definition of
acpi_find_root_bridge_handle() causes a build error to occur.

Remove the offending piece of garbage.

Reported-and-tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 include/linux/pci-acpi.h |    3 ---
 1 file changed, 3 deletions(-)

Index: linux-2.6/include/linux/pci-acpi.h
===================================================================
--- linux-2.6.orig/include/linux/pci-acpi.h
+++ linux-2.6/include/linux/pci-acpi.h
@@ -35,9 +35,6 @@ static inline acpi_handle acpi_pci_get_b
 	return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
 					      pbus->number);
 }
-#else
-static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
-{ return NULL; }
 #endif
 
 #ifdef CONFIG_ACPI_APEI

Re: [PATCH 1/2] PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset

[Len Brown]

Linus applied this one today.

thanks,
Len Brown, Intel Open Source Technology Center

[PATCH 2/2] ACPI: Fix boot problem related to APEI with acpi_disabled set

[Rafael J. Wysocki]

From: Rafael J. Wysocki <rjw@sisk.pl>

Commit 415e12b (PCI/ACPI: Request _OSC control once for each root
bridge (v3)) put the acpi_hest_init() call in acpi_pci_root_init()
into a wrong place, presumably because the author confused
acpi_pci_disabled with acpi_disabled.  Bring the code ordering in
acpi_pci_root_init() back to sanity.

Additionally, make sure that hest_disable is set when acpi_disabled
is set, which is going to prevent acpi_hest_parse(), that still may
be executed for acpi_disabled=1 through aer_acpi_firmware_first(),
from crashing because of uninitialized hest_tab.

Reported-and-tested-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 drivers/acpi/apei/hest.c |    6 +++---
 drivers/acpi/pci_root.c  |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

Index: linux-2.6/drivers/acpi/pci_root.c
===================================================================
--- linux-2.6.orig/drivers/acpi/pci_root.c
+++ linux-2.6/drivers/acpi/pci_root.c
@@ -631,11 +631,11 @@ static int acpi_pci_root_remove(struct a
 
 static int __init acpi_pci_root_init(void)
 {
+	acpi_hest_init();
+
 	if (acpi_pci_disabled)
 		return 0;
 
-	acpi_hest_init();
-
 	pci_acpi_crs_quirks();
 	if (acpi_bus_register_driver(&acpi_pci_root_driver) < 0)
 		return -ENODEV;
Index: linux-2.6/drivers/acpi/apei/hest.c
===================================================================
--- linux-2.6.orig/drivers/acpi/apei/hest.c
+++ linux-2.6/drivers/acpi/apei/hest.c
@@ -201,14 +201,14 @@ void __init acpi_hest_init(void)
 	int rc = -ENODEV;
 	unsigned int ghes_count = 0;
 
-	if (acpi_disabled)
-		return;
-
 	if (hest_disable) {
 		pr_info(HEST_PFX "Table parsing disabled.\n");
 		return;
 	}
 
+	if (acpi_disabled)
+		goto err;
+
 	status = acpi_get_table(ACPI_SIG_HEST, 0,
 				(struct acpi_table_header **)&hest_tab);
 	if (status == AE_NOT_FOUND) {

Re: [PATCH 2/2] ACPI: Fix boot problem related to APEI with acpi_disabled set

[Len Brown]

Linux applied this one today as well.

thanks,
Len Brown, Intel Open Source Technology Center