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

Commit 8633db6b authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Dispatcher: Fix interpreter locking around acpi_ev_initialize_region() 



In the code path of acpi_ev_initialize_region(), there is namespace
modification code unlocked. This patch tunes the code to make sure
such modification are always locked.

Fixes: 74f51b80 (ACPICA: Namespace: Fix dynamic table loading issues)
Tested-by: default avatarImre Deak <imre.deak@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 8121aa26

drivers/acpi/acpica/dsinit.c

+3 −8
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "acdispat.h"

#include "acnamesp.h"

#include "actables.h"

#include "acinterp.h"



#define _COMPONENT          ACPI_DISPATCHER

ACPI_MODULE_NAME("dsinit")
@@ -214,23 +215,17 @@ acpi_ds_initialize_objects(u32 table_index, 


	/* Walk entire namespace from the supplied root */



	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}



	/*

	 * We don't use acpi_walk_namespace since we do not want to acquire

	 * the namespace reader lock.

	 */

	status =

	    acpi_ns_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX,

				   ACPI_NS_WALK_UNLOCK, acpi_ds_init_one_object,

				   NULL, &info, NULL);

				   0, acpi_ds_init_one_object, NULL, &info,

				   NULL);

	if (ACPI_FAILURE(status)) {

		ACPI_EXCEPTION((AE_INFO, status, "During WalkNamespace"));

	}

	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);



	status = acpi_get_table_by_index(table_index, &table);

	if (ACPI_FAILURE(status)) {

drivers/acpi/acpica/dsmethod.c

+3 −9
Original line number Diff line number Diff line
@@ -99,14 +99,11 @@ acpi_ds_auto_serialize_method(struct acpi_namespace_node *node, 
			  "Method auto-serialization parse [%4.4s] %p\n",

			  acpi_ut_get_node_name(node), node));



	acpi_ex_enter_interpreter();



	/* Create/Init a root op for the method parse tree */



	op = acpi_ps_alloc_op(AML_METHOD_OP, obj_desc->method.aml_start);

	if (!op) {

		status = AE_NO_MEMORY;

		goto unlock;

		return_ACPI_STATUS(AE_NO_MEMORY);

	}



	acpi_ps_set_name(op, node->name.integer);
@@ -118,8 +115,7 @@ acpi_ds_auto_serialize_method(struct acpi_namespace_node *node, 
	    acpi_ds_create_walk_state(node->owner_id, NULL, NULL, NULL);

	if (!walk_state) {

		acpi_ps_free_op(op);

		status = AE_NO_MEMORY;

		goto unlock;

		return_ACPI_STATUS(AE_NO_MEMORY);

	}



	status = acpi_ds_init_aml_walk(walk_state, op, node,
@@ -128,7 +124,7 @@ acpi_ds_auto_serialize_method(struct acpi_namespace_node *node, 
	if (ACPI_FAILURE(status)) {

		acpi_ds_delete_walk_state(walk_state);

		acpi_ps_free_op(op);

		goto unlock;

		return_ACPI_STATUS(status);

	}



	walk_state->descending_callback = acpi_ds_detect_named_opcodes;
@@ -138,8 +134,6 @@ acpi_ds_auto_serialize_method(struct acpi_namespace_node *node, 
	status = acpi_ps_parse_aml(walk_state);



	acpi_ps_delete_parse_tree(op);

unlock:

	acpi_ex_exit_interpreter();

	return_ACPI_STATUS(status);

}

drivers/acpi/acpica/dswload2.c

+0 −2
Original line number Diff line number Diff line
@@ -607,11 +607,9 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state) 
				}

			}



			acpi_ex_exit_interpreter();

			status =

			    acpi_ev_initialize_region

			    (acpi_ns_get_attached_object(node), FALSE);

			acpi_ex_enter_interpreter();



			if (ACPI_FAILURE(status)) {

				/*

drivers/acpi/acpica/evrgnini.c

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "accommon.h"

#include "acevents.h"

#include "acnamesp.h"

#include "acinterp.h"



#define _COMPONENT          ACPI_EVENTS

ACPI_MODULE_NAME("evrgnini")
@@ -597,9 +598,11 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj, 
					}

				}



				acpi_ex_exit_interpreter();

				status =

				    acpi_ev_execute_reg_method(region_obj,

							       ACPI_REG_CONNECT);

				acpi_ex_enter_interpreter();



				if (acpi_ns_locked) {

					status =

drivers/acpi/acpica/nsload.c

+2 −0
Original line number Diff line number Diff line
@@ -137,7 +137,9 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node) 
	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

			  "**** Begin Table Object Initialization\n"));



	acpi_ex_enter_interpreter();

	status = acpi_ds_initialize_objects(table_index, node);

	acpi_ex_exit_interpreter();



	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

			  "**** Completed Table Object Initialization\n"));