[ACPI] ACPICA 20060210

Removed a couple of extraneous ACPI_ERROR messages that
appeared during normal execution. These became apparent
after the conversion from ACPI_DEBUG_PRINT.

Fixed a problem where the CreateField operator could hang
if the BitIndex or NumBits parameter referred to a named
object. From Valery Podrezov.
http://bugzilla.kernel.org/show_bug.cgi?id=5359

Fixed a problem where a DeRefOf operation on a buffer
object incorrectly failed with an exception. This also
fixes a couple of related RefOf and DeRefOf issues.
From Valery Podrezov.
http://bugzilla.kernel.org/show_bug.cgi?id=5360
http://bugzilla.kernel.org/show_bug.cgi?id=5387
http://bugzilla.kernel.org/show_bug.cgi?id=5392

Fixed a problem where the AE_BUFFER_LIMIT exception was
returned instead of AE_STRING_LIMIT on an out-of-bounds
Index() operation. From Valery Podrezov.
http://bugzilla.kernel.org/show_bug.cgi?id=5480

Implemented a memory cleanup at the end of the execution
of each iteration of an AML While() loop, preventing the
accumulation of outstanding objects. From Valery Podrezov.
http://bugzilla.kernel.org/show_bug.cgi?id=5427

Eliminated a chunk of duplicate code in the object
resolution code. From Valery Podrezov.
http://bugzilla.kernel.org/show_bug.cgi?id=5336

Fixed several warnings during the 64-bit code generation.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

21 files changed, 147 insertions, 69 deletions

diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index a29782fe3ec..864530f754c 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -110,6 +110,7 @@ acpi_ex_add_table(struct acpi_table_header *table,
 
         if (ACPI_FAILURE(status)) {
                 if (status == AE_ALREADY_EXISTS) {
+
                         /* Table already exists, just return the handle */
 
                         return_ACPI_STATUS(AE_OK);
@@ -121,6 +122,7 @@ acpi_ex_add_table(struct acpi_table_header *table,
 
         status = acpi_ns_load_table(table_info.installed_desc, parent_node);
         if (ACPI_FAILURE(status)) {
+
                 /* Uninstall table on error */
 
                 (void)acpi_tb_uninstall_table(table_info.installed_desc);
@@ -169,6 +171,7 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
          */
         status = acpi_tb_match_signature(operand[0]->string.pointer, NULL);
         if (status == AE_OK) {
+
                 /* Signature matched -- don't allow override */
 
                 return_ACPI_STATUS(AE_ALREADY_EXISTS);
@@ -252,6 +255,7 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
         /* Parameter Data (optional) */
 
         if (parameter_node) {
+
                 /* Store the parameter data into the optional parameter object */
 
                 status = acpi_ex_store(operand[5],
@@ -424,6 +428,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
 
         status = acpi_ex_add_table(table_ptr, acpi_gbl_root_node, &ddb_handle);
         if (ACPI_FAILURE(status)) {
+
                 /* On error, table_ptr was deallocated above */
 
                 return_ACPI_STATUS(status);
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index e6d52e12d77..a2c93c9ba07 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -319,6 +319,7 @@ acpi_ex_convert_to_ascii(acpi_integer integer,
                 remainder = 0;
 
                 for (i = decimal_length; i > 0; i--) {
+
                         /* Divide by nth factor of 10 */
 
                         digit = integer;
@@ -346,6 +347,7 @@ acpi_ex_convert_to_ascii(acpi_integer integer,
 
                 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 */
 
                         string[k] =
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index a7cca8d4f85..0a53d31e09d 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -463,6 +463,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
         }
 
         if (!obj_desc) {
+
                 /* This could be a null element of a package */
 
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Null Object Descriptor\n"));
@@ -532,6 +533,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
                                        obj_desc->reference.offset);
 
                         if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
+
                                 /* Value is an Integer */
 
                                 acpi_os_printf(" value is [%8.8X%8.8x]",
diff --git a/drivers/acpi/executer/exfield.c b/drivers/acpi/executer/exfield.c
index e259201ce9a..215783a33c2 100644
--- a/drivers/acpi/executer/exfield.c
+++ b/drivers/acpi/executer/exfield.c
@@ -142,6 +142,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
         length =
             (acpi_size) ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->field.bit_length);
         if (length > acpi_gbl_integer_byte_width) {
+
                 /* Field is too large for an Integer, create a Buffer instead */
 
                 buffer_desc = acpi_ut_create_buffer_object(length);
@@ -329,6 +330,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
             ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length);
 
         if (length < required_length) {
+
                 /* We need to create a new buffer */
 
                 new_buffer = ACPI_MEM_CALLOCATE(required_length);
diff --git a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c
index bd1af35f7fc..d5a4b2627c1 100644
--- a/drivers/acpi/executer/exfldio.c
+++ b/drivers/acpi/executer/exfldio.c
@@ -113,6 +113,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
         }
 
         if (rgn_desc->region.space_id == ACPI_ADR_SPACE_SMBUS) {
+
                 /* SMBus has a non-linear address space */
 
                 return_ACPI_STATUS(AE_OK);
@@ -491,6 +492,7 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                                   value));
 
                 if (read_write == ACPI_READ) {
+
                         /* Read the datum from the data_register */
 
                         status =
@@ -568,6 +570,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
         /* If the mask is all ones, we don't need to worry about the update rule */
 
         if (mask != ACPI_INTEGER_MAX) {
+
                 /* Decode the update rule */
 
                 switch (obj_desc->common_field.
@@ -704,6 +707,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
         /* Read the rest of the field */
 
         for (i = 1; i < field_datum_count; i++) {
+
                 /* Get next input datum from the field */
 
                 field_offset += obj_desc->common_field.access_byte_width;
@@ -817,6 +821,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
         /* Write the entire field */
 
         for (i = 1; i < field_datum_count; i++) {
+
                 /* Write merged datum to the target field */
 
                 merged_datum &= mask;
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index 48c18d29222..74f2c1a9bda 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -649,6 +649,7 @@ acpi_ex_do_logical_op(u16 opcode,
                         /* Length and all bytes must be equal */
 
                         if ((length0 == length1) && (compare == 0)) {
+
                                 /* Length and all bytes match ==> TRUE */
 
                                 local_result = TRUE;
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index f843b22e20b..eaee1de5e90 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -173,6 +173,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
         /* Support for multiple acquires by the owning thread */
 
         if (obj_desc->mutex.owner_thread) {
+
                 /* Special case for Global Lock, allow all threads */
 
                 if ((obj_desc->mutex.owner_thread->thread_id ==
@@ -192,6 +193,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
 
         status = acpi_ex_system_acquire_mutex(time_desc, obj_desc);
         if (ACPI_FAILURE(status)) {
+
                 /* Includes failure from a timeout on time_desc */
 
                 return_ACPI_STATUS(status);
@@ -286,6 +288,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
 
         obj_desc->mutex.acquisition_depth--;
         if (obj_desc->mutex.acquisition_depth != 0) {
+
                 /* Just decrement the depth and return */
 
                 return_ACPI_STATUS(AE_OK);
diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c
index 054fe5e1a31..f9bc81c1b78 100644
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/executer/exnames.c
@@ -85,6 +85,7 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
          * This may actually be somewhat longer than needed.
          */
         if (prefix_count == ACPI_UINT32_MAX) {
+
                 /* Special case for root */
 
                 size_needed = 1 + (ACPI_NAME_SIZE * num_name_segs) + 2 + 1;
@@ -119,11 +120,13 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
         /* Set up Dual or Multi prefixes if needed */
 
         if (num_name_segs > 2) {
+
                 /* Set up multi prefixes   */
 
                 *temp_ptr++ = AML_MULTI_NAME_PREFIX_OP;
                 *temp_ptr++ = (char)num_name_segs;
         } else if (2 == num_name_segs) {
+
                 /* Set up dual prefixes */
 
                 *temp_ptr++ = AML_DUAL_NAME_PREFIX;
@@ -184,6 +187,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
         /* Valid name segment  */
 
         if (index == 4) {
+
                 /* Found 4 valid characters */
 
                 char_buf[4] = '\0';
@@ -254,6 +258,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
         if (ACPI_TYPE_LOCAL_REGION_FIELD == data_type ||
             ACPI_TYPE_LOCAL_BANK_FIELD == data_type ||
             ACPI_TYPE_LOCAL_INDEX_FIELD == data_type) {
+
                 /* Disallow prefixes for types associated with field_unit names */
 
                 name_string = acpi_ex_allocate_name_string(0, 1);
@@ -410,6 +415,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
         }
 
         if (AE_CTRL_PENDING == status && has_prefix) {
+
                 /* Ran out of segments after processing a prefix */
 
                 ACPI_ERROR((AE_INFO, "Malformed Name at %p", name_string));
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index 23d0823bcd5..4f3627ee2b2 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -342,6 +342,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                         for (i = 0;
                              (i < acpi_gbl_integer_nybble_width) && (digit > 0);
                              i++) {
+
                                 /* Get the least significant 4-bit BCD digit */
 
                                 temp32 = ((u32) digit) & 0xF;
@@ -487,6 +488,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                 status = acpi_ex_convert_to_string(operand[0], &return_desc,
                                                    ACPI_EXPLICIT_CONVERT_DECIMAL);
                 if (return_desc == operand[0]) {
+
                         /* No conversion performed, add ref to handle return value */
                         acpi_ut_add_reference(return_desc);
                 }
@@ -497,6 +499,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                 status = acpi_ex_convert_to_string(operand[0], &return_desc,
                                                    ACPI_EXPLICIT_CONVERT_HEX);
                 if (return_desc == operand[0]) {
+
                         /* No conversion performed, add ref to handle return value */
                         acpi_ut_add_reference(return_desc);
                 }
@@ -506,6 +509,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
 
                 status = acpi_ex_convert_to_buffer(operand[0], &return_desc);
                 if (return_desc == operand[0]) {
+
                         /* No conversion performed, add ref to handle return value */
                         acpi_ut_add_reference(return_desc);
                 }
@@ -516,6 +520,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                 status = acpi_ex_convert_to_integer(operand[0], &return_desc,
                                                     ACPI_ANY_BASE);
                 if (return_desc == operand[0]) {
+
                         /* No conversion performed, add ref to handle return value */
                         acpi_ut_add_reference(return_desc);
                 }
@@ -541,6 +546,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
         }
 
         if (ACPI_SUCCESS(status)) {
+
                 /* Store the return value computed above into the target object */
 
                 status = acpi_ex_store(return_desc, operand[1], walk_state);
@@ -625,6 +631,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                 temp_desc = operand[0];
                 if (ACPI_GET_DESCRIPTOR_TYPE(temp_desc) ==
                     ACPI_DESC_TYPE_OPERAND) {
+
                         /* Internal reference object - prevent deletion */
 
                         acpi_ut_add_reference(temp_desc);
@@ -777,8 +784,25 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
                 /* Check for a method local or argument, or standalone String */
 
-                if (ACPI_GET_DESCRIPTOR_TYPE(operand[0]) !=
+                if (ACPI_GET_DESCRIPTOR_TYPE(operand[0]) ==
                     ACPI_DESC_TYPE_NAMED) {
+                        temp_desc =
+                            acpi_ns_get_attached_object((struct
+                                                         acpi_namespace_node *)
+                                                        operand[0]);
+                        if (temp_desc
+                            &&
+                            ((ACPI_GET_OBJECT_TYPE(temp_desc) ==
+                              ACPI_TYPE_STRING)
+                             || (ACPI_GET_OBJECT_TYPE(temp_desc) ==
+                                 ACPI_TYPE_LOCAL_REFERENCE))) {
+                                operand[0] = temp_desc;
+                                acpi_ut_add_reference(temp_desc);
+                        } else {
+                                status = AE_AML_OPERAND_TYPE;
+                                goto cleanup;
+                        }
+                } else {
                         switch (ACPI_GET_OBJECT_TYPE(operand[0])) {
                         case ACPI_TYPE_LOCAL_REFERENCE:
                                 /*
@@ -827,13 +851,24 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                 break;
 
                         case ACPI_TYPE_STRING:
+                                break;
 
+                        default:
+                                status = AE_AML_OPERAND_TYPE;
+                                goto cleanup;
+                        }
+                }
+
+                if (ACPI_GET_DESCRIPTOR_TYPE(operand[0]) !=
+                    ACPI_DESC_TYPE_NAMED) {
+                        if (ACPI_GET_OBJECT_TYPE(operand[0]) ==
+                            ACPI_TYPE_STRING) {
                                 /*
                                  * This is a deref_of (String). The string is a reference
                                  * to a named ACPI object.
                                  *
                                  * 1) Find the owning Node
-                                 * 2) Dereference the node to an actual object.  Could be a
+                                 * 2) Dereference the node to an actual object. Could be a
                                  *    Field, so we need to resolve the node to a value.
                                  */
                                 status =
@@ -857,11 +892,6 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                      (struct acpi_namespace_node, &return_desc),
                                      walk_state);
                                 goto cleanup;
-
-                        default:
-
-                                status = AE_AML_OPERAND_TYPE;
-                                goto cleanup;
                         }
                 }
 
diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c
index e263a5ddd40..5e1abb12c74 100644
--- a/drivers/acpi/executer/exoparg2.c
+++ b/drivers/acpi/executer/exoparg2.c
@@ -138,6 +138,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
                             acpi_ev_check_for_wake_only_gpe(walk_state->
                                                             gpe_event_info);
                         if (ACPI_FAILURE(status)) {
+
                                 /* AE_WAKE_ONLY_GPE only error, means ignore this notify */
 
                                 return_ACPI_STATUS(AE_OK)
@@ -252,6 +253,7 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)
         acpi_ut_remove_reference(return_desc2);
 
         if (ACPI_FAILURE(status)) {
+
                 /* Delete the return object */
 
                 acpi_ut_remove_reference(return_desc1);
@@ -287,6 +289,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
         /* Execute the opcode */
 
         if (walk_state->op_info->flags & AML_MATH) {
+
                 /* All simple math opcodes (add, etc.) */
 
                 return_desc = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
@@ -383,54 +386,70 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                         goto cleanup;
                 }
 
+                /* Initialize the Index reference object */
+
                 index = operand[1]->integer.value;
+                return_desc->reference.offset = (u32) index;
+                return_desc->reference.opcode = AML_INDEX_OP;
+                return_desc->reference.object = operand[0];
 
-                /* At this point, the Source operand is a Package, Buffer, or String */
+                /*
+                 * At this point, the Source operand is a String, Buffer, or Package.
+                 * Verify that the index is within range.
+                 */
+                switch (ACPI_GET_OBJECT_TYPE(operand[0])) {
+                case ACPI_TYPE_STRING:
 
-                if (ACPI_GET_OBJECT_TYPE(operand[0]) == ACPI_TYPE_PACKAGE) {
-                        /* Object to be indexed is a Package */
+                        if (index >= operand[0]->string.length) {
+                                status = AE_AML_STRING_LIMIT;
+                        }
+
+                        return_desc->reference.target_type =
+                            ACPI_TYPE_BUFFER_FIELD;
+                        break;
+
+                case ACPI_TYPE_BUFFER:
+
+                        if (index >= operand[0]->buffer.length) {
+                                status = AE_AML_BUFFER_LIMIT;
+                        }
+
+                        return_desc->reference.target_type =
+                            ACPI_TYPE_BUFFER_FIELD;
+                        break;
+
+                case ACPI_TYPE_PACKAGE:
 
                         if (index >= operand[0]->package.count) {
-                                ACPI_ERROR((AE_INFO,
-                                            "Index value (%X%8.8X) beyond package end (%X)",
-                                            ACPI_FORMAT_UINT64(index),
-                                            operand[0]->package.count));
                                 status = AE_AML_PACKAGE_LIMIT;
-                                goto cleanup;
                         }
 
                         return_desc->reference.target_type = ACPI_TYPE_PACKAGE;
-                        return_desc->reference.object = operand[0];
                         return_desc->reference.where =
                             &operand[0]->package.elements[index];
-                } else {
-                        /* Object to be indexed is a Buffer/String */
+                        break;
 
-                        if (index >= operand[0]->buffer.length) {
-                                ACPI_ERROR((AE_INFO,
-                                            "Index value (%X%8.8X) beyond end of buffer (%X)",
-                                            ACPI_FORMAT_UINT64(index),
-                                            operand[0]->buffer.length));
-                                status = AE_AML_BUFFER_LIMIT;
-                                goto cleanup;
-                        }
+                default:
 
-                        return_desc->reference.target_type =
-                            ACPI_TYPE_BUFFER_FIELD;
-                        return_desc->reference.object = operand[0];
+                        status = AE_AML_INTERNAL;
+                        goto cleanup;
+                }
+
+                /* Failure means that the Index was beyond the end of the object */
+
+                if (ACPI_FAILURE(status)) {
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Index (%X%8.8X) is beyond end of object",
+                                        ACPI_FORMAT_UINT64(index)));
+                        goto cleanup;
                 }
 
                 /*
                  * Add a reference to the target package/buffer/string for the life
-                 * of the index.
+                 * of the index
                  */
                 acpi_ut_add_reference(operand[0]);
 
-                /* Complete the Index reference object */
-
-                return_desc->reference.opcode = AML_INDEX_OP;
-                return_desc->reference.offset = (u32) index;
-
                 /* Store the reference to the Target */
 
                 status = acpi_ex_store(return_desc, operand[2], walk_state);
@@ -509,6 +528,7 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
         /* Execute the Opcode */
 
         if (walk_state->op_info->flags & AML_LOGICAL_NUMERIC) {
+
                 /* logical_op (Operand0, Operand1) */
 
                 status = acpi_ex_do_logical_numeric_op(walk_state->opcode,
@@ -518,6 +538,7 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
                                                        value, &logical_result);
                 goto store_logical_result;
         } else if (walk_state->op_info->flags & AML_LOGICAL) {
+
                 /* logical_op (Operand0, Operand1) */
 
                 status = acpi_ex_do_logical_op(walk_state->opcode, operand[0],
diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c
index 6a3a883cb8a..8da794ec35b 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/executer/exoparg3.c
@@ -208,6 +208,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
                         /* 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);
@@ -225,6 +226,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
                 }
 
                 if (buffer) {
+
                         /* We have a buffer, copy the portion requested */
 
                         ACPI_MEMCPY(buffer, operand[0]->string.pointer + index,
diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c
index e043d924444..33e4fb1addc 100644
--- a/drivers/acpi/executer/exoparg6.c
+++ b/drivers/acpi/executer/exoparg6.c
@@ -276,6 +276,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
                  * match was found.
                  */
                 for (; index < operand[0]->package.count; index++) {
+
                         /* Get the current package element */
 
                         this_element = operand[0]->package.elements[index];
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 6a4cfdff606..9db68d19253 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -135,6 +135,7 @@ acpi_ex_system_memory_space_handler(u32 function,
                  * Delete the existing mapping and create a new one.
                  */
                 if (mem_info->mapped_length) {
+
                         /* Valid mapping, delete it */
 
                         acpi_os_unmap_memory(mem_info->mapped_logical_address,
diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c
index 01b26c80d22..417d914d9e1 100644
--- a/drivers/acpi/executer/exresnte.c
+++ b/drivers/acpi/executer/exresnte.c
@@ -103,6 +103,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
 
         if ((entry_type == ACPI_TYPE_LOCAL_ALIAS) ||
             (entry_type == ACPI_TYPE_LOCAL_METHOD_ALIAS)) {
+
                 /* There is always exactly one level of indirection */
 
                 node = ACPI_CAST_PTR(struct acpi_namespace_node, node->object);
@@ -141,6 +142,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
 
                 status = acpi_ds_get_package_arguments(source_desc);
                 if (ACPI_SUCCESS(status)) {
+
                         /* Return an additional reference to the object */
 
                         obj_desc = source_desc;
@@ -158,6 +160,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
 
                 status = acpi_ds_get_buffer_arguments(source_desc);
                 if (ACPI_SUCCESS(status)) {
+
                         /* Return an additional reference to the object */
 
                         obj_desc = source_desc;
@@ -240,6 +243,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
                         /* This is a ddb_handle */
                         /* Return an additional reference to the object */
 
+                case AML_REF_OF_OP:
+
                         obj_desc = source_desc;
                         acpi_ut_add_reference(obj_desc);
                         break;
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 1deed492fe8..22dabdd1060 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -382,10 +382,16 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
         while (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_LOCAL_REFERENCE) {
                 switch (obj_desc->reference.opcode) {
                 case AML_REF_OF_OP:
+                case AML_INT_NAMEPATH_OP:
 
                         /* Dereference the reference pointer */
 
-                        node = obj_desc->reference.object;
+                        if (obj_desc->reference.opcode == AML_REF_OF_OP) {
+                                node = obj_desc->reference.object;
+                        } else {        /* AML_INT_NAMEPATH_OP */
+
+                                node = obj_desc->reference.node;
+                        }
 
                         /* All "References" point to a NS node */
 
@@ -401,6 +407,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
 
                         obj_desc = acpi_ns_get_attached_object(node);
                         if (!obj_desc) {
+
                                 /* No object, use the NS node type */
 
                                 type = acpi_ns_get_type(node);
@@ -432,6 +439,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
                          */
                         obj_desc = *(obj_desc->reference.where);
                         if (!obj_desc) {
+
                                 /* NULL package elements are allowed */
 
                                 type = 0;       /* Uninitialized */
@@ -439,39 +447,6 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
                         }
                         break;
 
-                case AML_INT_NAMEPATH_OP:
-
-                        /* Dereference the reference pointer */
-
-                        node = obj_desc->reference.node;
-
-                        /* All "References" point to a NS node */
-
-                        if (ACPI_GET_DESCRIPTOR_TYPE(node) !=
-                            ACPI_DESC_TYPE_NAMED) {
-                                ACPI_ERROR((AE_INFO, "Not a NS node %p [%s]",
-                                            node,
-                                            acpi_ut_get_descriptor_name(node)));
-                                return_ACPI_STATUS(AE_AML_INTERNAL);
-                        }
-
-                        /* Get the attached object */
-
-                        obj_desc = acpi_ns_get_attached_object(node);
-                        if (!obj_desc) {
-                                /* No object, use the NS node type */
-
-                                type = acpi_ns_get_type(node);
-                                goto exit;
-                        }
-
-                        /* Check for circular references */
-
-                        if (obj_desc == operand) {
-                                return_ACPI_STATUS(AE_AML_CIRCULAR_REFERENCE);
-                        }
-                        break;
-
                 case AML_LOCAL_OP:
                 case AML_ARG_OP:
 
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index a1c000f5a41..42b9089dccc 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -77,6 +77,7 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
         ACPI_FUNCTION_ENTRY();
 
         if (type_needed == ACPI_TYPE_ANY) {
+
                 /* All types OK, so we don't perform any typechecks */
 
                 return (AE_OK);
@@ -224,6 +225,7 @@ acpi_ex_resolve_operands(u16 opcode,
                         }
 
                         if (object_type == (u8) ACPI_TYPE_LOCAL_REFERENCE) {
+
                                 /* Decode the Reference */
 
                                 op_info = acpi_ps_get_opcode_info(opcode);
@@ -332,6 +334,7 @@ acpi_ex_resolve_operands(u16 opcode,
                         }
 
                         if (obj_desc->reference.opcode == AML_NAME_OP) {
+
                                 /* Convert a named reference to the actual named object */
 
                                 temp_node = obj_desc->reference.object;
@@ -662,6 +665,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                 }
 
                                 if (target_op == AML_DEBUG_OP) {
+
                                         /* Allow store of any object to the Debug object */
 
                                         break;
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 3f020c0e2b9..287476f319f 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -423,6 +423,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
                 }
 
                 if (obj_desc) {
+
                         /* Decrement reference count by the ref count of the parent package */
 
                         for (i = 0; i < ((union acpi_operand_object *)
@@ -572,6 +573,7 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,
         /* If no implicit conversion, drop into the default case below */
 
         if ((!implicit_conversion) || (walk_state->opcode == AML_COPY_OP)) {
+
                 /* Force execution of default (no implicit conversion) */
 
                 target_type = ACPI_TYPE_ANY;
diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 42967baf760..969f9cbbbee 100644
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -97,6 +97,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
                  */
                 if (ACPI_GET_OBJECT_TYPE(source_desc) ==
                     ACPI_TYPE_LOCAL_REFERENCE) {
+
                         /* Resolve a reference object first */
 
                         status =
@@ -121,6 +122,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
                     !((ACPI_GET_OBJECT_TYPE(source_desc) ==
                        ACPI_TYPE_LOCAL_REFERENCE)
                       && (source_desc->reference.opcode == AML_LOAD_OP))) {
+
                         /* Conversion successful but still not a valid type */
 
                         ACPI_ERROR((AE_INFO,
@@ -289,6 +291,7 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
         }
 
         if (actual_src_desc != source_desc) {
+
                 /* Delete the intermediate (temporary) source object */
 
                 acpi_ut_remove_reference(actual_src_desc);
diff --git a/drivers/acpi/executer/exstorob.c b/drivers/acpi/executer/exstorob.c
index 6ab70708775..41732d382bc 100644
--- a/drivers/acpi/executer/exstorob.c
+++ b/drivers/acpi/executer/exstorob.c
@@ -91,6 +91,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
         /* Copy source buffer to target buffer */
 
         if (length <= target_desc->buffer.length) {
+
                 /* Clear existing buffer and copy in the new one */
 
                 ACPI_MEMSET(target_desc->buffer.pointer, 0,
@@ -113,6 +114,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
                  * copy must not truncate the original buffer.
                  */
                 if (original_src_type == ACPI_TYPE_STRING) {
+
                         /* Set the new length of the target */
 
                         target_desc->buffer.length = length;
@@ -183,6 +185,7 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc,
                  */
                 if (target_desc->string.pointer &&
                     (!(target_desc->common.flags & AOPOBJ_STATIC_POINTER))) {
+
                         /* Only free if not a pointer into the DSDT */
 
                         ACPI_MEM_FREE(target_desc->string.pointer);
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c
index ea9144f42e1..6a2e47a0e11 100644
--- a/drivers/acpi/executer/exsystem.c
+++ b/drivers/acpi/executer/exsystem.c
@@ -76,6 +76,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_handle semaphore, u16 timeout)
         }
 
         if (status == AE_TIME) {
+
                 /* We must wait, so unlock the interpreter */
 
                 acpi_ex_exit_interpreter();
@@ -90,6 +91,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_handle semaphore, u16 timeout)
 
                 status2 = acpi_ex_enter_interpreter();
                 if (ACPI_FAILURE(status2)) {
+
                         /* Report fatal error, could not acquire interpreter */
 
                         return_ACPI_STATUS(status2);
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index f73a61aeb7e..8543d1a0ed3 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -194,6 +194,7 @@ u8 acpi_ex_acquire_global_lock(u32 field_flags)
         /* Only attempt lock if the always_lock bit is set */
 
         if (field_flags & AML_FIELD_LOCK_RULE_MASK) {
+
                 /* We should attempt to get the lock, wait forever */
 
                 status = acpi_ev_acquire_global_lock(ACPI_WAIT_FOREVER);
@@ -230,10 +231,12 @@ void acpi_ex_release_global_lock(u8 locked_by_me)
         /* Only attempt unlock if the caller locked it */
 
         if (locked_by_me) {
+
                 /* OK, now release the lock */
 
                 status = acpi_ev_release_global_lock();
                 if (ACPI_FAILURE(status)) {
+
                         /* Report the error, but there isn't much else we can do */
 
                         ACPI_EXCEPTION((AE_INFO, status,