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

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

Merge branch 'acpica' 

* acpica:
  ACPICA: Utilities: Add new decode function for parser values
  ACPICA: Tables: Add an error message complaining driver bugs
  ACPICA: Tables: Add acpi_tb_unload_table()
  ACPICA: Tables: Cleanup acpi_tb_install_and_load_table()
  ACPICA: Events: Fix acpi_ev_initialize_region() return value
  ACPICA: Back port of "ACPICA: Dispatcher: Tune interpreter lock around AcpiEvInitializeRegion()"
  ACPICA: Namespace: Add acpi_ns_handle_to_name()
  ACPICA: Update version to 20160930
  ACPICA: Move acpi_gbl_max_loop_iterations to the public globals file
  ACPICA: Disassembler: Fix for Divide() support, new support for test suite
  ACPICA: Increase loop limit for AE_AML_INFINITE_LOOP exception
  ACPICA: MacOSX: Fix wrong sem_destroy definition
  ACPICA: MacOSX: Fix anonymous semaphore implementation
  ACPICA: Update an info message during table load phase
parents 69973b83 5a6e7ec3

drivers/acpi/acpica/acevents.h

+1 −3
Original line number Diff line number Diff line
@@ -243,9 +243,7 @@ acpi_ev_default_region_setup(acpi_handle handle, 
			     u32 function,

			     void *handler_context, void **region_context);



acpi_status

acpi_ev_initialize_region(union acpi_operand_object *region_obj,

			  u8 acpi_ns_locked);

acpi_status acpi_ev_initialize_region(union acpi_operand_object *region_obj);



/*

 * evsci - SCI (System Control Interrupt) handling/dispatch

drivers/acpi/acpica/acglobal.h

+1 −4
Original line number Diff line number Diff line
@@ -240,10 +240,6 @@ 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);
@@ -318,6 +314,7 @@ 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_INIT_GLOBAL(u8, acpi_gbl_dm_emit_external_opcodes, FALSE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_do_disassembler_optimizations, TRUE);



ACPI_GLOBAL(u8, acpi_gbl_dm_opt_disasm);

ACPI_GLOBAL(u8, acpi_gbl_dm_opt_listing);

drivers/acpi/acpica/aclocal.h

+10 −9
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ union acpi_parse_value { 
	union acpi_parse_value          value;          /* Value or args associated with the opcode */\

	u8                              arg_list_length; /* Number of elements in the arg list */\

	ACPI_DISASM_ONLY_MEMBERS (\

	u8                              disasm_flags;   /* Used during AML disassembly */\

	u16                             disasm_flags;   /* Used during AML disassembly */\

	u8                              disasm_opcode;  /* Subtype used for disassembly */\

	char                            *operator_symbol;/* Used for C-style operator name strings */\

	char                            aml_op_name[16])	/* Op name (debug only) */
@@ -868,14 +868,15 @@ struct acpi_parse_state { 


/* Parse object disasm_flags */



#define ACPI_PARSEOP_IGNORE                 0x01

#define ACPI_PARSEOP_PARAMETER_LIST         0x02

#define ACPI_PARSEOP_EMPTY_TERMLIST         0x04

#define ACPI_PARSEOP_PREDEFINED_CHECKED     0x08

#define ACPI_PARSEOP_CLOSING_PAREN          0x10

#define ACPI_PARSEOP_COMPOUND_ASSIGNMENT    0x20

#define ACPI_PARSEOP_ASSIGNMENT             0x40

#define ACPI_PARSEOP_ELSEIF                 0x80

#define ACPI_PARSEOP_IGNORE                 0x0001

#define ACPI_PARSEOP_PARAMETER_LIST         0x0002

#define ACPI_PARSEOP_EMPTY_TERMLIST         0x0004

#define ACPI_PARSEOP_PREDEFINED_CHECKED     0x0008

#define ACPI_PARSEOP_CLOSING_PAREN          0x0010

#define ACPI_PARSEOP_COMPOUND_ASSIGNMENT    0x0020

#define ACPI_PARSEOP_ASSIGNMENT             0x0040

#define ACPI_PARSEOP_ELSEIF                 0x0080

#define ACPI_PARSEOP_LEGACY_ASL_ONLY        0x0100



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

 *

drivers/acpi/acpica/acnamesp.h

+3 −0
Original line number Diff line number Diff line
@@ -291,6 +291,9 @@ char *acpi_ns_get_normalized_pathname(struct acpi_namespace_node *node, 


char *acpi_ns_name_of_current_scope(struct acpi_walk_state *walk_state);



acpi_status

acpi_ns_handle_to_name(acpi_handle target_handle, struct acpi_buffer *buffer);



acpi_status

acpi_ns_handle_to_pathname(acpi_handle target_handle,

			   struct acpi_buffer *buffer, u8 no_trailing);

drivers/acpi/acpica/actables.h

+3 −2
Original line number Diff line number Diff line
@@ -127,10 +127,11 @@ acpi_status 
acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node);



acpi_status

acpi_tb_install_and_load_table(struct acpi_table_header *table,

			       acpi_physical_address address,

acpi_tb_install_and_load_table(acpi_physical_address address,

			       u8 flags, u8 override, u32 *table_index);



acpi_status acpi_tb_unload_table(u32 table_index);



void acpi_tb_terminate(void);



acpi_status acpi_tb_delete_namespace_by_owner(u32 table_index);