d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't call DEVICE_RESUME a second time if DEVICE_SUSPEND fails. The

Browse Source 
bus_generic_suspend method does this for us.  Disable interrupts before
entering S1.  This may help some systems suspend to S1 successfully.
This commit is contained in:
Nate Lawson 2004-08-10 22:02:52 +00:00
parent fad44deea3
commit c7f88fc386
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/acpica/acpi.c
View File

@ -1750,18 +1750,16 @@ acpi_SetSleepState(struct acpi_softc *sc, int state)
/* Enable any GPEs as appropriate and requested by the user. */
acpi_wake_prep_walk(state);
/* Inform all devices that we are going to sleep. */
if (DEVICE_SUSPEND(root_bus) != 0) {
/*
* Re-wake the system.
*
* XXX note that a better two-pass approach with a 'veto' pass
* followed by a "real thing" pass would be better, but the
* current bus interface does not provide for this.
*/
DEVICE_RESUME(root_bus);
/*
* Inform all devices that we are going to sleep. If at least one
* device fails, DEVICE_SUSPEND() automatically resumes the tree.
*
* XXX Note that a better two-pass approach with a 'veto' pass
* followed by a "real thing" pass would be better, but the current
* bus interface does not provide for this.
*/
if (DEVICE_SUSPEND(root_bus) != 0)
return_ACPI_STATUS (AE_ERROR);
}
status = AcpiEnterSleepStatePrep(state);
if (ACPI_FAILURE(status)) {
@ -1780,6 +1778,7 @@ acpi_SetSleepState(struct acpi_softc *sc, int state)
if (state == ACPI_STATE_S4)
AcpiEnable();
} else {
ACPI_DISABLE_IRQS();
status = AcpiEnterSleepState((UINT8)state);
if (ACPI_FAILURE(status)) {
device_printf(sc->acpi_dev, "AcpiEnterSleepState failed - %s\n",