From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 10 Jul 2019 09:52:50 +0000 (+0200)
Subject: Revert "ACPICA: Update table load object initialization"
X-Git-Tag: v5.4-rc1~615^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6cf7fb5a95dec9743f4bfd96f9ece580a355cdd1;p=platform%2Fkernel%2Flinux-rpi.git

Revert "ACPICA: Update table load object initialization"

Revert commit c522ad0637ca ("ACPICA: Update table load object
initialization") as it causes systems to hang on attempts to load
OEM ACPI tables.

Reported-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 58c04d7..587aeee 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -174,9 +174,12 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
 		return_ACPI_STATUS(status);
 	}
 
-	/* Complete the initialization/resolution of new objects */
+	/* Complete the initialization/resolution of package objects */
 
-	acpi_ns_initialize_objects();
+	status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT,
+					ACPI_UINT32_MAX, 0,
+					acpi_ns_init_one_package, NULL, NULL,
+					NULL);
 
 	/* Parameter Data (optional) */
 
@@ -434,11 +437,12 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
 		return_ACPI_STATUS(status);
 	}
 
-	/* Complete the initialization/resolution of new objects */
+	/* Complete the initialization/resolution of package objects */
 
-	acpi_ex_exit_interpreter();
-	acpi_ns_initialize_objects();
-	acpi_ex_enter_interpreter();
+	status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT,
+					ACPI_UINT32_MAX, 0,
+					acpi_ns_init_one_package, NULL, NULL,
+					NULL);
 
 	/* Store the ddb_handle into the Target operand */
 
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c
index 86f1693..ef8f8a9 100644
--- a/drivers/acpi/acpica/tbxfload.c
+++ b/drivers/acpi/acpica/tbxfload.c
@@ -297,11 +297,15 @@ acpi_status acpi_load_table(struct acpi_table_header *table)
 	status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table),
 						ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL,
 						FALSE, &table_index);
-	if (ACPI_SUCCESS(status)) {
 
-		/* Complete the initialization/resolution of new objects */
+	if (ACPI_SUCCESS(status)) {
+		/* Complete the initialization/resolution of package objects */
 
-		acpi_ns_initialize_objects();
+		status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE,
+						ACPI_ROOT_OBJECT,
+						ACPI_UINT32_MAX, 0,
+						acpi_ns_init_one_package,
+						NULL, NULL, NULL);
 	}
 
 	return_ACPI_STATUS(status);