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

Commit 460a5310 authored by Erik Schmauss's avatar Erik Schmauss Committed by Rafael J. Wysocki
Browse files

ACPICA: AML Parser: ignore control method status in module-level code 



Previous change in the AML parser code blindly set all non-successful
dispatcher statuses to AE_OK. That approach is incorrect, though,
because successful control method invocations from module-level
return AE_CTRL_TRANSFER. Overwriting AE_OK to this status causes the
AML parser to think that there was no return value from the control
method invocation.

Fixes: 92c0f4af386 (ACPICA: AML Parser: ignore dispatcher error status during table load)
Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Tested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Tested-by: default avatarOleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 73c2a01c

drivers/acpi/acpica/psloop.c

+12 −7
Original line number Diff line number Diff line
@@ -709,15 +709,20 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) 
			} else

			    if ((walk_state->

				 parse_flags & ACPI_PARSE_MODULE_LEVEL)

				&& status != AE_CTRL_TRANSFER

				&& ACPI_FAILURE(status)) {

				/*

				 * ACPI_PARSE_MODULE_LEVEL means that we are loading a table by

				 * executing it as a control method. However, if we encounter

				 * an error while loading the table, we need to keep trying to

				 * load the table rather than aborting the table load. Set the

				 * status to AE_OK to proceed with the table load. If we get a

				 * failure at this point, it means that the dispatcher got an

				 * error while processing Op (most likely an AML operand error.

				 * ACPI_PARSE_MODULE_LEVEL flag means that we are currently

				 * loading a table by executing it as a control method.

				 * However, if we encounter an error while loading the table,

				 * we need to keep trying to load the table rather than

				 * aborting the table load (setting the status to AE_OK

				 * continues the table load). If we get a failure at this

				 * point, it means that the dispatcher got an error while

				 * processing Op (most likely an AML operand error) or a

				 * control method was called from module level and the

				 * dispatcher returned AE_CTRL_TRANSFER. In the latter case,

				 * leave the status alone, there's nothing wrong with it.

				 */

				status = AE_OK;

			}