diff options
| author | cperciva <cperciva@FreeBSD.org> | 2015-10-01 10:52:26 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2015-10-01 10:52:26 +0000 |
| commit | 8e136c4370617d6cb5580f3c9e51ae1c58f7edbe (patch) | |
| tree | 7989543c22e5c121e120ae359b7126a9764569f1 /sys/dev/acpica/acpi.c | |
| parent | 10e70b971f2cc53a76bf17bffc580cab730750ed (diff) | |
| download | FreeBSD-src-8e136c4370617d6cb5580f3c9e51ae1c58f7edbe.zip FreeBSD-src-8e136c4370617d6cb5580f3c9e51ae1c58f7edbe.tar.gz | |
Disable suspend when we're shutting down. This solves the "tell FreeBSD
to shut down; close laptop lid" scenario which otherwise tended to end
with a laptop overheating or the battery dying.
The implementation uses a new sysctl, kern.suspend_blocked; init(8) sets
this while rc.suspend runs, and the ACPI sleep code ignores requests while
the sysctl is set.
Discussed on: freebsd-acpi (35 emails)
MFC after: 1 week
Diffstat (limited to 'sys/dev/acpica/acpi.c')
| -rw-r--r-- | sys/dev/acpica/acpi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 92f1292..0593235 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -2574,8 +2574,11 @@ acpi_ReqSleepState(struct acpi_softc *sc, int state) if (!acpi_sleep_states[state]) return (EOPNOTSUPP); - /* If a suspend request is already in progress, just return. */ - if (sc->acpi_next_sstate != 0) { + /* + * If a reboot/shutdown/suspend request is already in progress or + * suspend is blocked due to an upcoming shutdown, just return. + */ + if (rebooting || sc->acpi_next_sstate != 0 || suspend_blocked) { return (0); } |
