3 files changed, 127 insertions, 97 deletions

diff --git a/drivers/acpi/parser/psargs.c b/drivers/acpi/parser/psargs.c
index 6eae35febccd..e6d4cb9fd303 100644
--- a/drivers/acpi/parser/psargs.c
+++ b/drivers/acpi/parser/psargs.c
@@ -45,6 +45,7 @@
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
+#include <acpi/acdispat.h>
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psargs")
@@ -211,7 +212,7 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
  *              Arg                 - Where the namepath will be stored
  *              arg_count           - If the namepath points to a control method
  *                                    the method's argument is returned here.
- *              method_call         - Whether the namepath can possibly be the
+ *              possible_method_call - Whether the namepath can possibly be the
  *                                    start of a method call
  *
  * RETURN:      Status
@@ -227,11 +228,11 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
 acpi_status
 acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
                           struct acpi_parse_state *parser_state,
-                          union acpi_parse_object *arg, u8 method_call)
+                          union acpi_parse_object *arg, u8 possible_method_call)
 {
         char *path;
         union acpi_parse_object *name_op;
-        acpi_status status = AE_OK;
+        acpi_status status;
         union acpi_operand_object *method_desc;
         struct acpi_namespace_node *node;
         union acpi_generic_state scope_info;
@@ -239,114 +240,127 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
         ACPI_FUNCTION_TRACE("ps_get_next_namepath");
 
         path = acpi_ps_get_next_namestring(parser_state);
+        acpi_ps_init_op(arg, AML_INT_NAMEPATH_OP);
 
-        /* Null path case is allowed */
+        /* Null path case is allowed, just exit */
 
-        if (path) {
-                /*
-                 * Lookup the name in the internal namespace
-                 */
-                scope_info.scope.node = NULL;
-                node = parser_state->start_node;
-                if (node) {
-                        scope_info.scope.node = node;
-                }
+        if (!path) {
+                arg->common.value.name = path;
+                return_ACPI_STATUS(AE_OK);
+        }
 
-                /*
-                 * Lookup object.  We don't want to add anything new to the namespace
-                 * here, however.  So we use MODE_EXECUTE.  Allow searching of the
-                 * parent tree, but don't open a new scope -- we just want to lookup the
-                 * object  (MUST BE mode EXECUTE to perform upsearch)
-                 */
-                status = acpi_ns_lookup(&scope_info, path, ACPI_TYPE_ANY,
-                                        ACPI_IMODE_EXECUTE,
-                                        ACPI_NS_SEARCH_PARENT |
-                                        ACPI_NS_DONT_OPEN_SCOPE, NULL, &node);
-                if (ACPI_SUCCESS(status) && method_call) {
-                        if (node->type == ACPI_TYPE_METHOD) {
-                                /* This name is actually a control method invocation */
-
-                                method_desc = acpi_ns_get_attached_object(node);
-                                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                                  "Control Method - %p Desc %p Path=%p\n",
-                                                  node, method_desc, path));
-
-                                name_op = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP);
-                                if (!name_op) {
-                                        return_ACPI_STATUS(AE_NO_MEMORY);
-                                }
+        /* Setup search scope info */
+
+        scope_info.scope.node = NULL;
+        node = parser_state->start_node;
+        if (node) {
+                scope_info.scope.node = node;
+        }
 
-                                /* Change arg into a METHOD CALL and attach name to it */
+        /*
+         * Lookup the name in the internal namespace. We don't want to add
+         * anything new to the namespace here, however, so we use MODE_EXECUTE.
+         * Allow searching of the parent tree, but don't open a new scope -
+         * we just want to lookup the object (must be mode EXECUTE to perform
+         * the upsearch)
+         */
+        status =
+            acpi_ns_lookup(&scope_info, path, ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
+                           ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
+                           NULL, &node);
 
-                                acpi_ps_init_op(arg, AML_INT_METHODCALL_OP);
-                                name_op->common.value.name = path;
+        /*
+         * If this name is a control method invocation, we must
+         * setup the method call
+         */
+        if (ACPI_SUCCESS(status) &&
+            possible_method_call && (node->type == ACPI_TYPE_METHOD)) {
+                /* This name is actually a control method invocation */
 
-                                /* Point METHODCALL/NAME to the METHOD Node */
+                method_desc = acpi_ns_get_attached_object(node);
+                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
+                                  "Control Method - %p Desc %p Path=%p\n", node,
+                                  method_desc, path));
 
-                                name_op->common.node = node;
-                                acpi_ps_append_arg(arg, name_op);
+                name_op = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP);
+                if (!name_op) {
+                        return_ACPI_STATUS(AE_NO_MEMORY);
+                }
 
-                                if (!method_desc) {
-                                        ACPI_REPORT_ERROR(("ps_get_next_namepath: Control Method %p has no attached object\n", node));
-                                        return_ACPI_STATUS(AE_AML_INTERNAL);
-                                }
+                /* Change Arg into a METHOD CALL and attach name to it */
 
-                                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                                  "Control Method - %p Args %X\n",
-                                                  node,
-                                                  method_desc->method.
-                                                  param_count));
+                acpi_ps_init_op(arg, AML_INT_METHODCALL_OP);
+                name_op->common.value.name = path;
 
-                                /* Get the number of arguments to expect */
+                /* Point METHODCALL/NAME to the METHOD Node */
 
-                                walk_state->arg_count =
-                                    method_desc->method.param_count;
-                                return_ACPI_STATUS(AE_OK);
-                        }
+                name_op->common.node = node;
+                acpi_ps_append_arg(arg, name_op);
 
-                        /*
-                         * Else this is normal named object reference.
-                         * Just init the NAMEPATH object with the pathname.
-                         * (See code below)
-                         */
+                if (!method_desc) {
+                        ACPI_REPORT_ERROR(("ps_get_next_namepath: Control Method %p has no attached object\n", node));
+                        return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
 
-                if (ACPI_FAILURE(status)) {
-                        /*
-                         * 1) Any error other than NOT_FOUND is always severe
-                         * 2) NOT_FOUND is only important if we are executing a method.
-                         * 3) If executing a cond_ref_of opcode, NOT_FOUND is ok.
-                         */
-                        if ((((walk_state->
-                               parse_flags & ACPI_PARSE_MODE_MASK) ==
-                              ACPI_PARSE_EXECUTE) && (status == AE_NOT_FOUND)
-                             && (walk_state->op->common.aml_opcode !=
-                                 AML_COND_REF_OF_OP))
-                            || (status != AE_NOT_FOUND)) {
-                                ACPI_REPORT_NSERROR(path, status);
-
-                                acpi_os_printf
-                                    ("search_node %p start_node %p return_node %p\n",
-                                     scope_info.scope.node,
-                                     parser_state->start_node, node);
-                        } else {
-                                /*
-                                 * We got a NOT_FOUND during table load or we encountered
-                                 * a cond_ref_of(x) where the target does not exist.
-                                 * Either case is ok
-                                 */
-                                status = AE_OK;
-                        }
-                }
+                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
+                                  "Control Method - %p Args %X\n",
+                                  node, method_desc->method.param_count));
+
+                /* Get the number of arguments to expect */
+
+                walk_state->arg_count = method_desc->method.param_count;
+                return_ACPI_STATUS(AE_OK);
         }
 
         /*
-         * Regardless of success/failure above,
-         * Just initialize the Op with the pathname.
+         * Special handling if the name was not found during the lookup -
+         * some not_found cases are allowed
          */
-        acpi_ps_init_op(arg, AML_INT_NAMEPATH_OP);
-        arg->common.value.name = path;
+        if (status == AE_NOT_FOUND) {
+                /* 1) not_found is ok during load pass 1/2 (allow forward references) */
+
+                if ((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) !=
+                    ACPI_PARSE_EXECUTE) {
+                        status = AE_OK;
+                }
+
+                /* 2) not_found during a cond_ref_of(x) is ok by definition */
+
+                else if (walk_state->op->common.aml_opcode ==
+                         AML_COND_REF_OF_OP) {
+                        status = AE_OK;
+                }
+
+                /*
+                 * 3) not_found while building a Package is ok at this point, we
+                 * may flag as an error later if slack mode is not enabled.
+                 * (Some ASL code depends on allowing this behavior)
+                 */
+                else if ((arg->common.parent) &&
+                         ((arg->common.parent->common.aml_opcode ==
+                           AML_PACKAGE_OP)
+                          || (arg->common.parent->common.aml_opcode ==
+                              AML_VAR_PACKAGE_OP))) {
+                        status = AE_OK;
+                }
+        }
+
+        /* Final exception check (may have been changed from code above) */
+
+        if (ACPI_FAILURE(status)) {
+                ACPI_REPORT_NSERROR(path, status);
+
+                if ((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) ==
+                    ACPI_PARSE_EXECUTE) {
+                        /* Report a control method execution error */
 
+                        status = acpi_ds_method_error(status, walk_state);
+                }
+        }
+
+        /* Save the namepath */
+
+        arg->common.value.name = path;
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/parser/psloop.c b/drivers/acpi/parser/psloop.c
index 088d33999d90..e81e51b8b3ae 100644
--- a/drivers/acpi/parser/psloop.c
+++ b/drivers/acpi/parser/psloop.c
@@ -704,6 +704,15 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                 acpi_ps_pop_scope(parser_state, &op,
                                                   &walk_state->arg_types,
                                                   &walk_state->arg_count);
+
+                                if (op->common.aml_opcode != AML_WHILE_OP) {
+                                        status2 =
+                                            acpi_ds_result_stack_pop
+                                            (walk_state);
+                                        if (ACPI_FAILURE(status2)) {
+                                                return_ACPI_STATUS(status2);
+                                        }
+                                }
                         }
 
                         /* Close this iteration of the While loop */
diff --git a/drivers/acpi/parser/psparse.c b/drivers/acpi/parser/psparse.c
index 7cfa7eb0dfc7..f0979b2956f2 100644
--- a/drivers/acpi/parser/psparse.c
+++ b/drivers/acpi/parser/psparse.c
@@ -333,7 +333,6 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
 
         switch (callback_status) {
         case AE_CTRL_TERMINATE:
-
                 /*
                  * A control method was terminated via a RETURN statement.
                  * The walk of this method is complete.
@@ -346,13 +345,19 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
 
                 parser_state->aml = walk_state->aml_last_while;
                 walk_state->control_state->common.value = FALSE;
-                status = AE_CTRL_BREAK;
+                status = acpi_ds_result_stack_pop(walk_state);
+                if (ACPI_SUCCESS(status)) {
+                        status = AE_CTRL_BREAK;
+                }
                 break;
 
         case AE_CTRL_CONTINUE:
 
                 parser_state->aml = walk_state->aml_last_while;
-                status = AE_CTRL_CONTINUE;
+                status = acpi_ds_result_stack_pop(walk_state);
+                if (ACPI_SUCCESS(status)) {
+                        status = AE_CTRL_CONTINUE;
+                }
                 break;
 
         case AE_CTRL_PENDING:
@@ -369,16 +374,18 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
 #endif
 
         case AE_CTRL_TRUE:
-
                 /*
                  * Predicate of an IF was true, and we are at the matching ELSE.
                  * Just close out this package
                  */
                 parser_state->aml = acpi_ps_get_next_package_end(parser_state);
+                status = acpi_ds_result_stack_pop(walk_state);
+                if (ACPI_SUCCESS(status)) {
+                        status = AE_CTRL_PENDING;
+                }
                 break;
 
         case AE_CTRL_FALSE:
-
                 /*
                  * Either an IF/WHILE Predicate was false or we encountered a BREAK
                  * opcode.  In both cases, we do not execute the rest of the