From owner-svn-src-head@FreeBSD.ORG Sat Feb 2 12:42:08 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 94FAA7AE; Sat, 2 Feb 2013 12:42:08 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6FE3BF25; Sat, 2 Feb 2013 12:42:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12Cg8FS045740; Sat, 2 Feb 2013 12:42:08 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12Cg8Sb045739; Sat, 2 Feb 2013 12:42:08 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201302021242.r12Cg8Sb045739@svn.freebsd.org> From: Andriy Gapon Date: Sat, 2 Feb 2013 12:42:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r246250 - head/sys/dev/acpica X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 12:42:08 -0000 Author: avg Date: Sat Feb 2 12:42:07 2013 New Revision: 246250 URL: http://svnweb.freebsd.org/changeset/base/246250 Log: acpi: after wakeup from a state > S1 re-enable SCI_EN with a direct write This hack is picked up from Linux, which claims that it follows Windows behavior. PR: amd64/174409 Tested by: Sergey V. Dyatko , KAHO Toshikazu , Slawa Olhovchenkov MFC after: 13 days Modified: head/sys/dev/acpica/acpi.c Modified: head/sys/dev/acpica/acpi.c ============================================================================== --- head/sys/dev/acpica/acpi.c Sat Feb 2 12:08:28 2013 (r246249) +++ head/sys/dev/acpica/acpi.c Sat Feb 2 12:42:07 2013 (r246250) @@ -278,7 +278,7 @@ TUNABLE_INT("debug.acpi.interpreter_slac SYSCTL_INT(_debug_acpi, OID_AUTO, interpreter_slack, CTLFLAG_RDTUN, &acpi_interpreter_slack, 1, "Turn on interpreter slack mode."); -#ifdef __amd64__ +#if defined(__amd64__) || defined(__i386__) /* Reset system clock while resuming. XXX Remove once tested. */ static int acpi_reset_clock = 1; TUNABLE_INT("debug.acpi.reset_clock", &acpi_reset_clock); @@ -2744,6 +2744,19 @@ acpi_EnterSleepState(struct acpi_softc * if (state != ACPI_STATE_S1) { sleep_result = acpi_sleep_machdep(sc, state); acpi_wakeup_machdep(sc, state, sleep_result, 0); + + /* + * XXX According to ACPI specification SCI_EN bit should be restored + * by ACPI platform (BIOS, firmware) to its pre-sleep state. + * Unfortunately some BIOSes fail to do that and that leads to + * unexpected and serious consequences during wake up like a system + * getting stuck in SMI handlers. + * This hack is picked up from Linux, which claims that it follows + * Windows behavior. + */ + if (sleep_result == 1 && state != ACPI_STATE_S4) + AcpiWriteBitRegister(ACPI_BITREG_SCI_ENABLE, ACPI_ENABLE_EVENT); + AcpiLeaveSleepStatePrep(state); intr_restore(intr); @@ -2810,7 +2823,7 @@ backout: static void acpi_resync_clock(struct acpi_softc *sc) { -#ifdef __amd64__ +#if defined(__amd64__) || defined(__i386__) if (!acpi_reset_clock) return;