Commit cdf65d73 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPICA: Add a depth argument to acpi_execute_reg_methods() 



A subsequent change will need to pass a depth argument to
acpi_execute_reg_methods(), so prepare that function for it.

No intentional functional changes.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Cc: All applicable <stable@vger.kernel.org>
Link: https://patch.msgid.link/8451567.NyiUUSuA9g@rjwysocki.net
parent 779bac99

drivers/acpi/acpica/acevents.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj, 
		      u8 acpi_ns_is_locked);



void

acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,

acpi_ev_execute_reg_methods(struct acpi_namespace_node *node, u32 max_depth,

			    acpi_adr_space_type space_id, u32 function);



acpi_status

drivers/acpi/acpica/evregion.c

+4 −2
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ acpi_status acpi_ev_initialize_op_regions(void) 
						acpi_gbl_default_address_spaces

						[i])) {

			acpi_ev_execute_reg_methods(acpi_gbl_root_node,

						    ACPI_UINT32_MAX,

						    acpi_gbl_default_address_spaces

						    [i], ACPI_REG_CONNECT);

		}
@@ -672,6 +673,7 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function) 
 * FUNCTION:    acpi_ev_execute_reg_methods

 *

 * PARAMETERS:  node            - Namespace node for the device

 *              max_depth       - Depth to which search for _REG

 *              space_id        - The address space ID

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

 *
@@ -683,7 +685,7 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function) 
 ******************************************************************************/



void

acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,

acpi_ev_execute_reg_methods(struct acpi_namespace_node *node, u32 max_depth,

			    acpi_adr_space_type space_id, u32 function)

{

	struct acpi_reg_walk_info info;
@@ -717,7 +719,7 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node, 
	 * regions and _REG methods. (i.e. handlers must be installed for all

	 * regions of this Space ID before we can run any _REG methods)

	 */

	(void)acpi_ns_walk_namespace(ACPI_TYPE_ANY, node, ACPI_UINT32_MAX,

	(void)acpi_ns_walk_namespace(ACPI_TYPE_ANY, node, max_depth,

				     ACPI_NS_WALK_UNLOCK, acpi_ev_reg_run, NULL,

				     &info, NULL);

drivers/acpi/acpica/evxfregn.c

+7 −3
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ acpi_install_address_space_handler_internal(acpi_handle device, 
	/* Run all _REG methods for this address space */



	if (run_reg) {

		acpi_ev_execute_reg_methods(node, space_id, ACPI_REG_CONNECT);

		acpi_ev_execute_reg_methods(node, ACPI_UINT32_MAX, space_id,

					    ACPI_REG_CONNECT);

	}



unlock_and_exit:
@@ -263,6 +264,7 @@ ACPI_EXPORT_SYMBOL(acpi_remove_address_space_handler) 
 * FUNCTION:    acpi_execute_reg_methods

 *

 * PARAMETERS:  device          - Handle for the device

 *              max_depth       - Depth to which search for _REG

 *              space_id        - The address space ID

 *

 * RETURN:      Status
@@ -271,7 +273,8 @@ ACPI_EXPORT_SYMBOL(acpi_remove_address_space_handler) 
 *

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

acpi_status

acpi_execute_reg_methods(acpi_handle device, acpi_adr_space_type space_id)

acpi_execute_reg_methods(acpi_handle device, u32 max_depth,

			 acpi_adr_space_type space_id)

{

	struct acpi_namespace_node *node;

	acpi_status status;
@@ -296,7 +299,8 @@ acpi_execute_reg_methods(acpi_handle device, acpi_adr_space_type space_id) 


		/* Run all _REG methods for this address space */



		acpi_ev_execute_reg_methods(node, space_id, ACPI_REG_CONNECT);

		acpi_ev_execute_reg_methods(node, max_depth, space_id,

					    ACPI_REG_CONNECT);

	} else {

		status = AE_BAD_PARAMETER;

	}

drivers/acpi/ec.c

+1 −1
Original line number Diff line number Diff line
@@ -1506,7 +1506,7 @@ static int ec_install_handlers(struct acpi_ec *ec, struct acpi_device *device, 
	}



	if (call_reg && !test_bit(EC_FLAGS_EC_REG_CALLED, &ec->flags)) {

		acpi_execute_reg_methods(scope_handle, ACPI_ADR_SPACE_EC);

		acpi_execute_reg_methods(scope_handle, ACPI_UINT32_MAX, ACPI_ADR_SPACE_EC);

		set_bit(EC_FLAGS_EC_REG_CALLED, &ec->flags);

	}

include/acpi/acpixf.h

+1 −0
Original line number Diff line number Diff line
@@ -660,6 +660,7 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status 
			     void *context))

ACPI_EXTERNAL_RETURN_STATUS(acpi_status

			    acpi_execute_reg_methods(acpi_handle device,

						     u32 nax_depth,

						     acpi_adr_space_type

						     space_id))

ACPI_EXTERNAL_RETURN_STATUS(acpi_status