1 files changed, 53 insertions, 47 deletions

diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index a3f4d72bedc9..5ad34566738c 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,6 +45,7 @@
 #include <acpi/acpi.h>
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
+#include <acpi/amlresrc.h>
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exmisc")
@@ -97,7 +98,8 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
 
                 default:
 
-                        ACPI_REPORT_ERROR(("Unknown Reference opcode in get_reference %X\n", obj_desc->reference.opcode));
+                        ACPI_REPORT_ERROR(("Unknown Reference opcode %X\n",
+                                           obj_desc->reference.opcode));
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
                 break;
@@ -112,7 +114,8 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
 
         default:
 
-                ACPI_REPORT_ERROR(("Invalid descriptor type in get_reference: %X\n", ACPI_GET_DESCRIPTOR_TYPE(obj_desc)));
+                ACPI_REPORT_ERROR(("Invalid descriptor type %X\n",
+                                   ACPI_GET_DESCRIPTOR_TYPE(obj_desc)));
                 return_ACPI_STATUS(AE_TYPE);
         }
 
@@ -157,48 +160,58 @@ acpi_ex_concat_template(union acpi_operand_object *operand0,
                         union acpi_operand_object **actual_return_desc,
                         struct acpi_walk_state *walk_state)
 {
+        acpi_status status;
         union acpi_operand_object *return_desc;
         u8 *new_buf;
-        u8 *end_tag1;
-        u8 *end_tag2;
+        u8 *end_tag;
+        acpi_size length0;
         acpi_size length1;
-        acpi_size length2;
 
         ACPI_FUNCTION_TRACE("ex_concat_template");
 
-        /* Find the end_tags in each resource template */
+        /*
+         * Find the end_tag descriptor in each resource template.
+         * Note: returned pointers point TO the end_tag, not past it.
+         *
+         * Compute the length of each resource template
+         */
+        status = acpi_ut_get_resource_end_tag(operand0, &end_tag);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        length0 = ACPI_PTR_DIFF(end_tag, operand0->buffer.pointer);
 
-        end_tag1 = acpi_ut_get_resource_end_tag(operand0);
-        end_tag2 = acpi_ut_get_resource_end_tag(operand1);
-        if (!end_tag1 || !end_tag2) {
-                return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
+        status = acpi_ut_get_resource_end_tag(operand1, &end_tag);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
         }
 
-        /* Compute the length of each part */
+        /* Include the end_tag in the second template length */
 
-        length1 = ACPI_PTR_DIFF(end_tag1, operand0->buffer.pointer);
-        length2 = ACPI_PTR_DIFF(end_tag2, operand1->buffer.pointer) + 2;        /* Size of END_TAG */
+        length1 = ACPI_PTR_DIFF(end_tag, operand1->buffer.pointer) +
+            sizeof(struct aml_resource_end_tag);
 
         /* Create a new buffer object for the result */
 
-        return_desc = acpi_ut_create_buffer_object(length1 + length2);
+        return_desc = acpi_ut_create_buffer_object(length0 + length1);
         if (!return_desc) {
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
-        /* Copy the templates to the new descriptor */
-
+        /*
+         * Copy the templates to the new buffer, 0 first, then 1 follows. One
+         * end_tag descriptor is copied from Operand1.
+         */
         new_buf = return_desc->buffer.pointer;
-        ACPI_MEMCPY(new_buf, operand0->buffer.pointer, length1);
-        ACPI_MEMCPY(new_buf + length1, operand1->buffer.pointer, length2);
+        ACPI_MEMCPY(new_buf, operand0->buffer.pointer, length0);
+        ACPI_MEMCPY(new_buf + length0, operand1->buffer.pointer, length1);
 
-        /* Compute the new checksum */
+        /* Set the end_tag checksum to zero, means "ignore checksum" */
 
-        new_buf[return_desc->buffer.length - 1] =
-            acpi_ut_generate_checksum(return_desc->buffer.pointer,
-                                      (return_desc->buffer.length - 1));
+        new_buf[return_desc->buffer.length - 1] = 0;
 
-        /* Return the completed template descriptor */
+        /* Return the completed resource template */
 
         *actual_return_desc = return_desc;
         return_ACPI_STATUS(AE_OK);
@@ -229,7 +242,6 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
         union acpi_operand_object *return_desc;
         char *new_buf;
         acpi_status status;
-        acpi_size new_length;
 
         ACPI_FUNCTION_TRACE("ex_do_concatenate");
 
@@ -256,7 +268,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
                 break;
 
         default:
-                ACPI_REPORT_ERROR(("Concat - invalid obj type: %X\n",
+                ACPI_REPORT_ERROR(("Invalid object type: %X\n",
                                    ACPI_GET_OBJECT_TYPE(operand0)));
                 status = AE_AML_INTERNAL;
         }
@@ -296,8 +308,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                 /* Copy the first integer, LSB first */
 
-                ACPI_MEMCPY(new_buf,
-                            &operand0->integer.value,
+                ACPI_MEMCPY(new_buf, &operand0->integer.value,
                             acpi_gbl_integer_byte_width);
 
                 /* Copy the second integer (LSB first) after the first */
@@ -311,14 +322,11 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                 /* Result of two Strings is a String */
 
-                new_length = (acpi_size) operand0->string.length +
-                    (acpi_size) local_operand1->string.length;
-                if (new_length > ACPI_MAX_STRING_CONVERSION) {
-                        status = AE_AML_STRING_LIMIT;
-                        goto cleanup;
-                }
-
-                return_desc = acpi_ut_create_string_object(new_length);
+                return_desc = acpi_ut_create_string_object((acpi_size)
+                                                           (operand0->string.
+                                                            length +
+                                                            local_operand1->
+                                                            string.length));
                 if (!return_desc) {
                         status = AE_NO_MEMORY;
                         goto cleanup;
@@ -338,11 +346,10 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
                 /* Result of two Buffers is a Buffer */
 
                 return_desc = acpi_ut_create_buffer_object((acpi_size)
-                                                           operand0->buffer.
-                                                           length +
-                                                           (acpi_size)
-                                                           local_operand1->
-                                                           buffer.length);
+                                                           (operand0->buffer.
+                                                            length +
+                                                            local_operand1->
+                                                            buffer.length));
                 if (!return_desc) {
                         status = AE_NO_MEMORY;
                         goto cleanup;
@@ -352,8 +359,8 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                 /* Concatenate the buffers */
 
-                ACPI_MEMCPY(new_buf,
-                            operand0->buffer.pointer, operand0->buffer.length);
+                ACPI_MEMCPY(new_buf, operand0->buffer.pointer,
+                            operand0->buffer.length);
                 ACPI_MEMCPY(new_buf + operand0->buffer.length,
                             local_operand1->buffer.pointer,
                             local_operand1->buffer.length);
@@ -363,7 +370,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                 /* Invalid object type, should not happen here */
 
-                ACPI_REPORT_ERROR(("Concatenate - Invalid object type: %X\n",
+                ACPI_REPORT_ERROR(("Invalid object type: %X\n",
                                    ACPI_GET_OBJECT_TYPE(operand0)));
                 status = AE_AML_INTERNAL;
                 goto cleanup;
@@ -625,9 +632,8 @@ acpi_ex_do_logical_op(u16 opcode,
 
                 /* Lexicographic compare: compare the data bytes */
 
-                compare = ACPI_MEMCMP((const char *)operand0->buffer.pointer,
-                                      (const char *)local_operand1->buffer.
-                                      pointer,
+                compare = ACPI_MEMCMP(operand0->buffer.pointer,
+                                      local_operand1->buffer.pointer,
                                       (length0 > length1) ? length1 : length0);
 
                 switch (opcode) {