[ACPI] ACPICA 20050729 from Bob Moore

Implemented support to ignore an attempt to install/load
a particular ACPI table more than once. Apparently there
exists BIOS code that repeatedly attempts to load the same
SSDT upon certain events. Thanks to Venkatesh Pallipadi.

Restructured the main interface to the AML parser in
order to correctly handle all exceptional conditions. This
will prevent leakage of the OwnerId resource and should
eliminate the AE_OWNER_ID_LIMIT exceptions seen on some
machines. Thanks to Alexey Starikovskiy.

Support for "module level code" has been disabled in this
version due to a number of issues that have appeared
on various machines. The support can be enabled by
defining ACPI_ENABLE_MODULE_LEVEL_CODE during subsystem
compilation. When the issues are fully resolved, the code
will be enabled by default again.

Modified the internal functions for debug print support
to define the FunctionName parameter as a (const char *)
for compatibility with compiler built-in macros such as
__FUNCTION__, etc.

Linted the entire ACPICA source tree for both 32-bit
and 64-bit.

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

3 files changed, 101 insertions, 38 deletions

diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 5061c6f0ee66..78270f50e625 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -76,7 +76,7 @@ static acpi_status
 acpi_ut_create_list (
         char                            *list_name,
         u16                             object_size,
-        acpi_handle                     *return_cache);
+        struct acpi_memory_list         **return_cache);
 #endif
 
 
@@ -428,7 +428,7 @@ static acpi_status
 acpi_ut_create_list (
         char                            *list_name,
         u16                             object_size,
-        acpi_handle                     *return_cache)
+        struct acpi_memory_list         **return_cache)
 {
         struct acpi_memory_list         *cache;
 
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index 3d5fbc810b0b..c27cbb7f5c54 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.c
@@ -55,6 +55,12 @@ static u32   acpi_gbl_prev_thread_id = 0xFFFFFFFF;
 static char     *acpi_gbl_fn_entry_str = "----Entry";
 static char     *acpi_gbl_fn_exit_str = "----Exit-";
 
+/* Local prototypes */
+
+static const char *
+acpi_ut_trim_function_name (
+        const char                      *function_name);
+
 
 /*******************************************************************************
  *
@@ -72,7 +78,7 @@ void
 acpi_ut_init_stack_ptr_trace (
         void)
 {
-        u32                         current_sp;
+        u32                             current_sp;
 
 
         acpi_gbl_entry_stack_pointer = ACPI_PTR_DIFF (&current_sp, NULL);
@@ -95,7 +101,7 @@ void
 acpi_ut_track_stack_ptr (
         void)
 {
-        acpi_size                   current_sp;
+        acpi_size                       current_sp;
 
 
         current_sp = ACPI_PTR_DIFF (&current_sp, NULL);
@@ -112,6 +118,43 @@ acpi_ut_track_stack_ptr (
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_ut_trim_function_name
+ *
+ * PARAMETERS:  function_name       - Ascii string containing a procedure name
+ *
+ * RETURN:      Updated pointer to the function name
+ *
+ * DESCRIPTION: Remove the "Acpi" prefix from the function name, if present.
+ *              This allows compiler macros such as __FUNCTION__ to be used
+ *              with no change to the debug output.
+ *
+ ******************************************************************************/
+
+static const char *
+acpi_ut_trim_function_name (
+        const char                      *function_name)
+{
+
+        /* All Function names are longer than 4 chars, check is safe */
+
+        if (*(ACPI_CAST_PTR (u32, function_name)) == ACPI_FUNCTION_PREFIX1) {
+                /* This is the case where the original source has not been modified */
+
+                return (function_name + 4);
+        }
+
+        if (*(ACPI_CAST_PTR (u32, function_name)) == ACPI_FUNCTION_PREFIX2) {
+                /* This is the case where the source has been 'linuxized' */
+
+                return (function_name + 5);
+        }
+
+        return (function_name);
+}
+
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ut_debug_print
  *
  * PARAMETERS:  requested_debug_level - Requested debug print level
@@ -133,7 +176,7 @@ void  ACPI_INTERNAL_VAR_XFACE
 acpi_ut_debug_print (
         u32                             requested_debug_level,
         u32                             line_number,
-        char                            *function_name,
+        const char                      *function_name,
         char                            *module_name,
         u32                             component_id,
         char                            *format,
@@ -177,7 +220,7 @@ acpi_ut_debug_print (
         }
 
         acpi_os_printf ("[%02ld] %-22.22s: ",
-                acpi_gbl_nesting_level, function_name);
+                acpi_gbl_nesting_level, acpi_ut_trim_function_name (function_name));
 
         va_start (args, format);
         acpi_os_vprintf (format, args);
@@ -208,7 +251,7 @@ void  ACPI_INTERNAL_VAR_XFACE
 acpi_ut_debug_print_raw (
         u32                             requested_debug_level,
         u32                             line_number,
-        char                            *function_name,
+        const char                      *function_name,
         char                            *module_name,
         u32                             component_id,
         char                            *format,
@@ -247,7 +290,7 @@ EXPORT_SYMBOL(acpi_ut_debug_print_raw);
 void
 acpi_ut_trace (
         u32                             line_number,
-        char                            *function_name,
+        const char                      *function_name,
         char                            *module_name,
         u32                             component_id)
 {
@@ -282,7 +325,7 @@ EXPORT_SYMBOL(acpi_ut_trace);
 void
 acpi_ut_trace_ptr (
         u32                             line_number,
-        char                            *function_name,
+        const char                      *function_name,
         char                            *module_name,
         u32                             component_id,
         void                            *pointer)
@@ -316,7 +359,7 @@ acpi_ut_trace_ptr (
 void
 acpi_ut_trace_str (
         u32                             line_number,
-        char                            *function_name,
+        const char                      *function_name,
         char                            *module_name,
         u32                             component_id,
         char                            *string)
@@ -351,7 +394,7 @@ acpi_ut_trace_str (
 void
 acpi_ut_trace_u32 (
         u32                             line_number,
-        char                            *function_name,
+        const char                      *function_name,
         char                            *module_name,
         u32                             component_id,
         u32                             integer)
@@ -385,7 +428,7 @@ acpi_ut_trace_u32 (
 void
 acpi_ut_exit (
         u32                             line_number,
-        char                            *function_name,
+        const char                      *function_name,
         char                            *module_name,
         u32                             component_id)
 {
@@ -419,7 +462,7 @@ EXPORT_SYMBOL(acpi_ut_exit);
 void
 acpi_ut_status_exit (
         u32                             line_number,
-        char                            *function_name,
+        const char                      *function_name,
         char                            *module_name,
         u32                             component_id,
         acpi_status                     status)
@@ -463,7 +506,7 @@ EXPORT_SYMBOL(acpi_ut_status_exit);
 void
 acpi_ut_value_exit (
         u32                             line_number,
-        char                            *function_name,
+        const char                      *function_name,
         char                            *module_name,
         u32                             component_id,
         acpi_integer                    value)
@@ -499,7 +542,7 @@ EXPORT_SYMBOL(acpi_ut_value_exit);
 void
 acpi_ut_ptr_exit (
         u32                             line_number,
-        char                            *function_name,
+        const char                      *function_name,
         char                            *module_name,
         u32                             component_id,
         u8                              *ptr)
@@ -607,8 +650,8 @@ acpi_ut_dump_buffer (
                 }
 
                 /*
-                 * Print the ASCII equivalent characters
-                 * But watch out for the bad unprintable ones...
+                 * Print the ASCII equivalent characters but watch out for the bad
+                 * unprintable ones (printable chars are 0x20 through 0x7E)
                  */
                 acpi_os_printf (" ");
                 for (j = 0; j < 16; j++) {
@@ -618,9 +661,7 @@ acpi_ut_dump_buffer (
                         }
 
                         buf_char = buffer[i + j];
-                        if ((buf_char > 0x1F && buf_char < 0x2E) ||
-                                (buf_char > 0x2F && buf_char < 0x61) ||
-                                (buf_char > 0x60 && buf_char < 0x7F)) {
+                        if (ACPI_IS_PRINT (buf_char)) {
                                 acpi_os_printf ("%c", buf_char);
                         }
                         else {
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index df715cd89105..1d350b302a34 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -56,7 +56,11 @@
  *
  * PARAMETERS:  owner_id        - Where the new owner ID is returned
  *
- * DESCRIPTION: Allocate a table or method owner id
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Allocate a table or method owner ID. The owner ID is used to
+ *              track objects created by the table or method, to be deleted
+ *              when the method exits or the table is unloaded.
  *
  ******************************************************************************/
 
@@ -71,6 +75,8 @@ acpi_ut_allocate_owner_id (
         ACPI_FUNCTION_TRACE ("ut_allocate_owner_id");
 
 
+        /* Mutex for the global ID mask */
+
         status = acpi_ut_acquire_mutex (ACPI_MTX_CACHES);
         if (ACPI_FAILURE (status)) {
                 return_ACPI_STATUS (status);
@@ -81,7 +87,7 @@ acpi_ut_allocate_owner_id (
         for (i = 0; i < 32; i++) {
                 if (!(acpi_gbl_owner_id_mask & (1 << i))) {
                         acpi_gbl_owner_id_mask |= (1 << i);
-                        *owner_id = (acpi_owner_id) i;
+                        *owner_id = (acpi_owner_id) (i + 1);
                         goto exit;
                 }
         }
@@ -93,6 +99,7 @@ acpi_ut_allocate_owner_id (
          * they are released when a table is unloaded or a method completes
          * execution.
          */
+        *owner_id = 0;
         status = AE_OWNER_ID_LIMIT;
         ACPI_REPORT_ERROR ((
                 "Could not allocate new owner_id (32 max), AE_OWNER_ID_LIMIT\n"));
@@ -107,40 +114,55 @@ exit:
  *
  * FUNCTION:    acpi_ut_release_owner_id
  *
- * PARAMETERS:  owner_id        - A previously allocated owner ID
+ * PARAMETERS:  owner_id_ptr        - Pointer to a previously allocated owner_iD
  *
- * DESCRIPTION: Release a table or method owner id
+ * RETURN:      None. No error is returned because we are either exiting a
+ *              control method or unloading a table. Either way, we would
+ *              ignore any error anyway.
+ *
+ * DESCRIPTION: Release a table or method owner ID.  Valid IDs are 1 - 32
  *
  ******************************************************************************/
 
-acpi_status
+void
 acpi_ut_release_owner_id (
-        acpi_owner_id                   owner_id)
+        acpi_owner_id                   *owner_id_ptr)
 {
+        acpi_owner_id                   owner_id = *owner_id_ptr;
         acpi_status                     status;
 
 
         ACPI_FUNCTION_TRACE ("ut_release_owner_id");
 
 
+        /* Always clear the input owner_id (zero is an invalid ID) */
+
+        *owner_id_ptr = 0;
+
+        /* Zero is not a valid owner_iD */
+
+        if ((owner_id == 0) || (owner_id > 32)) {
+                ACPI_REPORT_ERROR (("Invalid owner_id: %2.2X\n", owner_id));
+                return_VOID;
+        }
+
+        /* Mutex for the global ID mask */
+
         status = acpi_ut_acquire_mutex (ACPI_MTX_CACHES);
         if (ACPI_FAILURE (status)) {
-                return_ACPI_STATUS (status);
+                return_VOID;
         }
 
-        /* Free the owner ID */
+        owner_id--; /* Normalize to zero */
+
+        /* Free the owner ID only if it is valid */
 
         if (acpi_gbl_owner_id_mask & (1 << owner_id)) {
                 acpi_gbl_owner_id_mask ^= (1 << owner_id);
         }
-        else {
-                /* This owner_id has not been allocated */
-
-                status = AE_NOT_EXIST;
-        }
 
         (void) acpi_ut_release_mutex (ACPI_MTX_CACHES);
-        return_ACPI_STATUS (status);
+        return_VOID;
 }
 
 
@@ -150,7 +172,7 @@ acpi_ut_release_owner_id (
  *
  * PARAMETERS:  src_string      - The source string to convert
  *
- * RETURN:      Converted src_string (same as input pointer)
+ * RETURN:      None
  *
  * DESCRIPTION: Convert string to uppercase
  *
@@ -158,7 +180,7 @@ acpi_ut_release_owner_id (
  *
  ******************************************************************************/
 
-char *
+void
 acpi_ut_strupr (
         char                            *src_string)
 {
@@ -169,7 +191,7 @@ acpi_ut_strupr (
 
 
         if (!src_string) {
-                return (NULL);
+                return;
         }
 
         /* Walk entire string, uppercasing the letters */
@@ -178,7 +200,7 @@ acpi_ut_strupr (
                 *string = (char) ACPI_TOUPPER (*string);
         }
 
-        return (src_string);
+        return;
 }