summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Wolf <W_Armin@gmx.de>2026-01-14 15:27:47 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2026-01-15 20:17:48 +0300
commitc3bc5f6d893b8e42890bf0a1097e6cc4ec33fe0b (patch)
tree8f9d8dfa199cef7e254a32da90fb6430597aaea3
parent091c4af3562d0b8484c7098fd16cf3cf9f39e7c9 (diff)
downloadlinux-c3bc5f6d893b8e42890bf0a1097e6cc4ec33fe0b.tar.xz
ACPICA: Fix asltests using the Fatal() opcode
Some asltests test the behavior of the Fatal() opcode and thus require that said opcode does not return an error when called. Introduce a compile-time option called ACPI_CONTINUE_ON_FATAL to instruct the executor to continue the execution of AML bytecode when encountering a Fatal() opcode. Also update the asltest to use this new option. Fixes: ("Abort AML bytecode execution when executing AML_FATAL_OP") Link: https://github.com/acpica/acpica/commit/428b3410c490 Signed-off-by: Armin Wolf <W_Armin@gmx.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Link: https://patch.msgid.link/2052065.usQuhbGJ8B@rafael.j.wysocki
-rw-r--r--drivers/acpi/acpica/exoparg3.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index c8c8c4e49563..2fc8070814e3 100644
--- a/drivers/acpi/acpica/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -72,11 +72,18 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)
acpi_os_signal(ACPI_SIGNAL_FATAL, &fatal);
+#ifndef ACPI_CONTINUE_ON_FATAL
/*
* Might return while OS is shutting down, so abort the AML execution
* by returning an error.
*/
return_ACPI_STATUS(AE_ERROR);
+#else
+ /*
+ * The alstests require that the Fatal() opcode does not return an error.
+ */
+ return_ACPI_STATUS(AE_OK);
+#endif
case AML_EXTERNAL_OP:
/*