[src/trunk]: src/sys/dev/acpi Instead of disabling all GPEs for non-wakedevs, ...

[jruoho <jruoho%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e11d7fa51b53
branches:  trunk
changeset: 755476:e11d7fa51b53
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Mon Jun 07 04:08:26 2010 +0000

description:
Instead of disabling all GPEs for non-wakedevs, set both runtime and wake
GPEs, but unset only wake GPEs. The old behavior was questionable, as the
intention was only to disable a device's ability to wake the system.
Maintaining the runtime GPE generation is more important now as ACPICA
supports sharing a single GPE across multiple devices.

Discussed with jmcneill@.

diffstat:

 sys/dev/acpi/acpi_wakedev.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 14d36cacd252 -r e11d7fa51b53 sys/dev/acpi/acpi_wakedev.c
--- a/sys/dev/acpi/acpi_wakedev.c       Mon Jun 07 03:43:50 2010 +0000
+++ b/sys/dev/acpi/acpi_wakedev.c       Mon Jun 07 04:08:26 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.c,v 1.15 2010/06/06 18:40:51 jruoho Exp $ */
+/* $NetBSD: acpi_wakedev.c,v 1.16 2010/06/07 04:08:26 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2009, 2010 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.15 2010/06/06 18:40:51 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.16 2010/06/07 04:08:26 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -269,12 +269,12 @@
                acpi_wakedev_power(obj);
 
        /*
-        * Set or unset a GPE as both runtime and wake.
+        * Set both runtime and wake GPEs, but unset only wake GPEs.
         */
        if (enable != 0)
                (void)AcpiEnableGpe(hdl, val, ACPI_GPE_TYPE_WAKE_RUN);
        else
-               (void)AcpiDisableGpe(hdl, val, ACPI_GPE_TYPE_WAKE_RUN);
+               (void)AcpiDisableGpe(hdl, val, ACPI_GPE_TYPE_WAKE);
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "wake GPE %s for %s\n",
                (enable != 0) ? "enabled" : "disabled", ad->ad_name));