Skip to contentSkip to conversation

ACPICA version 20190703

PATCH In review Erik Schmauss 2 participants 7 messages Jul 3, 2019 – Jul 5, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover ACPICA version 20190703

This series contains ACPICA version 20190703 changes that are relevant to Linux kernel. This patch set is available for viewing at:
https://github.com/SchmErik/linux/tree/acpica201907

Overall, this release contains several patches that simplify ACPICA initialization by removing unnecessary ACPI namespace walks.

Bob Moore (3):
ACPICA: Namespace: simplify creation of the initial/default namespace
ACPICA: Update for object initialization sequence
ACPICA: Update table load object initialization
ACPICA: Update version to 20190703

Erik Schmauss (2):
ACPICA: remove legacy module-level code due to deprecation

 drivers/acpi/acpica/acglobal.h |   1 -
 drivers/acpi/acpica/acnamesp.h |   2 -
 drivers/acpi/acpica/dsinit.c   |   2 +-
 drivers/acpi/acpica/exconfig.c |  16 ++-
 drivers/acpi/acpica/nsaccess.c |  54 ++++++++--
 drivers/acpi/acpica/nseval.c   | 190 ---------------------------------
 drivers/acpi/acpica/nsinit.c   |  49 ++++-----
 drivers/acpi/acpica/nsload.c   |  12 ---
 drivers/acpi/acpica/nsutils.c  |  12 ---
 drivers/acpi/acpica/tbdata.c   |  13 ---
 drivers/acpi/acpica/tbxfload.c |  10 +-
 drivers/acpi/acpica/utinit.c   |   1 -
 drivers/acpi/acpica/utxfinit.c |  18 ++--
 include/acpi/acpixf.h          |   2 +-
 14 files changed, 79 insertions(+), 303 deletions(-)
Signature · 1 line
2.17.2
#1 lore raw

PATCH 1/5 ACPICA: Namespace: simplify creation of the initial/default namespace

From: Bob Moore <[email protected]>

ACPICA commit 76658f55d8cc498a763bdb92f8e0d934822a129c

For the objects that are created by default (_GPE, _SB_, etc) there is no need to use the heavyweight ns_lookup function. Instead, simply create each object and link it in as the namespace is built.

---
 drivers/acpi/acpica/nsaccess.c | 54 +++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 11 deletions(-)
drivers/acpi/acpica/nsaccess.c +43 -11
index 7b855603f81a..2566e2d4c780 100644
@@ -36,6 +36,7 @@ acpi_status acpi_ns_root_initialize(void)
 	acpi_status status;
 	const struct acpi_predefined_names *init_val = NULL;
 	struct acpi_namespace_node *new_node;
+	struct acpi_namespace_node *prev_node = NULL;
 	union acpi_operand_object *obj_desc;
 	acpi_string val = NULL;
 
@@ -61,12 +62,28 @@ acpi_status acpi_ns_root_initialize(void)
 	 */
 	acpi_gbl_root_node = &acpi_gbl_root_node_struct;
 
-	/* Enter the pre-defined names in the name table */
+	/* Enter the predefined names in the name table */
 
 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,
 			  "Entering predefined entries into namespace\n"));
 
+	/*
+	 * Create the initial (default) namespace.
+	 * This namespace looks like something similar to this:
+	 *
+	 *   ACPI Namespace (from Namespace Root):
+	 *    0  _GPE Scope        00203160 00
+	 *    0  _PR_ Scope        002031D0 00
+	 *    0  _SB_ Device       00203240 00 Notify Object: 0020ADD8
+	 *    0  _SI_ Scope        002032B0 00
+	 *    0  _TZ_ Device       00203320 00
+	 *    0  _REV Integer      00203390 00 = 0000000000000002
+	 *    0  _OS_ String       00203488 00 Len 14 "Microsoft Windows NT"
+	 *    0  _GL_ Mutex        00203580 00 Object 002035F0
+	 *    0  _OSI Method       00203678 00 Args 1 Len 0000 Aml 00000000
+	 */
 	for (init_val = acpi_gbl_pre_defined_names; init_val->name; init_val++) {
+		status = AE_OK;
 
 		/* _OSI is optional for now, will be permanent later */
 
@@ -75,17 +92,32 @@ acpi_status acpi_ns_root_initialize(void)
 			continue;
 		}
 
-		status =
-		    acpi_ns_lookup(NULL, ACPI_CAST_PTR(char, init_val->name),
-				   init_val->type, ACPI_IMODE_LOAD_PASS2,
-				   ACPI_NS_NO_UPSEARCH, NULL, &new_node);
-		if (ACPI_FAILURE(status)) {
-			ACPI_EXCEPTION((AE_INFO, status,
-					"Could not create predefined name %s",
-					init_val->name));
-			continue;
+		/*
+		 * Create, init, and link the new predefined name
+		 * Note: No need to use acpi_ns_lookup here because all the
+		 * predefined names are at the root level. It is much easier to
+		 * just create and link the new node(s) here.
+		 */
+		new_node =
+		    ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_namespace_node));
+		if (!new_node) {
+			status = AE_NO_MEMORY;
+			goto unlock_and_exit;
 		}
 
+		ACPI_COPY_NAMESEG(new_node->name.ascii, init_val->name);
+		new_node->descriptor_type = ACPI_DESC_TYPE_NAMED;
+		new_node->type = init_val->type;
+
+		if (!prev_node) {
+			acpi_gbl_root_node_struct.child = new_node;
+		} else {
+			prev_node->peer = new_node;
+		}
+
+		new_node->parent = &acpi_gbl_root_node_struct;
+		prev_node = new_node;
+
 		/*
 		 * Name entered successfully. If entry in pre_defined_names[] specifies
 		 * an initial value, create the initial value.
@@ -131,7 +163,7 @@ acpi_status acpi_ns_root_initialize(void)
 
 				new_node->value = obj_desc->method.param_count;
 #else
-				/* Mark this as a very SPECIAL method */
+				/* Mark this as a very SPECIAL method (_OSI) */
 
 				obj_desc->method.info_flags =
 				    ACPI_METHOD_INTERNAL_ONLY;
Signature · 1 line
2.17.2
#2 lore raw

PATCH 2/5 ACPICA: remove legacy module-level code due to deprecation

In reply to Erik Schmauss

ACPICA commit 1ca34b1a7b960ef321eae5dcddfff77707c88aef

There have been several places that has been calling functions regarding module level code blocks. This change removes all old vestiges in the codebase. This is dead code.

---
 drivers/acpi/acpica/acglobal.h |   1 -
 drivers/acpi/acpica/acnamesp.h |   2 -
 drivers/acpi/acpica/nseval.c   | 190 ---------------------------------
 drivers/acpi/acpica/nsload.c   |  12 ---
 drivers/acpi/acpica/nsutils.c  |  12 ---
 drivers/acpi/acpica/tbdata.c   |  13 ---
 drivers/acpi/acpica/utinit.c   |   1 -
 drivers/acpi/acpica/utxfinit.c |  13 ---
 8 files changed, 244 deletions(-)
drivers/acpi/acpica/acglobal.h +0 -1
index d056a1845613..fd3beea93421 100644
@@ -178,7 +178,6 @@ ACPI_GLOBAL(u8, acpi_gbl_verbose_leak_dump);
 ACPI_GLOBAL(struct acpi_namespace_node, acpi_gbl_root_node_struct);
 ACPI_GLOBAL(struct acpi_namespace_node *, acpi_gbl_root_node);
 ACPI_GLOBAL(struct acpi_namespace_node *, acpi_gbl_fadt_gpe_device);
-ACPI_GLOBAL(union acpi_operand_object *, acpi_gbl_module_code_list);
 
 extern const u8 acpi_gbl_ns_properties[ACPI_NUM_NS_TYPES];
 extern const struct acpi_predefined_names
drivers/acpi/acpica/acnamesp.h +0 -2
index 39812fc4386a..7da1864798a0 100644
@@ -207,8 +207,6 @@ acpi_ns_dump_object_paths(acpi_object_type type,
  */
 acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info);
 
-void acpi_ns_exec_module_code_list(void);
-
 /*
  * nsarguments - Argument count/type checking for predefined/reserved names
  */
drivers/acpi/acpica/nseval.c +0 -190

205 lines not on this page · raw message

drivers/acpi/acpica/nsload.c +0 -12
index 35fff5c75da1..d7c4d6e8e21e 100644
@@ -109,18 +109,6 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,
 			  "**** Completed Table Object Initialization\n"));
 
-	/*
-	 * This case handles the legacy option that groups all module-level
-	 * code blocks together and defers execution until all of the tables
-	 * are loaded. Execute all of these blocks at this time.
-	 * Execute any module-level code that was detected during the table
-	 * load phase.
-	 *
-	 * Note: this option is deprecated and will be eliminated in the
-	 * future. Use of this option can cause problems with AML code that
-	 * depends upon in-order immediate execution of module-level code.
-	 */
-	acpi_ns_exec_module_code_list();
 	return_ACPI_STATUS(status);
 }
 
drivers/acpi/acpica/nsutils.c +0 -12
index 6bc90d46db5c..b8d007c84d32 100644
@@ -560,21 +560,9 @@ struct acpi_namespace_node *acpi_ns_validate_handle(acpi_handle handle)
 void acpi_ns_terminate(void)
 {
 	acpi_status status;
-	union acpi_operand_object *prev;
-	union acpi_operand_object *next;
 
 	ACPI_FUNCTION_TRACE(ns_terminate);
 
-	/* Delete any module-level code blocks */
-
-	next = acpi_gbl_module_code_list;
-	while (next) {
-		prev = next;
-		next = next->method.mutex;
-		prev->method.mutex = NULL;	/* Clear the Mutex (cheated) field */
-		acpi_ut_remove_reference(prev);
-	}
-
 	/*
 	 * Free the entire namespace -- all nodes and all objects
 	 * attached to the nodes
drivers/acpi/acpica/tbdata.c +0 -13
index 933f81316ad2..91a4b984f224 100644
@@ -933,19 +933,6 @@ acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node)
 
 	status = acpi_ns_load_table(table_index, parent_node);
 
-	/*
-	 * This case handles the legacy option that groups all module-level
-	 * code blocks together and defers execution until all of the tables
-	 * are loaded. Execute all of these blocks at this time.
-	 * Execute any module-level code that was detected during the table
-	 * load phase.
-	 *
-	 * Note: this option is deprecated and will be eliminated in the
-	 * future. Use of this option can cause problems with AML code that
-	 * depends upon in-order immediate execution of module-level code.
-	 */
-	acpi_ns_exec_module_code_list();
-
 	/*
 	 * Update GPEs for any new _Lxx/_Exx methods. Ignore errors. The host is
 	 * responsible for discovering any new wake GPEs by running _PRW methods
drivers/acpi/acpica/utinit.c +0 -1
index bc124591320e..6f33e7c72327 100644
@@ -180,7 +180,6 @@ acpi_status acpi_ut_init_globals(void)
 
 	/* Namespace */
 
-	acpi_gbl_module_code_list = NULL;
 	acpi_gbl_root_node = NULL;
 	acpi_gbl_root_node_struct.name.integer = ACPI_ROOT_NAME;
 	acpi_gbl_root_node_struct.descriptor_type = ACPI_DESC_TYPE_NAMED;
drivers/acpi/acpica/utxfinit.c +0 -13
index 9f3b1e3a09de..077b1af03283 100644
@@ -211,19 +211,6 @@ acpi_status ACPI_INIT_FUNCTION acpi_initialize_objects(u32 flags)
 
 	ACPI_FUNCTION_TRACE(acpi_initialize_objects);
 
-	/*
-	 * This case handles the legacy option that groups all module-level
-	 * code blocks together and defers execution until all of the tables
-	 * are loaded. Execute all of these blocks at this time.
-	 * Execute any module-level code that was detected during the table
-	 * load phase.
-	 *
-	 * Note: this option is deprecated and will be eliminated in the
-	 * future. Use of this option can cause problems with AML code that
-	 * depends upon in-order immediate execution of module-level code.
-	 */
-	acpi_ns_exec_module_code_list();
-
 	/*
 	 * Initialize the objects that remain uninitialized. This
 	 * runs the executable AML that may be part of the
Signature · 1 line
2.17.2
#3 lore raw

PATCH 3/5 ACPICA: Update for object initialization sequence

In reply to Erik Schmauss

From: Bob Moore <[email protected]>

ACPICA commit 106c72a97f5ca972f29956e5e9a0429b8c4a2723

1) Do not allow the objects to be initialized twice
2) Only package objects require a deferred initialization
3) Cleanup initialization output

---
 drivers/acpi/acpica/dsinit.c   |  2 +-
 drivers/acpi/acpica/nsinit.c   | 49 +++++++++++++---------------------
 drivers/acpi/acpica/utxfinit.c | 11 ++++++--
 3 files changed, 29 insertions(+), 33 deletions(-)
drivers/acpi/acpica/dsinit.c +1 -1
index 4ebd23700bbc..a1ffed29903b 100644
@@ -202,7 +202,7 @@ acpi_ds_initialize_objects(u32 table_index,
 
 	if (ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_DSDT)) {
 		ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
-				      "\nInitializing Namespace objects:\n"));
+				      "\nACPI table initialization:\n"));
 	}
 
 	/* Summary of objects initialized */
drivers/acpi/acpica/nsinit.c +19 -30

88 lines not on this page · raw message

drivers/acpi/acpica/utxfinit.c +9 -2
index 077b1af03283..cf769e94fe0f 100644
@@ -211,11 +211,17 @@ acpi_status ACPI_INIT_FUNCTION acpi_initialize_objects(u32 flags)
 
 	ACPI_FUNCTION_TRACE(acpi_initialize_objects);
 
+#ifdef ACPI_OBSOLETE_BEHAVIOR
+	/*
+	 * 05/2019: Removed, initialization now happens at both object
+	 * creation and table load time
+	 */
+
 	/*
 	 * Initialize the objects that remain uninitialized. This
 	 * runs the executable AML that may be part of the
-	 * declaration of these objects:
-	 * operation_regions, buffer_fields, Buffers, and Packages.
+	 * declaration of these objects: operation_regions, buffer_fields,
+	 * bank_fields, Buffers, and Packages.
 	 */
 	if (!(flags & ACPI_NO_OBJECT_INIT)) {
 		status = acpi_ns_initialize_objects();
@@ -223,6 +229,7 @@ acpi_status ACPI_INIT_FUNCTION acpi_initialize_objects(u32 flags)
 			return_ACPI_STATUS(status);
 		}
 	}
+#endif
 
 	/*
 	 * Initialize all device/region objects in the namespace. This runs
Signature · 1 line
2.17.2
#4 lore raw

PATCH 4/5 ACPICA: Update table load object initialization

In reply to Erik Schmauss

ACPICA commit c7ef9f3526765bed8930825dda1eed1a274b9668

Use the common internal "initialize objects" interface Affects:
Load()
load_table()
acpi_load_table

---
 drivers/acpi/acpica/exconfig.c | 16 ++++++----------
 drivers/acpi/acpica/tbxfload.c | 10 +++-------
 2 files changed, 9 insertions(+), 17 deletions(-)
drivers/acpi/acpica/exconfig.c +6 -10
index 587aeeeb5070..58c04d706723 100644
@@ -174,12 +174,9 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
 		return_ACPI_STATUS(status);
 	}
 
-	/* Complete the initialization/resolution of package objects */
+	/* Complete the initialization/resolution of new objects */
 
-	status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT,
-					ACPI_UINT32_MAX, 0,
-					acpi_ns_init_one_package, NULL, NULL,
-					NULL);
+	acpi_ns_initialize_objects();
 
 	/* Parameter Data (optional) */
 
@@ -437,12 +434,11 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
 		return_ACPI_STATUS(status);
 	}
 
-	/* Complete the initialization/resolution of package objects */
+	/* Complete the initialization/resolution of new objects */
 
-	status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT,
-					ACPI_UINT32_MAX, 0,
-					acpi_ns_init_one_package, NULL, NULL,
-					NULL);
+	acpi_ex_exit_interpreter();
+	acpi_ns_initialize_objects();
+	acpi_ex_enter_interpreter();
 
 	/* Store the ddb_handle into the Target operand */
 
drivers/acpi/acpica/tbxfload.c +3 -7
index ef8f8a9f3c9c..86f1693f6d29 100644
@@ -297,15 +297,11 @@ 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 package objects */
 
-		status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE,
-						ACPI_ROOT_OBJECT,
-						ACPI_UINT32_MAX, 0,
-						acpi_ns_init_one_package,
-						NULL, NULL, NULL);
+		/* Complete the initialization/resolution of new objects */
+
+		acpi_ns_initialize_objects();
 	}
 
 	return_ACPI_STATUS(status);
Signature · 1 line
2.17.2
#5 lore raw

PATCH 5/5 ACPICA: Update version to 20190703

In reply to Erik Schmauss

From: Bob Moore <[email protected]>

ACPICA commit 450ffd8b9c100db561ecf23063620cb107d68c30

Version 20190703.

---
 include/acpi/acpixf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/acpi/acpixf.h +1 -1
index 4a8a05401fb5..3845c8fcc94e 100644
@@ -12,7 +12,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20190509
+#define ACPI_CA_VERSION                 0x20190703
 
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>
Signature · 1 line
2.17.2
#6 lore raw
In reply to Erik Schmauss
Quoted 16 lines · CEST Erik Schmauss

This series contains ACPICA version 20190703 changes that are relevant to Linux kernel. This patch set is available for viewing at:
https://github.com/SchmErik/linux/tree/acpica201907

Overall, this release contains several patches that simplify ACPICA initialization by removing unnecessary ACPI namespace walks.

Bob Moore (3):
ACPICA: Namespace: simplify creation of the initial/default namespace
ACPICA: Update for object initialization sequence
ACPICA: Update table load object initialization
ACPICA: Update version to 20190703

Erik Schmauss (2):
ACPICA: remove legacy module-level code due to deprecation

Quoted 17 lines
 drivers/acpi/acpica/acglobal.h |   1 -
 drivers/acpi/acpica/acnamesp.h |   2 -
 drivers/acpi/acpica/dsinit.c   |   2 +-
 drivers/acpi/acpica/exconfig.c |  16 ++-
 drivers/acpi/acpica/nsaccess.c |  54 ++++++++--
 drivers/acpi/acpica/nseval.c   | 190 ---------------------------------
 drivers/acpi/acpica/nsinit.c   |  49 ++++-----
 drivers/acpi/acpica/nsload.c   |  12 ---
 drivers/acpi/acpica/nsutils.c  |  12 ---
 drivers/acpi/acpica/tbdata.c   |  13 ---
 drivers/acpi/acpica/tbxfload.c |  10 +-
 drivers/acpi/acpica/utinit.c   |   1 -
 drivers/acpi/acpica/utxfinit.c |  18 ++--
 include/acpi/acpixf.h          |   2 +-
 14 files changed, 79 insertions(+), 303 deletions(-)

All applied, thanks!