fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / drivers / acpi / utils.c
index 1ce2047..68a809f 100644 (file)
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
-
 #define _COMPONENT             ACPI_BUS_COMPONENT
-ACPI_MODULE_NAME               ("acpi_utils")
-
+ACPI_MODULE_NAME("acpi_utils")
 
 /* --------------------------------------------------------------------------
                             Object Evaluation Helpers
    -------------------------------------------------------------------------- */
-
 #ifdef ACPI_DEBUG_OUTPUT
 #define acpi_util_eval_error(h,p,s) {\
        char prefix[80] = {'\0'};\
@@ -49,56 +46,54 @@ ACPI_MODULE_NAME            ("acpi_utils")
 #else
 #define acpi_util_eval_error(h,p,s)
 #endif
-
-
 acpi_status
-acpi_extract_package (
-       union acpi_object       *package,
-       struct acpi_buffer      *format,
-       struct acpi_buffer      *buffer)
+acpi_extract_package(union acpi_object *package,
+                    struct acpi_buffer *format, struct acpi_buffer *buffer)
 {
-       u32                     size_required = 0;
-       u32                     tail_offset = 0;
-       char                    *format_string = NULL;
-       u32                     format_count = 0;
-       u32                     i = 0;
-       u8                      *head = NULL;
-       u8                      *tail = NULL;
-
-       ACPI_FUNCTION_TRACE("acpi_extract_package");
-
-       if (!package || (package->type != ACPI_TYPE_PACKAGE) || (package->package.count < 1)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Invalid 'package' argument\n"));
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+       u32 size_required = 0;
+       u32 tail_offset = 0;
+       char *format_string = NULL;
+       u32 format_count = 0;
+       u32 i = 0;
+       u8 *head = NULL;
+       u8 *tail = NULL;
+
+
+       if (!package || (package->type != ACPI_TYPE_PACKAGE)
+           || (package->package.count < 1)) {
+               printk(KERN_WARNING PREFIX "Invalid package argument\n");
+               return AE_BAD_PARAMETER;
        }
 
        if (!format || !format->pointer || (format->length < 1)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Invalid 'format' argument\n"));
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               printk(KERN_WARNING PREFIX "Invalid format argument\n");
+               return AE_BAD_PARAMETER;
        }
 
        if (!buffer) {
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Invalid 'buffer' argument\n"));
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               printk(KERN_WARNING PREFIX "Invalid buffer argument\n");
+               return AE_BAD_PARAMETER;
        }
 
-       format_count = (format->length/sizeof(char)) - 1;
+       format_count = (format->length / sizeof(char)) - 1;
        if (format_count > package->package.count) {
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Format specifies more objects [%d] than exist in package [%d].", format_count, package->package.count));
-               return_ACPI_STATUS(AE_BAD_DATA);
+               printk(KERN_WARNING PREFIX "Format specifies more objects [%d]"
+                             " than exist in package [%d].\n",
+                             format_count, package->package.count);
+               return AE_BAD_DATA;
        }
 
-       format_string = (char*)format->pointer;
+       format_string = format->pointer;
 
        /*
         * Calculate size_required.
         */
-       for (i=0; i<format_count; i++) {
+       for (i = 0; i < format_count; i++) {
 
                union acpi_object *element = &(package->package.elements[i]);
 
                if (!element) {
-                       return_ACPI_STATUS(AE_BAD_DATA);
+                       return AE_BAD_DATA;
                }
 
                switch (element->type) {
@@ -110,12 +105,17 @@ acpi_extract_package (
                                tail_offset += sizeof(acpi_integer);
                                break;
                        case 'S':
-                               size_required += sizeof(char*) + sizeof(acpi_integer) + sizeof(char);
-                               tail_offset += sizeof(char*);
+                               size_required +=
+                                   sizeof(char *) + sizeof(acpi_integer) +
+                                   sizeof(char);
+                               tail_offset += sizeof(char *);
                                break;
                        default:
-                               ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Invalid package element [%d]: got number, expecing [%c].\n", i, format_string[i]));
-                               return_ACPI_STATUS(AE_BAD_DATA);
+                               printk(KERN_WARNING PREFIX "Invalid package element"
+                                             " [%d]: got number, expecing"
+                                             " [%c]\n",
+                                             i, format_string[i]);
+                               return AE_BAD_DATA;
                                break;
                        }
                        break;
@@ -124,25 +124,35 @@ acpi_extract_package (
                case ACPI_TYPE_BUFFER:
                        switch (format_string[i]) {
                        case 'S':
-                               size_required += sizeof(char*) + (element->string.length * sizeof(char)) + sizeof(char);
-                               tail_offset += sizeof(char*);
+                               size_required +=
+                                   sizeof(char *) +
+                                   (element->string.length * sizeof(char)) +
+                                   sizeof(char);
+                               tail_offset += sizeof(char *);
                                break;
                        case 'B':
-                               size_required += sizeof(u8*) + (element->buffer.length * sizeof(u8));
-                               tail_offset += sizeof(u8*);
+                               size_required +=
+                                   sizeof(u8 *) +
+                                   (element->buffer.length * sizeof(u8));
+                               tail_offset += sizeof(u8 *);
                                break;
                        default:
-                               ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Invalid package element [%d] got string/buffer, expecing [%c].\n", i, format_string[i]));
-                               return_ACPI_STATUS(AE_BAD_DATA);
+                               printk(KERN_WARNING PREFIX "Invalid package element"
+                                             " [%d] got string/buffer,"
+                                             " expecing [%c]\n",
+                                             i, format_string[i]);
+                               return AE_BAD_DATA;
                                break;
                        }
                        break;
 
                case ACPI_TYPE_PACKAGE:
                default:
-                       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found unsupported element at index=%d\n", i));
+                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                         "Found unsupported element at index=%d\n",
+                                         i));
                        /* TBD: handle nested packages... */
-                       return_ACPI_STATUS(AE_SUPPORT);
+                       return AE_SUPPORT;
                        break;
                }
        }
@@ -152,10 +162,9 @@ acpi_extract_package (
         */
        if (buffer->length < size_required) {
                buffer->length = size_required;
-               return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
-       }
-       else if (buffer->length != size_required || !buffer->pointer) {
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               return AE_BUFFER_OVERFLOW;
+       } else if (buffer->length != size_required || !buffer->pointer) {
+               return AE_BAD_PARAMETER;
        }
 
        head = buffer->pointer;
@@ -164,13 +173,13 @@ acpi_extract_package (
        /*
         * Extract package data.
         */
-       for (i=0; i<format_count; i++) {
+       for (i = 0; i < format_count; i++) {
 
                u8 **pointer = NULL;
                union acpi_object *element = &(package->package.elements[i]);
 
                if (!element) {
-                       return_ACPI_STATUS(AE_BAD_DATA);
+                       return AE_BAD_DATA;
                }
 
                switch (element->type) {
@@ -178,14 +187,16 @@ acpi_extract_package (
                case ACPI_TYPE_INTEGER:
                        switch (format_string[i]) {
                        case 'N':
-                               *((acpi_integer*)head) = element->integer.value;
+                               *((acpi_integer *) head) =
+                                   element->integer.value;
                                head += sizeof(acpi_integer);
                                break;
                        case 'S':
-                               pointer = (u8**)head;
+                               pointer = (u8 **) head;
                                *pointer = tail;
-                               *((acpi_integer*)tail) = element->integer.value;
-                               head += sizeof(acpi_integer*);
+                               *((acpi_integer *) tail) =
+                                   element->integer.value;
+                               head += sizeof(acpi_integer *);
                                tail += sizeof(acpi_integer);
                                /* NULL terminate string */
                                *tail = (char)0;
@@ -201,20 +212,22 @@ acpi_extract_package (
                case ACPI_TYPE_BUFFER:
                        switch (format_string[i]) {
                        case 'S':
-                               pointer = (u8**)head;
+                               pointer = (u8 **) head;
                                *pointer = tail;
-                               memcpy(tail, element->string.pointer, element->string.length);
-                               head += sizeof(char*);
+                               memcpy(tail, element->string.pointer,
+                                      element->string.length);
+                               head += sizeof(char *);
                                tail += element->string.length * sizeof(char);
                                /* NULL terminate string */
                                *tail = (char)0;
                                tail += sizeof(char);
                                break;
                        case 'B':
-                               pointer = (u8**)head;
+                               pointer = (u8 **) head;
                                *pointer = tail;
-                               memcpy(tail, element->buffer.pointer, element->buffer.length);
-                               head += sizeof(u8*);
+                               memcpy(tail, element->buffer.pointer,
+                                      element->buffer.length);
+                               head += sizeof(u8 *);
                                tail += element->buffer.length * sizeof(u8);
                                break;
                        default:
@@ -231,43 +244,41 @@ acpi_extract_package (
                }
        }
 
-       return_ACPI_STATUS(AE_OK);
+       return AE_OK;
 }
-EXPORT_SYMBOL(acpi_extract_package);
 
+EXPORT_SYMBOL(acpi_extract_package);
 
 acpi_status
-acpi_evaluate_integer (
-       acpi_handle             handle,
-       acpi_string             pathname,
-       struct acpi_object_list *arguments,
-       unsigned long           *data)
+acpi_evaluate_integer(acpi_handle handle,
+                     acpi_string pathname,
+                     struct acpi_object_list *arguments, unsigned long *data)
 {
-       acpi_status             status = AE_OK;
-       union acpi_object       *element;
-       struct acpi_buffer      buffer = {0,NULL};
+       acpi_status status = AE_OK;
+       union acpi_object *element;
+       struct acpi_buffer buffer = { 0, NULL };
 
-       ACPI_FUNCTION_TRACE("acpi_evaluate_integer");
 
        if (!data)
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               return AE_BAD_PARAMETER;
 
-       element = kmalloc(sizeof(union acpi_object), GFP_KERNEL);
-       if(!element)
-               return_ACPI_STATUS(AE_NO_MEMORY);
+       element = kzalloc(sizeof(union acpi_object), irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
+       if (!element)
+               return AE_NO_MEMORY;
 
-       memset(element, 0, sizeof(union acpi_object));
        buffer.length = sizeof(union acpi_object);
        buffer.pointer = element;
        status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
        if (ACPI_FAILURE(status)) {
                acpi_util_eval_error(handle, pathname, status);
-               return_ACPI_STATUS(status);
+               kfree(element);
+               return status;
        }
 
        if (element->type != ACPI_TYPE_INTEGER) {
                acpi_util_eval_error(handle, pathname, AE_BAD_DATA);
-               return_ACPI_STATUS(AE_BAD_DATA);
+               kfree(element);
+               return AE_BAD_DATA;
        }
 
        *data = element->integer.value;
@@ -275,78 +286,71 @@ acpi_evaluate_integer (
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%lu]\n", *data));
 
-       return_ACPI_STATUS(AE_OK);
+       return AE_OK;
 }
-EXPORT_SYMBOL(acpi_evaluate_integer);
 
+EXPORT_SYMBOL(acpi_evaluate_integer);
 
 #if 0
 acpi_status
-acpi_evaluate_string (
-       acpi_handle             handle,
-       acpi_string             pathname,
-       acpi_object_list        *arguments,
-       acpi_string             *data)
+acpi_evaluate_string(acpi_handle handle,
+                    acpi_string pathname,
+                    acpi_object_list * arguments, acpi_string * data)
 {
-       acpi_status             status = AE_OK;
-       acpi_object             *element = NULL;
-       acpi_buffer             buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+       acpi_status status = AE_OK;
+       acpi_object *element = NULL;
+       acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
-       ACPI_FUNCTION_TRACE("acpi_evaluate_string");
 
        if (!data)
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               return AE_BAD_PARAMETER;
 
        status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
        if (ACPI_FAILURE(status)) {
                acpi_util_eval_error(handle, pathname, status);
-               return_ACPI_STATUS(status);
+               return status;
        }
 
        element = (acpi_object *) buffer.pointer;
 
-       if ((element->type != ACPI_TYPE_STRING) 
-               || (element->type != ACPI_TYPE_BUFFER)
-               || !element->string.length) {
+       if ((element->type != ACPI_TYPE_STRING)
+           || (element->type != ACPI_TYPE_BUFFER)
+           || !element->string.length) {
                acpi_util_eval_error(handle, pathname, AE_BAD_DATA);
-               return_ACPI_STATUS(AE_BAD_DATA);
+               return AE_BAD_DATA;
        }
 
-       *data = kmalloc(element->string.length + 1, GFP_KERNEL);
+       *data = kzalloc(element->string.length + 1, GFP_KERNEL);
        if (!data) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Memory allocation error\n"));
-               return_VALUE(-ENOMEM);
+               printk(KERN_ERR PREFIX "Memory allocation\n");
+               return -ENOMEM;
        }
-       memset(*data, 0, element->string.length + 1);
 
        memcpy(*data, element->string.pointer, element->string.length);
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data));
 
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
-       return_ACPI_STATUS(AE_OK);
+       return AE_OK;
 }
 #endif
 
-
 acpi_status
-acpi_evaluate_reference (
-       acpi_handle             handle,
-       acpi_string             pathname,
-       struct acpi_object_list *arguments,
-       struct acpi_handle_list *list)
+acpi_evaluate_reference(acpi_handle handle,
+                       acpi_string pathname,
+                       struct acpi_object_list *arguments,
+                       struct acpi_handle_list *list)
 {
-       acpi_status             status = AE_OK;
-       union acpi_object       *package = NULL;
-       union acpi_object       *element = NULL;
-       struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-       u32                     i = 0;
+       acpi_status status = AE_OK;
+       union acpi_object *package = NULL;
+       union acpi_object *element = NULL;
+       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+       u32 i = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_evaluate_reference");
 
        if (!list) {
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               return AE_BAD_PARAMETER;
        }
 
        /* Evaluate object. */
@@ -355,35 +359,32 @@ acpi_evaluate_reference (
        if (ACPI_FAILURE(status))
                goto end;
 
-       package = (union acpi_object *) buffer.pointer;
+       package = buffer.pointer;
 
        if ((buffer.length == 0) || !package) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
-                       "No return object (len %X ptr %p)\n", 
-                       (unsigned)buffer.length, package));
+               printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",
+                           (unsigned)buffer.length, package);
                status = AE_BAD_DATA;
                acpi_util_eval_error(handle, pathname, status);
                goto end;
        }
        if (package->type != ACPI_TYPE_PACKAGE) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
-                       "Expecting a [Package], found type %X\n", 
-                       package->type));
+               printk(KERN_ERR PREFIX "Expecting a [Package], found type %X\n",
+                           package->type);
                status = AE_BAD_DATA;
                acpi_util_eval_error(handle, pathname, status);
                goto end;
        }
        if (!package->package.count) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
-                       "[Package] has zero elements (%p)\n", 
-                       package));
+               printk(KERN_ERR PREFIX "[Package] has zero elements (%p)\n",
+                           package);
                status = AE_BAD_DATA;
                acpi_util_eval_error(handle, pathname, status);
                goto end;
        }
 
        if (package->package.count > ACPI_MAX_HANDLES) {
-               return_ACPI_STATUS(AE_NO_MEMORY);
+               return AE_NO_MEMORY;
        }
        list->count = package->package.count;
 
@@ -395,9 +396,9 @@ acpi_evaluate_reference (
 
                if (element->type != ACPI_TYPE_ANY) {
                        status = AE_BAD_DATA;
-                       ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
-                               "Expecting a [Reference] package element, found type %X\n",
-                               element->type));
+                       printk(KERN_ERR PREFIX
+                                   "Expecting a [Reference] package element, found type %X\n",
+                                   element->type);
                        acpi_util_eval_error(handle, pathname, status);
                        break;
                }
@@ -406,18 +407,18 @@ acpi_evaluate_reference (
 
                list->handles[i] = element->reference.handle;
                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found reference [%p]\n",
-                       list->handles[i]));
+                                 list->handles[i]));
        }
 
-end:
+      end:
        if (ACPI_FAILURE(status)) {
                list->count = 0;
                //kfree(list->handles);
        }
 
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
-       return_ACPI_STATUS(status);
+       return status;
 }
-EXPORT_SYMBOL(acpi_evaluate_reference);
 
+EXPORT_SYMBOL(acpi_evaluate_reference);