5 files changed, 43 insertions, 38 deletions

diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index 9ae3cb55979..823352435e0 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -214,9 +214,8 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
                  * location within the namespace where the table will be loaded.
                  */
                 status =
-                    acpi_ns_get_node_by_path(operand[3]->string.pointer,
-                                             start_node, ACPI_NS_SEARCH_PARENT,
-                                             &parent_node);
+                    acpi_ns_get_node(start_node, operand[3]->string.pointer,
+                                     ACPI_NS_SEARCH_PARENT, &parent_node);
                 if (ACPI_FAILURE(status)) {
                         return_ACPI_STATUS(status);
                 }
@@ -237,9 +236,8 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
                 /* Find the node referenced by the parameter_path_string */
 
                 status =
-                    acpi_ns_get_node_by_path(operand[4]->string.pointer,
-                                             start_node, ACPI_NS_SEARCH_PARENT,
-                                             &parameter_node);
+                    acpi_ns_get_node(start_node, operand[4]->string.pointer,
+                                     ACPI_NS_SEARCH_PARENT, &parameter_node);
                 if (ACPI_FAILURE(status)) {
                         return_ACPI_STATUS(status);
                 }
diff --git a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c
index ca9925c0d01..3b7c4352ec5 100644
--- a/drivers/acpi/executer/exfldio.c
+++ b/drivers/acpi/executer/exfldio.c
@@ -145,10 +145,10 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
          * length of one field datum (access width) must fit within the region.
          * (Region length is specified in bytes)
          */
-        if (rgn_desc->region.length < (obj_desc->common_field.base_byte_offset +
-                                       field_datum_byte_offset +
-                                       obj_desc->common_field.
-                                       access_byte_width)) {
+        if (rgn_desc->region.length <
+            (obj_desc->common_field.base_byte_offset +
+             field_datum_byte_offset +
+             obj_desc->common_field.access_byte_width)) {
                 if (acpi_gbl_enable_interpreter_slack) {
                         /*
                          * Slack mode only:  We will go ahead and allow access to this
@@ -811,13 +811,15 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
 
         mask =
             ACPI_MASK_BITS_BELOW(obj_desc->common_field.start_field_bit_offset);
-        datum_count =
-            ACPI_ROUND_UP_TO(obj_desc->common_field.bit_length,
-                             obj_desc->common_field.access_bit_width);
-        field_datum_count =
-            ACPI_ROUND_UP_TO(obj_desc->common_field.bit_length +
-                             obj_desc->common_field.start_field_bit_offset,
-                             obj_desc->common_field.access_bit_width);
+
+        datum_count = ACPI_ROUND_UP_TO(obj_desc->common_field.bit_length,
+                                       obj_desc->common_field.access_bit_width);
+
+        field_datum_count = ACPI_ROUND_UP_TO(obj_desc->common_field.bit_length +
+                                             obj_desc->common_field.
+                                             start_field_bit_offset,
+                                             obj_desc->common_field.
+                                             access_bit_width);
 
         /* Get initial Datum from the input buffer */
 
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index 794d9b8de95..bd98aab017c 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -445,10 +445,24 @@ acpi_ex_do_math_op(u16 opcode, acpi_integer integer0, acpi_integer integer1)
 
         case AML_SHIFT_LEFT_OP: /* shift_left (Operand, shift_count, Result) */
 
+                /*
+                 * We need to check if the shiftcount is larger than the integer bit
+                 * width since the behavior of this is not well-defined in the C language.
+                 */
+                if (integer1 >= acpi_gbl_integer_bit_width) {
+                        return (0);
+                }
                 return (integer0 << integer1);
 
         case AML_SHIFT_RIGHT_OP:        /* shift_right (Operand, shift_count, Result) */
 
+                /*
+                 * We need to check if the shiftcount is larger than the integer bit
+                 * width since the behavior of this is not well-defined in the C language.
+                 */
+                if (integer1 >= acpi_gbl_integer_bit_width) {
+                        return (0);
+                }
                 return (integer0 >> integer1);
 
         case AML_SUBTRACT_OP:   /* Subtract (Integer0, Integer1, Result) */
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index 05b89c5878e..8284c52875b 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -874,16 +874,14 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                  *    Field, so we need to resolve the node to a value.
                                  */
                                 status =
-                                    acpi_ns_get_node_by_path(operand[0]->string.
-                                                             pointer,
-                                                             walk_state->
-                                                             scope_info->scope.
-                                                             node,
-                                                             ACPI_NS_SEARCH_PARENT,
-                                                             ACPI_CAST_INDIRECT_PTR
-                                                             (struct
-                                                              acpi_namespace_node,
-                                                              &return_desc));
+                                    acpi_ns_get_node(walk_state->scope_info->
+                                                     scope.node,
+                                                     operand[0]->string.pointer,
+                                                     ACPI_NS_SEARCH_PARENT,
+                                                     ACPI_CAST_INDIRECT_PTR
+                                                     (struct
+                                                      acpi_namespace_node,
+                                                      &return_desc));
                                 if (ACPI_FAILURE(status)) {
                                         goto cleanup;
                                 }
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 4fba452a559..3cc97ba48b3 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -477,23 +477,16 @@ acpi_ex_data_table_space_handler(u32 function,
                                  acpi_integer * value,
                                  void *handler_context, void *region_context)
 {
-        acpi_status status = AE_OK;
-        u32 byte_width = ACPI_DIV_8(bit_width);
-        u32 i;
-        char *logical_addr_ptr;
-
         ACPI_FUNCTION_TRACE(ex_data_table_space_handler);
 
-        logical_addr_ptr = ACPI_PHYSADDR_TO_PTR(address);
-
         /* Perform the memory read or write */
 
         switch (function) {
         case ACPI_READ:
 
-                for (i = 0; i < byte_width; i++) {
-                        ((char *)value)[i] = logical_addr_ptr[i];
-                }
+                ACPI_MEMCPY(ACPI_CAST_PTR(char, value),
+                            ACPI_PHYSADDR_TO_PTR(address),
+                            ACPI_DIV_8(bit_width));
                 break;
 
         case ACPI_WRITE:
@@ -502,5 +495,5 @@ acpi_ex_data_table_space_handler(u32 function,
                 return_ACPI_STATUS(AE_SUPPORT);
         }
 
-        return_ACPI_STATUS(status);
+        return_ACPI_STATUS(AE_OK);
 }