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

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

Merge branch 'acpica' 

* acpica: (53 commits)
  ACPICA: Use designated initializers
  ACPICA: Update version to 20170531
  ACPICA: Update a couple of debug output messages
  ACPICA: acpiexec: enhance local signal handler
  ACPICA: Simplify output for the ACPI Debug Object
  ACPICA: Unix application OSL: Correctly handle control-c (EINTR)
  ACPICA: Improvements for debug output only
  ACPICA: Disassembler: allow conflicting external declarations to be emitted.
  ACPICA: Disassembler: add external op to namespace on first pass
  ACPICA: Disassembler: prevent external op's from opening a new scope
  ACPICA: Changed Gbl_disasm_flag to acpi_gbl_disasm_flag
  ACPICA: Changing External to a named object
  ACPICA: Update two error messages to emit control method name
  ACPICA: Fix for Device/Thermal objects with ObjectType and DerefOf
  ACPICA: Comment update: spelling/format. No functional change
  ACPICA: Update comments, no functional change
  ACPICA: Split resource descriptor decode strings to a new file
  ACPICA: Remove extraneous status check
  ACPICA: Export the public mutex interfaces
  ACPICA: Disassembler: Abort on an invalid/unknown AML opcode
  ...
parents c0bc126f 3d867f6c

drivers/acpi/acpica/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ acpi-y += \ 
	utosi.o		\

	utownerid.o	\

	utpredef.o	\

	utresdecode.o	\

	utresrc.o	\

	utstate.o	\

	utstring.o	\

drivers/acpi/acpica/acapps.h

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ acpi_dm_finish_namespace_load(union acpi_parse_object *parse_tree_root, 
			      acpi_owner_id owner_id);



void

acpi_dm_convert_resource_indexes(union acpi_parse_object *parse_tree_root,

acpi_dm_convert_parse_objects(union acpi_parse_object *parse_tree_root,

			      struct acpi_namespace_node *namespace_root);



/*

drivers/acpi/acpica/acglobal.h

+3 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ 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_INIT_GLOBAL(ACPI_PARSE_OBJECT_LIST, *acpi_gbl_temp_list_head, NULL);



ACPI_GLOBAL(u8, acpi_gbl_dm_opt_disasm);

ACPI_GLOBAL(u8, acpi_gbl_dm_opt_listing);
@@ -368,6 +369,8 @@ ACPI_GLOBAL(const char, *acpi_gbl_pld_vertical_position_list[]); 
ACPI_GLOBAL(const char, *acpi_gbl_pld_horizontal_position_list[]);

ACPI_GLOBAL(const char, *acpi_gbl_pld_shape_list[]);



ACPI_INIT_GLOBAL(u8, acpi_gbl_disasm_flag, FALSE);



#endif



/*

drivers/acpi/acpica/aclocal.h

+13 −2
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ ACPI_PARSE_COMMON}; 
 * and bytelists.

 */

struct acpi_parse_obj_named {

	ACPI_PARSE_COMMON u8 *path;

	ACPI_PARSE_COMMON char *path;

	u8 *data;		/* AML body or bytelist data */

	u32 length;		/* AML length */

	u32 name;		/* 4-byte name or zero if no name */
@@ -1142,8 +1142,13 @@ struct acpi_port_info { 
#define ACPI_RESOURCE_NAME_ADDRESS64            0x8A

#define ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64   0x8B

#define ACPI_RESOURCE_NAME_GPIO                 0x8C

#define ACPI_RESOURCE_NAME_PIN_FUNCTION         0x8D

#define ACPI_RESOURCE_NAME_SERIAL_BUS           0x8E

#define ACPI_RESOURCE_NAME_LARGE_MAX            0x8E

#define ACPI_RESOURCE_NAME_PIN_CONFIG           0x8F

#define ACPI_RESOURCE_NAME_PIN_GROUP            0x90

#define ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION   0x91

#define ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG     0x92

#define ACPI_RESOURCE_NAME_LARGE_MAX            0x92



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

 *
@@ -1176,12 +1181,18 @@ struct acpi_external_list { 
#define ACPI_EXT_INTERNAL_PATH_ALLOCATED    0x04	/* Deallocate internal path on completion */

#define ACPI_EXT_EXTERNAL_EMITTED           0x08	/* External() statement has been emitted */

#define ACPI_EXT_ORIGIN_FROM_OPCODE         0x10	/* External came from a External() opcode */

#define ACPI_EXT_CONFLICTING_DECLARATION    0x20	/* External has a conflicting declaration within AML */



struct acpi_external_file {

	char *path;

	struct acpi_external_file *next;

};



struct acpi_parse_object_list {

	union acpi_parse_object *op;

	struct acpi_parse_object_list *next;

};



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

 *

 * Debugger

drivers/acpi/acpica/acopcode.h

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
#define ARGP_DWORD_OP                   ARGP_LIST1 (ARGP_DWORDDATA)

#define ARGP_ELSE_OP                    ARGP_LIST2 (ARGP_PKGLENGTH,  ARGP_TERMLIST)

#define ARGP_EVENT_OP                   ARGP_LIST1 (ARGP_NAME)

#define ARGP_EXTERNAL_OP                ARGP_LIST3 (ARGP_NAMESTRING, ARGP_BYTEDATA,      ARGP_BYTEDATA)

#define ARGP_EXTERNAL_OP                ARGP_LIST3 (ARGP_NAME,       ARGP_BYTEDATA,      ARGP_BYTEDATA)

#define ARGP_FATAL_OP                   ARGP_LIST3 (ARGP_BYTEDATA,   ARGP_DWORDDATA,     ARGP_TERMARG)

#define ARGP_FIELD_OP                   ARGP_LIST4 (ARGP_PKGLENGTH,  ARGP_NAMESTRING,    ARGP_BYTEDATA,  ARGP_FIELDLIST)

#define ARGP_FIND_SET_LEFT_BIT_OP       ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)