Add devctl(4) notify support to ACPI. Various subsystems now notify

userland whenever events occur.  See the example in devd.conf below
to see how to use it.

7 files changed, 39 insertions, 3 deletions

diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 43dca2a..33cb20c 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -51,6 +51,7 @@
 #include "acpi.h"
 #include <dev/acpica/acpivar.h>
 #include <dev/acpica/acpiio.h>
+#include <contrib/dev/acpica/acnamesp.h>
 
 MALLOC_DEFINE(M_ACPIDEV, "acpidev", "ACPI devices");
 
@@ -2054,6 +2055,27 @@ acpi_sleep_state_sysctl(SYSCTL_HANDLER_ARGS)
     return (error);
 }
 
+/* Inform devctl(4) when we receive a Notify. */
+void
+acpi_UserNotify(const char *subsystem, ACPI_HANDLE h, uint8_t notify)
+{
+    char		notify_buf[16];
+    ACPI_BUFFER		handle_buf;
+    ACPI_STATUS		status;
+
+    if (subsystem == NULL)
+	return;
+
+    handle_buf.Pointer = NULL;
+    handle_buf.Length = ACPI_ALLOCATE_BUFFER;
+    status = AcpiNsHandleToPathname(h, &handle_buf);
+    if (ACPI_FAILURE(status))
+	return;
+    snprintf(notify_buf, sizeof(notify_buf), "notify=0x%02x", notify);
+    devctl_notify("ACPI", subsystem, handle_buf.Pointer, notify_buf);
+    AcpiOsFree(handle_buf.Pointer);
+}
+
 #ifdef ACPI_DEBUG
 /*
  * Support for parsing debug options from the kernel environment.
diff --git a/sys/dev/acpica/acpi_acad.c b/sys/dev/acpica/acpi_acad.c
index 601f96c..29b8bb9 100644
--- a/sys/dev/acpica/acpi_acad.c
+++ b/sys/dev/acpica/acpi_acad.c
@@ -39,7 +39,7 @@
 #include <sys/conf.h>
 #include <sys/power.h>
 
-#include  "acpi.h"
+#include "acpi.h"
 #include <dev/acpica/acpivar.h>
 #include <dev/acpica/acpiio.h>
  
@@ -108,6 +108,8 @@ acpi_acad_get_status(void *context)
 				POWER_PROFILE_ECONOMY);
 	ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev),
 		    "%s Line\n", sc->status ? "On" : "Off");
+
+	acpi_UserNotify("ACAD", h, sc->status);
     }
 }
 
diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c
index ab8ba21..33ace78 100644
--- a/sys/dev/acpica/acpi_button.c
+++ b/sys/dev/acpica/acpi_button.c
@@ -175,6 +175,8 @@ acpi_button_notify_pressed_for_sleep(void *arg)
     if (acpi_sc == NULL)
 	return_VOID;
 
+    acpi_UserNotify("Button", sc->button_handle, sc->button_type);
+
     switch (sc->button_type) {
     case ACPI_POWER_BUTTON:
 	ACPI_VPRINT(sc->button_dev, acpi_sc, "power button pressed\n");
@@ -202,6 +204,8 @@ acpi_button_notify_pressed_for_wakeup(void *arg)
     if (acpi_sc == NULL)
 	return_VOID;
 
+    acpi_UserNotify("Button", sc->button_handle, sc->button_type);
+
     switch (sc->button_type) {
     case ACPI_POWER_BUTTON:
 	ACPI_VPRINT(sc->button_dev, acpi_sc, "wakeup by power button\n");
diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c
index b5bebc9..d14ea71 100644
--- a/sys/dev/acpica/acpi_cmbat.c
+++ b/sys/dev/acpica/acpi_cmbat.c
@@ -295,6 +295,8 @@ acpi_cmbat_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context)
     if ((sc = device_get_softc(dev)) == NULL)
 	return;
 
+    acpi_UserNotify("CMBAT", h, notify);
+
     switch (notify) {
     case ACPI_NOTIFY_DEVICE_CHECK:
     case ACPI_BATTERY_BST_CHANGE:
diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c
index d855a47..ecb8ccc 100644
--- a/sys/dev/acpica/acpi_lid.c
+++ b/sys/dev/acpica/acpi_lid.c
@@ -54,7 +54,8 @@ static int	acpi_lid_attach(device_t dev);
 static int	acpi_lid_suspend(device_t dev);
 static int	acpi_lid_resume(device_t dev);
 static void	acpi_lid_notify_status_changed(void *arg);
-static void 	acpi_lid_notify_handler(ACPI_HANDLE h,UINT32 notify, void *context);
+static void 	acpi_lid_notify_handler(ACPI_HANDLE h, UINT32 notify,
+					void *context);
 
 static device_method_t acpi_lid_methods[] = {
     /* Device interface */
@@ -149,6 +150,8 @@ acpi_lid_notify_status_changed(void *arg)
     ACPI_VPRINT(sc->lid_dev, acpi_sc, "Lid %s\n",
 		sc->lid_status ? "opened" : "closed");
 
+    acpi_UserNotify("Lid", sc->lid_handle, sc->lid_status);
+
     if (sc->lid_status == 0)
 	EVENTHANDLER_INVOKE(acpi_sleep_event, acpi_sc->acpi_lid_switch_sx);
     else
@@ -178,4 +181,3 @@ acpi_lid_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context)
 
     return_VOID;
 }
-
diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c
index 86ee656..df704ec 100644
--- a/sys/dev/acpica/acpi_thermal.c
+++ b/sys/dev/acpica/acpi_thermal.c
@@ -727,6 +727,8 @@ acpi_tz_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context)
 	break;
     }
 
+    acpi_UserNotify("Thermal", h, notify);
+
     return_VOID;
 }
 
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index 578a6c0..77e36ad 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -188,6 +188,8 @@ extern ACPI_STATUS	acpi_SetIntrModel(int model);
 extern ACPI_STATUS	acpi_SetSleepState(struct acpi_softc *sc, int state);
 extern ACPI_STATUS	acpi_Enable(struct acpi_softc *sc);
 extern ACPI_STATUS	acpi_Disable(struct acpi_softc *sc);
+extern void		acpi_UserNotify(const char *subsystem, ACPI_HANDLE h,
+					uint8_t notify);
 
 struct acpi_parse_resource_set {
     void	(*set_init)(device_t dev, void **context);