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

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

ACPICA: Rename AE_AML_INFINITE_LOOP exception 

ACPICA commit e017213698374e01225f641ba0917516d8e91427

More appropriately renamed to AE_AML_LOOP_TIMEOUT, now that
a real timer is used for the implementation.

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


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 164a08ce

drivers/acpi/acpica/dscontrol.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state *walk_state, 
			if (ACPI_TIME_AFTER(acpi_os_get_timer(),

					    control_state->control.

					    loop_timeout)) {

				status = AE_AML_INFINITE_LOOP;

				status = AE_AML_LOOP_TIMEOUT;

				break;

			}

include/acpi/acexcep.h

+3 −3
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ struct acpi_exception_info { 
#define AE_AML_CIRCULAR_REFERENCE       EXCEP_AML (0x001E)

#define AE_AML_BAD_RESOURCE_LENGTH      EXCEP_AML (0x001F)

#define AE_AML_ILLEGAL_ADDRESS          EXCEP_AML (0x0020)

#define AE_AML_INFINITE_LOOP            EXCEP_AML (0x0021)

#define AE_AML_LOOP_TIMEOUT             EXCEP_AML (0x0021)

#define AE_AML_UNINITIALIZED_NODE       EXCEP_AML (0x0022)

#define AE_AML_TARGET_TYPE              EXCEP_AML (0x0023)
@@ -368,8 +368,8 @@ static const struct acpi_exception_info acpi_gbl_exception_names_aml[] = { 
		  "The length of a Resource Descriptor in the AML is incorrect"),

	EXCEP_TXT("AE_AML_ILLEGAL_ADDRESS",

		  "A memory, I/O, or PCI configuration address is invalid"),

	EXCEP_TXT("AE_AML_INFINITE_LOOP",

		  "An apparent infinite AML While loop, method was aborted"),

	EXCEP_TXT("AE_AML_LOOP_TIMEOUT",

		  "An AML While loop exceeded the maximum execution time"),

	EXCEP_TXT("AE_AML_UNINITIALIZED_NODE",

		  "A namespace node is uninitialized or unresolved"),

	EXCEP_TXT("AE_AML_TARGET_TYPE",