Skip to content

Commit 3877b2c

Browse files
acpibobrafaeljw
authored andcommitted
ACPICA: Debugger: Reduce verbosity for module-level code errors.
Module-level code execution has no method arguments or locals, so do not attempt to output values for these. Signed-off-by: Bob Moore <[email protected]> Signed-off-by: Erik Schmauss <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent fb30b29 commit 3877b2c

File tree

2 files changed

+31
-4
lines changed

2 files changed

+31
-4
lines changed

drivers/acpi/acpica/dbobject.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ void
3535
acpi_db_dump_method_info(acpi_status status, struct acpi_walk_state *walk_state)
3636
{
3737
struct acpi_thread_state *thread;
38+
struct acpi_namespace_node *node;
39+
40+
node = walk_state->method_node;
41+
42+
/* There are no locals or arguments for the module-level code case */
43+
44+
if (node == acpi_gbl_root_node) {
45+
return;
46+
}
3847

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

@@ -384,8 +393,14 @@ void acpi_db_decode_locals(struct acpi_walk_state *walk_state)
384393
struct acpi_namespace_node *node;
385394
u8 display_locals = FALSE;
386395

387-
obj_desc = walk_state->method_desc;
388396
node = walk_state->method_node;
397+
obj_desc = walk_state->method_desc;
398+
399+
/* There are no locals for the module-level code case */
400+
401+
if (node == acpi_gbl_root_node) {
402+
return;
403+
}
389404

390405
if (!node) {
391406
acpi_os_printf
@@ -452,6 +467,12 @@ void acpi_db_decode_arguments(struct acpi_walk_state *walk_state)
452467
node = walk_state->method_node;
453468
obj_desc = walk_state->method_desc;
454469

470+
/* There are no arguments for the module-level code case */
471+
472+
if (node == acpi_gbl_root_node) {
473+
return;
474+
}
475+
455476
if (!node) {
456477
acpi_os_printf
457478
("No method node (Executing subtree for buffer or opregion)\n");

drivers/acpi/acpica/dsdebug.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,15 @@ acpi_ds_dump_method_stack(acpi_status status,
162162
op->common.next = NULL;
163163

164164
#ifdef ACPI_DISASSEMBLER
165-
acpi_os_printf("Failed at ");
166-
acpi_dm_disassemble(next_walk_state, op,
167-
ACPI_UINT32_MAX);
165+
if (walk_state->method_node !=
166+
acpi_gbl_root_node) {
167+
168+
/* More verbose if not module-level code */
169+
170+
acpi_os_printf("Failed at ");
171+
acpi_dm_disassemble(next_walk_state, op,
172+
ACPI_UINT32_MAX);
173+
}
168174
#endif
169175
op->common.next = next;
170176
}

0 commit comments

Comments
 (0)