From owner-freebsd-acpi@freebsd.org Thu Oct 1 10:54:09 2015 Return-Path: Delivered-To: freebsd-acpi@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6441AA0DF0A for ; Thu, 1 Oct 2015 10:54:09 +0000 (UTC) (envelope-from bounces+73574-3fe6-freebsd-acpi=freebsd.org@sendgrid.net) Received: from o1.l99.sendgrid.net (o1.l99.sendgrid.net [198.37.153.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 184BF1277 for ; Thu, 1 Oct 2015 10:54:08 +0000 (UTC) (envelope-from bounces+73574-3fe6-freebsd-acpi=freebsd.org@sendgrid.net) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sendgrid.info; h=subject:references:to:from:mime-version:in-reply-to:content-type:content-transfer-encoding; s=smtpapi; bh=IOwULHOIPSLZIM4JvRk4K6e/jN0=; b=MgGFlqZaQLd+JEVOee 3r7o6gFdt2fPPiov9+Nd2kopUeTLdck1VgD/5B9i+yUhYSGDV2+gw0Zn4zUxNAoo +XCFSA7IJxUpH6zCi9ZDBLNVF5n2TiUplktwA4JkpNugflk58CsAFDObbjtGwlLM JJvaPiQoz1kVnH4K0QNjtsG8s= Received: by filter0542p1mdw1.sendgrid.net with SMTP id filter0542p1mdw1.13720.560D10C99 2015-10-01 10:54:01.117797374 +0000 UTC Received: from localhost ([UNAVAILABLE]. [10.42.2.107]) by 10.42.243.102:2500 (trex/5.2.14); Thu, 01 Oct 2015 10:54:01 GMT Received: from mail.tarsnap.com (ec2-54-86-246-204.compute-1.amazonaws.com [54.86.246.204]) by ismtpd0001p1iad1.sendgrid.net (SG) with ESMTP id eX2RIFB9RrKyeNnYYl9Mhw for ; Thu, 01 Oct 2015 10:54:01.122 +0000 (UTC) Received: (qmail 58882 invoked from network); 1 Oct 2015 10:53:42 -0000 Received: from unknown (HELO clamshell.daemonology.net) (127.0.0.1) by ec2-107-20-205-189.compute-1.amazonaws.com with ESMTP; 1 Oct 2015 10:53:42 -0000 Received: (qmail 4193 invoked from network); 1 Oct 2015 10:53:43 -0000 Received: from unknown (HELO clamshell.daemonology.net) (127.0.0.1) by clamshell.daemonology.net with SMTP; 1 Oct 2015 10:53:43 -0000 Subject: Fwd: svn commit: r288446 - in head: sbin/init sys/dev/acpica sys/kern sys/sys References: <201510011052.t91AqR38036244@repo.freebsd.org> To: "freebsd-acpi@freebsd.org" From: Colin Percival X-Forwarded-Message-Id: <201510011052.t91AqR38036244@repo.freebsd.org> Message-ID: <560D10B7.2010501@freebsd.org> Date: Thu, 1 Oct 2015 03:53:43 -0700 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <201510011052.t91AqR38036244@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SG-EID: t2fXfoZHCw6vGsGKHqKxJ9qWwHSlQfPdDS+3+p6rOCvdO8A+qs/ctrlROD3dIw+jW84eAcq+CQMczQ 8rDyViOseewnuZxvslDlKHlnkikRUvmvdaoAcCb40ZD9bkglS1/+AagkXLVDZuLmG517KNhX3RtVUx OFOtIu1s5YjA2ZfsLpBj4nLMOSbnbmssSB9a X-BeenThere: freebsd-acpi@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: ACPI and power management development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2015 10:54:09 -0000 Thanks to everybody who helped with the design and discussion of this. -------- Forwarded Message -------- Subject: svn commit: r288446 - in head: sbin/init sys/dev/acpica sys/kern sys/sys Date: Thu, 1 Oct 2015 10:52:27 +0000 (UTC) From: Colin Percival To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Author: cperciva Date: Thu Oct 1 10:52:26 2015 New Revision: 288446 URL: https://svnweb.freebsd.org/changeset/base/288446 Log: 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 Modified: head/sbin/init/init.c head/sys/dev/acpica/acpi.c head/sys/kern/kern_shutdown.c head/sys/sys/systm.h Modified: head/sbin/init/init.c ============================================================================== --- head/sbin/init/init.c Thu Oct 1 10:43:40 2015 (r288445) +++ head/sbin/init/init.c Thu Oct 1 10:52:26 2015 (r288446) @@ -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; } Modified: head/sys/dev/acpica/acpi.c ============================================================================== --- head/sys/dev/acpica/acpi.c Thu Oct 1 10:43:40 2015 (r288445) +++ head/sys/dev/acpica/acpi.c Thu Oct 1 10:52:26 2015 (r288446) @@ -2574,8 +2574,11 @@ acpi_ReqSleepState(struct acpi_softc *sc 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); } Modified: head/sys/kern/kern_shutdown.c ============================================================================== --- head/sys/kern/kern_shutdown.c Thu Oct 1 10:43:40 2015 (r288445) +++ head/sys/kern/kern_shutdown.c Thu Oct 1 10:52:26 2015 (r288446) @@ -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. Modified: head/sys/sys/systm.h ============================================================================== --- head/sys/sys/systm.h Thu Oct 1 10:43:40 2015 (r288445) +++ head/sys/sys/systm.h Thu Oct 1 10:52:26 2015 (r288446) @@ -46,6 +46,7 @@ #include /* 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 */