[ACPI] ACPICA 20051216

Implemented optional support to allow unresolved names
within ASL Package objects. A null object is inserted in
the package when a named reference cannot be located in
the current namespace. Enabled via the interpreter slack
flag which Linux has enabled by default (acpi=strict
to disable slack).  This should eliminate AE_NOT_FOUND
exceptions seen on machines that contain such code.

Implemented an optimization to the initialization
sequence that can improve boot time. During ACPI device
initialization, the _STA method is now run if and only
if the _INI method exists. The _STA method is used to
determine if the device is present; An _INI can only be
run if _STA returns present, but it is a waste of time to
run the _STA method if the _INI does not exist. (Prototype
and assistance from Dong Wei)

Implemented use of the C99 uintptr_t for the pointer
casting macros if it is available in the current
compiler. Otherwise, the default (void *) cast is used
as before.

Fixed some possible memory leaks found within the
execution path of the Break, Continue, If, and CreateField
operators. (Valery Podrezov)

Fixed a problem introduced in the 20051202 release where
an exception is generated during method execution if a
control method attempts to declare another method.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

3 files changed, 59 insertions, 47 deletions

diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index 0a08d2f04a06..efa3f4233736 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -336,23 +336,22 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
         struct acpi_parameter_info pinfo;
         u32 flags;
         acpi_status status;
+        struct acpi_namespace_node *ini_node;
+        struct acpi_namespace_node *device_node;
 
         ACPI_FUNCTION_TRACE("ns_init_one_device");
 
-        pinfo.parameters = NULL;
-        pinfo.parameter_type = ACPI_PARAM_ARGS;
-
-        pinfo.node = acpi_ns_map_handle_to_node(obj_handle);
-        if (!pinfo.node) {
+        device_node = acpi_ns_map_handle_to_node(obj_handle);
+        if (!device_node) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         /*
          * We will run _STA/_INI on Devices, Processors and thermal_zones only
          */
-        if ((pinfo.node->type != ACPI_TYPE_DEVICE) &&
-            (pinfo.node->type != ACPI_TYPE_PROCESSOR) &&
-            (pinfo.node->type != ACPI_TYPE_THERMAL)) {
+        if ((device_node->type != ACPI_TYPE_DEVICE) &&
+            (device_node->type != ACPI_TYPE_PROCESSOR) &&
+            (device_node->type != ACPI_TYPE_THERMAL)) {
                 return_ACPI_STATUS(AE_OK);
         }
 
@@ -364,57 +363,69 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
         info->device_count++;
 
         /*
-         * Run _STA to determine if we can run _INI on the device.
+         * Check if the _INI method exists for this device -
+         * if _INI does not exist, there is no need to run _STA
+         * No _INI means device requires no initialization
+         */
+        status = acpi_ns_search_node(*ACPI_CAST_PTR(u32, METHOD_NAME__INI),
+                                     device_node, ACPI_TYPE_METHOD, &ini_node);
+        if (ACPI_FAILURE(status)) {
+                /* No _INI method found - move on to next device */
+
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /*
+         * Run _STA to determine if we can run _INI on the device -
+         * the device must be present before _INI can be run.
+         * However, _STA is not required - assume device present if no _STA
          */
         ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_METHOD,
-                                                      pinfo.node,
+                                                      device_node,
                                                       METHOD_NAME__STA));
-        status = acpi_ut_execute_STA(pinfo.node, &flags);
 
+        pinfo.node = device_node;
+        pinfo.parameters = NULL;
+        pinfo.parameter_type = ACPI_PARAM_ARGS;
+
+        status = acpi_ut_execute_STA(pinfo.node, &flags);
         if (ACPI_FAILURE(status)) {
-                if (pinfo.node->type == ACPI_TYPE_DEVICE) {
-                        /* Ignore error and move on to next device */
+                /* Ignore error and move on to next device */
 
-                        return_ACPI_STATUS(AE_OK);
-                }
+                return_ACPI_STATUS(AE_OK);
+        }
 
-                /* _STA is not required for Processor or thermal_zone objects */
-        } else {
+        if (flags != ACPI_UINT32_MAX) {
                 info->num_STA++;
+        }
 
-                if (!(flags & 0x01)) {
-                        /* Don't look at children of a not present device */
+        if (!(flags & ACPI_STA_DEVICE_PRESENT)) {
+                /* Don't look at children of a not present device */
 
-                        return_ACPI_STATUS(AE_CTRL_DEPTH);
-                }
+                return_ACPI_STATUS(AE_CTRL_DEPTH);
         }
 
         /*
-         * The device is present. Run _INI.
+         * The device is present and _INI exists. Run the _INI method.
+         * (We already have the _INI node from above)
          */
         ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_METHOD,
                                                       pinfo.node,
                                                       METHOD_NAME__INI));
-        status = acpi_ns_evaluate_relative(METHOD_NAME__INI, &pinfo);
-        if (ACPI_FAILURE(status)) {
-                /* No _INI (AE_NOT_FOUND) means device requires no initialization */
 
-                if (status != AE_NOT_FOUND) {
-                        /* Ignore error and move on to next device */
+        pinfo.node = ini_node;
+        status = acpi_ns_evaluate_by_handle(&pinfo);
+        if (ACPI_FAILURE(status)) {
+                /* Ignore error and move on to next device */
 
 #ifdef ACPI_DEBUG_OUTPUT
-                        char *scope_name =
-                            acpi_ns_get_external_pathname(pinfo.node);
+                char *scope_name = acpi_ns_get_external_pathname(ini_node);
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_WARN, "%s._INI failed: %s\n",
-                                          scope_name,
-                                          acpi_format_exception(status)));
+                ACPI_DEBUG_PRINT((ACPI_DB_WARN, "%s._INI failed: %s\n",
+                                  scope_name, acpi_format_exception(status)));
 
-                        ACPI_MEM_FREE(scope_name);
+                ACPI_MEM_FREE(scope_name);
 #endif
-                }
-
-                status = AE_OK;
         } else {
                 /* Delete any return object (especially if implicit_return is enabled) */
 
@@ -434,5 +445,5 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
                     acpi_gbl_init_handler(pinfo.node, ACPI_INIT_DEVICE_INI);
         }
 
-        return_ACPI_STATUS(status);
+        return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index 50a3ca5470ed..c1b1943d4670 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -99,8 +99,8 @@ acpi_ns_search_node(u32 target_name,
                 if (scope_name) {
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                           "Searching %s (%p) For [%4.4s] (%s)\n",
-                                          scope_name, node,
-                                          (char *)&target_name,
+                                          scope_name, node, ACPI_CAST_PTR(char,
+                                                                          &target_name),
                                           acpi_ut_get_type_name(type)));
 
                         ACPI_MEM_FREE(scope_name);
@@ -131,7 +131,7 @@ acpi_ns_search_node(u32 target_name,
                          */
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                           "Name [%4.4s] (%s) %p found in scope [%4.4s] %p\n",
-                                          (char *)&target_name,
+                                          ACPI_CAST_PTR(char, &target_name),
                                           acpi_ut_get_type_name(next_node->
                                                                 type),
                                           next_node,
@@ -160,7 +160,8 @@ acpi_ns_search_node(u32 target_name,
 
         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                           "Name [%4.4s] (%s) not found in search in scope [%4.4s] %p first child %p\n",
-                          (char *)&target_name, acpi_ut_get_type_name(type),
+                          ACPI_CAST_PTR(char, &target_name),
+                          acpi_ut_get_type_name(type),
                           acpi_ut_get_node_name(node), node, node->child));
 
         return_ACPI_STATUS(AE_NOT_FOUND);
@@ -210,14 +211,14 @@ acpi_ns_search_parent_tree(u32 target_name,
          */
         if (!parent_node) {
                 ACPI_DEBUG_PRINT((ACPI_DB_NAMES, "[%4.4s] has no parent\n",
-                                  (char *)&target_name));
+                                  ACPI_CAST_PTR(char, &target_name)));
                 return_ACPI_STATUS(AE_NOT_FOUND);
         }
 
         if (acpi_ns_local(type)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                   "[%4.4s] type [%s] must be local to this scope (no parent search)\n",
-                                  (char *)&target_name,
+                                  ACPI_CAST_PTR(char, &target_name),
                                   acpi_ut_get_type_name(type)));
                 return_ACPI_STATUS(AE_NOT_FOUND);
         }
@@ -227,7 +228,7 @@ acpi_ns_search_parent_tree(u32 target_name,
         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                           "Searching parent [%4.4s] for [%4.4s]\n",
                           acpi_ut_get_node_name(parent_node),
-                          (char *)&target_name));
+                          ACPI_CAST_PTR(char, &target_name)));
 
         /*
          * Search parents until target is found or we have backed up to the root
@@ -360,7 +361,7 @@ acpi_ns_search_and_enter(u32 target_name,
         if (interpreter_mode == ACPI_IMODE_EXECUTE) {
                 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                   "%4.4s Not found in %p [Not adding]\n",
-                                  (char *)&target_name, node));
+                                  ACPI_CAST_PTR(char, &target_name), node));
 
                 return_ACPI_STATUS(AE_NOT_FOUND);
         }
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index 8167af1fa57b..75b137a6a3c9 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -473,8 +473,8 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
                 return (AE_CTRL_DEPTH);
         }
 
-        if (!(flags & 0x01)) {
-                /* Don't return at the device or children of the device if not there */
+        if (!(flags & ACPI_STA_DEVICE_PRESENT)) {
+                /* Don't examine children of the device if not present */
 
                 return (AE_CTRL_DEPTH);
         }