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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Cc: All applicable <stable@vger.kernel.org>
Link: https://patch.msgid.link/8451567.NyiUUSuA9g@rjwysocki.net

diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index ddd072cbc738d49ceb23aa5a515e0fa3edccd4d0..1c5218b79fc2acb3a6e1616e8b0ce2a9ac357ca7 100644 (file)
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -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

diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 18fdf2bc2d499ab4ead865e91b094c9dc0e0bb81..cf53b9535f18e00730781769d1ec54874f440ac7 100644 (file)
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -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 @@ cleanup1:
  * 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 @@ cleanup1:
  ******************************************************************************/
 
 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);
 

diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index 3197e6303c5b086768eea7c61a98cf68c94e5e16..95f78383bbdba16bab4d0a2022c87780cf6615bb 100644 (file)
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -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;
        }

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 68dd17f96f636f343f76418b1b870161816e50ba..d9c12db80f1123cbc9b3c0ef3f553df689d80d2e 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -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);
        }
 

diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 94d0fc3bd412d3f6bed7d8c1472212df25a0ca5c..9f1c1d225e32c62a7f728a2711d5ff9045e86bcd 100644 (file)
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -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