ACPI: handle systems which asynchoronously enable ACPI mode
Folklore suggested that such systems existed
in the pre-history of ACPI.
However, we removed the SCI_EN polling loop from
acpi_hw_set_mode() in b430acbd7c
because it delayed resume by 3 seconds on boxes
that refused to set SCI_EN.
Matthew removed the call to acpi_enable() from
the suspend resume path.
James found a modern system that still needs to be polled
upon boot.
So here we restore the workaround, except that we
put it in acpi_enable() rather than the low level
acpi_hw_set_mode().
https://bugzilla.kernel.org/show_bug.cgi?id=16271
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
9341625307
commit
3d695839a1
|
@ -70,6 +70,7 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
|
||||||
acpi_status acpi_enable(void)
|
acpi_status acpi_enable(void)
|
||||||
{
|
{
|
||||||
acpi_status status;
|
acpi_status status;
|
||||||
|
int retry;
|
||||||
|
|
||||||
ACPI_FUNCTION_TRACE(acpi_enable);
|
ACPI_FUNCTION_TRACE(acpi_enable);
|
||||||
|
|
||||||
|
@ -98,16 +99,18 @@ acpi_status acpi_enable(void)
|
||||||
|
|
||||||
/* Sanity check that transition succeeded */
|
/* Sanity check that transition succeeded */
|
||||||
|
|
||||||
if (acpi_hw_get_mode() != ACPI_SYS_MODE_ACPI) {
|
for (retry = 0; retry < 30000; ++retry) {
|
||||||
ACPI_ERROR((AE_INFO,
|
if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) {
|
||||||
"Hardware did not enter ACPI mode"));
|
if (retry != 0)
|
||||||
return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
|
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,
|
ACPI_ERROR((AE_INFO, "Hardware did not enter ACPI mode"));
|
||||||
"Transition to ACPI mode successful\n"));
|
return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
|
||||||
|
|
||||||
return_ACPI_STATUS(AE_OK);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ACPI_EXPORT_SYMBOL(acpi_enable)
|
ACPI_EXPORT_SYMBOL(acpi_enable)
|
||||||
|
|
Loading…
Reference in New Issue