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

Commit 2f8c1141 authored by Erik Schmauss's avatar Erik Schmauss Committed by Rafael J. Wysocki
Browse files

ACPICA: Disassembler: prevent external op's from opening a new scope 

ACPICA commit c512c2bfcce65b8e8f37d549ac2fa4a1e0182e46

Since Externals could be of ACPI_TYPE_METHOD, there is a possibility
that the acpi_ns_lookup may cause a new scope to be opened. Therefore,
disable opening the scope for all acpi_ns_lookup invocations that deal
with externals.

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


Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
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 e6b6ea37

drivers/acpi/acpica/dswload2.c

+10 −0
Original line number Diff line number Diff line
@@ -310,6 +310,16 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state, 
				flags |= ACPI_NS_TEMPORARY;

			}

		}

#ifdef ACPI_ASL_COMPILER



		/*

		 * Do not open a scope. This could be an external method

		 * and open a scope.

		 */

		if (walk_state->opcode == AML_EXTERNAL_OP) {

			flags |= ACPI_NS_DONT_OPEN_SCOPE;

		}

#endif



		/* Add new entry or lookup existing entry */