aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/executer/exdump.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/executer/exdump.c')
-rw-r--r--drivers/acpi/executer/exdump.c29
1 files changed, 14 insertions, 15 deletions
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index 2be2e2bf95bf..7d4123256cf1 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -214,10 +214,11 @@ static struct acpi_exdump_info acpi_ex_dump_index_field[5] = {
214 {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(index_field.data_obj), "Data Object"} 214 {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(index_field.data_obj), "Data Object"}
215}; 215};
216 216
217static struct acpi_exdump_info acpi_ex_dump_reference[7] = { 217static struct acpi_exdump_info acpi_ex_dump_reference[8] = {
218 {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_reference), NULL}, 218 {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_reference), NULL},
219 {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(reference.target_type), "Target Type"}, 219 {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(reference.target_type), "Target Type"},
220 {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(reference.offset), "Offset"}, 220 {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(reference.offset), "Offset"},
221 {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(reference.value), "Value"},
221 {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(reference.object), "Object Desc"}, 222 {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(reference.object), "Object Desc"},
222 {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(reference.node), "Node"}, 223 {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(reference.node), "Node"},
223 {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(reference.where), "Where"}, 224 {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(reference.where), "Where"},
@@ -497,24 +498,24 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
497 switch (obj_desc->reference.opcode) { 498 switch (obj_desc->reference.opcode) {
498 case AML_DEBUG_OP: 499 case AML_DEBUG_OP:
499 500
500 acpi_os_printf("Reference: Debug\n"); 501 acpi_os_printf("Reference: [Debug]\n");
501 break; 502 break;
502 503
503 case AML_INDEX_OP: 504 case AML_INDEX_OP:
504 505
505 acpi_os_printf("Reference: Index %p\n", 506 acpi_os_printf("Reference: [Index] %p\n",
506 obj_desc->reference.object); 507 obj_desc->reference.object);
507 break; 508 break;
508 509
509 case AML_LOAD_OP: 510 case AML_LOAD_OP:
510 511
511 acpi_os_printf("Reference: [DdbHandle] TableIndex %p\n", 512 acpi_os_printf("Reference: [DdbHandle] TableIndex %X\n",
512 obj_desc->reference.object); 513 obj_desc->reference.value);
513 break; 514 break;
514 515
515 case AML_REF_OF_OP: 516 case AML_REF_OF_OP:
516 517
517 acpi_os_printf("Reference: (RefOf) %p [%s]\n", 518 acpi_os_printf("Reference: [RefOf] %p [%s]\n",
518 obj_desc->reference.object, 519 obj_desc->reference.object,
519 acpi_ut_get_type_name(((union 520 acpi_ut_get_type_name(((union
520 acpi_operand_object 521 acpi_operand_object
@@ -526,7 +527,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
526 527
527 case AML_ARG_OP: 528 case AML_ARG_OP:
528 529
529 acpi_os_printf("Reference: Arg%d", 530 acpi_os_printf("Reference: [Arg%d]",
530 obj_desc->reference.offset); 531 obj_desc->reference.offset);
531 532
532 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) { 533 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
@@ -544,7 +545,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
544 545
545 case AML_LOCAL_OP: 546 case AML_LOCAL_OP:
546 547
547 acpi_os_printf("Reference: Local%d", 548 acpi_os_printf("Reference: [Local%d]",
548 obj_desc->reference.offset); 549 obj_desc->reference.offset);
549 550
550 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) { 551 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
@@ -562,7 +563,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
562 563
563 case AML_INT_NAMEPATH_OP: 564 case AML_INT_NAMEPATH_OP:
564 565
565 acpi_os_printf("Reference: Namepath %X [%4.4s]\n", 566 acpi_os_printf("Reference: [Namepath] %X [%4.4s]\n",
566 obj_desc->reference.node->name.integer, 567 obj_desc->reference.node->name.integer,
567 obj_desc->reference.node->name.ascii); 568 obj_desc->reference.node->name.ascii);
568 break; 569 break;
@@ -883,13 +884,11 @@ static void acpi_ex_dump_reference_obj(union acpi_operand_object *obj_desc)
883 acpi_os_printf(" Target: %p", 884 acpi_os_printf(" Target: %p",
884 obj_desc->reference.object); 885 obj_desc->reference.object);
885 if (obj_desc->reference.opcode == AML_LOAD_OP) { 886 if (obj_desc->reference.opcode == AML_LOAD_OP) {
886 /* 887 acpi_os_printf(" [DDBHandle] Table Index: %X\n",
887 * For DDBHandle reference, 888 obj_desc->reference.value);
888 * obj_desc->Reference.Object is the table index
889 */
890 acpi_os_printf(" [DDBHandle]\n");
891 } else { 889 } else {
892 acpi_os_printf(" [%s]\n", 890 acpi_os_printf(" Target: %p [%s]\n",
891 obj_desc->reference.object,
893 acpi_ut_get_type_name(((union 892 acpi_ut_get_type_name(((union
894 acpi_operand_object 893 acpi_operand_object
895 *) 894 *)