9 files changed, 266 insertions, 441 deletions

diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 4f7d3f57d05c..dec7994d405c 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -278,8 +278,7 @@ ACPI_EXTERN acpi_cache_t *acpi_gbl_operand_cache;
 
 /* Global handlers */
 
-ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_device_notify;
-ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_system_notify;
+ACPI_EXTERN struct acpi_global_notify_handler acpi_gbl_global_notify[2];
 ACPI_EXTERN acpi_exception_handler acpi_gbl_exception_handler;
 ACPI_EXTERN acpi_init_handler acpi_gbl_init_handler;
 ACPI_EXTERN acpi_tbl_handler acpi_gbl_table_handler;
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index e3922ca20e7f..28f677834bfd 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -600,13 +600,22 @@ acpi_status(*acpi_parse_downwards) (struct acpi_walk_state * walk_state,
 
 typedef acpi_status(*acpi_parse_upwards) (struct acpi_walk_state * walk_state);
 
+/* Global handlers for AML Notifies */
+
+struct acpi_global_notify_handler {
+        acpi_notify_handler handler;
+        void *context;
+};
+
 /*
  * Notify info - used to pass info to the deferred notify
  * handler/dispatcher.
  */
 struct acpi_notify_info {
-        ACPI_STATE_COMMON struct acpi_namespace_node *node;
-        union acpi_operand_object *handler_obj;
+        ACPI_STATE_COMMON u8 handler_list_id;
+        struct acpi_namespace_node *node;
+        union acpi_operand_object *handler_list_head;
+        struct acpi_global_notify_handler *global;
 };
 
 /* Generic state is union of structs above */
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index c065078ca83b..39a2b84120be 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -206,8 +206,7 @@ struct acpi_object_method {
  * Common fields for objects that support ASL notifications
  */
 #define ACPI_COMMON_NOTIFY_INFO \
-        union acpi_operand_object       *system_notify;     /* Handler for system notifies */\
-        union acpi_operand_object       *device_notify;     /* Handler for driver notifies */\
+        union acpi_operand_object       *notify_list[2];    /* Handlers for system/device notifies */\
         union acpi_operand_object       *handler;       /* Handler for Address space */
 
 struct acpi_object_notify_common {      /* COMMON NOTIFY for POWER, PROCESSOR, DEVICE, and THERMAL */
@@ -296,10 +295,10 @@ struct acpi_object_buffer_field {
 
 struct acpi_object_notify_handler {
         ACPI_OBJECT_COMMON_HEADER struct acpi_namespace_node *node;     /* Parent device */
-        u32 handler_type;
-        acpi_notify_handler handler;
+        u32 handler_type;       /* Type: Device/System/Both */
+        acpi_notify_handler handler;    /* Handler address */
         void *context;
-        struct acpi_object_notify_handler *next;
+        union acpi_operand_object *next[2];     /* Device and System handler lists */
 };
 
 struct acpi_object_addr_handler {
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index 51ef9f5e002d..381fce93a561 100644
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -101,102 +101,77 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                              u32 notify_value)
 {
         union acpi_operand_object *obj_desc;
-        union acpi_operand_object *handler_obj = NULL;
-        union acpi_generic_state *notify_info;
+        union acpi_operand_object *handler_list_head = NULL;
+        union acpi_generic_state *info;
+        u8 handler_list_id = 0;
         acpi_status status = AE_OK;
 
         ACPI_FUNCTION_NAME(ev_queue_notify_request);
 
-        /*
-         * For value 0x03 (Ejection Request), may need to run a device method.
-         * For value 0x02 (Device Wake), if _PRW exists, may need to run
-         *   the _PS0 method.
-         * For value 0x80 (Status Change) on the power button or sleep button,
-         *   initiate soft-off or sleep operation.
-         *
-         * For all cases, simply dispatch the notify to the handler.
-         */
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "Dispatching Notify on [%4.4s] (%s) Value 0x%2.2X (%s) Node %p\n",
-                          acpi_ut_get_node_name(node),
-                          acpi_ut_get_type_name(node->type), notify_value,
-                          acpi_ut_get_notify_name(notify_value), node));
+        /* Are Notifies allowed on this object? */
 
-        /* Get the notify object attached to the NS Node */
-
-        obj_desc = acpi_ns_get_attached_object(node);
-        if (obj_desc) {
-
-                /* We have the notify object, Get the correct handler */
-
-                switch (node->type) {
+        if (!acpi_ev_is_notify_object(node)) {
+                return (AE_TYPE);
+        }
 
-                        /* Notify is allowed only on these types */
+        /* Get the correct notify list type (System or Device) */
 
-                case ACPI_TYPE_DEVICE:
-                case ACPI_TYPE_THERMAL:
-                case ACPI_TYPE_PROCESSOR:
+        if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
+                handler_list_id = ACPI_SYSTEM_HANDLER_LIST;
+        } else {
+                handler_list_id = ACPI_DEVICE_HANDLER_LIST;
+        }
 
-                        if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
-                                handler_obj =
-                                    obj_desc->common_notify.system_notify;
-                        } else {
-                                handler_obj =
-                                    obj_desc->common_notify.device_notify;
-                        }
-                        break;
+        /* Get the notify object attached to the namespace Node */
 
-                default:
+        obj_desc = acpi_ns_get_attached_object(node);
+        if (obj_desc) {
 
-                        /* All other types are not supported */
+                /* We have an attached object, Get the correct handler list */
 
-                        return (AE_TYPE);
-                }
+                handler_list_head =
+                    obj_desc->common_notify.notify_list[handler_list_id];
         }
 
         /*
-         * If there is a handler to run, schedule the dispatcher.
-         * Check for:
-         * 1) Global system notify handler
-         * 2) Global device notify handler
-         * 3) Per-device notify handler
+         * If there is no notify handler (Global or Local)
+         * for this object, just ignore the notify
          */
-        if ((acpi_gbl_system_notify.handler &&
-             (notify_value <= ACPI_MAX_SYS_NOTIFY)) ||
-            (acpi_gbl_device_notify.handler &&
-             (notify_value > ACPI_MAX_SYS_NOTIFY)) || handler_obj) {
-                notify_info = acpi_ut_create_generic_state();
-                if (!notify_info) {
-                        return (AE_NO_MEMORY);
+        if (!acpi_gbl_global_notify[handler_list_id].handler
+            && !handler_list_head) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                  "No notify handler for Notify, ignoring (%4.4s, %X) node %p\n",
+                                  acpi_ut_get_node_name(node), notify_value,
+                                  node));