Skip to content

Commit

Permalink
ACPICA: Debugger: Reduce verbosity for module-level code errors.
Browse files Browse the repository at this point in the history
Module-level code execution has no method arguments or locals,
so do not attempt to output values for these.

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>
  • Loading branch information
Bob Moore authored and Rafael J. Wysocki committed Jun 6, 2018
1 parent fb30b29 commit 3877b2c
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 4 deletions.
23 changes: 22 additions & 1 deletion drivers/acpi/acpica/dbobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ void
acpi_db_dump_method_info(acpi_status status, struct acpi_walk_state *walk_state)
{
struct acpi_thread_state *thread;
struct acpi_namespace_node *node;

node = walk_state->method_node;

/* There are no locals or arguments for the module-level code case */

if (node == acpi_gbl_root_node) {
return;
}

/* Ignore control codes, they are not errors */

Expand Down Expand Up @@ -384,8 +393,14 @@ void acpi_db_decode_locals(struct acpi_walk_state *walk_state)
struct acpi_namespace_node *node;
u8 display_locals = FALSE;

obj_desc = walk_state->method_desc;
node = walk_state->method_node;
obj_desc = walk_state->method_desc;

/* There are no locals for the module-level code case */

if (node == acpi_gbl_root_node) {
return;
}

if (!node) {
acpi_os_printf
Expand Down Expand Up @@ -452,6 +467,12 @@ void acpi_db_decode_arguments(struct acpi_walk_state *walk_state)
node = walk_state->method_node;
obj_desc = walk_state->method_desc;

/* There are no arguments for the module-level code case */

if (node == acpi_gbl_root_node) {
return;
}

if (!node) {
acpi_os_printf
("No method node (Executing subtree for buffer or opregion)\n");
Expand Down
12 changes: 9 additions & 3 deletions drivers/acpi/acpica/dsdebug.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,15 @@ acpi_ds_dump_method_stack(acpi_status status,
op->common.next = NULL;

#ifdef ACPI_DISASSEMBLER
acpi_os_printf("Failed at ");
acpi_dm_disassemble(next_walk_state, op,
ACPI_UINT32_MAX);
if (walk_state->method_node !=
acpi_gbl_root_node) {

/* More verbose if not module-level code */

acpi_os_printf("Failed at ");
acpi_dm_disassemble(next_walk_state, op,
ACPI_UINT32_MAX);
}
#endif
op->common.next = next;
}
Expand Down

0 comments on commit 3877b2c

Please sign in to comment.