ACPICA: Dispatcher: Cleanup union acpi_operand_object's AML address assignments

ACPICA commit afb52611dbe7403551f93504d3798534f5c343f4

This patch cleans up the code of assigning the AML address to the
union acpi_operand_object.

The idea behind this cleanup is:
The AML address of the union acpi_operand_object should always be determined at
the point where the object is encountered. It should be started from the
first byte of the object. For example, the opcode of the object, the name
string of the user_term object, or the first byte of the packaged object
(where a pkg_length is prefixed). So it's not cleaner to have it assigned
here and there in the entire ACPICA source tree.

There are some special cases for the internal opcodes, before cleaning up
the internal opcodes, we should also determine the rules for the AML
addresses of the internal opcodes:
1. INT_NAMEPATH_OP: the address of the first byte for the name_string.
2. INT_METHODCALL_OP: the address of the first byte for the name_string.
3. INT_BYTELIST_OP: the address of the first byte for the byte_data list.
4. INT_EVAL_SUBTREE_OP: the address of the first byte for the
                        Region/Package/Buffer/bank_field/Field arguments.
5. INT_NAMEDFIELD_OP: the address to the name_seg.
6. INT_RESERVEDFIELD_OP: the address to the 0x00 prefix.
7. INT_ACCESSFIELD_OP: the address to the 0x01 prefix.
8. INT_CONNECTION_OP: the address to the 0x02 prefix.
9: INT_EXTACCESSFIELD_OP: the address to the 0x03 prefix.
10.INT_RETURN_VALUE_OP: the address of the replaced operand.
11.computational_data: the address to the
                      Byte/Word/Dword/Qword/string_prefix.

Before cleaning up the internal root scope of the aml_walk, turning it into
the term_list, we need to remember the aml_start address as the "Aml"
attribute for the union acpi_operand_object created by acpi_ps_create_scope_op().

Finally, we can delete some redundant AML address assignment in psloop.c.

Link: https://github.com/acpica/acpica/commit/afb52611
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

12 files changed, 53 insertions, 49 deletions

diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index 0cdd2fce493a..6021ccfb0b1c 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h
@@ -225,11 +225,11 @@ void acpi_ps_delete_parse_tree(union acpi_parse_object *root);
 /*
  * psutils - parser utilities
  */
-union acpi_parse_object *acpi_ps_create_scope_op(void);
+union acpi_parse_object *acpi_ps_create_scope_op(u8 *aml);
 
 void acpi_ps_init_op(union acpi_parse_object *op, u16 opcode);
 
-union acpi_parse_object *acpi_ps_alloc_op(u16 opcode);
+union acpi_parse_object *acpi_ps_alloc_op(u16 opcode, u8 *aml);
 
 void acpi_ps_free_op(union acpi_parse_object *op);
 
diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c
index 3e6989738e85..e2ab59e39162 100644
--- a/drivers/acpi/acpica/dsargs.c
+++ b/drivers/acpi/acpica/dsargs.c
@@ -86,7 +86,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,
 
         /* Allocate a new parser op to be the root of the parsed tree */
 
-        op = acpi_ps_alloc_op(AML_INT_EVAL_SUBTREE_OP);
+        op = acpi_ps_alloc_op(AML_INT_EVAL_SUBTREE_OP, aml_start);
         if (!op) {
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
@@ -129,7 +129,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,
 
         /* Evaluate the deferred arguments */
 
-        op = acpi_ps_alloc_op(AML_INT_EVAL_SUBTREE_OP);
+        op = acpi_ps_alloc_op(AML_INT_EVAL_SUBTREE_OP, aml_start);
         if (!op) {
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index bf8c16e379fb..4abc2425de4b 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -103,7 +103,7 @@ acpi_ds_auto_serialize_method(struct acpi_namespace_node *node,
 
         /* Create/Init a root op for the method parse tree */
 
-        op = acpi_ps_alloc_op(AML_METHOD_OP);
+        op = acpi_ps_alloc_op(AML_METHOD_OP, obj_desc->method.aml_start);
         if (!op) {
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index 845ff44919c3..097188a6b1c1 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -388,7 +388,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
 
                 /* Create a new op */
 
-                op = acpi_ps_alloc_op(walk_state->opcode);
+                op = acpi_ps_alloc_op(walk_state->opcode, walk_state->aml);
                 if (!op) {
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c
index fcaa30c611fb..e2c08cd79aca 100644
--- a/drivers/acpi/acpica/dswload2.c
+++ b/drivers/acpi/acpica/dswload2.c
@@ -335,7 +335,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
 
                 /* Create a new op */
 
-                op = acpi_ps_alloc_op(walk_state->opcode);
+                op = acpi_ps_alloc_op(walk_state->opcode, walk_state->aml);
                 if (!op) {
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index 9926a67ca6d7..3736d43b18b9 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -78,6 +78,20 @@ acpi_ns_one_complete_parse(u32 pass_number,
 
         ACPI_FUNCTION_TRACE(ns_one_complete_parse);
 
+        status = acpi_get_table_by_index(table_index, &table);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Table must consist of at least a complete header */
+
+        if (table->length < sizeof(struct acpi_table_header)) {
+                return_ACPI_STATUS(AE_BAD_HEADER);
+        }
+
+        aml_start = (u8 *)table + sizeof(struct acpi_table_header);
+        aml_length = table->length - sizeof(struct acpi_table_header);
+
         status = acpi_tb_get_owner_id(table_index, &owner_id);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
@@ -85,7 +99,7 @@ acpi_ns_one_complete_parse(u32 pass_number,
 
         /* Create and init a Root Node */
 
-        parse_root = acpi_ps_create_scope_op();
+        parse_root = acpi_ps_create_scope_op(aml_start);
         if (!parse_root) {
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
@@ -98,23 +112,12 @@ acpi_ns_one_complete_parse(u32 pass_number,
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
-        status = acpi_get_table_by_index(table_index, &table);
+        status = acpi_ds_init_aml_walk(walk_state, parse_root, NULL,
+                                       aml_start, aml_length, NULL,
+                                       (u8)pass_number);
         if (ACPI_FAILURE(status)) {
                 acpi_ds_delete_walk_state(walk_state);
-                acpi_ps_free_op(parse_root);
-                return_ACPI_STATUS(status);
-        }
-
-        /* Table must consist of at least a complete header */
-
-        if (table->length < sizeof(struct acpi_table_header)) {
-                status = AE_BAD_HEADER;
-        } else {
-                aml_start = (u8 *)table + sizeof(struct acpi_table_header);
-                aml_length = table->length - sizeof(struct acpi_table_header);
-                status = acpi_ds_init_aml_walk(walk_state, parse_root, NULL,
-                                               aml_start, aml_length, NULL,
-                                               (u8)pass_number);
+                goto cleanup;
         }
 
         /* Found OSDT table, enable the namespace override feature */
@@ -124,11 +127,6 @@ acpi_ns_one_complete_parse(u32 pass_number,
                 walk_state->namespace_override = TRUE;
         }
 
-        if (ACPI_FAILURE(status)) {
-                acpi_ds_delete_walk_state(walk_state);
-                goto cleanup;
-        }
-
         /* start_node is the default location to load the table */
 
         if (start_node && start_node != acpi_gbl_root_node) {
diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index 0bee9466d149..29d8b7b01dca 100644
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -287,7 +287,7 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
                                   "Control Method - %p Desc %p Path=%p\n", node,
                                   method_desc, path));
 
-                name_op = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP);
+                name_op = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP, start);
                 if (!name_op) {
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
@@ -535,13 +535,11 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
 
         /* Allocate a new field op */
 
-        field = acpi_ps_alloc_op(opcode);
+        field = acpi_ps_alloc_op(opcode, aml);
         if (!field) {
                 return_PTR(NULL);
         }
 
-        field->common.aml = aml;
-
         /* Decode the field type */
 
         switch (opcode) {
@@ -603,6 +601,7 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
                  * Argument for Connection operator can be either a Buffer
                  * (resource descriptor), or a name_string.
                  */
+                aml = parser_state->aml;
                 if (ACPI_GET8(parser_state->aml) == AML_BUFFER_OP) {
                         parser_state->aml++;
 
@@ -615,7 +614,8 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
 
                                 /* Non-empty list */
 
-                                arg = acpi_ps_alloc_op(AML_INT_BYTELIST_OP);
+                                arg =
+                                    acpi_ps_alloc_op(AML_INT_BYTELIST_OP, aml);
                                 if (!arg) {
                                         acpi_ps_free_op(field);
                                         return_PTR(NULL);
@@ -664,7 +664,7 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
 
                         parser_state->aml = pkg_end;
                 } else {
-                        arg = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP);
+                        arg = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP, aml);
                         if (!arg) {
                                 acpi_ps_free_op(field);
                                 return_PTR(NULL);
@@ -729,7 +729,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
 
                 /* Constants, strings, and namestrings are all the same size */
 
-                arg = acpi_ps_alloc_op(AML_BYTE_OP);
+                arg = acpi_ps_alloc_op(AML_BYTE_OP, parser_state->aml);
                 if (!arg) {
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
@@ -776,7 +776,8 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
 
                         /* Non-empty list */
 
-                        arg = acpi_ps_alloc_op(AML_INT_BYTELIST_OP);
+                        arg = acpi_ps_alloc_op(AML_INT_BYTELIST_OP,
+                                               parser_state->aml);
                         if (!arg) {
                                 return_ACPI_STATUS(AE_NO_MEMORY);
                         }
@@ -806,7 +807,9 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
 
                         /* null_name or name_string */
 
-                        arg = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP);
+                        arg =
+                            acpi_ps_alloc_op(AML_INT_NAMEPATH_OP,
+                                             parser_state->aml);
                         if (!arg) {
                                 return_ACPI_STATUS(AE_NO_MEMORY);
                         }
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index d5843830fef8..49c60c2671ef 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -137,7 +137,6 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                         }
 
                         if (arg) {
-                                arg->common.aml = walk_state->aml;
                                 acpi_ps_append_arg(op, arg);
                         }
 
@@ -491,8 +490,6 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                 continue;
                         }
 
-                        op->common.aml = walk_state->aml;
-
                         if (walk_state->op_info) {
                                 ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
                                                   "Opcode %4.4X [%s] Op %p Aml %p\n",
diff --git a/drivers/acpi/acpica/psobject.c b/drivers/acpi/acpica/psobject.c
index 6ba3bb7402a9..e54bc2aa7a88 100644
--- a/drivers/acpi/acpica/psobject.c
+++ b/drivers/acpi/acpica/psobject.c
@@ -297,7 +297,7 @@ acpi_ps_create_op(struct acpi_walk_state *walk_state,
         /* Create Op structure and append to parent's argument list */
 
         walk_state->op_info = acpi_ps_get_opcode_info(walk_state->opcode);
-        op = acpi_ps_alloc_op(walk_state->opcode);
+        op = acpi_ps_alloc_op(walk_state->opcode, aml_op_start);
         if (!op) {
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index a555f7f7b9a2..b857ad58022a 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -185,7 +185,8 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,
                          * op must be replaced by a placeholder return op
                          */
                         replacement_op =
-                            acpi_ps_alloc_op(AML_INT_RETURN_VALUE_OP);
+                            acpi_ps_alloc_op(AML_INT_RETURN_VALUE_OP,
+                                             op->common.aml);
                         if (!replacement_op) {
                                 status = AE_NO_MEMORY;
                         }
@@ -209,7 +210,8 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,
                             || (op->common.parent->common.aml_opcode ==
                                 AML_VAR_PACKAGE_OP)) {
                                 replacement_op =
-                                    acpi_ps_alloc_op(AML_INT_RETURN_VALUE_OP);
+                                    acpi_ps_alloc_op(AML_INT_RETURN_VALUE_OP,
+                                                     op->common.aml);
                                 if (!replacement_op) {
                                         status = AE_NO_MEMORY;
                                 }
@@ -224,7 +226,8 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,
                                         AML_VAR_PACKAGE_OP)) {
                                         replacement_op =
                                             acpi_ps_alloc_op(op->common.
-                                                             aml_opcode);
+                                                             aml_opcode,
+                                                             op->common.aml);
                                         if (!replacement_op) {
                                                 status = AE_NO_MEMORY;
                                         } else {
@@ -240,7 +243,8 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,
                 default:
 
                         replacement_op =
-                            acpi_ps_alloc_op(AML_INT_RETURN_VALUE_OP);
+                            acpi_ps_alloc_op(AML_INT_RETURN_VALUE_OP,
+                                             op->common.aml);
                         if (!replacement_op) {
                                 status = AE_NO_MEMORY;
                         }
diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c
index 32440912023a..183cc1efbc51 100644
--- a/drivers/acpi/acpica/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -60,11 +60,11 @@ ACPI_MODULE_NAME("psutils")
  * DESCRIPTION: Create a Scope and associated namepath op with the root name
  *
  ******************************************************************************/
-union acpi_parse_object *acpi_ps_create_scope_op(void)
+union acpi_parse_object *acpi_ps_create_scope_op(u8 *aml)
 {
         union acpi_parse_object *scope_op;
 
-        scope_op = acpi_ps_alloc_op(AML_SCOPE_OP);
+        scope_op = acpi_ps_alloc_op(AML_SCOPE_OP, aml);
         if (!scope_op) {
                 return (NULL);
         }
@@ -103,6 +103,7 @@ void acpi_ps_init_op(union acpi_parse_object *op, u16 opcode)
  * FUNCTION:    acpi_ps_alloc_op
  *
  * PARAMETERS:  opcode          - Opcode that will be stored in the new Op
+ *              aml             - Address of the opcode
  *
  * RETURN:      Pointer to the new Op, null on failure
  *
@@ -112,7 +113,7 @@ void acpi_ps_init_op(union acpi_parse_object *op, u16 opcode)
  *
  ******************************************************************************/
 
-union acpi_parse_object *acpi_ps_alloc_op(u16 opcode)
+union acpi_parse_object *acpi_ps_alloc_op(u16 opcode, u8 *aml)
 {
         union acpi_parse_object *op;
         const struct acpi_opcode_info *op_info;
@@ -149,6 +150,7 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode)
 
         if (op) {
                 acpi_ps_init_op(op, opcode);
+                op->common.aml = aml;
                 op->common.flags = flags;
         }
 
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index 841a5ea06094..1f3f46d44312 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -256,7 +256,7 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
 
         /* Create and init a Root Node */
 
-        op = acpi_ps_create_scope_op();
+        op = acpi_ps_create_scope_op(info->obj_desc->method.aml_start);
         if (!op) {
                 status = AE_NO_MEMORY;
                 goto cleanup;