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

Merge branch 'acpica' 

* acpica: (43 commits)
  ACPICA: Drop Linux-specific waking vector functions
  ACPICA: Update version to 20151218
  ACPICA: Add per-table execution of module-level code
  ACPICA: Add "root node" case to the ACPI name repair code
  ACPICA: Events: Introduce ACPI_REG_DISCONNECT invocation to acpi_ev_execute_reg_methods()
  ACPICA: Events: Enhance acpi_ev_execute_reg_method() to ensure no _REG evaluations can happen during OS early boot stages
  ACPICA: Events: Split acpi_ev_associate_reg_method() from region initialization code
  ACPICA: Events: Fix an issue that region object is re-attached to another scope when it is already attached
  ACPICA: Utilities: Reorder initialization code
  ACPICA: Events: Uses common_notify for address space handlers
  ACPICA: Events: Deploys acpi_ev_find_region_handler()
  ACPICA: Cleanup code related to the per-table module level improvement
  ACPICA: Update for CondRefOf and RefOf operators
  ACPICA: Update internal #defines for ObjectType operator. No functional change
  ACPICA: Update parameter type for ObjectType operator
  ACPICA: Parser: Fix for SuperName method invocation
  ACPICA: Parser: Add constants for internal namepath function
  ACPICA: iasl/Disassembler: Support ASL ElseIf operator
  ACPICA: Add new exception code, AE_IO_ERROR
  ACPICA: Tools: Add spacing and missing options in acpibin tool
  ...
parents 51834d6a e3e9b577

drivers/acpi/acpica/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ acpi-y += \ 
	exdump.o	\

	exfield.o	\

	exfldio.o	\

	exmisc.o	\

	exmutex.o	\

	exnames.o	\

	exoparg1.o	\
@@ -57,7 +58,6 @@ acpi-y += \ 
	exoparg3.o	\

	exoparg6.o	\

	exprep.o	\

	exmisc.o	\

	exregion.o	\

	exresnte.o	\

	exresolv.o	\
@@ -66,6 +66,7 @@ acpi-y += \ 
	exstoren.o	\

	exstorob.o	\

	exsystem.o	\

	extrace.o	\

	exutils.o



acpi-y +=		\
@@ -196,7 +197,6 @@ acpi-$(ACPI_FUTURE_USAGE) += \ 
	dbfileio.o		\

	dbtest.o		\

	utcache.o		\

	utfileio.o		\

	utprint.o		\

	uttrack.o		\

	utuuid.o

drivers/acpi/acpica/acapps.h

+32 −26
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
#ifndef _ACAPPS

#define _ACAPPS



#include <stdio.h>



/* Common info for tool signons */



#define ACPICA_NAME                 "Intel ACPI Component Architecture"
@@ -85,11 +87,40 @@ 
	acpi_os_printf (description);



#define ACPI_OPTION(name, description) \

	acpi_os_printf (" %-18s%s\n", name, description);

	acpi_os_printf (" %-20s%s\n", name, description);



/* Check for unexpected exceptions */



#define ACPI_CHECK_STATUS(name, status, expected) \

	if (status != expected) \

	{ \

		acpi_os_printf ("Unexpected %s from %s (%s-%d)\n", \

			acpi_format_exception (status), #name, _acpi_module_name, __LINE__); \

	}



/* Check for unexpected non-AE_OK errors */



#define ACPI_CHECK_OK(name, status)   ACPI_CHECK_STATUS (name, status, AE_OK);



#define FILE_SUFFIX_DISASSEMBLY     "dsl"

#define FILE_SUFFIX_BINARY_TABLE    ".dat"	/* Needs the dot */



/* acfileio */



acpi_status

ac_get_all_tables_from_file(char *filename,

			    u8 get_only_aml_tables,

			    struct acpi_new_table_desc **return_list_head);



u8 ac_is_file_binary(FILE * file);



acpi_status ac_validate_table_header(FILE * file, long table_offset);



/* Values for get_only_aml_tables */



#define ACPI_GET_ONLY_AML_TABLES    TRUE

#define ACPI_GET_ALL_TABLES         FALSE



/*

 * getopt

 */
@@ -107,30 +138,6 @@ extern char *acpi_gbl_optarg; 
 */

u32 cm_get_file_size(ACPI_FILE file);



#ifndef ACPI_DUMP_APP

/*

 * adisasm

 */

acpi_status

ad_aml_disassemble(u8 out_to_file,

		   char *filename, char *prefix, char **out_filename);



void ad_print_statistics(void);



acpi_status ad_find_dsdt(u8 **dsdt_ptr, u32 *dsdt_length);



void ad_dump_tables(void);



acpi_status ad_get_local_tables(void);



acpi_status

ad_parse_table(struct acpi_table_header *table,

	       acpi_owner_id * owner_id, u8 load_table, u8 external);



acpi_status ad_display_tables(char *filename, struct acpi_table_header *table);



acpi_status ad_display_statistics(void);



/*

 * adwalk

 */
@@ -168,6 +175,5 @@ char *ad_generate_filename(char *prefix, char *table_id); 
void

ad_write_table(struct acpi_table_header *table,

	       u32 length, char *table_name, char *oem_table_id);

#endif



#endif				/* _ACAPPS */

drivers/acpi/acpica/acdebug.h

+1 −4
Original line number Diff line number Diff line
@@ -245,10 +245,7 @@ void acpi_db_open_debug_file(char *name); 


acpi_status acpi_db_load_acpi_table(char *filename);



acpi_status

acpi_db_get_table_from_file(char *filename,

			    struct acpi_table_header **table,

			    u8 must_be_aml_table);

acpi_status acpi_db_load_tables(struct acpi_new_table_desc *list_head);



/*

 * dbhistry - debugger HISTORY command

drivers/acpi/acpica/acevents.h

+9 −2
Original line number Diff line number Diff line
@@ -161,6 +161,11 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info, 
/*

 * evhandler - Address space handling

 */

union acpi_operand_object *acpi_ev_find_region_handler(acpi_adr_space_type

						       space_id,

						       union acpi_operand_object

						       *handler_obj);



u8

acpi_ev_has_default_handler(struct acpi_namespace_node *node,

			    acpi_adr_space_type space_id);
@@ -193,9 +198,11 @@ void 
acpi_ev_detach_region(union acpi_operand_object *region_obj,

		      u8 acpi_ns_is_locked);



acpi_status

void acpi_ev_associate_reg_method(union acpi_operand_object *region_obj);



void

acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,

			    acpi_adr_space_type space_id);

			    acpi_adr_space_type space_id, u32 function);



acpi_status

acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function);

drivers/acpi/acpica/acglobal.h

+2 −1
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ ACPI_GLOBAL(acpi_cache_t *, acpi_gbl_operand_cache); 


ACPI_INIT_GLOBAL(u32, acpi_gbl_startup_flags, 0);

ACPI_INIT_GLOBAL(u8, acpi_gbl_shutdown, TRUE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_early_initialization, TRUE);



/* Global handlers */
@@ -164,7 +165,7 @@ ACPI_GLOBAL(u8, acpi_gbl_next_owner_id_offset); 


/* Initialization sequencing */



ACPI_GLOBAL(u8, acpi_gbl_reg_methods_executed);

ACPI_INIT_GLOBAL(u8, acpi_gbl_reg_methods_enabled, FALSE);



/* Misc */

CRA Git | Maintained and supported by SUSTech CRA and CCSE