diff options
| author | marks <marks@FreeBSD.org> | 2004-12-01 23:40:48 +0000 |
|---|---|---|
| committer | marks <marks@FreeBSD.org> | 2004-12-01 23:40:48 +0000 |
| commit | 47a3ae4cbdedd77fbc30e72d7f09746d357a8470 (patch) | |
| tree | f533db81ee58484399773c25a82e12d857953d20 /sys/contrib | |
| parent | 64092a1d818b16769b4d52d44e61c5e07e3941c2 (diff) | |
| download | FreeBSD-src-47a3ae4cbdedd77fbc30e72d7f09746d357a8470.zip FreeBSD-src-47a3ae4cbdedd77fbc30e72d7f09746d357a8470.tar.gz | |
Local change: In the resume path, give up after waiting for a while
for WAK_STS to be set. Some BIOSs never set it.
Approved by: njl
MFC after: 1 week
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/dev/acpica/hwsleep.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/contrib/dev/acpica/hwsleep.c b/sys/contrib/dev/acpica/hwsleep.c index bb4ef6a..648b365 100644 --- a/sys/contrib/dev/acpica/hwsleep.c +++ b/sys/contrib/dev/acpica/hwsleep.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Name: hwsleep.c - ACPI Hardware Sleep/Wake Interface - * $Revision: 69 $ + * $Revision: 70 $ * *****************************************************************************/ @@ -381,14 +381,14 @@ AcpiEnterSleepState ( * 1) Disable/Clear all GPEs * 2) Enable all wakeup GPEs */ - Status = AcpiHwDisableAllGpes (); + Status = AcpiHwDisableAllGpes (ACPI_ISR); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); } AcpiGbl_SystemAwakeAndRunning = FALSE; - Status = AcpiHwEnableAllWakeupGpes (); + Status = AcpiHwEnableAllWakeupGpes (ACPI_ISR); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); @@ -543,14 +543,14 @@ AcpiEnterSleepStateS4bios ( * 1) Disable/Clear all GPEs * 2) Enable all wakeup GPEs */ - Status = AcpiHwDisableAllGpes (); + Status = AcpiHwDisableAllGpes (ACPI_ISR); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); } AcpiGbl_SystemAwakeAndRunning = FALSE; - Status = AcpiHwEnableAllWakeupGpes (); + Status = AcpiHwEnableAllWakeupGpes (ACPI_ISR); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); @@ -582,6 +582,7 @@ AcpiEnterSleepStateS4bios ( * RETURN: Status * * DESCRIPTION: Perform OS-independent ACPI cleanup after a sleep + * Called with interrupts ENABLED. * ******************************************************************************/ @@ -677,14 +678,14 @@ AcpiLeaveSleepState ( * 1) Disable/Clear all GPEs * 2) Enable all runtime GPEs */ - Status = AcpiHwDisableAllGpes (); + Status = AcpiHwDisableAllGpes (ACPI_NOT_ISR); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); } AcpiGbl_SystemAwakeAndRunning = TRUE; - Status = AcpiHwEnableAllRuntimeGpes (); + Status = AcpiHwEnableAllRuntimeGpes (ACPI_NOT_ISR); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); |
