diff options
| author | Len Brown <len.brown@intel.com> | 2010-07-22 18:17:39 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-07-22 18:17:39 -0400 |
| commit | 855977ef6d07e8d1d50994ab7310e40d18a64e16 (patch) | |
| tree | c8da3c02c1ba756b3b5e4a38ac4e031268aa3276 /drivers/acpi | |
| parent | 840ba24dd615e71154f0faab136b744c0a481041 (diff) | |
| parent | 3d695839a135a9b3f24b0d7cfd9c4fde2eadd2c5 (diff) | |
| download | linux-3.10-855977ef6d07e8d1d50994ab7310e40d18a64e16.tar.gz linux-3.10-855977ef6d07e8d1d50994ab7310e40d18a64e16.tar.bz2 linux-3.10-855977ef6d07e8d1d50994ab7310e40d18a64e16.zip | |
Merge branch 'bugzilla-16271' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/evxfevnt.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c index d97b8dce166..18b3f1468b7 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; ACPI_FUNCTION_TRACE(acpi_enable); @@ -98,16 +99,18 @@ acpi_status acpi_enable(void) /* Sanity check that transition succeeded */ - if (acpi_hw_get_mode() != ACPI_SYS_MODE_ACPI) { - ACPI_ERROR((AE_INFO, - "Hardware did not enter ACPI mode")); - return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE); + for (retry = 0; retry < 30000; ++retry) { + if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) { + if (retry != 0) + ACPI_WARNING((AE_INFO, + "Platform took > %d00 usec to enter ACPI mode", retry)); + return_ACPI_STATUS(AE_OK); + } + acpi_os_stall(100); /* 100 usec */ } - ACPI_DEBUG_PRINT((ACPI_DB_INIT, - "Transition to ACPI mode successful\n")); - - return_ACPI_STATUS(AE_OK); + ACPI_ERROR((AE_INFO, "Hardware did not enter ACPI mode")); + return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE); } ACPI_EXPORT_SYMBOL(acpi_enable) |