diff mbox

2.6.35-rc3 regression: IBM Maia system is unbootable [ACPI related?]

Message ID 1277141166.10998.79.camel@mulgrave.site (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

James Bottomley June 21, 2010, 5:26 p.m. UTC
None
diff mbox

Patch

diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index d5a5efc..bace473 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -70,6 +70,7 @@  acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 acpi_status acpi_enable(void)
 {
 	acpi_status status;
+	int retry = 0;
 
 	ACPI_FUNCTION_TRACE(acpi_enable);
 
@@ -98,6 +99,11 @@  acpi_status acpi_enable(void)
 
 	/* Sanity check that transition succeeded */
 
+	while (acpi_hw_get_mode() != ACPI_SYS_MODE_ACPI && retry < 3000) {
+		ACPI_ERROR((AE_INFO,
+			    "Hardware did not enter ACPI mode, retry = %d", retry++));
+		acpi_os_stall(1000);
+	}
 	if (acpi_hw_get_mode() != ACPI_SYS_MODE_ACPI) {
 		ACPI_ERROR((AE_INFO,
 			    "Hardware did not enter ACPI mode"));