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

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

ACPICA: Events: Fix an issue that _REG association can happen before namespace is initialized 

ACPICA commit c508f8592efaa0d8197f26d7fee6382c5ac8e383

Current code flow cannot ensure _REG association can happen after the
namespace is initialized, so we move _REG association to where _REG was
about to run to fix this issue.

This issue is detected when acpi_ev_initialize_region() is invoked during
the table loading. And this is one of the most important the root cause why
ACPICA table loading is split into 2 load passes. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/c508f859
Link: https://bugs.acpica.org/show_bug.cgi?id=1252


Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ca4fc027

drivers/acpi/acpica/acevents.h

+0 −2
Original line number Diff line number Diff line
@@ -198,8 +198,6 @@ void 
acpi_ev_detach_region(union acpi_operand_object *region_obj,

		      u8 acpi_ns_is_locked);



void acpi_ev_associate_reg_method(union acpi_operand_object *region_obj);



void

acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,

			    acpi_adr_space_type space_id, u32 function);

drivers/acpi/acpica/evregion.c

+24 −47
Original line number Diff line number Diff line
@@ -526,82 +526,59 @@ acpi_ev_attach_region(union acpi_operand_object *handler_obj, 


/*******************************************************************************

 *

 * FUNCTION:    acpi_ev_associate_reg_method

 * FUNCTION:    acpi_ev_execute_reg_method

 *

 * PARAMETERS:  region_obj          - Region object

 *              function            - Passed to _REG: On (1) or Off (0)

 *

 * RETURN:      Status

 *

 * DESCRIPTION: Find and associate _REG method to a region

 * DESCRIPTION: Execute _REG method for a region

 *

 ******************************************************************************/



void acpi_ev_associate_reg_method(union acpi_operand_object *region_obj)

acpi_status

acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)

{

	struct acpi_evaluate_info *info;

	union acpi_operand_object *args[3];

	union acpi_operand_object *region_obj2;

	const acpi_name *reg_name_ptr =

	    ACPI_CAST_PTR(acpi_name, METHOD_NAME__REG);

	struct acpi_namespace_node *method_node;

	struct acpi_namespace_node *node;

	union acpi_operand_object *region_obj2;

	acpi_status status;



	ACPI_FUNCTION_TRACE(ev_associate_reg_method);

	ACPI_FUNCTION_TRACE(ev_execute_reg_method);



	if (!acpi_gbl_namespace_initialized ||

	    region_obj->region.handler == NULL) {

		return_ACPI_STATUS(AE_OK);

	}



	region_obj2 = acpi_ns_get_secondary_object(region_obj);

	if (!region_obj2) {

		return_VOID;

		return_ACPI_STATUS(AE_NOT_EXIST);

	}



	/*

	 * Find any "_REG" method associated with this region definition.

	 * The method should always be updated as this function may be

	 * invoked after a namespace change.

	 */

	node = region_obj->region.node->parent;



	/* Find any "_REG" method associated with this region definition */



	status =

	    acpi_ns_search_one_scope(*reg_name_ptr, node, ACPI_TYPE_METHOD,

				     &method_node);

	if (ACPI_SUCCESS(status)) {

		/*

		 * The _REG method is optional and there can be only one per region

		 * definition. This will be executed when the handler is attached

		 * or removed

		 * The _REG method is optional and there can be only one per

		 * region definition. This will be executed when the handler is

		 * attached or removed.

		 */

		region_obj2->extra.method_REG = method_node;

	}



	return_VOID;

}



/*******************************************************************************

 *

 * FUNCTION:    acpi_ev_execute_reg_method

 *

 * PARAMETERS:  region_obj          - Region object

 *              function            - Passed to _REG: On (1) or Off (0)

 *

 * RETURN:      Status

 *

 * DESCRIPTION: Execute _REG method for a region

 *

 ******************************************************************************/



acpi_status

acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)

{

	struct acpi_evaluate_info *info;

	union acpi_operand_object *args[3];

	union acpi_operand_object *region_obj2;

	acpi_status status;



	ACPI_FUNCTION_TRACE(ev_execute_reg_method);



	region_obj2 = acpi_ns_get_secondary_object(region_obj);

	if (!region_obj2) {

		return_ACPI_STATUS(AE_NOT_EXIST);

	}



	if (region_obj2->extra.method_REG == NULL ||

	    region_obj->region.handler == NULL ||

	    !acpi_gbl_namespace_initialized) {

	if (region_obj2->extra.method_REG == NULL) {

		return_ACPI_STATUS(AE_OK);

	}

drivers/acpi/acpica/evrgnini.c

+0 −1
Original line number Diff line number Diff line
@@ -518,7 +518,6 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj, 
		return_ACPI_STATUS(AE_OK);

	}



	acpi_ev_associate_reg_method(region_obj);

	region_obj->common.flags |= AOPOBJ_OBJECT_INITIALIZED;



	node = region_obj->region.node->parent;