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, 4 insertions, 685 deletions

diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index bb658777fa88..207c836aec64 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -49,16 +49,6 @@
 #define _COMPONENT          ACPI_UTILITIES
          ACPI_MODULE_NAME    ("utmisc")
 
-/* 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);
-
 
 /*******************************************************************************
  *
@@ -84,6 +74,10 @@ acpi_ut_strupr (
         ACPI_FUNCTION_ENTRY ();
 
 
+        if (!src_string) {
+                return (NULL);
+        }
+
         /* Walk entire string, uppercasing the letters */
 
         for (string = src_string; *string; string++) {
@@ -543,326 +537,6 @@ error_exit:
 
 /*******************************************************************************
  *
- * 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);
-}
-
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ut_create_update_state_and_push
  *
  * PARAMETERS:  Object          - Object to be added to the new state
@@ -905,361 +579,6 @@ acpi_ut_create_update_state_and_push (
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_create_pkg_state_and_push
- *
- * PARAMETERS:  Object          - Object to be added to the new state
- *              Action          - Increment/Decrement
- *              state_list      - List the state will be added to
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Create a new state and push it
- *
- ******************************************************************************/
-
-#ifdef ACPI_FUTURE_USAGE
-acpi_status
-acpi_ut_create_pkg_state_and_push (
-        void                            *internal_object,
-        void                            *external_object,
-        u16                             index,
-        union acpi_generic_state        **state_list)
-{
-        union acpi_generic_state         *state;
-
-
-        ACPI_FUNCTION_ENTRY ();
-
-
-        state = acpi_ut_create_pkg_state (internal_object, external_object, index);
-        if (!state) {
-                return (AE_NO_MEMORY);
-        }
-
-        acpi_ut_push_generic_state (state_list, state);
-        return (AE_OK);
-}
-#endif  /*  ACPI_FUTURE_USAGE  */
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_push_generic_state
- *
- * PARAMETERS:  list_head           - Head of the state stack
- *              State               - State object to push
- *
- * RETURN:      None
- *
- * DESCRIPTION: Push a state object onto a state stack
- *
- ******************************************************************************/
-
-void
-acpi_ut_push_generic_state (
-        union acpi_generic_state        **list_head,
-        union acpi_generic_state        *state)
-{
-        ACPI_FUNCTION_TRACE ("ut_push_generic_state");
-
-
-        /* Push the state object onto the front of the list (stack) */
-
-        state->common.next = *list_head;
-        *list_head = state;
-
-        return_VOID;
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_pop_generic_state
- *
- * PARAMETERS:  list_head           - Head of the state stack
- *
- * RETURN:      The popped state object
- *
- * DESCRIPTION: Pop a state object from a state stack
- *
- ******************************************************************************/
-
-union acpi_generic_state *
-acpi_ut_pop_generic_state (
-        union acpi_generic_state        **list_head)
-{
-        union acpi_generic_state        *state;
-
-
-        ACPI_FUNCTION_TRACE ("ut_pop_generic_state");
-
-
-        /* Remove the state object at the head of the list (stack) */
-
-        state = *list_head;
-        if (state) {
-                /* Update the list head */
-
-                *list_head = state->common.next;
-        }
-
-        return_PTR (state);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_create_generic_state
- *
- * PARAMETERS:  None
- *
- * RETURN:      The new state object. NULL on failure.
- *
- * DESCRIPTION: Create a generic state object.  Attempt to obtain one from
- *              the global state cache;  If none available, create a new one.
- *
- ******************************************************************************/
-
-union acpi_generic_state *
-acpi_ut_create_generic_state (
-        void)
-{
-        union acpi_generic_state        *state;
-
-
-        ACPI_FUNCTION_ENTRY ();
-
-
-        state = acpi_ut_acquire_from_cache (ACPI_MEM_LIST_STATE);
-
-        /* Initialize */
-
-        if (state) {
-                state->common.data_type = ACPI_DESC_TYPE_STATE;
-        }
-
-        return (state);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_create_thread_state
- *
- * PARAMETERS:  None
- *
- * RETURN:      New Thread State. NULL on failure
- *
- * DESCRIPTION: Create a "Thread State" - a flavor of the generic state used
- *              to track per-thread info during method execution
- *
- ******************************************************************************/
-
-struct acpi_thread_state *
-acpi_ut_create_thread_state (
-        void)
-{
-        union acpi_generic_state        *state;
-
-
-        ACPI_FUNCTION_TRACE ("ut_create_thread_state");
-
-
-        /* Create the generic state object */
-
-        state = acpi_ut_create_generic_state ();
-        if (!state) {
-                return_PTR (NULL);
-        }
-
-        /* Init fields specific to the update struct */
-
-        state->common.data_type = ACPI_DESC_TYPE_STATE_THREAD;
-        state->thread.thread_id = acpi_os_get_thread_id ();
-
-        return_PTR ((struct acpi_thread_state *) state);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_create_update_state
- *
- * PARAMETERS:  Object          - Initial Object to be installed in the state
- *              Action          - Update action to be performed
- *
- * RETURN:      New state object, null on failure
- *
- * DESCRIPTION: Create an "Update State" - a flavor of the generic state used
- *              to update reference counts and delete complex objects such
- *              as packages.
- *
- ******************************************************************************/
-
-union acpi_generic_state *
-acpi_ut_create_update_state (
-        union acpi_operand_object       *object,
-        u16                             action)
-{
-        union acpi_generic_state        *state;
-
-
-        ACPI_FUNCTION_TRACE_PTR ("ut_create_update_state", object);
-
-
-        /* Create the generic state object */
-
-        state = acpi_ut_create_generic_state ();
-        if (!state) {
-                return_PTR (NULL);
-        }
-
-        /* Init fields specific to the update struct */
-
-        state->common.data_type = ACPI_DESC_TYPE_STATE_UPDATE;
-        state->update.object = object;
-        state->update.value  = action;
-
-        return_PTR (state);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_create_pkg_state
- *
- * PARAMETERS:  Object          - Initial Object to be installed in the state
- *              Action          - Update action to be performed
- *
- * RETURN:      New state object, null on failure
- *
- * DESCRIPTION: Create a "Package State"
- *
- ******************************************************************************/
-
-union acpi_generic_state *
-acpi_ut_create_pkg_state (
-        void                            *internal_object,
-        void                            *external_object,
-        u16                             index)
-{
-        union acpi_generic_state        *state;
-
-
-        ACPI_FUNCTION_TRACE_PTR ("ut_create_pkg_state", internal_object);
-
-
-        /* Create the generic state object */
-
-        state = acpi_ut_create_generic_state ();
-        if (!state) {
-                return_PTR (NULL);
-        }
-
-        /* Init fields specific to the update struct */
-
-        state->common.data_type = ACPI_DESC_TYPE_STATE_PACKAGE;
-        state->pkg.source_object = (union acpi_operand_object *) internal_object;
-        state->pkg.dest_object  = external_object;
-        state->pkg.index        = index;
-        state->pkg.num_packages = 1;
-
-        return_PTR (state);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_create_control_state
- *
- * PARAMETERS:  None
- *
- * RETURN:      New state object, null on failure
- *
- * DESCRIPTION: Create a "Control State" - a flavor of the generic state used
- *              to support nested IF/WHILE constructs in the AML.
- *
- ******************************************************************************/
-
-union acpi_generic_state *
-acpi_ut_create_control_state (
-        void)
-{
-        union acpi_generic_state        *state;
-
-
-        ACPI_FUNCTION_TRACE ("ut_create_control_state");
-
-
-        /* Create the generic state object */
-
-        state = acpi_ut_create_generic_state ();
-        if (!state) {
-                return_PTR (NULL);
-        }
-
-        /* Init fields specific to the control struct */
-
-        state->common.data_type = ACPI_DESC_TYPE_STATE_CONTROL;
-        state->common.state     = ACPI_CONTROL_CONDITIONAL_EXECUTING;
-
-        return_PTR (state);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_delete_generic_state
- *
- * PARAMETERS:  State               - The state object to be deleted
- *
- * RETURN:      None
- *
- * DESCRIPTION: Put a state object back into the global state cache.  The object
- *              is not actually freed at this time.
- *
- ******************************************************************************/
-
-void
-acpi_ut_delete_generic_state (
-        union acpi_generic_state        *state)
-{
-        ACPI_FUNCTION_TRACE ("ut_delete_generic_state");
-
-
-        acpi_ut_release_to_cache (ACPI_MEM_LIST_STATE, state);
-        return_VOID;
-}
-
-
-#ifdef ACPI_ENABLE_OBJECT_CACHE
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_delete_generic_state_cache
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Purge the global state object cache.  Used during subsystem
- *              termination.
- *
- ******************************************************************************/
-
-void
-acpi_ut_delete_generic_state_cache (
-        void)
-{
-        ACPI_FUNCTION_TRACE ("ut_delete_generic_state_cache");
-
-
-        acpi_ut_delete_generic_cache (ACPI_MEM_LIST_STATE);
-        return_VOID;
-}
-#endif
-
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ut_walk_package_tree
  *
  * PARAMETERS:  source_object       - The package to walk