MI disable_lid_wakeups() is not needed, x86 systems can do this

in sleep_resume(), which seems sensible for other future systems also

diff --git a/sys/arch/arm64/dev/apm.c b/sys/arch/arm64/dev/apm.c
index 4e809be..f50aef6 100644 (file)
--- a/sys/arch/arm64/dev/apm.c
+++ b/sys/arch/arm64/dev/apm.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: apm.c,v 1.12 2022/02/11 01:55:12 deraadt Exp $        */
+/*     $OpenBSD: apm.c,v 1.13 2022/02/15 02:38:16 deraadt Exp $        */
 
 /*-
  * Copyright (c) 2001 Alexander Guy.  All rights reserved.
@@ -437,10 +437,5 @@ suspend_finish(void *v)
 #endif
 }
 
-void
-disable_lid_wakeups(void *v)
-{
-}
-
 #endif /* SUSPEND */
 

diff --git a/sys/arch/macppc/dev/apm.c b/sys/arch/macppc/dev/apm.c
index 9921dbd..ea912dd 100644 (file)
--- a/sys/arch/macppc/dev/apm.c
+++ b/sys/arch/macppc/dev/apm.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: apm.c,v 1.28 2022/02/12 16:22:40 deraadt Exp $        */
+/*     $OpenBSD: apm.c,v 1.29 2022/02/15 02:38:17 deraadt Exp $        */
 
 /*-
  * Copyright (c) 2001 Alexander Guy.  All rights reserved.
@@ -401,8 +401,4 @@ suspend_finish(void *v)
 {
 }
 
-void
-disable_lid_wakeups(void *v)
-{
-}
 #endif /* SUSPEND */

diff --git a/sys/dev/acpi/acpi_x86.c b/sys/dev/acpi/acpi_x86.c
index dd7d9a5..de9a737 100644 (file)
--- a/sys/dev/acpi/acpi_x86.c
+++ b/sys/dev/acpi/acpi_x86.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi_x86.c,v 1.4 2022/02/15 02:29:23 deraadt Exp $ */
+/* $OpenBSD: acpi_x86.c,v 1.5 2022/02/15 02:38:17 deraadt Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -140,6 +140,8 @@ sleep_resume(void *v)
 {
        struct acpi_softc *sc = v;
 
+       acpibtn_disable_psw();          /* disable _LID for wakeup */
+
        /* 3rd resume AML step: _TTS(runstate) */
        if (aml_node_setval(sc, sc->sc_tts, sc->sc_state) != 0)
                return (EINVAL);
@@ -161,13 +163,6 @@ suspend_finish(void *v)
                acpi_addtask(sc, acpi_sleep_task, sc, sc->sc_state);
 }
 
-void
-disable_lid_wakeups(void *v)
-{
-       acpibtn_disable_psw();          /* disable _LID for wakeup */
-
-}
-
 void
 display_suspend(void *v)
 {

diff --git a/sys/kern/subr_suspend.c b/sys/kern/subr_suspend.c
index 03754b6..6c34b27 100644 (file)
--- a/sys/kern/subr_suspend.c
+++ b/sys/kern/subr_suspend.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_suspend.c,v 1.4 2022/02/13 15:56:55 deraadt Exp $ */
+/* $OpenBSD: subr_suspend.c,v 1.5 2022/02/15 02:38:18 deraadt Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -139,8 +139,6 @@ fail_suspend:
        intr_enable();
        splx(s);
 
-       disable_lid_wakeups(v);
-
        inittodr(gettime());
 
        sleep_resume(v);

diff --git a/sys/sys/device.h b/sys/sys/device.h
index ad4e449..a0d5a7d 100644 (file)
--- a/sys/sys/device.h
+++ b/sys/sys/device.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: device.h,v 1.58 2022/02/11 01:55:12 deraadt Exp $     */
+/*     $OpenBSD: device.h,v 1.59 2022/02/15 02:38:18 deraadt Exp $     */
 /*     $NetBSD: device.h,v 1.15 1996/04/09 20:55:24 cgd Exp $  */
 
 /*
@@ -211,7 +211,6 @@ void        gosleep(void *v);
 void   display_suspend(void *v);
 void   display_resume(void *v);
 void   suspend_finish(void *v);
-void   disable_lid_wakeups(void *v);
 
 struct device *device_mainbus(void);
 struct device *device_mpath(void);