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

Commit 6d63e354 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' into acpi-trace

parents 74d33293 40913fe6

drivers/acpi/acpica/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-y += acpi.o 
acpi-y :=		\

	dsargs.o	\

	dscontrol.o	\

	dsdebug.o	\

	dsfield.o	\

	dsinit.o	\

	dsmethod.o	\
@@ -164,6 +165,7 @@ acpi-y += \ 
	utmath.o	\

	utmisc.o	\

	utmutex.o	\

	utnonansi.o	\

	utobject.o	\

	utosi.o		\

	utownerid.o	\

drivers/acpi/acpica/acdebug.h

+19 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ void acpi_db_display_interfaces(char *action_arg, char *interface_name_arg); 


acpi_status acpi_db_sleep(char *object_arg);



void acpi_db_trace(char *enable_arg, char *method_arg, char *once_arg);



void acpi_db_display_locks(void);



void acpi_db_display_resources(char *object_arg);
@@ -261,6 +263,23 @@ acpi_status acpi_db_user_commands(char prompt, union acpi_parse_object *op); 
char *acpi_db_get_next_token(char *string,

			     char **next, acpi_object_type * return_type);



/*

 * dbobject

 */

void acpi_db_decode_internal_object(union acpi_operand_object *obj_desc);



void

acpi_db_display_internal_object(union acpi_operand_object *obj_desc,

				struct acpi_walk_state *walk_state);



void acpi_db_decode_arguments(struct acpi_walk_state *walk_state);



void acpi_db_decode_locals(struct acpi_walk_state *walk_state);



void

acpi_db_dump_method_info(acpi_status status,

			 struct acpi_walk_state *walk_state);



/*

 * dbstats - Generation and display of ACPI table statistics

 */

drivers/acpi/acpica/acdispat.h

+8 −0
Original line number Diff line number Diff line
@@ -354,4 +354,12 @@ acpi_status 
acpi_ds_result_push(union acpi_operand_object *object,

		    struct acpi_walk_state *walk_state);



/*

 * dsdebug - parser debugging routines

 */

void

acpi_ds_dump_method_stack(acpi_status status,

			  struct acpi_walk_state *walk_state,

			  union acpi_parse_object *op);



#endif				/* _ACDISPAT_H_ */

drivers/acpi/acpica/acglobal.h

+1 −2
Original line number Diff line number Diff line
@@ -290,8 +290,6 @@ ACPI_GLOBAL(u32, acpi_fixed_event_count[ACPI_NUM_FIXED_EVENTS]); 


ACPI_GLOBAL(u32, acpi_gbl_original_dbg_level);

ACPI_GLOBAL(u32, acpi_gbl_original_dbg_layer);

ACPI_GLOBAL(u32, acpi_gbl_trace_dbg_level);

ACPI_GLOBAL(u32, acpi_gbl_trace_dbg_layer);



/*****************************************************************************

 *
@@ -309,6 +307,7 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_no_resource_disassembly, FALSE); 
ACPI_INIT_GLOBAL(u8, acpi_gbl_ignore_noop_operator, FALSE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_cstyle_disassembly, TRUE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_force_aml_disassembly, FALSE);

ACPI_INIT_GLOBAL(union acpi_parse_object *, acpi_gbl_previous_op, NULL);



ACPI_GLOBAL(u8, acpi_gbl_db_opt_disasm);

ACPI_GLOBAL(u8, acpi_gbl_db_opt_verbose);

drivers/acpi/acpica/acinterp.h

+22 −0
Original line number Diff line number Diff line
@@ -131,6 +131,28 @@ void 
acpi_ex_do_debug_object(union acpi_operand_object *source_desc,

			u32 level, u32 index);



void

acpi_ex_start_trace_method(struct acpi_namespace_node *method_node,

			   union acpi_operand_object *obj_desc,

			   struct acpi_walk_state *walk_state);



void

acpi_ex_stop_trace_method(struct acpi_namespace_node *method_node,

			  union acpi_operand_object *obj_desc,

			  struct acpi_walk_state *walk_state);



void

acpi_ex_start_trace_opcode(union acpi_parse_object *op,

			   struct acpi_walk_state *walk_state);



void

acpi_ex_stop_trace_opcode(union acpi_parse_object *op,

			  struct acpi_walk_state *walk_state);



void

acpi_ex_trace_point(acpi_trace_event_type type,

		    u8 begin, u8 *aml, char *pathname);



/*

 * exfield - ACPI AML (p-code) execution - field manipulation

 */