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

Commit 74e30f96 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Fix for implicit result conversion for the ToXXX functions 

ACPICA commit e1342c9f2dde37a67e916099658b65984ef8a434

Implicit result conversion was incorrectly disabled for the
following functions:
 FromBCD
 ToBCD
 ToDecimalString
 ToHexString
 ToInteger
 ToBuffer

Link: https://github.com/acpica/acpica/commit/e1342c9f


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 57707a9a

drivers/acpi/acpica/acopcode.h

+7 −7
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ 
#define ARGI_FIELD_OP                   ARGI_INVALID_OPCODE

#define ARGI_FIND_SET_LEFT_BIT_OP       ARGI_LIST2 (ARGI_INTEGER,    ARGI_TARGETREF)

#define ARGI_FIND_SET_RIGHT_BIT_OP      ARGI_LIST2 (ARGI_INTEGER,    ARGI_TARGETREF)

#define ARGI_FROM_BCD_OP                ARGI_LIST2 (ARGI_INTEGER,    ARGI_FIXED_TARGET)

#define ARGI_FROM_BCD_OP                ARGI_LIST2 (ARGI_INTEGER,    ARGI_TARGETREF)

#define ARGI_IF_OP                      ARGI_INVALID_OPCODE

#define ARGI_INCREMENT_OP               ARGI_LIST1 (ARGI_TARGETREF)

#define ARGI_INDEX_FIELD_OP             ARGI_INVALID_OPCODE
@@ -313,12 +313,12 @@ 
#define ARGI_SUBTRACT_OP                ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)

#define ARGI_THERMAL_ZONE_OP            ARGI_INVALID_OPCODE

#define ARGI_TIMER_OP                   ARG_NONE

#define ARGI_TO_BCD_OP                  ARGI_LIST2 (ARGI_INTEGER,    ARGI_FIXED_TARGET)

#define ARGI_TO_BUFFER_OP               ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)

#define ARGI_TO_DEC_STR_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)

#define ARGI_TO_HEX_STR_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)

#define ARGI_TO_INTEGER_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)

#define ARGI_TO_STRING_OP               ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_FIXED_TARGET)

#define ARGI_TO_BCD_OP                  ARGI_LIST2 (ARGI_INTEGER,    ARGI_TARGETREF)

#define ARGI_TO_BUFFER_OP               ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_TARGETREF)

#define ARGI_TO_DEC_STR_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_TARGETREF)

#define ARGI_TO_HEX_STR_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_TARGETREF)

#define ARGI_TO_INTEGER_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_TARGETREF)

#define ARGI_TO_STRING_OP               ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_TARGETREF)

#define ARGI_UNLOAD_OP                  ARGI_LIST1 (ARGI_DDBHANDLE)

#define ARGI_VAR_PACKAGE_OP             ARGI_LIST1 (ARGI_INTEGER)

#define ARGI_WAIT_OP                    ARGI_LIST2 (ARGI_EVENT,      ARGI_INTEGER)

drivers/acpi/acpica/amlcode.h

+17 −3
Original line number Diff line number Diff line
@@ -277,9 +277,23 @@ 
#define ARGI_DEVICE_REF             0x0D

#define ARGI_REFERENCE              0x0E

#define ARGI_TARGETREF              0x0F	/* Target, subject to implicit conversion */

#define ARGI_FIXED_TARGET           0x10	/* Target, no implicit conversion */

#define ARGI_SIMPLE_TARGET          0x11	/* Name, Local, Arg -- no implicit conversion */

#define ARGI_STORE_TARGET           0x12	/* Target for store is TARGETREF + package objects */

#define ARGI_SIMPLE_TARGET          0x10	/* Name, Local, Arg -- no implicit conversion */

#define ARGI_STORE_TARGET           0x11	/* Target for store is TARGETREF + package objects */

/*

 * #define ARGI_FIXED_TARGET           0x10     Target, no implicit conversion

 *

 * Removed 10/2016. ARGI_FIXED_TARGET was used for these operators:

 *      from_BCD

 *      to_BCD

 *      to_decimal_string

 *      to_hex_string

 *      to_integer

 *      to_buffer

 * The purpose of this type was to disable "implicit result conversion",

 * but this was incorrect per the ACPI spec and other ACPI implementations.

 * These operators now have the target operand defined as a normal

 * ARGI_TARGETREF.

 */



/* Multiple/complex types */

drivers/acpi/acpica/exconvrt.c

+0 −1
Original line number Diff line number Diff line
@@ -592,7 +592,6 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type, 
	 */

	switch (GET_CURRENT_ARG_TYPE(walk_state->op_info->runtime_args)) {

	case ARGI_SIMPLE_TARGET:

	case ARGI_FIXED_TARGET:

	case ARGI_INTEGER_REF:	/* Handles Increment, Decrement cases */



		switch (destination_type) {

drivers/acpi/acpica/exresop.c

+0 −1
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ acpi_ex_resolve_operands(u16 opcode, 
		case ARGI_OBJECT_REF:

		case ARGI_DEVICE_REF:

		case ARGI_TARGETREF:	/* Allows implicit conversion rules before store */

		case ARGI_FIXED_TARGET:	/* No implicit conversion before store to target */

		case ARGI_SIMPLE_TARGET:	/* Name, Local, or arg - no implicit conversion  */

		case ARGI_STORE_TARGET: