[PATCH v5 2/5] ACPICA: Parser: Fix a regression in LoadTable support

From	Lv Zheng <lv.zheng@intel.com>
Newsgroups	linux.kernel
Subject	[PATCH v5 2/5] ACPICA: Parser: Fix a regression in LoadTable support
Date	2016-09-23 05:30 +0200
Message-ID	<skplv-6JY-1@gated-at.bofh.it> (permalink)
References	<rydZo-52M-5@gated-at.bofh.it> <skplv-6JY-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

ACPICA commit a78506e0ce8ab1d20db2a055d99cf9143e89eb29

LoadTable allows an alternative RootPathString than the default "\", while
the new table execution support fails to keep this logic.

This regression can be detected by ASLTS - TLT0.tst4, this patch fixes this
regression.

Linux upstream is not affected by this regression as we haven't enabled the
new table execution support there. BZ 1326, Lv Zheng.

Link: https://github.com/acpica/acpica/commit/a78506e0
Link: https://bugs.acpica.org/show_bug.cgi?id=1326
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
---
 drivers/acpi/acpica/psxface.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index 8d7e5b5..f3c8726 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -305,6 +305,17 @@ acpi_status acpi_ps_execute_table(struct acpi_evaluate_info *info)
 		walk_state->parse_flags |= ACPI_PARSE_MODULE_LEVEL;
 	}
 
+	/* Info->Node is the default location to load the table  */
+
+	if (info->node && info->node != acpi_gbl_root_node) {
+		status =
+		    acpi_ds_scope_stack_push(info->node, ACPI_TYPE_METHOD,
+					     walk_state);
+		if (ACPI_FAILURE(status)) {
+			goto cleanup;
+		}
+	}
+
 	/*
 	 * Parse the AML, walk_state will be deleted by parse_aml
 	 */
-- 
1.7.10

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v5 2/5] ACPICA: Parser: Fix a regression in LoadTable support Lv Zheng <lv.zheng@intel.com> - 2016-09-23 05:30 +0200

csiph-web