Pull bugzilla-5452 into release branch

[pandora-kernel.git] / drivers / acpi / utilities / utmutex.c

diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
index e158b1b..25eb343 100644 (file)
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -68,19 +68,26 @@ acpi_status acpi_ut_mutex_initialize(void)
        u32 i;
        acpi_status status;
 
-       ACPI_FUNCTION_TRACE("ut_mutex_initialize");
+       ACPI_FUNCTION_TRACE(ut_mutex_initialize);
 
        /*
         * Create each of the predefined mutex objects
         */
-       for (i = 0; i < NUM_MUTEX; i++) {
+       for (i = 0; i < ACPI_NUM_MUTEX; i++) {
                status = acpi_ut_create_mutex(i);
                if (ACPI_FAILURE(status)) {
                        return_ACPI_STATUS(status);
                }
        }
 
+       /* Create the spinlocks for use at interrupt level */
+
        status = acpi_os_create_lock(&acpi_gbl_gpe_lock);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
+       }
+
+       status = acpi_os_create_lock(&acpi_gbl_hardware_lock);
        return_ACPI_STATUS(status);
 }
 
@@ -100,16 +107,19 @@ void acpi_ut_mutex_terminate(void)
 {
        u32 i;
 
-       ACPI_FUNCTION_TRACE("ut_mutex_terminate");
+       ACPI_FUNCTION_TRACE(ut_mutex_terminate);
 
        /*
         * Delete each predefined mutex object
         */
-       for (i = 0; i < NUM_MUTEX; i++) {
+       for (i = 0; i < ACPI_NUM_MUTEX; i++) {
                (void)acpi_ut_delete_mutex(i);
        }
 
+       /* Delete the spinlocks */
+
        acpi_os_delete_lock(acpi_gbl_gpe_lock);
+       acpi_os_delete_lock(acpi_gbl_hardware_lock);
        return_VOID;
 }
 
@@ -129,9 +139,9 @@ static acpi_status acpi_ut_create_mutex(acpi_mutex_handle mutex_id)
 {
        acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE_U32("ut_create_mutex", mutex_id);
+       ACPI_FUNCTION_TRACE_U32(ut_create_mutex, mutex_id);
 
-       if (mutex_id > MAX_MUTEX) {
+       if (mutex_id > ACPI_MAX_MUTEX) {
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
@@ -163,9 +173,9 @@ static acpi_status acpi_ut_delete_mutex(acpi_mutex_handle mutex_id)
 {
        acpi_status status;
 
-       ACPI_FUNCTION_TRACE_U32("ut_delete_mutex", mutex_id);
+       ACPI_FUNCTION_TRACE_U32(ut_delete_mutex, mutex_id);
 
-       if (mutex_id > MAX_MUTEX) {
+       if (mutex_id > ACPI_MAX_MUTEX) {
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
@@ -192,11 +202,11 @@ static acpi_status acpi_ut_delete_mutex(acpi_mutex_handle mutex_id)
 acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
 {
        acpi_status status;
-       u32 this_thread_id;
+       acpi_thread_id this_thread_id;
 
-       ACPI_FUNCTION_NAME("ut_acquire_mutex");
+       ACPI_FUNCTION_NAME(ut_acquire_mutex);
 
-       if (mutex_id > MAX_MUTEX) {
+       if (mutex_id > ACPI_MAX_MUTEX) {
                return (AE_BAD_PARAMETER);
        }
 
@@ -213,24 +223,23 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
                 * the mutex ordering rule.  This indicates a coding error somewhere in
                 * the ACPI subsystem code.
                 */
-               for (i = mutex_id; i < MAX_MUTEX; i++) {
+               for (i = mutex_id; i < ACPI_MAX_MUTEX; i++) {
                        if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {
                                if (i == mutex_id) {
-                                       ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                         "Mutex [%s] already acquired by this thread [%X]\n",
-                                                         acpi_ut_get_mutex_name
-                                                         (mutex_id),
-                                                         this_thread_id));
+                                       ACPI_ERROR((AE_INFO,
+                                                   "Mutex [%s] already acquired by this thread [%X]",
+                                                   acpi_ut_get_mutex_name
+                                                   (mutex_id),
+                                                   this_thread_id));
 
                                        return (AE_ALREADY_ACQUIRED);
                                }
 
-                               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                 "Invalid acquire order: Thread %X owns [%s], wants [%s]\n",
-                                                 this_thread_id,
-                                                 acpi_ut_get_mutex_name(i),
-                                                 acpi_ut_get_mutex_name
-                                                 (mutex_id)));
+                               ACPI_ERROR((AE_INFO,
+                                           "Invalid acquire order: Thread %X owns [%s], wants [%s]",
+                                           this_thread_id,
+                                           acpi_ut_get_mutex_name(i),
+                                           acpi_ut_get_mutex_name(mutex_id)));
 
                                return (AE_ACQUIRE_DEADLOCK);
                        }
@@ -253,11 +262,9 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
                acpi_gbl_mutex_info[mutex_id].use_count++;
                acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id;
        } else {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Thread %X could not acquire Mutex [%s] %s\n",
-                                 this_thread_id,
-                                 acpi_ut_get_mutex_name(mutex_id),
-                                 acpi_format_exception(status)));
+               ACPI_EXCEPTION((AE_INFO, status,
+                               "Thread %X could not acquire Mutex [%X]",
+                               this_thread_id, mutex_id));
        }
 
        return (status);
@@ -278,16 +285,16 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
 acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
 {
        acpi_status status;
-       u32 this_thread_id;
+       acpi_thread_id this_thread_id;
 
-       ACPI_FUNCTION_NAME("ut_release_mutex");
+       ACPI_FUNCTION_NAME(ut_release_mutex);
 
        this_thread_id = acpi_os_get_thread_id();
        ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                          "Thread %X releasing Mutex [%s]\n", this_thread_id,
                          acpi_ut_get_mutex_name(mutex_id)));
 
-       if (mutex_id > MAX_MUTEX) {
+       if (mutex_id > ACPI_MAX_MUTEX) {
                return (AE_BAD_PARAMETER);
        }
 
@@ -295,9 +302,9 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
         * Mutex must be acquired in order to release it!
         */
        if (acpi_gbl_mutex_info[mutex_id].thread_id == ACPI_MUTEX_NOT_ACQUIRED) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Mutex [%s] is not acquired, cannot release\n",
-                                 acpi_ut_get_mutex_name(mutex_id)));
+               ACPI_ERROR((AE_INFO,
+                           "Mutex [%X] is not acquired, cannot release",
+                           mutex_id));
 
                return (AE_NOT_ACQUIRED);
        }
@@ -312,17 +319,16 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
                 * ordering rule.  This indicates a coding error somewhere in
                 * the ACPI subsystem code.
                 */
-               for (i = mutex_id; i < MAX_MUTEX; i++) {
+               for (i = mutex_id; i < ACPI_MAX_MUTEX; i++) {
                        if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {
                                if (i == mutex_id) {
                                        continue;
                                }
 
-                               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                 "Invalid release order: owns [%s], releasing [%s]\n",
-                                                 acpi_ut_get_mutex_name(i),
-                                                 acpi_ut_get_mutex_name
-                                                 (mutex_id)));
+                               ACPI_ERROR((AE_INFO,
+                                           "Invalid release order: owns [%s], releasing [%s]",
+                                           acpi_ut_get_mutex_name(i),
+                                           acpi_ut_get_mutex_name(mutex_id)));
 
                                return (AE_RELEASE_DEADLOCK);
                        }
@@ -338,11 +344,9 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
            acpi_os_signal_semaphore(acpi_gbl_mutex_info[mutex_id].mutex, 1);
 
        if (ACPI_FAILURE(status)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Thread %X could not release Mutex [%s] %s\n",
-                                 this_thread_id,
-                                 acpi_ut_get_mutex_name(mutex_id),
-                                 acpi_format_exception(status)));
+               ACPI_EXCEPTION((AE_INFO, status,
+                               "Thread %X could not release Mutex [%X]",
+                               this_thread_id, mutex_id));
        } else {
                ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                                  "Thread %X released Mutex [%s]\n",