/home/lenb/src/to-akpm branch 'acpi-2.6.12'

6 files changed, 82 insertions, 199 deletions

diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index ece7a9dedd5c..7589e1fdf25a 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -159,19 +159,20 @@ acpi_ns_root_initialize (
                                 obj_desc->method.param_count = (u8) ACPI_TO_INTEGER (val);
                                 obj_desc->common.flags |= AOPOBJ_DATA_VALID;
 
-#if defined (_ACPI_ASL_COMPILER) || defined (_ACPI_DUMP_App)
+#if defined (ACPI_ASL_COMPILER)
 
-                                /*
-                                 * i_aSL Compiler cheats by putting parameter count
-                                 * in the owner_iD
-                                 */
-                                new_node->owner_id = obj_desc->method.param_count;
+                                /* save the parameter count for the i_aSL compiler */
+
+                                new_node->value = obj_desc->method.param_count;
 #else
                                 /* Mark this as a very SPECIAL method */
 
                                 obj_desc->method.method_flags = AML_METHOD_INTERNAL_ONLY;
+
+#ifndef ACPI_DUMP_APP
                                 obj_desc->method.implementation = acpi_ut_osi_implementation;
 #endif
+#endif
                                 break;
 
                         case ACPI_TYPE_INTEGER:
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index 5653a19d7172..21d560decbf9 100644
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.c
@@ -83,7 +83,7 @@ acpi_ns_create_node (
                 return_PTR (NULL);
         }
 
-        ACPI_MEM_TRACKING (acpi_gbl_memory_lists[ACPI_MEM_LIST_NSNODE].total_allocated++);
+        ACPI_MEM_TRACKING (acpi_gbl_ns_node_list->total_allocated++);
 
         node->name.integer   = name;
         node->reference_count = 1;
@@ -151,7 +151,7 @@ acpi_ns_delete_node (
                 }
         }
 
-        ACPI_MEM_TRACKING (acpi_gbl_memory_lists[ACPI_MEM_LIST_NSNODE].total_freed++);
+        ACPI_MEM_TRACKING (acpi_gbl_ns_node_list->total_freed++);
 
         /*
          * Detach an object if there is one then delete the node
@@ -176,10 +176,9 @@ acpi_ns_delete_node (
  * DESCRIPTION: Initialize a new namespace node and install it amongst
  *              its peers.
  *
- *              Note: Current namespace lookup is linear search.  However, the
- *              nodes are linked in alphabetical order to 1) put all reserved
- *              names (start with underscore) first, and to 2) make a readable
- *              namespace dump.
+ *              Note: Current namespace lookup is linear search. This appears
+ *              to be sufficient as namespace searches consume only a small
+ *              fraction of the execution time of the ACPI subsystem.
  *
  ******************************************************************************/
 
@@ -190,12 +189,8 @@ acpi_ns_install_node (
         struct acpi_namespace_node      *node,          /* New Child*/
         acpi_object_type                type)
 {
-        u16                             owner_id = 0;
+        acpi_owner_id                   owner_id = 0;
         struct acpi_namespace_node      *child_node;
-#ifdef ACPI_ALPHABETIC_NAMESPACE
-
-        struct acpi_namespace_node      *previous_child_node;
-#endif
 
 
         ACPI_FUNCTION_TRACE ("ns_install_node");
@@ -219,57 +214,6 @@ acpi_ns_install_node (
                 node->peer = parent_node;
         }
         else {
-#ifdef ACPI_ALPHABETIC_NAMESPACE
-                /*
-                 * Walk the list whilst searching for the correct
-                 * alphabetic placement.
-                 */
-                previous_child_node = NULL;
-                while (acpi_ns_compare_names (acpi_ut_get_node_name (child_node),
-                                 acpi_ut_get_node_name (node)) < 0) {
-                        if (child_node->flags & ANOBJ_END_OF_PEER_LIST) {
-                                /* Last peer;  Clear end-of-list flag */
-
-                                child_node->flags &= ~ANOBJ_END_OF_PEER_LIST;
-
-                                /* This node is the new peer to the child node */
-
-                                child_node->peer = node;
-
-                                /* This node is the new end-of-list */
-
-                                node->flags |= ANOBJ_END_OF_PEER_LIST;
-                                node->peer = parent_node;
-                                break;
-                        }
-
-                        /* Get next peer */
-
-                        previous_child_node = child_node;
-                        child_node = child_node->peer;
-                }
-
-                /* Did the node get inserted at the end-of-list? */
-
-                if (!(node->flags & ANOBJ_END_OF_PEER_LIST)) {
-                        /*
-                         * Loop above terminated without reaching the end-of-list.
-                         * Insert the new node at the current location
-                         */
-                        if (previous_child_node) {
-                                /* Insert node alphabetically */
-
-                                node->peer = child_node;
-                                previous_child_node->peer = node;
-                        }
-                        else {
-                                /* Insert node alphabetically at start of list */
-
-                                node->peer = child_node;
-                                parent_node->child = node;
-                        }
-                }
-#else
                 while (!(child_node->flags & ANOBJ_END_OF_PEER_LIST)) {
                         child_node = child_node->peer;
                 }
@@ -279,9 +223,8 @@ acpi_ns_install_node (
                 /* Clear end-of-list flag */
 
                 child_node->flags &= ~ANOBJ_END_OF_PEER_LIST;
-                node->flags     |= ANOBJ_END_OF_PEER_LIST;
+                node->flags |= ANOBJ_END_OF_PEER_LIST;
                 node->peer = parent_node;
-#endif
         }
 
         /* Init the new entry */
@@ -362,7 +305,7 @@ acpi_ns_delete_children (
 
                 /* Now we can free this child object */
 
-                ACPI_MEM_TRACKING (acpi_gbl_memory_lists[ACPI_MEM_LIST_NSNODE].total_freed++);
+                ACPI_MEM_TRACKING (acpi_gbl_ns_node_list->total_freed++);
 
                 ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "Object %p, Remaining %X\n",
                         child_node, acpi_gbl_current_node_count));
@@ -559,7 +502,7 @@ acpi_ns_remove_reference (
 
 void
 acpi_ns_delete_namespace_by_owner (
-        u16                             owner_id)
+        acpi_owner_id                    owner_id)
 {
         struct acpi_namespace_node      *child_node;
         struct acpi_namespace_node      *deletion_node;
@@ -570,6 +513,10 @@ acpi_ns_delete_namespace_by_owner (
         ACPI_FUNCTION_TRACE_U32 ("ns_delete_namespace_by_owner", owner_id);
 
 
+        if (owner_id == 0) {
+                return_VOID;
+        }
+
         parent_node   = acpi_gbl_root_node;
         child_node    = NULL;
         deletion_node = NULL;
@@ -639,54 +586,3 @@ acpi_ns_delete_namespace_by_owner (
 }
 
 
-#ifdef ACPI_ALPHABETIC_NAMESPACE
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ns_compare_names
- *
- * PARAMETERS:  Name1           - First name to compare
- *              Name2           - Second name to compare
- *
- * RETURN:      value from strncmp
- *
- * DESCRIPTION: Compare two ACPI names.  Names that are prefixed with an
- *              underscore are forced to be alphabetically first.
- *
- ******************************************************************************/
-
-int
-acpi_ns_compare_names (
-        char                            *name1,
-        char                            *name2)
-{
-        char                            reversed_name1[ACPI_NAME_SIZE];
-        char                            reversed_name2[ACPI_NAME_SIZE];
-        u32                             i;
-        u32                             j;
-
-
-        /*
-         * Replace all instances of "underscore" with a value that is smaller so
-         * that all names that are prefixed with underscore(s) are alphabetically
-         * first.
-         *
-         * Reverse the name bytewise so we can just do a 32-bit compare instead
-         * of a strncmp.
-         */
-        for (i = 0, j= (ACPI_NAME_SIZE - 1); i < ACPI_NAME_SIZE; i++, j--) {
-                reversed_name1[j] = name1[i];
-                if (name1[i] == '_') {
-                        reversed_name1[j] = '*';
-                }
-
-                reversed_name2[j] = name2[i];
-                if (name2[i] == '_') {
-                        reversed_name2[j] = '*';
-                }
-        }
-
-        return (*(int *) reversed_name1 - *(int *) reversed_name2);
-}
-#endif
-
-
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 6c2aef0e0dd4..5d25add6b031 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -85,6 +85,9 @@ acpi_ns_print_pathname (
         u32                             num_segments,
         char                            *pathname)
 {
+        acpi_native_uint                i;
+
+
         ACPI_FUNCTION_NAME ("ns_print_pathname");
 
 
@@ -97,9 +100,13 @@ acpi_ns_print_pathname (
         ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "["));
 
         while (num_segments) {
-                acpi_os_printf ("%4.4s", pathname);
-                pathname += ACPI_NAME_SIZE;
+                for (i = 0; i < 4; i++) {
+                        ACPI_IS_PRINT (pathname[i]) ?
+                                acpi_os_printf ("%c", pathname[i]) :
+                                acpi_os_printf ("?");
+                }
 
+                pathname += ACPI_NAME_SIZE;
                 num_segments--;
                 if (num_segments) {
                         acpi_os_printf (".");
@@ -203,38 +210,42 @@ acpi_ns_dump_one_object (
 
         /* Check if the owner matches */
 
-        if ((info->owner_id != ACPI_UINT32_MAX) &&
+        if ((info->owner_id != ACPI_OWNER_ID_MAX) &&
                 (info->owner_id != this_node->owner_id)) {
                 return (AE_OK);
         }
 
-        /* Indent the object according to the level */
+        if (!(info->display_type & ACPI_DISPLAY_SHORT)) {
+                /* Indent the object according to the level */
 
-        acpi_os_printf ("%2d%*s", (u32) level - 1, (int) level * 2, " ");
+                acpi_os_printf ("%2d%*s", (u32) level - 1, (int) level * 2, " ");
 
-        /* Check the node type and name */
+                /* Check the node type and name */
 
-        if (type > ACPI_TYPE_LOCAL_MAX) {
-                ACPI_REPORT_WARNING (("Invalid ACPI Type %08X\n", type));
-        }
+                if (type > ACPI_TYPE_LOCAL_MAX) {
+                        ACPI_REPORT_WARNING (("Invalid ACPI Type %08X\n", type));
+                }
 
-        if (!acpi_ut_valid_acpi_name (this_node->name.integer)) {
-                ACPI_REPORT_WARNING (("Invalid ACPI Name %08X\n",
-                        this_node->name.integer));
+                if (!acpi_ut_valid_acpi_name (this_node->name.integer)) {
+                        ACPI_REPORT_WARNING (("Invalid ACPI Name %08X\n",
+                                this_node->name.integer));
+                }
+
+                acpi_os_printf ("%4.4s", acpi_ut_get_node_name (this_node));
         }
 
         /*
          * Now we can print out the pertinent information
          */
-        acpi_os_printf ("%4.4s %-12s %p ",
-                        acpi_ut_get_node_name (this_node), acpi_ut_get_type_name (type), this_node);
+        acpi_os_printf (" %-12s %p ",
+                        acpi_ut_get_type_name (type), this_node);
 
         dbg_level = acpi_dbg_level;
         acpi_dbg_level = 0;
         obj_desc = acpi_ns_get_attached_object (this_node);
         acpi_dbg_level = dbg_level;
 
-        switch (info->display_type) {
+        switch (info->display_type & ACPI_DISPLAY_MASK) {
         case ACPI_DISPLAY_SUMMARY:
 
                 if (!obj_desc) {
@@ -475,7 +486,7 @@ acpi_ns_dump_one_object (
 
         while (obj_desc) {
                 obj_type = ACPI_TYPE_INVALID;
-                acpi_os_printf ("      Attached Object %p: ", obj_desc);
+                acpi_os_printf ("Attached Object %p: ", obj_desc);
 
                 /* Decode the type of attached object and dump the contents */
 
@@ -484,9 +495,9 @@ acpi_ns_dump_one_object (
 
                         acpi_os_printf ("(Ptr to Node)\n");
                         bytes_to_dump = sizeof (struct acpi_namespace_node);
+                        ACPI_DUMP_BUFFER (obj_desc, bytes_to_dump);
                         break;
 
-
                 case ACPI_DESC_TYPE_OPERAND:
 
                         obj_type = ACPI_GET_OBJECT_TYPE (obj_desc);
@@ -497,24 +508,19 @@ acpi_ns_dump_one_object (
                                 bytes_to_dump = 32;
                         }
                         else {
-                                acpi_os_printf ("(Ptr to ACPI Object type %s, %X)\n",
-                                        acpi_ut_get_type_name (obj_type), obj_type);
+                                acpi_os_printf ("(Ptr to ACPI Object type %X [%s])\n",
+                                        obj_type, acpi_ut_get_type_name (obj_type));
                                 bytes_to_dump = sizeof (union acpi_operand_object);
                         }
-                        break;
 
+                        ACPI_DUMP_BUFFER (obj_desc, bytes_to_dump);
+                        break;
 
                 default:
 
-                        acpi_os_printf (
-                                "(String or Buffer ptr - not an object descriptor) [%s]\n",
-                                acpi_ut_get_descriptor_name (obj_desc));
-                        bytes_to_dump = 16;
                         break;
                 }
 
-                ACPI_DUMP_BUFFER (obj_desc, bytes_to_dump);
-
                 /* If value is NOT an internal object, we are done */
 
                 if (ACPI_GET_DESCRIPTOR_TYPE (obj_desc) != ACPI_DESC_TYPE_OPERAND) {
@@ -525,13 +531,17 @@ acpi_ns_dump_one_object (
                  * Valid object, get the pointer to next level, if any
                  */
                 switch (obj_type) {
+                case ACPI_TYPE_BUFFER:
                 case ACPI_TYPE_STRING:
+                        /*
+                         * NOTE: takes advantage of common fields between string/buffer
+                         */
+                        bytes_to_dump = obj_desc->string.length;
                         obj_desc = (void *) obj_desc->string.pointer;
-                        break;
-
-                case ACPI_TYPE_BUFFER:
-                        obj_desc = (void *) obj_desc->buffer.pointer;
-                        break;
+                        acpi_os_printf ( "(Buffer/String pointer %p length %X)\n",
+                                obj_desc, bytes_to_dump);
+                        ACPI_DUMP_BUFFER (obj_desc, bytes_to_dump);
+                        goto cleanup;
 
                 case ACPI_TYPE_BUFFER_FIELD:
                         obj_desc = (union acpi_operand_object *) obj_desc->buffer_field.buffer_obj;
@@ -595,7 +605,7 @@ acpi_ns_dump_objects (
         acpi_object_type                type,
         u8                              display_type,
         u32                             max_depth,
-        u32                             owner_id,
+        acpi_owner_id                   owner_id,
         acpi_handle                     start_handle)
 {
         struct acpi_walk_info           info;
@@ -640,14 +650,14 @@ acpi_ns_dump_entry (
 
 
         info.debug_level = debug_level;
-        info.owner_id = ACPI_UINT32_MAX;
+        info.owner_id = ACPI_OWNER_ID_MAX;
         info.display_type = ACPI_DISPLAY_SUMMARY;
 
         (void) acpi_ns_dump_one_object (handle, 1, &info, NULL);
 }
 
 
-#ifdef _ACPI_ASL_COMPILER
+#ifdef ACPI_ASL_COMPILER
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_dump_tables
@@ -691,7 +701,7 @@ acpi_ns_dump_tables (
         }
 
         acpi_ns_dump_objects (ACPI_TYPE_ANY, ACPI_DISPLAY_OBJECTS, max_depth,
-                        ACPI_UINT32_MAX, search_handle);
+                        ACPI_OWNER_ID_MAX, search_handle);
         return_VOID;
 }
 #endif  /* _ACPI_ASL_COMPILER */
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c
index 1ae89a1c8826..908cffd5e720 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/namespace/nseval.c
@@ -365,6 +365,7 @@ acpi_ns_evaluate_by_handle (
  *
  * PARAMETERS:  Info            - Method info block, contains:
  *                  Node            - Method Node to execute
+ *                  obj_desc        - Method object
  *                  Parameters      - List of parameters to pass to the method,
  *                                    terminated by NULL. Params itself may be
  *                                    NULL if no parameters are being passed.
@@ -387,7 +388,6 @@ acpi_ns_execute_control_method (
         struct acpi_parameter_info      *info)
 {
         acpi_status                     status;
-        union acpi_operand_object       *obj_desc;
 
 
         ACPI_FUNCTION_TRACE ("ns_execute_control_method");
@@ -395,8 +395,8 @@ acpi_ns_execute_control_method (
 
         /* Verify that there is a method associated with this object */
 
-        obj_desc = acpi_ns_get_attached_object (info->node);
-        if (!obj_desc) {
+        info->obj_desc = acpi_ns_get_attached_object (info->node);
+        if (!info->obj_desc) {
                 ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No attached method object\n"));
 
                 (void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
@@ -407,7 +407,7 @@ acpi_ns_execute_control_method (
                 ACPI_LV_INFO, _COMPONENT);
 
         ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Method at AML address %p Length %X\n",
-                obj_desc->method.aml_start + 1, obj_desc->method.aml_length - 1));
+                info->obj_desc->method.aml_start + 1, info->obj_desc->method.aml_length - 1));
 
         /*
          * Unlock the namespace before execution.  This allows namespace access
@@ -430,7 +430,7 @@ acpi_ns_execute_control_method (
                 return_ACPI_STATUS (status);
         }
 
-        status = acpi_psx_execute (info);
+        status = acpi_ps_execute_method (info);
         acpi_ex_exit_interpreter ();
 
         return_ACPI_STATUS (status);
diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index 34e497016601..1428a84a31e6 100644
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.c
@@ -198,7 +198,7 @@ acpi_ns_load_table_by_type (
         switch (table_type) {
         case ACPI_TABLE_DSDT:
 
-                ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Loading DSDT\n"));
+                ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Namespace load: DSDT\n"));
 
                 table_desc = acpi_gbl_table_lists[ACPI_TABLE_DSDT].next;
 
@@ -218,17 +218,18 @@ acpi_ns_load_table_by_type (
 
 
         case ACPI_TABLE_SSDT:
+        case ACPI_TABLE_PSDT:
 
-                ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Loading %d SSDTs\n",
-                        acpi_gbl_table_lists[ACPI_TABLE_SSDT].count));
+                ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Namespace load: %d SSDT or PSDTs\n",
+                        acpi_gbl_table_lists[table_type].count));
 
                 /*
-                 * Traverse list of SSDT tables
+                 * Traverse list of SSDT or PSDT tables
                  */
-                table_desc = acpi_gbl_table_lists[ACPI_TABLE_SSDT].next;
-                for (i = 0; i < acpi_gbl_table_lists[ACPI_TABLE_SSDT].count; i++) {
+                table_desc = acpi_gbl_table_lists[table_type].next;
+                for (i = 0; i < acpi_gbl_table_lists[table_type].count; i++) {
                         /*
-                         * Only attempt to load table if it is not
+                         * Only attempt to load table into namespace if it is not
                          * already loaded!
                          */
                         if (!table_desc->loaded_into_namespace) {
@@ -245,33 +246,6 @@ acpi_ns_load_table_by_type (
                 break;
 
 
-        case ACPI_TABLE_PSDT:
-
-                ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Loading %d PSDTs\n",
-                        acpi_gbl_table_lists[ACPI_TABLE_PSDT].count));
-
-                /*
-                 * Traverse list of PSDT tables
-                 */
-                table_desc = acpi_gbl_table_lists[ACPI_TABLE_PSDT].next;
-
-                for (i = 0; i < acpi_gbl_table_lists[ACPI_TABLE_PSDT].count; i++) {
-                        /* Only attempt to load table if it is not already loaded! */
-
-                        if (!table_desc->loaded_into_namespace) {
-                                status = acpi_ns_load_table (table_desc, acpi_gbl_root_node);
-                                if (ACPI_FAILURE (status)) {
-                                        break;
-                                }
-
-                                table_desc->loaded_into_namespace = TRUE;
-                        }
-
-                        table_desc = table_desc->next;
-                }
-                break;
-
-
         default:
                 status = AE_SUPPORT;
                 break;
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index a0e13e8d3764..24bed931d39d 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.c
@@ -67,7 +67,7 @@
 
 acpi_status
 acpi_ns_one_complete_parse (
-        u32                             pass_number,
+        u8                              pass_number,
         struct acpi_table_desc          *table_desc)
 {
         union acpi_parse_object         *parse_root;
@@ -87,7 +87,7 @@ acpi_ns_one_complete_parse (
 
         /* Create and initialize a new walk state */
 
-        walk_state = acpi_ds_create_walk_state (table_desc->table_id,
+        walk_state = acpi_ds_create_walk_state (table_desc->owner_id,
                            NULL, NULL, NULL);
         if (!walk_state) {
                 acpi_ps_free_op (parse_root);
@@ -146,6 +146,7 @@ acpi_ns_parse_table (
          * to service the entire parse.  The second pass of the parse then
          * performs another complete parse of the AML..
          */
+        ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Start pass 1\n"));
         status = acpi_ns_one_complete_parse (1, table_desc);
         if (ACPI_FAILURE (status)) {
                 return_ACPI_STATUS (status);
@@ -160,6 +161,7 @@ acpi_ns_parse_table (
          * overhead of this is compensated for by the fact that the
          * parse objects are all cached.
          */
+        ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Start pass 2\n"));
         status = acpi_ns_one_complete_parse (2, table_desc);
         if (ACPI_FAILURE (status)) {
                 return_ACPI_STATUS (status);