Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fde175e3 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Cleanup output for the ASL Debug object 

ACPICA commit d4a53a396fe5d384425251b0257f8d125bbed617

Especially for use of the Index operator. For buffers and strings,
only output the actual byte pointed to by the index. For packages,
only print the package element decoded by the index.

Link: https://github.com/acpica/acpica/commit/d4a53a39


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent dc00203b

drivers/acpi/acpica/acobject.h

+1 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ struct acpi_object_reference { 
	void *object;		/* name_op=>HANDLE to obj, index_op=>union acpi_operand_object */

	struct acpi_namespace_node *node;	/* ref_of or Namepath */

	union acpi_operand_object **where;	/* Target of Index */

	u8 *index_pointer;	/* Used for Buffers and Strings */

	u32 value;		/* Used for Local/Arg/Index/ddb_handle */

};

drivers/acpi/acpica/exdebug.c

+40 −2
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc, 
{

	u32 i;

	u32 timer;

	union acpi_operand_object *object_desc;

	u32 value;



	ACPI_FUNCTION_TRACE_PTR(ex_do_debug_object, source_desc);
@@ -254,8 +256,44 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc, 
							 object)->object,

							level + 4, 0);

			} else {

				acpi_ex_do_debug_object(source_desc->reference.

							object, level + 4, 0);

				object_desc = source_desc->reference.object;

				value = source_desc->reference.value;



				switch (object_desc->common.type) {

				case ACPI_TYPE_BUFFER:



					acpi_os_printf("Buffer[%u] = 0x%2.2X\n",

						       value,

						       *source_desc->reference.

						       index_pointer);

					break;



				case ACPI_TYPE_STRING:



					acpi_os_printf

					    ("String[%u] = \"%c\" (0x%2.2X)\n",

					     value,

					     *source_desc->reference.

					     index_pointer,

					     *source_desc->reference.

					     index_pointer);

					break;



				case ACPI_TYPE_PACKAGE:



					acpi_os_printf("Package[%u] = ", value);

					acpi_ex_do_debug_object(*source_desc->

								reference.where,

								level + 4, 0);

					break;



				default:



					acpi_os_printf

					    ("Unknown Reference object type %X\n",

					     object_desc->common.type);

					break;

				}

			}

		}

		break;

drivers/acpi/acpica/exdump.c

+5 −4
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static struct acpi_exdump_info acpi_ex_dump_index_field[5] = { 
	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(index_field.data_obj), "Data Object"}

};



static struct acpi_exdump_info acpi_ex_dump_reference[8] = {

static struct acpi_exdump_info acpi_ex_dump_reference[9] = {

	{ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_reference), NULL},

	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(reference.class), "Class"},

	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(reference.target_type), "Target Type"},
@@ -232,6 +232,8 @@ static struct acpi_exdump_info acpi_ex_dump_reference[8] = { 
	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(reference.object), "Object Desc"},

	{ACPI_EXD_NODE, ACPI_EXD_OFFSET(reference.node), "Node"},

	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(reference.where), "Where"},

	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(reference.index_pointer),

	 "Index Pointer"},

	{ACPI_EXD_REFERENCE, 0, NULL}

};
@@ -1005,14 +1007,13 @@ static void acpi_ex_dump_reference_obj(union acpi_operand_object *obj_desc) 
	} else if (obj_desc->reference.object) {

		if (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) ==

		    ACPI_DESC_TYPE_OPERAND) {

			acpi_os_printf(" Target: %p",

			acpi_os_printf("%22s %p", "Target :",

				       obj_desc->reference.object);

			if (obj_desc->reference.class == ACPI_REFCLASS_TABLE) {

				acpi_os_printf(" Table Index: %X\n",

					       obj_desc->reference.value);

			} else {

				acpi_os_printf(" Target: %p [%s]\n",

					       obj_desc->reference.object,

				acpi_os_printf(" [%s]\n",

					       acpi_ut_get_type_name(((union

								       acpi_operand_object

								       *)

drivers/acpi/acpica/exoparg2.c

+4 −0
Original line number Diff line number Diff line
@@ -380,6 +380,8 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state) 


			return_desc->reference.target_type =

			    ACPI_TYPE_BUFFER_FIELD;

			return_desc->reference.index_pointer =

			    &(operand[0]->buffer.pointer[index]);

			break;



		case ACPI_TYPE_BUFFER:
@@ -391,6 +393,8 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state) 


			return_desc->reference.target_type =

			    ACPI_TYPE_BUFFER_FIELD;

			return_desc->reference.index_pointer =

			    &(operand[0]->buffer.pointer[index]);

			break;



		case ACPI_TYPE_PACKAGE: