ACPICA: Namespace: Ensure \_SB._INI executed before any _REG

ACPICA commit 8ae25b8d128b6b8509010be321ff6bf2760f3807

There is BIOS code relying on the fact that \_SB._INI should get evaluated
before any other control methods. This may implies a gap in ACPICA/Linux
initialization/enumeration process.

Before revealing Windows true behavior by more validations, this patch only
ensures \_SB._INI evaluated before any _REG control methods. This can help
to make progress to other initialization order fixes. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/8ae25b8d
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 9684ed61284df5739bcd80215974d5c649f747fd..022d69cb345a07014d73f674e5a55dd189042952 100644 (file)
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -88,7 +88,7 @@
  */
 acpi_status acpi_ns_initialize_objects(void);
 
-acpi_status acpi_ns_initialize_devices(void);
+acpi_status acpi_ns_initialize_devices(u32 flags);
 
 /*
  * nsload -  Namespace loading

diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index bd75d46234a4209c62bab768edcf3566fc7ed011..3281dd83b2e8e1ae21dd11fd630f106afe061088 100644 (file)
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -46,6 +46,7 @@
 #include "acnamesp.h"
 #include "acdispat.h"
 #include "acinterp.h"
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsinit")
@@ -133,82 +134,108 @@ acpi_status acpi_ns_initialize_objects(void)
  *
  ******************************************************************************/
 
-acpi_status acpi_ns_initialize_devices(void)
+acpi_status acpi_ns_initialize_devices(u32 flags)
 {
        acpi_status status;
        struct acpi_device_walk_info info;
 
        ACPI_FUNCTION_TRACE(ns_initialize_devices);
 
-       /* Init counters */
+       if (!(flags & ACPI_NO_DEVICE_INIT)) {
+               ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                 "[Init] Initializing ACPI Devices\n"));
 
-       info.device_count = 0;
-       info.num_STA = 0;
-       info.num_INI = 0;
+               /* Init counters */
 
-       ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
-                             "Initializing Device/Processor/Thermal objects "
-                             "and executing _INI/_STA methods:\n"));
+               info.device_count = 0;
+               info.num_STA = 0;
+               info.num_INI = 0;
 
-       /* Tree analysis: find all subtrees that contain _INI methods */
+               ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
+                                     "Initializing Device/Processor/Thermal objects "
+                                     "and executing _INI/_STA methods:\n"));
 
-       status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
-                                       ACPI_UINT32_MAX, FALSE,
-                                       acpi_ns_find_ini_methods, NULL, &info,
-                                       NULL);
-       if (ACPI_FAILURE(status)) {
-               goto error_exit;
-       }
+               /* Tree analysis: find all subtrees that contain _INI methods */
 
-       /* Allocate the evaluation information block */
+               status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
+                                               ACPI_UINT32_MAX, FALSE,
+                                               acpi_ns_find_ini_methods, NULL,
+                                               &info, NULL);
+               if (ACPI_FAILURE(status)) {
+                       goto error_exit;
+               }
+
+               /* Allocate the evaluation information block */
 
-       info.evaluate_info =
-           ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));
-       if (!info.evaluate_info) {
-               status = AE_NO_MEMORY;
-               goto error_exit;
+               info.evaluate_info =
+                   ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));
+               if (!info.evaluate_info) {
+                       status = AE_NO_MEMORY;
+                       goto error_exit;
+               }
+
+               /*
+                * Execute the "global" _INI method that may appear at the root.
+                * This support is provided for Windows compatibility (Vista+) and
+                * is not part of the ACPI specification.
+                */
+               info.evaluate_info->prefix_node = acpi_gbl_root_node;
+               info.evaluate_info->relative_pathname = METHOD_NAME__INI;
+               info.evaluate_info->parameters = NULL;
+               info.evaluate_info->flags = ACPI_IGNORE_RETURN_VALUE;
+
+               status = acpi_ns_evaluate(info.evaluate_info);
+               if (ACPI_SUCCESS(status)) {
+                       info.num_INI++;
+               }
        }
 
        /*
-        * Execute the "global" _INI method that may appear at the root. This
-        * support is provided for Windows compatibility (Vista+) and is not
-        * part of the ACPI specification.
+        * Run all _REG methods
+        *
+        * Note: Any objects accessed by the _REG methods will be automatically
+        * initialized, even if they contain executable AML (see the call to
+        * acpi_ns_initialize_objects below).
         */
-       info.evaluate_info->prefix_node = acpi_gbl_root_node;
-       info.evaluate_info->relative_pathname = METHOD_NAME__INI;
-       info.evaluate_info->parameters = NULL;
-       info.evaluate_info->flags = ACPI_IGNORE_RETURN_VALUE;
+       if (!(flags & ACPI_NO_ADDRESS_SPACE_INIT)) {
+               ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                 "[Init] Executing _REG OpRegion methods\n"));
 
-       status = acpi_ns_evaluate(info.evaluate_info);
-       if (ACPI_SUCCESS(status)) {
-               info.num_INI++;
+               status = acpi_ev_initialize_op_regions();
+               if (ACPI_FAILURE(status)) {
+                       goto error_exit;
+               }
        }
 
-       /* Walk namespace to execute all _INIs on present devices */
+       if (!(flags & ACPI_NO_DEVICE_INIT)) {
 
-       status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
-                                       ACPI_UINT32_MAX, FALSE,
-                                       acpi_ns_init_one_device, NULL, &info,
-                                       NULL);
+               /* Walk namespace to execute all _INIs on present devices */
 
-       /*
-        * Any _OSI requests should be completed by now. If the BIOS has
-        * requested any Windows OSI strings, we will always truncate
-        * I/O addresses to 16 bits -- for Windows compatibility.
-        */
-       if (acpi_gbl_osi_data >= ACPI_OSI_WIN_2000) {
-               acpi_gbl_truncate_io_addresses = TRUE;
-       }
+               status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
+                                               ACPI_UINT32_MAX, FALSE,
+                                               acpi_ns_init_one_device, NULL,
+                                               &info, NULL);
 
-       ACPI_FREE(info.evaluate_info);
-       if (ACPI_FAILURE(status)) {
-               goto error_exit;
-       }
+               /*
+                * Any _OSI requests should be completed by now. If the BIOS has
+                * requested any Windows OSI strings, we will always truncate
+                * I/O addresses to 16 bits -- for Windows compatibility.
+                */
+               if (acpi_gbl_osi_data >= ACPI_OSI_WIN_2000) {
+                       acpi_gbl_truncate_io_addresses = TRUE;
+               }
 
-       ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
-                             "    Executed %u _INI methods requiring %u _STA executions "
-                             "(examined %u objects)\n",
-                             info.num_INI, info.num_STA, info.device_count));
+               ACPI_FREE(info.evaluate_info);
+               if (ACPI_FAILURE(status)) {
+                       goto error_exit;
+               }
+
+               ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
+                                     "    Executed %u _INI methods requiring %u _STA executions "
+                                     "(examined %u objects)\n",
+                                     info.num_INI, info.num_STA,
+                                     info.device_count));
+       }
 
        return_ACPI_STATUS(status);
 

diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c
index 94158301b6c158f60bc15775a45784f53282144a..66d6f19fd6adabf2c3331fb9321ceab8570bbea0 100644 (file)
--- a/drivers/acpi/acpica/utxfinit.c
+++ b/drivers/acpi/acpica/utxfinit.c
@@ -301,33 +301,14 @@ acpi_status __init acpi_initialize_objects(u32 flags)
                }
        }
 
-       /*
-        * Run all _REG methods
-        *
-        * Note: Any objects accessed by the _REG methods will be automatically
-        * initialized, even if they contain executable AML (see the call to
-        * acpi_ns_initialize_objects below).
-        */
        acpi_gbl_reg_methods_enabled = TRUE;
-       if (!(flags & ACPI_NO_ADDRESS_SPACE_INIT)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                 "[Init] Executing _REG OpRegion methods\n"));
-
-               status = acpi_ev_initialize_op_regions();
-               if (ACPI_FAILURE(status)) {
-                       return_ACPI_STATUS(status);
-               }
-       }
 
        /*
-        * Initialize all device objects in the namespace. This runs the device
-        * _STA and _INI methods.
+        * Initialize all device/region objects in the namespace. This runs
+        * the device _STA and _INI methods and region _REG methods.
         */
-       if (!(flags & ACPI_NO_DEVICE_INIT)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                 "[Init] Initializing ACPI Devices\n"));
-
-               status = acpi_ns_initialize_devices();
+       if (!(flags & (ACPI_NO_DEVICE_INIT | ACPI_NO_ADDRESS_SPACE_INIT))) {
+               status = acpi_ns_initialize_devices(flags);
                if (ACPI_FAILURE(status)) {
                        return_ACPI_STATUS(status);
                }