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

Merge branch 'acpica' 

* acpica:
  ACPICA: Remove acpi_gbl_group_module_level_code and only use acpi_gbl_execute_tables_as_methods instead
  ACPICA: AML Parser: fix parse loop to correctly skip erroneous extended opcodes
  ACPICA: AML interpreter: add region addresses in global list during initialization
  ACPICA: Update version to 20181003
  ACPICA: Never run _REG on system_memory and system_IO
  ACPICA: Split large interpreter file
  ACPICA: Update for field unit access
  ACPICA: Rename some of the Field Attribute defines
  ACPICA: Update for generic_serial_bus and attrib_raw_process_bytes protocol
parents 589edb56 08930d56

drivers/acpi/acpica/Makefile

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

	exresolv.o	\

	exresop.o	\

	exserial.o	\

	exstore.o	\

	exstoren.o	\

	exstorob.o	\

drivers/acpi/acpica/acevents.h

+2 −0
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ acpi_ev_default_region_setup(acpi_handle handle, 


acpi_status acpi_ev_initialize_region(union acpi_operand_object *region_obj);



u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node);



/*

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

 */

drivers/acpi/acpica/acinterp.h

+23 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ acpi_ex_trace_point(acpi_trace_event_type type, 
/*

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

 */

acpi_status

acpi_ex_get_protocol_buffer_length(u32 protocol_id, u32 *return_length);



acpi_status

acpi_ex_common_buffer_setup(union acpi_operand_object *obj_desc,

			    u32 buffer_length, u32 * datum_count);
@@ -267,6 +270,26 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc, 


acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info);



/*

 * exserial - field_unit support for serial address spaces

 */

acpi_status

acpi_ex_read_serial_bus(union acpi_operand_object *obj_desc,

			union acpi_operand_object **return_buffer);



acpi_status

acpi_ex_write_serial_bus(union acpi_operand_object *source_desc,

			 union acpi_operand_object *obj_desc,

			 union acpi_operand_object **return_buffer);



acpi_status

acpi_ex_read_gpio(union acpi_operand_object *obj_desc, void *buffer);



acpi_status

acpi_ex_write_gpio(union acpi_operand_object *source_desc,

		   union acpi_operand_object *obj_desc,

		   union acpi_operand_object **return_buffer);



/*

 * exsystem - Interface to OS services

 */

drivers/acpi/acpica/aclocal.h

+1 −1
Original line number Diff line number Diff line
@@ -395,9 +395,9 @@ struct acpi_simple_repair_info { 
/* Info for running the _REG methods */



struct acpi_reg_walk_info {

	acpi_adr_space_type space_id;

	u32 function;

	u32 reg_run_count;

	acpi_adr_space_type space_id;

};



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

drivers/acpi/acpica/amlcode.h

+5 −5
Original line number Diff line number Diff line
@@ -432,15 +432,15 @@ typedef enum { 
 */

typedef enum {

	AML_FIELD_ATTRIB_QUICK = 0x02,

	AML_FIELD_ATTRIB_SEND_RCV = 0x04,

	AML_FIELD_ATTRIB_SEND_RECEIVE = 0x04,

	AML_FIELD_ATTRIB_BYTE = 0x06,

	AML_FIELD_ATTRIB_WORD = 0x08,

	AML_FIELD_ATTRIB_BLOCK = 0x0A,

	AML_FIELD_ATTRIB_MULTIBYTE = 0x0B,

	AML_FIELD_ATTRIB_WORD_CALL = 0x0C,

	AML_FIELD_ATTRIB_BLOCK_CALL = 0x0D,

	AML_FIELD_ATTRIB_BYTES = 0x0B,

	AML_FIELD_ATTRIB_PROCESS_CALL = 0x0C,

	AML_FIELD_ATTRIB_BLOCK_PROCESS_CALL = 0x0D,

	AML_FIELD_ATTRIB_RAW_BYTES = 0x0E,

	AML_FIELD_ATTRIB_RAW_PROCESS = 0x0F

	AML_FIELD_ATTRIB_RAW_PROCESS_BYTES = 0x0F

} AML_ACCESS_ATTRIBUTE;



/* Bit fields in the AML method_flags byte */