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

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

Merge branch 'acpica' 

* acpica: (42 commits)
  ACPICA: Update version to 20150818
  ACPICA: Debugger: Cleanup debugging outputs to dump name path without trailing underscores
  ACPICA: Disassembler: Cleanup acpi_gbl_db_opt_verbose acpiexec usage
  ACPICA: Disassembler: Cleanup acpi_gbl_db_opt_disasm
  ACPICA: Debugger: Split debugger initialization/termination APIs
  ACPICA: Header support to improve compatibility with MSVC
  ACPICA: Make the max-number-of-loops runtime configurable
  ACPICA: Debugger: Add option to display namespace summary/counts
  ACPICA: Add additional debug info/statements
  ACPICA: Table handling: Cleanup and update debug output for tools
  ACPICA: acpiexec/acpinames: Support very large number of ACPI tables
  ACPICA: acpinames: Add new options and wildcard support
  ACPICA: Headers: Fix some comments, no functional change
  ACPICA: Tables: Cleanup to reduce FACS globals
  ACPICA: Tables: Fix global table list issues by removing fixed table indexes
  ACPICA: Update info messages during ACPICA init
  ACPICA: Disassembler: Update for new listing mode
  ACPICA: Update parameter validation for data_table_region and load_table
  ACPICA: Disassembler: Remove duplicate code in _PLD processing.
  ACPICA: Correctly cleanup after a ACPI table load failure
  ...
parents 64291f7d b7a4f7ff

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 −7
Original line number Diff line number Diff line
@@ -67,9 +67,6 @@ struct acpi_db_execute_walk { 
};



#define PARAM_LIST(pl)                  pl

#define DBTEST_OUTPUT_LEVEL(lvl)        if (acpi_gbl_db_opt_verbose)

#define VERBOSE_PRINT(fp)               DBTEST_OUTPUT_LEVEL(lvl) {\

			  acpi_os_printf PARAM_LIST(fp);}



#define EX_NO_SINGLE_STEP               1

#define EX_SINGLE_STEP                  2
@@ -77,10 +74,6 @@ struct acpi_db_execute_walk { 
/*

 * dbxface - external debugger interfaces

 */

acpi_status acpi_db_initialize(void);



void acpi_db_terminate(void);



acpi_status

acpi_db_single_step(struct acpi_walk_state *walk_state,

		    union acpi_parse_object *op, u32 op_type);
@@ -102,6 +95,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 +256,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

+12 −8
Original line number Diff line number Diff line
@@ -58,11 +58,12 @@ ACPI_GLOBAL(struct acpi_table_list, acpi_gbl_root_table_list); 


ACPI_GLOBAL(struct acpi_table_header *, acpi_gbl_DSDT);

ACPI_GLOBAL(struct acpi_table_header, acpi_gbl_original_dsdt_header);

ACPI_INIT_GLOBAL(u32, acpi_gbl_dsdt_index, ACPI_INVALID_TABLE_INDEX);

ACPI_INIT_GLOBAL(u32, acpi_gbl_facs_index, ACPI_INVALID_TABLE_INDEX);

ACPI_INIT_GLOBAL(u32, acpi_gbl_xfacs_index, ACPI_INVALID_TABLE_INDEX);



#if (!ACPI_REDUCED_HARDWARE)

ACPI_GLOBAL(struct acpi_table_facs *, acpi_gbl_FACS);

ACPI_GLOBAL(struct acpi_table_facs *, acpi_gbl_facs32);

ACPI_GLOBAL(struct acpi_table_facs *, acpi_gbl_facs64);



#endif				/* !ACPI_REDUCED_HARDWARE */
@@ -235,6 +236,10 @@ ACPI_INIT_GLOBAL(u32, acpi_gbl_nesting_level, 0); 


ACPI_GLOBAL(struct acpi_thread_state *, acpi_gbl_current_walk_list);



/* Maximum number of While() loop iterations before forced abort */



ACPI_GLOBAL(u16, acpi_gbl_max_loop_iterations);



/* Control method single step flag */



ACPI_GLOBAL(u8, acpi_gbl_cm_single_step);
@@ -290,8 +295,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,9 +312,10 @@ 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(u8, acpi_gbl_dm_opt_verbose, TRUE);



ACPI_GLOBAL(u8, acpi_gbl_db_opt_disasm);

ACPI_GLOBAL(u8, acpi_gbl_db_opt_verbose);

ACPI_GLOBAL(u8, acpi_gbl_dm_opt_disasm);

ACPI_GLOBAL(u8, acpi_gbl_dm_opt_listing);

ACPI_GLOBAL(u8, acpi_gbl_num_external_methods);

ACPI_GLOBAL(u32, acpi_gbl_resolved_external_methods);

ACPI_GLOBAL(struct acpi_external_list *, acpi_gbl_external_list);
@@ -346,8 +350,8 @@ ACPI_GLOBAL(char, acpi_gbl_db_debug_filename[ACPI_DB_LINE_BUFFER_SIZE]); 
/*

 * Statistic globals

 */

ACPI_GLOBAL(u16, acpi_gbl_obj_type_count[ACPI_TYPE_NS_NODE_MAX + 1]);

ACPI_GLOBAL(u16, acpi_gbl_node_type_count[ACPI_TYPE_NS_NODE_MAX + 1]);

ACPI_GLOBAL(u16, acpi_gbl_obj_type_count[ACPI_TOTAL_TYPES]);

ACPI_GLOBAL(u16, acpi_gbl_node_type_count[ACPI_TOTAL_TYPES]);

ACPI_GLOBAL(u16, acpi_gbl_obj_type_count_misc);

ACPI_GLOBAL(u16, acpi_gbl_node_type_count_misc);

ACPI_GLOBAL(u32, acpi_gbl_num_nodes);

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

 */