1 files changed, 39 insertions, 25 deletions

diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index 10fc78517843..b40513dd6a6a 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -212,18 +212,19 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                 case ACPI_TYPE_BUFFER:
 
                         /*
-                         * These types we will allow, but we will change the type. This
-                         * enables some existing code of the form:
+                         * These types we will allow, but we will change the type.
+                         * This enables some existing code of the form:
                          *
                          *  Name (DEB, 0)
                          *  Scope (DEB) { ... }
                          *
-                         * Note: silently change the type here. On the second pass, we will report
-                         * a warning
+                         * Note: silently change the type here. On the second pass,
+                         * we will report a warning
                          */
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                          "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)\n",
-                                          path,
+                                          "Type override - [%4.4s] had invalid type (%s) "
+                                          "for Scope operator, changed to type ANY\n",
+                                          acpi_ut_get_node_name(node),
                                           acpi_ut_get_type_name(node->type)));
 
                         node->type = ACPI_TYPE_ANY;
@@ -235,8 +236,10 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                         /* All other types are an error */
 
                         ACPI_ERROR((AE_INFO,
-                                    "Invalid type (%s) for target of Scope operator [%4.4s] (Cannot override)",
-                                    acpi_ut_get_type_name(node->type), path));
+                                    "Invalid type (%s) for target of "
+                                    "Scope operator [%4.4s] (Cannot override)",
+                                    acpi_ut_get_type_name(node->type),
+                                    acpi_ut_get_node_name(node)));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
@@ -697,15 +700,16 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                 case ACPI_TYPE_BUFFER:
 
                         /*
-                         * These types we will allow, but we will change the type. This
-                         * enables some existing code of the form:
+                         * These types we will allow, but we will change the type.
+                         * This enables some existing code of the form:
                          *
                          *  Name (DEB, 0)
                          *  Scope (DEB) { ... }
                          */
                         ACPI_WARNING((AE_INFO,
-                                      "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)",
-                                      buffer_ptr,
+                                      "Type override - [%4.4s] had invalid type (%s) "
+                                      "for Scope operator, changed to type ANY\n",
+                                      acpi_ut_get_node_name(node),
                                       acpi_ut_get_type_name(node->type)));
 
                         node->type = ACPI_TYPE_ANY;
@@ -717,9 +721,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                         /* All other types are an error */
 
                         ACPI_ERROR((AE_INFO,
-                                    "Invalid type (%s) for target of Scope operator [%4.4s]",
+                                    "Invalid type (%s) for target of "
+                                    "Scope operator [%4.4s] (Cannot override)",
                                     acpi_ut_get_type_name(node->type),
-                                    buffer_ptr));
+                                    acpi_ut_get_node_name(node)));
 
                         return (AE_AML_OPERAND_TYPE);
                 }
@@ -1047,9 +1052,22 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                         }
 
                         /*
-                         * If we are executing a method, initialize the region
+                         * The op_region is not fully parsed at this time. The only valid
+                         * argument is the space_id. (We must save the address of the
+                         * AML of the address and length operands)
+                         *
+                         * If we have a valid region, initialize it. The namespace is
+                         * unlocked at this point.
+                         *
+                         * Need to unlock interpreter if it is locked (if we are running
+                         * a control method), in order to allow _REG methods to be run
+                         * during acpi_ev_initialize_region.
                          */
                         if (walk_state->method_node) {
+                                /*
+                                 * Executing a method: initialize the region and unlock
+                                 * the interpreter
+                                 */
                                 status =
                                     acpi_ex_create_region(op->named.data,
                                                           op->named.length,
@@ -1058,21 +1076,17 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                                 if (ACPI_FAILURE(status)) {
                                         return (status);
                                 }
-                        }
 
-                        /*
-                         * The op_region is not fully parsed at this time. Only valid
-                         * argument is the space_id. (We must save the address of the
-                         * AML of the address and length operands)
-                         */
+                                acpi_ex_exit_interpreter();
+                        }
 
-                        /*
-                         * If we have a valid region, initialize it
-                         * Namespace is NOT locked at this point.
-                         */
                         status =
                             acpi_ev_initialize_region
                             (acpi_ns_get_attached_object(node), FALSE);
+                        if (walk_state->method_node) {
+                                acpi_ex_enter_interpreter();
+                        }
+
                         if (ACPI_FAILURE(status)) {
                                 /*
                                  *  If AE_NOT_EXIST is returned, it is not fatal