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

Commit 9ce81784 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPI 5.0: Implement Connection() and AccessAs() changes 



Support within the interpreter and operation region dispatch.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ffef6827

drivers/acpi/acpica/acevents.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ acpi_status acpi_ev_initialize_op_regions(void); 


acpi_status

acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,

			       union acpi_operand_object *field_obj,

			       u32 function,

			       u32 region_offset, u32 bit_width, u64 *value);

drivers/acpi/acpica/aclocal.h

+5 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ typedef u32 acpi_mutex_handle; 


/* Total number of aml opcodes defined */



#define AML_NUM_OPCODES                 0x7F

#define AML_NUM_OPCODES                 0x81



/* Forward declarations */
@@ -249,12 +249,16 @@ struct acpi_create_field_info { 
	struct acpi_namespace_node *field_node;

	struct acpi_namespace_node *register_node;

	struct acpi_namespace_node *data_register_node;

	struct acpi_namespace_node *connection_node;

	u8 *resource_buffer;

	u32 bank_value;

	u32 field_bit_position;

	u32 field_bit_length;

	u16 resource_length;

	u8 field_flags;

	u8 attribute;

	u8 field_type;

	u8 access_length;

};



typedef

drivers/acpi/acpica/acobject.h

+4 −1
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO}; 
	u32                             base_byte_offset;   /* Byte offset within containing object */\

	u32                             value;              /* Value to store into the Bank or Index register */\

	u8                              start_field_bit_offset;/* Bit offset within first field datum (0-63) */\

	u8                              access_length;	/* For serial regions/fields */





struct acpi_object_field_common {	/* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */
@@ -261,7 +262,9 @@ struct acpi_object_field_common { /* COMMON FIELD (for BUFFER, REGION, BANK, and 
};



struct acpi_object_region_field {

	ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO union acpi_operand_object *region_obj;	/* Containing op_region object */

	ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO u16 resource_length;

	union acpi_operand_object *region_obj;	/* Containing op_region object */

	u8 *resource_buffer;	/* resource_template for serial regions/fields */

};



struct acpi_object_bank_field {

drivers/acpi/acpica/acopcode.h

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ 
#define ARGP_CONCAT_OP                  ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)

#define ARGP_CONCAT_RES_OP              ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)

#define ARGP_COND_REF_OF_OP             ARGP_LIST2 (ARGP_SUPERNAME,  ARGP_SUPERNAME)

#define ARGP_CONNECTFIELD_OP            ARGP_LIST1 (ARGP_NAMESTRING)

#define ARGP_CONTINUE_OP                ARG_NONE

#define ARGP_COPY_OP                    ARGP_LIST2 (ARGP_TERMARG,    ARGP_SIMPLENAME)

#define ARGP_CREATE_BIT_FIELD_OP        ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_NAME)
@@ -164,6 +165,7 @@ 
#define ARGP_RETURN_OP                  ARGP_LIST1 (ARGP_TERMARG)

#define ARGP_REVISION_OP                ARG_NONE

#define ARGP_SCOPE_OP                   ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_TERMLIST)

#define ARGP_SERIALFIELD_OP             ARGP_LIST1 (ARGP_NAMESTRING)

#define ARGP_SHIFT_LEFT_OP              ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)

#define ARGP_SHIFT_RIGHT_OP             ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)

#define ARGP_SIGNAL_OP                  ARGP_LIST1 (ARGP_SUPERNAME)
@@ -223,6 +225,7 @@ 
#define ARGI_CONCAT_OP                  ARGI_LIST3 (ARGI_COMPUTEDATA,ARGI_COMPUTEDATA,   ARGI_TARGETREF)

#define ARGI_CONCAT_RES_OP              ARGI_LIST3 (ARGI_BUFFER,     ARGI_BUFFER,        ARGI_TARGETREF)

#define ARGI_COND_REF_OF_OP             ARGI_LIST2 (ARGI_OBJECT_REF, ARGI_TARGETREF)

#define ARGI_CONNECTFIELD_OP            ARGI_INVALID_OPCODE

#define ARGI_CONTINUE_OP                ARGI_INVALID_OPCODE

#define ARGI_COPY_OP                    ARGI_LIST2 (ARGI_ANYTYPE,    ARGI_SIMPLE_TARGET)

#define ARGI_CREATE_BIT_FIELD_OP        ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_REFERENCE)
@@ -294,6 +297,7 @@ 
#define ARGI_RETURN_OP                  ARGI_INVALID_OPCODE

#define ARGI_REVISION_OP                ARG_NONE

#define ARGI_SCOPE_OP                   ARGI_INVALID_OPCODE

#define ARGI_SERIALFIELD_OP             ARGI_INVALID_OPCODE

#define ARGI_SHIFT_LEFT_OP              ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)

#define ARGI_SHIFT_RIGHT_OP             ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)

#define ARGI_SIGNAL_OP                  ARGI_LIST1 (ARGI_EVENT)

drivers/acpi/acpica/amlcode.h

+10 −0
Original line number Diff line number Diff line
@@ -188,6 +188,14 @@ 
#define AML_LLESSEQUAL_OP           (u16) 0x9294

#define AML_LNOTEQUAL_OP            (u16) 0x9293



/*

 * Opcodes for "Field" operators

 */

#define AML_FIELD_OFFSET_OP         (u8) 0x00

#define AML_FIELD_ACCESS_OP         (u8) 0x01

#define AML_FIELD_CONNECTION_OP     (u8) 0x02	/* ACPI 5.0 */

#define AML_FIELD_EXT_ACCESS_OP     (u8) 0x03	/* ACPI 5.0 */



/*

 * Internal opcodes

 * Use only "Unknown" AML opcodes, don't attempt to use
@@ -202,6 +210,8 @@ 
#define AML_INT_METHODCALL_OP       (u16) 0x0035

#define AML_INT_RETURN_VALUE_OP     (u16) 0x0036

#define AML_INT_EVAL_SUBTREE_OP     (u16) 0x0037

#define AML_INT_CONNECTION_OP       (u16) 0x0038

#define AML_INT_EXTACCESSFIELD_OP   (u16) 0x0039



#define ARG_NONE                    0x0