7 files changed, 204 insertions, 44 deletions

diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index 97856c48bd74..21331625e66e 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -367,7 +367,7 @@ acpi_ex_convert_to_ascii (
 
                 /* hex_length: 2 ascii hex chars per data byte */
 
-                hex_length = ACPI_MUL_2 (data_width);
+                hex_length = (acpi_native_uint) ACPI_MUL_2 (data_width);
                 for (i = 0, j = (hex_length-1); i < hex_length; i++, j--) {
                         /* Get one hex digit, most significant digits first */
 
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index ae6cad85e015..7007abb6051e 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -80,6 +80,16 @@ acpi_ex_out_address (
         acpi_physical_address           value);
 #endif  /* ACPI_FUTURE_USAGE */
 
+static void
+acpi_ex_dump_reference (
+        union acpi_operand_object       *obj_desc);
+
+static void
+acpi_ex_dump_package (
+        union acpi_operand_object       *obj_desc,
+        u32                             level,
+        u32                             index);
+
 
 /*******************************************************************************
  *
@@ -508,7 +518,7 @@ acpi_ex_out_integer (
         char                            *title,
         u32                             value)
 {
-        acpi_os_printf ("%20s : %X\n", title, value);
+        acpi_os_printf ("%20s : %.2X\n", title, value);
 }
 
 static void
@@ -565,9 +575,144 @@ acpi_ex_dump_node (
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_ex_dump_reference
+ *
+ * PARAMETERS:  Object              - Descriptor to dump
+ *
+ * DESCRIPTION: Dumps a reference object
+ *
+ ******************************************************************************/
+
+static void
+acpi_ex_dump_reference (
+        union acpi_operand_object       *obj_desc)
+{
+        struct acpi_buffer              ret_buf;
+        acpi_status                     status;
+
+
+        if (obj_desc->reference.opcode == AML_INT_NAMEPATH_OP) {
+                acpi_os_printf ("Named Object %p ", obj_desc->reference.node);
+                ret_buf.length = ACPI_ALLOCATE_LOCAL_BUFFER;
+                status = acpi_ns_handle_to_pathname (obj_desc->reference.node, &ret_buf);
+                if (ACPI_FAILURE (status)) {
+                        acpi_os_printf ("Could not convert name to pathname\n");
+                }
+                else {
+                   acpi_os_printf ("%s\n", ret_buf.pointer);
+                   ACPI_MEM_FREE (ret_buf.pointer);
+                }
+        }
+        else if (obj_desc->reference.object) {
+                acpi_os_printf ("\nReferenced Object: %p\n", obj_desc->reference.object);
+        }
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ex_dump_package
+ *
+ * PARAMETERS:  Object              - Descriptor to dump
+ *              Level               - Indentation Level
+ *              Index               - Package index for this object
+ *
+ * DESCRIPTION: Dumps the elements of the package
+ *
+ ******************************************************************************/
+
+static void
+acpi_ex_dump_package (
+        union acpi_operand_object       *obj_desc,
+        u32                             level,
+        u32                             index)
+{
+        u32                             i;
+
+
+        /* Indentation and index output */
+
+        if (level > 0) {
+                for (i = 0; i < level; i++) {
+                        acpi_os_printf (" ");
+                }
+
+                acpi_os_printf ("[%.2d] ", index);
+        }
+
+        acpi_os_printf ("%p ", obj_desc);
+
+        /* Null package elements are allowed */
+
+        if (!obj_desc) {
+                acpi_os_printf ("[Null Object]\n");
+                return;
+        }
+
+        /* Packages may only contain a few object types */
+
+        switch (ACPI_GET_OBJECT_TYPE (obj_desc)) {
+        case ACPI_TYPE_INTEGER:
+
+                acpi_os_printf ("[Integer] = %8.8X%8.8X\n",
+                                 ACPI_FORMAT_UINT64 (obj_desc->integer.value));
+                break;
+
+
+        case ACPI_TYPE_STRING:
+
+                acpi_os_printf ("[String] Value: ");
+                for (i = 0; i < obj_desc->string.length; i++) {
+                        acpi_os_printf ("%c", obj_desc->string.pointer[i]);
+                }
+                acpi_os_printf ("\n");
+                break;
+
+
+        case ACPI_TYPE_BUFFER:
+
+                acpi_os_printf ("[Buffer] Length %.2X = ", obj_desc->buffer.length);
+                if (obj_desc->buffer.length) {
+                        acpi_ut_dump_buffer ((u8 *) obj_desc->buffer.pointer,
+                                        obj_desc->buffer.length, DB_DWORD_DISPLAY, _COMPONENT);
+                }
+                else {
+                        acpi_os_printf ("\n");
+                }
+                break;
+
+
+        case ACPI_TYPE_PACKAGE:
+
+                acpi_os_printf ("[Package] Contains %d Elements: \n",
+                                obj_desc->package.count);
+
+                for (i = 0; i < obj_desc->package.count; i++) {
+                        acpi_ex_dump_package (obj_desc->package.elements[i], level+1, i);
+                }
+                break;
+
+
+        case ACPI_TYPE_LOCAL_REFERENCE:
+
+                acpi_os_printf ("[Object Reference] ");
+                acpi_ex_dump_reference (obj_desc);
+                break;
+
+
+        default:
+
+                acpi_os_printf ("[Unknown Type] %X\n", ACPI_GET_OBJECT_TYPE (obj_desc));
+                break;
+        }
+}
+
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ex_dump_object_descriptor
  *
- * PARAMETERS:  *Object             - Descriptor to dump
+ * PARAMETERS:  Object              - Descriptor to dump
  *              Flags               - Force display if TRUE
  *
  * DESCRIPTION: Dumps the members of the object descriptor given.
@@ -579,9 +724,6 @@ acpi_ex_dump_object_descriptor (
         union acpi_operand_object       *obj_desc,
         u32                             flags)
 {
-        u32                             i;
-
-
         ACPI_FUNCTION_TRACE ("ex_dump_object_descriptor");
 
 
@@ -648,22 +790,13 @@ acpi_ex_dump_object_descriptor (
         case ACPI_TYPE_PACKAGE:
 
                 acpi_ex_out_integer ("Flags",       obj_desc->package.flags);
-                acpi_ex_out_integer ("Count",       obj_desc->package.count);
-                acpi_ex_out_pointer ("Elements",    obj_desc->package.elements);
+                acpi_ex_out_integer ("Elements",    obj_desc->package.count);
+                acpi_ex_out_pointer ("Element List", obj_desc->package.elements);
 
                 /* Dump the package contents */
 
-                if (obj_desc->package.count > 0) {
-                        acpi_os_printf ("\nPackage Contents:\n");
-                        for (i = 0; i < obj_desc->package.count; i++) {
-                                acpi_os_printf ("[%.3d] %p", i, obj_desc->package.elements[i]);
-                                if (obj_desc->package.elements[i]) {
-                                        acpi_os_printf (" %s",
-                                                acpi_ut_get_object_type_name (obj_desc->package.elements[i]));
-                                }
-                                acpi_os_printf ("\n");
-                        }
-                }
+                acpi_os_printf ("\nPackage Contents:\n");
+                acpi_ex_dump_package (obj_desc, 0, 0);
                 break;
 
 
@@ -790,10 +923,7 @@ acpi_ex_dump_object_descriptor (
                 acpi_ex_out_pointer ("Node",        obj_desc->reference.node);
                 acpi_ex_out_pointer ("Where",       obj_desc->reference.where);
 
-                if (obj_desc->reference.object) {
-                        acpi_os_printf ("\nReferenced Object:\n");
-                        acpi_ex_dump_object_descriptor (obj_desc->reference.object, flags);
-                }
+                acpi_ex_dump_reference (obj_desc);
                 break;
 
 
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index 022f281345b8..237ef28c8132 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -302,7 +302,7 @@ acpi_ex_do_concatenate (
                 /* Result of two Integers is a Buffer */
                 /* Need enough buffer space for two integers */
 
-                return_desc = acpi_ut_create_buffer_object (
+                return_desc = acpi_ut_create_buffer_object ((acpi_size)
                                    ACPI_MUL_2 (acpi_gbl_integer_byte_width));
                 if (!return_desc) {
                         status = AE_NO_MEMORY;
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index ffc61ddeb659..131f49acb1df 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -113,8 +113,9 @@ acpi_ex_opcode_0A_0T_1R (
                         status = AE_NO_MEMORY;
                         goto cleanup;
                 }
-
+#if ACPI_MACHINE_WIDTH != 16
                 return_desc->integer.value = acpi_os_get_timer ();
+#endif
                 break;
 
         default:                /*  Unknown opcode  */
diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c
index 23b068adbf58..197890f443b5 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/executer/exoparg3.c
@@ -160,7 +160,7 @@ acpi_ex_opcode_3A_1T_1R (
 {
         union acpi_operand_object       **operand = &walk_state->operands[0];
         union acpi_operand_object       *return_desc = NULL;
-        char                            *buffer;
+        char                            *buffer = NULL;
         acpi_status                     status = AE_OK;
         acpi_integer                    index;
         acpi_size                       length;
@@ -193,34 +193,63 @@ acpi_ex_opcode_3A_1T_1R (
                  * If the index is beyond the length of the String/Buffer, or if the
                  * requested length is zero, return a zero-length String/Buffer
                  */
-                if ((index < operand[0]->string.length) &&
-                        (length > 0)) {
-                        /* Truncate request if larger than the actual String/Buffer */
-
-                        if ((index + length) >
-                                operand[0]->string.length) {
-                                length = (acpi_size) operand[0]->string.length -
-                                                 (acpi_size) index;
-                        }
+                if (index >= operand[0]->string.length) {
+                        length = 0;
+                }
+
+                /* Truncate request if larger than the actual String/Buffer */
+
+                else if ((index + length) > operand[0]->string.length) {
+                        length = (acpi_size) operand[0]->string.length -
+                                         (acpi_size) index;
+                }
 
-                        /* Allocate a new buffer for the String/Buffer */
+                /* Strings always have a sub-pointer, not so for buffers */
+
+                switch (ACPI_GET_OBJECT_TYPE (operand[0])) {
+                case ACPI_TYPE_STRING:
+
+                        /* Always allocate a new buffer for the String */
 
                         buffer = ACPI_MEM_CALLOCATE ((acpi_size) length + 1);
                         if (!buffer) {
                                 status = AE_NO_MEMORY;
                                 goto cleanup;
                         }
+                        break;
+
+                case ACPI_TYPE_BUFFER:
+
+                        /* If the requested length is zero, don't allocate a buffer */
+
+                        if (length > 0) {
+                                /* Allocate a new buffer for the Buffer */
+
+                                buffer = ACPI_MEM_CALLOCATE (length);
+                                if (!buffer) {
+                                        status = AE_NO_MEMORY;
+                                        goto cleanup;
+                                }
+                        }
+                        break;
 
+                default:                        /* Should not happen */
+
+                        status = AE_AML_OPERAND_TYPE;
+                        goto cleanup;
+                }
+
+                if (length > 0) {
                         /* Copy the portion requested */
 
                         ACPI_MEMCPY (buffer, operand[0]->string.pointer + index,
                                           length);
+                }
 
-                        /* Set the length of the new String/Buffer */
+                /* Set the length of the new String/Buffer */
 
-                        return_desc->string.pointer = buffer;
-                        return_desc->string.length = (u32) length;
-                }
+                return_desc->string.pointer = buffer;
+                return_desc->string.length = (u32) length;
 
                 /* Mark buffer initialized */
 
@@ -244,13 +273,13 @@ cleanup:
 
         /* Delete return object on error */
 
-        if (ACPI_FAILURE (status)) {
+        if (ACPI_FAILURE (status) || walk_state->result_obj) {
                 acpi_ut_remove_reference (return_desc);
         }
 
         /* Set the return object and exit */
 
-        if (!walk_state->result_obj) {
+        else {
                 walk_state->result_obj = return_desc;
         }
         return_ACPI_STATUS (status);
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 763ffeea8503..59dbfeaa54c0 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -147,7 +147,7 @@ acpi_ex_do_debug_object (
 
         case ACPI_TYPE_BUFFER:
 
-                ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "[0x%.2X]",
+                ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "[0x%.2X]\n",
                         (u32) source_desc->buffer.length));
                 ACPI_DUMP_BUFFER (source_desc->buffer.pointer,
                         (source_desc->buffer.length < 32) ? source_desc->buffer.length : 32);
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index 5c7ec0c04177..d00b0dcba96a 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -369,7 +369,7 @@ acpi_ex_eisa_id_to_string (
  *
  * RETURN:      None, string
  *
- * DESCRIPTOIN: Convert a number to string representation. Assumes string
+ * DESCRIPTION: Convert a number to string representation. Assumes string
  *              buffer is large enough to hold the string.
  *
  ******************************************************************************/