ACPICA: Update for some debug output. No functional change

ACPICA commit 3a08436fe3bff297a6de162252964e955946c7d3

Improve/simplify some of the debug messages.

Link: https://github.com/acpica/acpica/commit/3a08436f
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c
index 04a9f60..a164b15 100644 (file)
--- a/drivers/acpi/acpica/dsargs.c
+++ b/drivers/acpi/acpica/dsargs.c
@@ -346,6 +346,7 @@ acpi_status acpi_ds_get_package_arguments(union acpi_operand_object *obj_desc)
        status = acpi_ds_execute_arguments(node, node,
                                           obj_desc->package.aml_length,
                                           obj_desc->package.aml_start);
+
        return_ACPI_STATUS(status);
 }
 

diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index 0181cd3..84667c9 100644 (file)
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -603,8 +603,8 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,
 
        if (!op->common.value.arg) {
                ACPI_ERROR((AE_INFO,
-                           "Dispatch: Missing child while executing TermArg for %X",
-                           op->common.aml_opcode));
+                           "Missing child while evaluating opcode %4.4X, Op %p",
+                           op->common.aml_opcode, op));
                return_ACPI_STATUS(AE_OK);
        }
 

diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index fa4ef92..be1410f 100644 (file)
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -147,7 +147,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state *walk_state,
        char *path;
        u32 flags;
 
-       ACPI_FUNCTION_TRACE(ds_load1_begin_op);
+       ACPI_FUNCTION_TRACE_PTR(ds_load1_begin_op, walk_state->op);
 
        op = walk_state->op;
        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op,

diff --git a/drivers/acpi/acpica/exnames.c b/drivers/acpi/acpica/exnames.c
index c7b249c..6dc2682 100644 (file)
--- a/drivers/acpi/acpica/exnames.c
+++ b/drivers/acpi/acpica/exnames.c
@@ -174,13 +174,10 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
                return_ACPI_STATUS(AE_CTRL_PENDING);
        }
 
-       ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "Bytes from stream:\n"));
-
        for (index = 0;
             (index < ACPI_NAME_SIZE)
             && (acpi_ut_valid_name_char(*aml_address, 0)); index++) {
                char_buf[index] = *aml_address++;
-               ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "%c\n", char_buf[index]));
        }
 
        /* Valid name segment  */
@@ -192,9 +189,9 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
                char_buf[4] = '\0';
 
                if (name_string) {
-                       strcat(name_string, char_buf);
                        ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-                                         "Appended to - %s\n", name_string));
+                                         "Appending NameSeg %s\n", char_buf));
+                       strcat(name_string, char_buf);
                } else {
                        ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                          "No Name string - %s\n", char_buf));

diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index c17af4a..9369752 100644 (file)
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -286,7 +286,7 @@ error_exit:
  * RETURN:      Status
  *
  * DESCRIPTION: Callback from acpi_walk_namespace. Invoked for every object
- *              within the  namespace.
+ *              within the namespace.
  *
  *              Currently, the only objects that require initialization are:
  *              1) Methods
@@ -400,6 +400,10 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
                        break;
                }
 
+               ACPI_DEBUG_PRINT_RAW((ACPI_DB_PARSE,
+                                     "%s: Completing resolution of Package elements\n",
+                                     ACPI_GET_FUNCTION_NAME));
+
                /*
                 * Resolve all named references in package objects (and all
                 * sub-packages). This action has been deferred until the entire
@@ -409,6 +413,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
                status = acpi_ut_walk_package_tree(obj_desc, NULL,
                                                   acpi_ds_init_package_element,
                                                   NULL);
+
                obj_desc->package.flags |= AOPOBJ_DATA_VALID;
                break;
 

diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c
index c686eda..5d3bfaa 100644 (file)
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -354,6 +354,9 @@ char *acpi_ns_get_normalized_pathname(struct acpi_namespace_node *node,
        (void)acpi_ns_build_normalized_path(node, name_buffer, size,
                                            no_trailing);
 
+       ACPI_DEBUG_PRINT_RAW((ACPI_DB_NAMES, "%s: Path \"%s\"\n",
+                             ACPI_GET_FUNCTION_NAME, name_buffer));
+
        return_PTR(name_buffer);
 }
 

diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index c5b22ea..6ac2d26 100644 (file)
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -112,8 +112,10 @@ acpi_ns_execute_table(u32 table_index, struct acpi_namespace_node *start_node)
                goto cleanup;
        }
 
-       ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                         "Create table code block: %p\n", method_obj));
+       ACPI_DEBUG_PRINT_RAW((ACPI_DB_PARSE,
+                             "%s: Create table pseudo-method for [%4.4s] @%p, method %p\n",
+                             ACPI_GET_FUNCTION_NAME, table->signature, table,
+                             method_obj));
 
        method_obj->method.aml_start = aml_start;
        method_obj->method.aml_length = aml_length;
@@ -265,7 +267,8 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
        ACPI_FUNCTION_TRACE(ns_parse_table);
 
        if (acpi_gbl_parse_table_as_term_list) {
-               ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start load pass\n"));
+               ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
+                                 "**** Start table execution pass\n"));
 
                status = acpi_ns_execute_table(table_index, start_node);
                if (ACPI_FAILURE(status)) {

diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 7dca287..569df3c 100644 (file)
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -165,7 +165,7 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                }
 
                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                 "Final argument count: %u pass %u\n",
+                                 "Final argument count: %8.8X pass %u\n",
                                  walk_state->arg_count,
                                  walk_state->pass_number));
 
@@ -581,7 +581,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                /* Check for arguments that need to be processed */
 
                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                 "Parseloop: argument count: %u\n",
+                                 "Parseloop: argument count: %8.8X\n",
                                  walk_state->arg_count));
 
                if (walk_state->arg_count) {

diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index 2474ff9..b10fb68 100644 (file)
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -454,7 +454,7 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                          walk_state->parser_state.aml_size));
 
        if (!walk_state->parser_state.aml) {
-               return_ACPI_STATUS(AE_NULL_OBJECT);
+               return_ACPI_STATUS(AE_BAD_ADDRESS);
        }
 
        /* Create and initialize a new thread state */

diff --git a/drivers/acpi/acpica/utcache.c b/drivers/acpi/acpica/utcache.c
index 08e6944..3ec7e8a 100644 (file)
--- a/drivers/acpi/acpica/utcache.c
+++ b/drivers/acpi/acpica/utcache.c
@@ -269,9 +269,10 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
                cache->current_depth--;
 
                ACPI_MEM_TRACKING(cache->hits++);
-               ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                 "Object %p from %s cache\n", object,
-                                 cache->list_name));
+               ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC,
+                                     "%s: Object %p from %s cache\n",
+                                     ACPI_GET_FUNCTION_NAME, object,
+                                     cache->list_name));
 
                status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
                if (ACPI_FAILURE(status)) {

diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index 7d8d020..db98f0d 100644 (file)
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -332,8 +332,10 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
 
        /* Now the object can be safely deleted */
 
-       ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "Deleting Object %p [%s]\n",
-                         object, acpi_ut_get_object_type_name(object)));
+       ACPI_DEBUG_PRINT_RAW((ACPI_DB_ALLOCATIONS,
+                             "%s: Deleting Object %p [%s]\n",
+                             ACPI_GET_FUNCTION_NAME, object,
+                             acpi_ut_get_object_type_name(object)));
 
        acpi_ut_delete_object_desc(object);
        return_VOID;
@@ -444,9 +446,10 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
                                      object));
                }
 
-               ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
-                                 "Obj %p Type %.2X Refs %.2X [Decremented]\n",
-                                 object, object->common.type, new_count));
+               ACPI_DEBUG_PRINT_RAW((ACPI_DB_ALLOCATIONS,
+                                     "%s: Obj %p Type %.2X Refs %.2X [Decremented]\n",
+                                     ACPI_GET_FUNCTION_NAME, object,
+                                     object->common.type, new_count));
 
                /* Actually delete the object on a reference count of zero */
 
@@ -747,9 +750,10 @@ void acpi_ut_remove_reference(union acpi_operand_object *object)
                return;
        }
 
-       ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
-                         "Obj %p Current Refs=%X [To Be Decremented]\n",
-                         object, object->common.reference_count));
+       ACPI_DEBUG_PRINT_RAW((ACPI_DB_ALLOCATIONS,
+                             "%s: Obj %p Current Refs=%X [To Be Decremented]\n",
+                             ACPI_GET_FUNCTION_NAME, object,
+                             object->common.reference_count));
 
        /*
         * Decrement the reference count, and only actually delete the object