7 files changed, 149 insertions, 60 deletions

diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 3dfb8a442b26..241c535c1753 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -232,7 +232,7 @@ acpi_status acpi_ut_validate_buffer(struct acpi_buffer * buffer)
  * RETURN:      Status
  *
  * DESCRIPTION: Validate that the buffer is of the required length or
- *              allocate a new buffer.  Returned buffer is always zeroed.
+ *              allocate a new buffer. Returned buffer is always zeroed.
  *
  ******************************************************************************/
 
@@ -240,57 +240,66 @@ acpi_status
 acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
                           acpi_size required_length)
 {
-        acpi_status status = AE_OK;
+        acpi_size input_buffer_length;
 
-        switch (buffer->length) {
+        /* Parameter validation */
+
+        if (!buffer || !required_length) {
+                return (AE_BAD_PARAMETER);
+        }
+
+        /*
+         * Buffer->Length is used as both an input and output parameter. Get the
+         * input actual length and set the output required buffer length.
+         */
+        input_buffer_length = buffer->length;
+        buffer->length = required_length;
+
+        /*
+         * The input buffer length contains the actual buffer length, or the type
+         * of buffer to be allocated by this routine.
+         */
+        switch (input_buffer_length) {
         case ACPI_NO_BUFFER:
 
-                /* Set the exception and returned the required length */
+                /* Return the exception (and the required buffer length) */
 
-                status = AE_BUFFER_OVERFLOW;
-                break;
+                return (AE_BUFFER_OVERFLOW);
 
         case ACPI_ALLOCATE_BUFFER:
 
                 /* Allocate a new buffer */
 
                 buffer->pointer = acpi_os_allocate(required_length);
-                if (!buffer->pointer) {
-                        return (AE_NO_MEMORY);
-                }
-
-                /* Clear the buffer */
-
-                ACPI_MEMSET(buffer->pointer, 0, required_length);
                 break;
 
         case ACPI_ALLOCATE_LOCAL_BUFFER:
 
                 /* Allocate a new buffer with local interface to allow tracking */
 
-                buffer->pointer = ACPI_ALLOCATE_ZEROED(required_length);
-                if (!buffer->pointer) {
-                        return (AE_NO_MEMORY);
-                }
+                buffer->pointer = ACPI_ALLOCATE(required_length);
                 break;
 
         default:
 
                 /* Existing buffer: Validate the size of the buffer */
 
-                if (buffer->length < required_length) {
-                        status = AE_BUFFER_OVERFLOW;
-                        break;
+                if (input_buffer_length < required_length) {
+                        return (AE_BUFFER_OVERFLOW);
                 }
+                break;
+        }
 
-                /* Clear the buffer */
+        /* Validate allocation from above or input buffer pointer */
 
-                ACPI_MEMSET(buffer->pointer, 0, required_length);
-                break;
+        if (!buffer->pointer) {
+                return (AE_NO_MEMORY);
         }
 
-        buffer->length = required_length;
-        return (status);
+        /* Have a valid buffer, clear it */
+
+        ACPI_MEMSET(buffer->pointer, 0, required_length);
+        return (AE_OK);
 }
 
 #ifdef NOT_USED_BY_LINUX
diff --git a/drivers/acpi/utilities/utcopy.c b/drivers/acpi/utilities/utcopy.c
index 53499ac90988..5b2f7c27b705 100644
--- a/drivers/acpi/utilities/utcopy.c
+++ b/drivers/acpi/utilities/utcopy.c
@@ -42,7 +42,6 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
 
 
@@ -176,20 +175,24 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
 
                 /* This is an object reference. */
 
-                switch (internal_object->reference.opcode) {
-                case AML_INT_NAMEPATH_OP:
-
-                        /* For namepath, return the object handle ("reference") */
-
-                default:
-
-                        /* We are referring to the namespace node */
+                switch (internal_object->reference.class) {
+                case ACPI_REFCLASS_NAME:
 
+                        /*
+                         * For namepath, return the object handle ("reference")
+                         * We are referring to the namespace node
+                         */
                         external_object->reference.handle =
                             internal_object->reference.node;
                         external_object->reference.actual_type =
                             acpi_ns_get_type(internal_object->reference.node);
                         break;
+
+                default:
+
+                        /* All other reference types are unsupported */
+
+                        return_ACPI_STATUS(AE_TYPE);
                 }
                 break;
 
@@ -533,7 +536,7 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
 
                 /* TBD: should validate incoming handle */
 
-                internal_object->reference.opcode = AML_INT_NAMEPATH_OP;
+                internal_object->reference.class = ACPI_REFCLASS_NAME;
                 internal_object->reference.node =
                     external_object->reference.handle;
                 break;
@@ -743,11 +746,11 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
                  * We copied the reference object, so we now must add a reference
                  * to the object pointed to by the reference
                  *
-                 * DDBHandle reference (from Load/load_table is a special reference,
-                 * it's Reference.Object is the table index, so does not need to
+                 * DDBHandle reference (from Load/load_table) is a special reference,
+                 * it does not have a Reference.Object, so does not need to
                  * increase the reference count
                  */
-                if (source_desc->reference.opcode == AML_LOAD_OP) {
+                if (source_desc->reference.class == ACPI_REFCLASS_TABLE) {
                         break;
                 }
 
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index c5c791a575c9..d197c6b29e17 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.c
@@ -45,7 +45,6 @@
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
-#include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdelete")
@@ -135,6 +134,10 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                 obj_pointer = object->package.elements;
                 break;
 
+                /*
+                 * These objects have a possible list of notify handlers.
+                 * Device object also may have a GPE block.
+                 */
         case ACPI_TYPE_DEVICE:
 
                 if (object->device.gpe_block) {
@@ -142,9 +145,14 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                                                        gpe_block);
                 }
 
-                /* Walk the handler list for this device */
+                /*lint -fallthrough */
+
+        case ACPI_TYPE_PROCESSOR:
+        case ACPI_TYPE_THERMAL:
+
+                /* Walk the notify handler list for this object */
 
-                handler_desc = object->device.handler;
+                handler_desc = object->common_notify.handler;
                 while (handler_desc) {
                         next_desc = handler_desc->address_space.next;
                         acpi_ut_remove_reference(handler_desc);
@@ -539,8 +547,8 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
                          * reference must track changes to the ref count of the index or
                          * target object.
                          */
-                        if ((object->reference.opcode == AML_INDEX_OP) ||
-                            (object->reference.opcode == AML_INT_NAMEPATH_OP)) {
+                        if ((object->reference.class == ACPI_REFCLASS_INDEX) ||
+                            (object->reference.class == ACPI_REFCLASS_NAME)) {
                                 next_object = object->reference.object;
                         }
                         break;
@@ -577,6 +585,13 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
         ACPI_EXCEPTION((AE_INFO, status,
                         "Could not update object reference count"));
 
+        /* Free any stacked Update State objects */
+
+        while (state_list) {
+                state = acpi_ut_pop_generic_state(&state_list);
+                acpi_ut_delete_generic_state(state);
+        }
+
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index a6e71b801d2d..670551b95e56 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -281,7 +281,6 @@ struct acpi_bit_register_info acpi_gbl_bit_register_info[ACPI_NUM_BITREG] = {
         /* ACPI_BITREG_RT_CLOCK_ENABLE      */ {ACPI_REGISTER_PM1_ENABLE,
                                                 ACPI_BITPOSITION_RT_CLOCK_ENABLE,
                                                 ACPI_BITMASK_RT_CLOCK_ENABLE},
-        /* ACPI_BITREG_WAKE_ENABLE          */ {ACPI_REGISTER_PM1_ENABLE, 0, 0},
         /* ACPI_BITREG_PCIEXP_WAKE_DISABLE  */ {ACPI_REGISTER_PM1_ENABLE,
                                                 ACPI_BITPOSITION_PCIEXP_WAKE_DISABLE,
                                                 ACPI_BITMASK_PCIEXP_WAKE_DISABLE},
@@ -575,6 +574,47 @@ char *acpi_ut_get_descriptor_name(void *object)
 
 }
 
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_reference_name
+ *
+ * PARAMETERS:  Object               - An ACPI reference object
+ *
+ * RETURN:      Pointer to a string
+ *
+ * DESCRIPTION: Decode a reference object sub-type to a string.
+ *
+ ******************************************************************************/
+
+/* Printable names of reference object sub-types */
+
+static const char *acpi_gbl_ref_class_names[] = {
+        /* 00 */ "Local",
+        /* 01 */ "Argument",
+        /* 02 */ "RefOf",
+        /* 03 */ "Index",
+        /* 04 */ "DdbHandle",
+        /* 05 */ "Named Object",
+        /* 06 */ "Debug"
+};
+
+const char *acpi_ut_get_reference_name(union acpi_operand_object *object)
+{
+        if (!object)
+                return "NULL Object";
+
+        if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND)
+                return "Not an Operand object";
+
+        if (object->common.type != ACPI_TYPE_LOCAL_REFERENCE)
+                return "Not a Reference object";
+
+        if (object->reference.class > ACPI_REFCLASS_MAX)
+                return "Unknown Reference class";
+
+        return acpi_gbl_ref_class_names[object->reference.class];
+}
+
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
 /*
  * Strings and procedures used for debug only
@@ -677,14 +717,14 @@ u8 acpi_ut_valid_object_type(acpi_object_type type)
  *
  * PARAMETERS:  None
  *
- * RETURN:      None
+ * RETURN:      Status
  *
  * DESCRIPTION: Init library globals.  All globals that require specific
  *              initialization should be initialized here!
  *
  ******************************************************************************/
 
-void acpi_ut_init_globals(void)
+acpi_status acpi_ut_init_globals(void)
 {
         acpi_status status;
         u32 i;
@@ -695,7 +735,7 @@ void acpi_ut_init_globals(void)
 
         status = acpi_ut_create_caches();
         if (ACPI_FAILURE(status)) {
-                return;
+                return_ACPI_STATUS(status);
         }
 
         /* Mutex locked flags */
@@ -772,8 +812,8 @@ void acpi_ut_init_globals(void)
         acpi_gbl_display_final_mem_stats = FALSE;
 #endif
 
-        return_VOID;
+        return_ACPI_STATUS(AE_OK);
 }
 
 ACPI_EXPORT_SYMBOL(acpi_dbg_level)
-    ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
+ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index f34be6773556..9089a158a874 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -995,6 +995,15 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
                                                          state->pkg.
                                                          this_target_obj, 0);
                         if (!state) {
+
+                                /* Free any stacked Update State objects */
+
+                                while (state_list) {
+                                        state =
+                                            acpi_ut_pop_generic_state
+                                            (&state_list);
+                                        acpi_ut_delete_generic_state(state);
+                                }
                                 return_ACPI_STATUS(AE_NO_MEMORY);
                         }
                 }
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index e25484495e65..c354e7a42bcd 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -43,7 +43,6 @@
 
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
-#include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utobject")
@@ -425,6 +424,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
                                acpi_size * obj_length)
 {
         acpi_size length;
+        acpi_size size;
         acpi_status status = AE_OK;
 
         ACPI_FUNCTION_TRACE_PTR(ut_get_simple_object_size, internal_object);
@@ -477,17 +477,21 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
 
         case ACPI_TYPE_LOCAL_REFERENCE:
 
-                switch (internal_object->reference.opcode) {
-                case AML_INT_NAMEPATH_OP:
+                switch (internal_object->reference.class) {
+                case ACPI_REFCLASS_NAME:
 
                         /*
                          * Get the actual length of the full pathname to this object.
                          * The reference will be converted to the pathname to the object
                          */
-                        length +=
-                            ACPI_ROUND_UP_TO_NATIVE_WORD
-                            (acpi_ns_get_pathname_length
-                             (internal_object->reference.node));
+                        size =
+                            acpi_ns_get_pathname_length(internal_object->
+                                                        reference.node);
+                        if (!size) {
+                                return_ACPI_STATUS(AE_BAD_PARAMETER);
+                        }
+
+                        length += ACPI_ROUND_UP_TO_NATIVE_WORD(size);
                         break;
 
                 default:
@@ -498,8 +502,10 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
                          * required eventually.
                          */
                         ACPI_ERROR((AE_INFO,
-                                    "Unsupported Reference opcode=%X in object %p",
-                                    internal_object->reference.opcode,
+                                    "Cannot convert to external object - "
+                                    "unsupported Reference Class [%s] %X in object %p",
+                                    acpi_ut_get_reference_name(internal_object),
+                                    internal_object->reference.class,
                                     internal_object));
                         status = AE_TYPE;
                         break;
@@ -508,7 +514,9 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unsupported type=%X in object %p",
+                ACPI_ERROR((AE_INFO, "Cannot convert to external object - "
+                            "unsupported type [%s] %X in object %p",
+                            acpi_ut_get_object_type_name(internal_object),
                             ACPI_GET_OBJECT_TYPE(internal_object),
                             internal_object));
                 status = AE_TYPE;
diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c
index f8bdadf3c32f..c198a4d40583 100644
--- a/drivers/acpi/utilities/utxface.c
+++ b/drivers/acpi/utilities/utxface.c
@@ -81,7 +81,12 @@ acpi_status __init acpi_initialize_subsystem(void)
 
         /* Initialize all globals used by the subsystem */
 
-        acpi_ut_init_globals();
+        status = acpi_ut_init_globals();
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "During initialization of globals"));
+                return_ACPI_STATUS(status);
+        }
 
         /* Create the default mutex objects */