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

Disable suspend when we're shutting down. This solves the "tell FreeBSD

Browse Source 
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
This commit is contained in:
Colin Percival 2015-10-01 10:52:26 +00:00
parent 9439047657
commit 2eb0015ab7
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sbin/init/init.c
View File

@ -1487,6 +1487,15 @@ static state_func_t
death(void)
{
session_t *sp;
int block, blocked;
size_t len;
/* Temporarily block suspend. */
len = sizeof(blocked);
block = 1;
if (sysctlbyname("kern.suspend_blocked", &blocked, &len,
&block, sizeof(block)) == -1)
blocked = 0;
/*
* Also revoke the TTY here. Because runshutdown() may reopen
@ -1503,6 +1512,11 @@ death(void)
/* Try to run the rc.shutdown script within a period of time */
runshutdown();
/* Unblock suspend if we blocked it. */
if (!blocked)
sysctlbyname("kern.suspend_blocked", NULL, NULL,
&blocked, sizeof(blocked));
return (state_func_t) death_single;
}

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

@ -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);
}

4
sys/kern/kern_shutdown.c
View File

@ -137,6 +137,10 @@ static int show_busybufs = 1;
SYSCTL_INT(_kern_shutdown, OID_AUTO, show_busybufs, CTLFLAG_RW,
&show_busybufs, 0, "");
int suspend_blocked = 0;
SYSCTL_INT(_kern, OID_AUTO, suspend_blocked, CTLFLAG_RW,
&suspend_blocked, 0, "Block suspend due to a pending shutdown");
/*
* Variable panicstr contains argument to first call to panic; used as flag
* to indicate that the kernel has already called panic.

1
sys/sys/systm.h
View File

@ -46,6 +46,7 @@
#include <sys/stdint.h> /* for people using printf mainly */
extern int cold; /* nonzero if we are doing a cold boot */
extern int suspend_blocked; /* block suspend due to pending shutdown */
extern int rebooting; /* kern_reboot() has been called. */
extern const char *panicstr; /* panic message */
extern char version[]; /* system version */