Clear event status on resume, to avoid going back to sleep/reboot/shutdown

immediately after resume. Tested by a bunch of people on hackers@ on
various hardware. Fixes at least Toshiba NB200 and Gateway LT3103u.

ok marco

diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index c13b734..5878f29 100644 (file)
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.176 2010/07/13 21:01:05 deraadt Exp $ */
+/* $OpenBSD: acpi.c,v 1.177 2010/07/18 19:49:35 mlarkin Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -2096,6 +2096,10 @@ acpi_resume(struct acpi_softc *sc, int state)
        /* Force SCI_EN on resume to fix horribly broken machines */
        acpi_write_pmreg(sc, ACPIREG_PM1_CNT, 0, ACPI_PM1_SCI_EN);
 
+       /* Clear fixed event status */
+       acpi_write_pmreg(sc, ACPIREG_PM1_STS, 1,
+           ACPI_PM1_ALL_STS);
+
        if (sc->sc_bfs)
                if (aml_evalnode(sc, sc->sc_bfs, 1, &env, NULL) != 0) {
                        dnprintf(10, "%s evaluating method _BFS failed.\n",