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

ACPICA: Update parameter type for ObjectType operator 

ACPICA commit 67953304a34944548f2fa53a4b0786a5db0ca2ea

The grammar for this operator changed in ACPI 5.0A, but it was
not necessary to update the interpreter/parser until now.

The UserTerm (method invocation) element was removed. Previously
a SuperName, the lone argument now requires a new ARGP_ type.

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


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 ae90fbf5

drivers/acpi/acpica/acopcode.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ 
#define ARGP_TO_HEX_STR_OP              ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)

#define ARGP_TO_INTEGER_OP              ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)

#define ARGP_TO_STRING_OP               ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)

#define ARGP_TYPE_OP                    ARGP_LIST1 (ARGP_SUPERNAME)

#define ARGP_TYPE_OP                    ARGP_LIST1 (ARGP_NAME_OR_REF)

#define ARGP_UNLOAD_OP                  ARGP_LIST1 (ARGP_SUPERNAME)

#define ARGP_VAR_PACKAGE_OP             ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_TERMARG,       ARGP_DATAOBJLIST)

#define ARGP_WAIT_OP                    ARGP_LIST2 (ARGP_SUPERNAME,  ARGP_TERMARG)

drivers/acpi/acpica/amlcode.h

+2 −1
Original line number Diff line number Diff line
@@ -238,7 +238,8 @@ 
#define ARGP_TERMLIST               0x0F

#define ARGP_WORDDATA               0x10

#define ARGP_QWORDDATA              0x11

#define ARGP_SIMPLENAME             0x12

#define ARGP_SIMPLENAME             0x12	/* name_string | local_term | arg_term */

#define ARGP_NAME_OR_REF            0x13	/* For object_type only */



/*

 * Resolved argument types for the AML Interpreter

drivers/acpi/acpica/psargs.c

+3 −2
Original line number Diff line number Diff line
@@ -800,6 +800,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state, 
	case ARGP_TARGET:

	case ARGP_SUPERNAME:

	case ARGP_SIMPLENAME:

	case ARGP_NAME_OR_REF:



		subop = acpi_ps_peek_opcode(parser_state);

		if (subop == 0 ||
@@ -825,8 +826,8 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state, 
							      ACPI_POSSIBLE_METHOD_CALL);



				/*

				 * If the super_name arg of Unload is a method call,

				 * we have restored the AML pointer, just free this Arg

				 * If the super_name argument is a method call, we have

				 * already restored the AML pointer, just free this Arg

				 */

				if (arg->common.aml_opcode ==

				    AML_INT_METHODCALL_OP) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE