ACPI: EC: Evaluate orphan _REG under EC device

commit 0e6b6dedf16800df0ff73ffe2bb5066514db29c2 upstream.

After starting to install the EC address space handler at the ACPI
namespace root, if there is an "orphan" _REG method in the EC device's
scope, it will not be evaluated any more.  This breaks EC operation
regions on some systems, like Asus gu605.

To address this, use a wrapper around an existing ACPICA function to
look for an "orphan" _REG method in the EC device scope and evaluate
it if present.

Fixes: 60fa6ae6e6d0 ("ACPI: EC: Install address space handler at the namespace root")
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218945
Reported-by: VitaliiT <vitaly.torshyn@gmail.com>
Tested-by: VitaliiT <vitaly.torshyn@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index 922f559a3e5902f380099307c742ca30f63a723e..e4d4a4e744a4fec838b47ee0a71e9b0fbcdd8546 100644 (file)
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -191,6 +191,10 @@ void
 acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,
                            acpi_adr_space_type space_id, u32 function);
 
+void
+acpi_ev_execute_orphan_reg_method(struct acpi_namespace_node *node,
+                                 acpi_adr_space_type space_id);
+
 acpi_status
 acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function);
 

diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index fd6471e764f1a1f8481ef066300129d0faa6aebe..3c9e4a6f24aa3448d7ac46975e7aaf18985c8f45 100644 (file)
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -20,10 +20,6 @@ extern u8 acpi_gbl_default_address_spaces[];
 
 /* Local prototypes */
 
-static void
-acpi_ev_execute_orphan_reg_method(struct acpi_namespace_node *device_node,
-                                 acpi_adr_space_type space_id);
-
 static acpi_status
 acpi_ev_reg_run(acpi_handle obj_handle,
                u32 level, void *context, void **return_value);
@@ -811,7 +807,7 @@ acpi_ev_reg_run(acpi_handle obj_handle,
  *
  ******************************************************************************/
 
-static void
+void
 acpi_ev_execute_orphan_reg_method(struct acpi_namespace_node *device_node,
                                  acpi_adr_space_type space_id)
 {

diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index e94e6631502c101dd4facb6d5c59237ffa06d77a..a56d4dd51835edaa406ab7cc4afbdf05272313af 100644 (file)
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -304,3 +304,57 @@ acpi_execute_reg_methods(acpi_handle device, acpi_adr_space_type space_id)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_execute_reg_methods)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_execute_orphan_reg_method
+ *
+ * PARAMETERS:  device          - Handle for the device
+ *              space_id        - The address space ID
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Execute an "orphan" _REG method that appears under an ACPI
+ *              device. This is a _REG method that has no corresponding region
+ *              within the device's scope.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_execute_orphan_reg_method(acpi_handle device, acpi_adr_space_type space_id)
+{
+       struct acpi_namespace_node *node;
+       acpi_status status;
+
+       ACPI_FUNCTION_TRACE(acpi_execute_orphan_reg_method);
+
+       /* Parameter validation */
+
+       if (!device) {
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
+       }
+
+       status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
+       }
+
+       /* Convert and validate the device handle */
+
+       node = acpi_ns_validate_handle(device);
+       if (node) {
+
+               /*
+                * If an "orphan" _REG method is present in the device's scope
+                * for the given address space ID, run it.
+                */
+
+               acpi_ev_execute_orphan_reg_method(node, space_id);
+       } else {
+               status = AE_BAD_PARAMETER;
+       }
+
+       (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+       return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_execute_orphan_reg_method)

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 230fe6463cc1f5fbdfe41bcbe2a3f6e0eba2bebf..0c8920161bec0c90ef0af79067a3904c73dafd7a 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1532,6 +1532,9 @@ 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);
+               if (scope_handle != ec->handle)
+                       acpi_execute_orphan_reg_method(ec->handle, 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 754efb4e633071ffea6188dc481d7f86ddd8a9a1..42fba1d0d6335805ecfd4950d5d4721b1cccf607 100644 (file)
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -668,6 +668,10 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status
                            acpi_execute_reg_methods(acpi_handle device,
                                                     acpi_adr_space_type
                                                     space_id))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                           acpi_execute_orphan_reg_method(acpi_handle device,
+                                                          acpi_adr_space_type
+                                                          space_id))
 ACPI_EXTERNAL_RETURN_STATUS(acpi_status
                            acpi_remove_address_space_handler(acpi_handle
                                                              device,