ACPICA 20050617-0624 from Bob Moore <robert.moore@intel.com>

ACPICA 20050617:

Moved the object cache operations into the OS interface
layer (OSL) to allow the host OS to handle these operations
if desired (for example, the Linux OSL will invoke the
slab allocator).  This support is optional; the compile
time define ACPI_USE_LOCAL_CACHE may be used to utilize
the original cache code in the ACPI CA core.  The new OSL
interfaces are shown below.  See utalloc.c for an example
implementation, and acpiosxf.h for the exact interface
definitions.  Thanks to Alexey Starikovskiy.
	acpi_os_create_cache
	acpi_os_delete_cache
	acpi_os_purge_cache
	acpi_os_acquire_object
	acpi_os_release_object

Modified the interfaces to acpi_os_acquire_lock and
acpi_os_release_lock to return and restore a flags
parameter.  This fits better with many OS lock models.
Note: the current execution state (interrupt handler
or not) is no longer passed to these interfaces.  If
necessary, the OSL must determine this state by itself, a
simple and fast operation.  Thanks to Alexey Starikovskiy.

Fixed a problem in the ACPI table handling where a valid
XSDT was assumed present if the revision of the RSDP
was 2 or greater.  According to the ACPI specification,
the XSDT is optional in all cases, and the table manager
therefore now checks for both an RSDP >=2 and a valid
XSDT pointer.  Otherwise, the RSDT pointer is used.
Some ACPI 2.0 compliant BIOSs contain only the RSDT.

Fixed an interpreter problem with the Mid() operator in the
case of an input string where the resulting output string
is of zero length.  It now correctly returns a valid,
null terminated string object instead of a string object
with a null pointer.

Fixed a problem with the control method argument handling
to allow a store to an Arg object that already contains an
object of type Device.  The Device object is now correctly
overwritten.  Previously, an error was returned.

ACPICA 20050624:

Modified the new OSL cache interfaces to use ACPI_CACHE_T
as the type for the host-defined cache object.  This allows
the OSL implementation to define and type this object in
any manner desired, simplifying the OSL implementation.
For example, ACPI_CACHE_T is defined as kmem_cache_t for
Linux, and should be defined in the OS-specific header
file for other operating systems as required.

Changed the interface to AcpiOsAcquireObject to directly
return the requested object as the function return (instead
of ACPI_STATUS.) This change was made for performance
reasons, since this is the purpose of the interface in the
first place.  acpi_os_acquire_object is now similar to the
acpi_os_allocate interface.  Thanks to Alexey Starikovskiy.

Modified the initialization sequence in
acpi_initialize_subsystem to call the OSL interface
acpi_osl_initialize first, before any local initialization.
This change was required because the global initialization
now calls OSL interfaces.

Restructured the code base to split some files because
of size and/or because the code logically belonged in a
separate file.  New files are listed below.

  utilities/utcache.c	/* Local cache interfaces */
  utilities/utmutex.c	/* Local mutex support */
  utilities/utstate.c	/* State object support */
  parser/psloop.c	/* Main AML parse loop */

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 380 insertions, 0 deletions

diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
new file mode 100644
index 000000000000..a80b97cb2e56
--- /dev/null
+++ b/drivers/acpi/utilities/utmutex.c
@@ -0,0 +1,380 @@
+/*******************************************************************************
+ *
+ * Module Name: utmutex - local mutex support
+ *
+ ******************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2005, R. Byron Moore
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+
+#include <acpi/acpi.h>
+
+#define _COMPONENT          ACPI_UTILITIES
+         ACPI_MODULE_NAME    ("utmutex")
+
+/* Local prototypes */
+
+static acpi_status
+acpi_ut_create_mutex (
+        acpi_mutex_handle               mutex_id);
+
+static acpi_status
+acpi_ut_delete_mutex (
+        acpi_mutex_handle               mutex_id);
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_mutex_initialize
+ *
+ * PARAMETERS:  None.
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Create the system mutex objects.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_mutex_initialize (
+        void)
+{
+        u32                             i;
+        acpi_status                     status;
+
+
+        ACPI_FUNCTION_TRACE ("ut_mutex_initialize");
+
+
+        /*
+         * Create each of the predefined mutex objects
+         */
+        for (i = 0; i < NUM_MUTEX; i++) {
+                status = acpi_ut_create_mutex (i);
+                if (ACPI_FAILURE (status)) {
+                        return_ACPI_STATUS (status);
+                }
+        }
+
+        status = acpi_os_create_lock (&acpi_gbl_gpe_lock);
+        return_ACPI_STATUS (status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_mutex_terminate
+ *
+ * PARAMETERS:  None.
+ *
+ * RETURN:      None.
+ *
+ * DESCRIPTION: Delete all of the system mutex objects.
+ *
+ ******************************************************************************/
+
+void
+acpi_ut_mutex_terminate (
+        void)
+{
+        u32                             i;
+
+
+        ACPI_FUNCTION_TRACE ("ut_mutex_terminate");
+
+
+        /*
+         * Delete each predefined mutex object
+         */
+        for (i = 0; i < NUM_MUTEX; i++) {
+                (void) acpi_ut_delete_mutex (i);
+        }
+
+        acpi_os_delete_lock (acpi_gbl_gpe_lock);
+        return_VOID;
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_create_mutex
+ *
+ * PARAMETERS:  mutex_iD        - ID of the mutex to be created
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Create a mutex object.
+ *
+ ******************************************************************************/
+
+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);
+
+
+        if (mutex_id > MAX_MUTEX) {
+                return_ACPI_STATUS (AE_BAD_PARAMETER);
+        }
+
+        if (!acpi_gbl_mutex_info[mutex_id].mutex) {
+                status = acpi_os_create_semaphore (1, 1,
+                                  &acpi_gbl_mutex_info[mutex_id].mutex);
+                acpi_gbl_mutex_info[mutex_id].owner_id = ACPI_MUTEX_NOT_ACQUIRED;
+                acpi_gbl_mutex_info[mutex_id].use_count = 0;
+        }
+
+        return_ACPI_STATUS (status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_delete_mutex
+ *
+ * PARAMETERS:  mutex_iD        - ID of the mutex to be deleted
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Delete a mutex object.
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_ut_delete_mutex (
+        acpi_mutex_handle               mutex_id)
+{
+        acpi_status                     status;
+
+
+        ACPI_FUNCTION_TRACE_U32 ("ut_delete_mutex", mutex_id);
+
+
+        if (mutex_id > MAX_MUTEX) {
+                return_ACPI_STATUS (AE_BAD_PARAMETER);
+        }
+
+        status = acpi_os_delete_semaphore (acpi_gbl_mutex_info[mutex_id].mutex);
+
+        acpi_gbl_mutex_info[mutex_id].mutex = NULL;
+        acpi_gbl_mutex_info[mutex_id].owner_id = ACPI_MUTEX_NOT_ACQUIRED;
+
+        return_ACPI_STATUS (status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_acquire_mutex
+ *
+ * PARAMETERS:  mutex_iD        - ID of the mutex to be acquired
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Acquire a mutex object.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_acquire_mutex (
+        acpi_mutex_handle               mutex_id)
+{
+        acpi_status                     status;
+        u32                             this_thread_id;
+
+
+        ACPI_FUNCTION_NAME ("ut_acquire_mutex");
+
+
+        if (mutex_id > MAX_MUTEX) {
+                return (AE_BAD_PARAMETER);
+        }
+
+        this_thread_id = acpi_os_get_thread_id ();
+
+#ifdef ACPI_MUTEX_DEBUG
+        {
+                u32                             i;
+                /*
+                 * Mutex debug code, for internal debugging only.
+                 *
+                 * Deadlock prevention.  Check if this thread owns any mutexes of value
+                 * greater than or equal to this one.  If so, the thread has violated
+                 * the mutex ordering rule.  This indicates a coding error somewhere in
+                 * the ACPI subsystem code.
+                 */
+                for (i = mutex_id; i < MAX_MUTEX; i++) {
+                        if (acpi_gbl_mutex_info[i].owner_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));
+
+                                        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)));
+
+                                return (AE_ACQUIRE_DEADLOCK);
+                        }
+                }
+        }
+#endif
+
+        ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX,
+                "Thread %X attempting to acquire Mutex [%s]\n",
+                this_thread_id, acpi_ut_get_mutex_name (mutex_id)));
+
+        status = acpi_os_wait_semaphore (acpi_gbl_mutex_info[mutex_id].mutex,
+                           1, ACPI_WAIT_FOREVER);
+        if (ACPI_SUCCESS (status)) {
+                ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Thread %X acquired Mutex [%s]\n",
+                        this_thread_id, acpi_ut_get_mutex_name (mutex_id)));
+
+                acpi_gbl_mutex_info[mutex_id].use_count++;
+                acpi_gbl_mutex_info[mutex_id].owner_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)));
+        }
+
+        return (status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_release_mutex
+ *
+ * PARAMETERS:  mutex_iD        - ID of the mutex to be released
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Release a mutex object.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_release_mutex (
+        acpi_mutex_handle               mutex_id)
+{
+        acpi_status                     status;
+        u32                             this_thread_id;
+
+
+        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) {
+                return (AE_BAD_PARAMETER);
+        }
+
+        /*
+         * Mutex must be acquired in order to release it!
+         */
+        if (acpi_gbl_mutex_info[mutex_id].owner_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)));
+
+                return (AE_NOT_ACQUIRED);
+        }
+
+#ifdef ACPI_MUTEX_DEBUG
+        {
+                u32                             i;
+                /*
+                 * Mutex debug code, for internal debugging only.
+                 *
+                 * Deadlock prevention.  Check if this thread owns any mutexes of value
+                 * greater than this one.  If so, the thread has violated the mutex
+                 * ordering rule.  This indicates a coding error somewhere in
+                 * the ACPI subsystem code.
+                 */
+                for (i = mutex_id; i < MAX_MUTEX; i++) {
+                        if (acpi_gbl_mutex_info[i].owner_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)));
+
+                                return (AE_RELEASE_DEADLOCK);
+                        }
+                }
+        }
+#endif
+
+        /* Mark unlocked FIRST */
+
+        acpi_gbl_mutex_info[mutex_id].owner_id = ACPI_MUTEX_NOT_ACQUIRED;
+
+        status = 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)));
+        }
+        else {
+                ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Thread %X released Mutex [%s]\n",
+                        this_thread_id, acpi_ut_get_mutex_name (mutex_id)));
+        }
+
+        return (status);
+}
+
+