]> err.no Git - linux-2.6/blobdiff - drivers/acpi/resources/rslist.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[linux-2.6] / drivers / acpi / resources / rslist.c
index f72d42e0927b5b8841fdd3e14d1c14f4b7df72ff..b78c7e797a1955ad8be12526d7657d926d98e237 100644 (file)
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rslist")
 
-/* Local prototypes */
-static ACPI_GET_RESOURCE_HANDLER acpi_rs_get_resource_handler(u8 resource_type);
-
-static acpi_status acpi_rs_validate_resource_length(union aml_resource *aml);
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_validate_resource_length
- *
- * PARAMETERS:  Aml                 - Pointer to the AML resource descriptor
- *
- * RETURN:      Status - AE_OK if the resource length appears valid
- *
- * DESCRIPTION: Validate the resource_length. Fixed-length descriptors must
- *              have the exact length; variable-length descriptors must be
- *              at least as long as the minimum. Certain Small descriptors
- *              can vary in size by at most one byte.
- *
- ******************************************************************************/
-
-static acpi_status acpi_rs_validate_resource_length(union aml_resource *aml)
-{
-       struct acpi_resource_info *resource_info;
-       u16 minimum_aml_resource_length;
-       u16 resource_length;
-
-       ACPI_FUNCTION_ENTRY();
-
-       /* Get the size and type info about this resource descriptor */
-
-       resource_info =
-           acpi_rs_get_resource_info(aml->small_header.descriptor_type);
-       if (!resource_info) {
-               return (AE_AML_INVALID_RESOURCE_TYPE);
-       }
-
-       resource_length = acpi_rs_get_resource_length(aml);
-       minimum_aml_resource_length =
-           resource_info->minimum_aml_resource_length;
-
-       /* Validate based upon the type of resource, fixed length or variable */
-
-       if (resource_info->length_type == ACPI_FIXED_LENGTH) {
-               /* Fixed length resource, length must match exactly */
-
-               if (resource_length != minimum_aml_resource_length) {
-                       return (AE_AML_BAD_RESOURCE_LENGTH);
-               }
-       } else if (resource_info->length_type == ACPI_VARIABLE_LENGTH) {
-               /* Variable length resource, must be at least the minimum */
-
-               if (resource_length < minimum_aml_resource_length) {
-                       return (AE_AML_BAD_RESOURCE_LENGTH);
-               }
-       } else {
-               /* Small variable length resource, allowed to be (Min) or (Min-1) */
-
-               if ((resource_length > minimum_aml_resource_length) ||
-                   (resource_length < (minimum_aml_resource_length - 1))) {
-                       return (AE_AML_BAD_RESOURCE_LENGTH);
-               }
-       }
-
-       return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_get_resource_handler
- *
- * PARAMETERS:  resource_type       - Byte 0 of a resource descriptor
- *
- * RETURN:      Pointer to the resource conversion handler
- *
- * DESCRIPTION: Extract the Resource Type/Name from the first byte of
- *              a resource descriptor.
- *
- ******************************************************************************/
-
-static ACPI_GET_RESOURCE_HANDLER acpi_rs_get_resource_handler(u8 resource_type)
-{
-       ACPI_FUNCTION_ENTRY();
-
-       /* Determine if this is a small or large resource */
-
-       if (resource_type & ACPI_RESOURCE_NAME_LARGE) {
-               /* Large Resource Type -- bits 6:0 contain the name */
-
-               if (resource_type > ACPI_RESOURCE_NAME_LARGE_MAX) {
-                       return (NULL);
-               }
-
-               return (acpi_gbl_lg_get_resource_dispatch[(resource_type &
-                                                          ACPI_RESOURCE_NAME_LARGE_MASK)]);
-       } else {
-               /* Small Resource Type -- bits 6:3 contain the name */
-
-               return (acpi_gbl_sm_get_resource_dispatch[((resource_type &
-                                                           ACPI_RESOURCE_NAME_SMALL_MASK)
-                                                          >> 3)]);
-       }
-}
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_rs_convert_aml_to_resources
  *
- * PARAMETERS:  aml_buffer          - Pointer to the resource byte stream
- *              aml_buffer_length   - Length of aml_buffer
- *              output_buffer       - Pointer to the buffer that will
- *                                    contain the output structures
+ * PARAMETERS:  acpi_walk_aml_callback
+ *              resource_ptr            - Pointer to the buffer that will
+ *                                        contain the output structures
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Takes the resource byte stream and parses it, creating a
- *              linked list of resources in the caller's output buffer
+ * DESCRIPTION: Convert an AML resource to an internal representation of the
+ *              resource that is aligned and easier to access.
  *
  ******************************************************************************/
-
 acpi_status
-acpi_rs_convert_aml_to_resources(u8 * aml_buffer,
-                                u32 aml_buffer_length, u8 * output_buffer)
+acpi_rs_convert_aml_to_resources(u8 * aml,
+                                u32 length,
+                                u32 offset, u8 resource_index, void **context)
 {
-       u8 *buffer = output_buffer;
-       acpi_status status;
-       acpi_size bytes_parsed = 0;
+       struct acpi_resource **resource_ptr =
+           ACPI_CAST_INDIRECT_PTR(struct acpi_resource, context);
        struct acpi_resource *resource;
-       u16 resource_length;
-       u32 descriptor_length;
-       ACPI_GET_RESOURCE_HANDLER handler;
-
-       ACPI_FUNCTION_TRACE("rs_convert_aml_to_resources");
-
-       /* Loop until end-of-buffer or an end_tag is found */
-
-       while (bytes_parsed < aml_buffer_length) {
-               /* Get the handler associated with this Descriptor Type */
-
-               handler = acpi_rs_get_resource_handler(*aml_buffer);
-               if (!handler) {
-                       /* No handler indicates invalid resource type */
-
-                       return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
-               }
-
-               resource_length =
-                   acpi_rs_get_resource_length(ACPI_CAST_PTR
-                                               (union aml_resource,
-                                                aml_buffer));
-
-               descriptor_length =
-                   acpi_rs_get_descriptor_length(ACPI_CAST_PTR
-                                                 (union aml_resource,
-                                                  aml_buffer));
-
-               /*
-                * Perform limited validation of the resource length, based upon
-                * what we know about the resource type
-                */
-               status =
-                   acpi_rs_validate_resource_length(ACPI_CAST_PTR
-                                                    (union aml_resource,
-                                                     aml_buffer));
-               if (ACPI_FAILURE(status)) {
-                       return_ACPI_STATUS(status);
-               }
-
-               /* Convert a byte stream resource to local resource struct */
-
-               status = handler(ACPI_CAST_PTR(union aml_resource, aml_buffer),
-                                resource_length,
-                                ACPI_CAST_PTR(struct acpi_resource, buffer));
-               if (ACPI_FAILURE(status)) {
-                       ACPI_REPORT_ERROR(("Could not convert AML resource (type %X) to resource, %s\n", *aml_buffer, acpi_format_exception(status)));
-                       return_ACPI_STATUS(status);
-               }
-
-               /* Set the aligned length of the new resource descriptor */
-
-               resource = ACPI_CAST_PTR(struct acpi_resource, buffer);
-               resource->length =
-                   (u32) ACPI_ALIGN_RESOURCE_SIZE(resource->length);
-
-               /* Normal exit on completion of an end_tag resource descriptor */
-
-               if (acpi_rs_get_resource_type(*aml_buffer) ==
-                   ACPI_RESOURCE_NAME_END_TAG) {
-                       return_ACPI_STATUS(AE_OK);
-               }
-
-               /* Update counter and point to the next input resource */
+       acpi_status status;
 
-               bytes_parsed += descriptor_length;
-               aml_buffer += descriptor_length;
+       ACPI_FUNCTION_TRACE(rs_convert_aml_to_resources);
 
-               /* Point to the next structure in the output buffer */
+       /*
+        * Check that the input buffer and all subsequent pointers into it
+        * are aligned on a native word boundary. Most important on IA64
+        */
+       resource = *resource_ptr;
+       if (ACPI_IS_MISALIGNED(resource)) {
+               ACPI_WARNING((AE_INFO,
+                             "Misaligned resource pointer %p", resource));
+       }
 
-               buffer += resource->length;
+       /* Convert the AML byte stream resource to a local resource struct */
+
+       status =
+           acpi_rs_convert_aml_to_resource(resource,
+                                           ACPI_CAST_PTR(union aml_resource,
+                                                         aml),
+                                           acpi_gbl_get_resource_dispatch
+                                           [resource_index]);
+       if (ACPI_FAILURE(status)) {
+               ACPI_EXCEPTION((AE_INFO, status,
+                               "Could not convert AML resource (Type %X)",
+                               *aml));
+               return_ACPI_STATUS(status);
        }
 
-       /* Completed buffer, but did not find an end_tag resource descriptor */
+       ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
+                         "Type %.2X, AmlLength %.2X InternalLength %.2X\n",
+                         acpi_ut_get_resource_type(aml), length,
+                         resource->length));
 
-       return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);
+       /* Point to the next structure in the output buffer */
+
+       *resource_ptr = ACPI_ADD_PTR(void, resource, resource->length);
+       return_ACPI_STATUS(AE_OK);
 }
 
 /*******************************************************************************
@@ -275,42 +132,44 @@ acpi_status
 acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
                                 acpi_size aml_size_needed, u8 * output_buffer)
 {
-       u8 *aml_buffer = output_buffer;
+       u8 *aml = output_buffer;
+       u8 *end_aml = output_buffer + aml_size_needed;
        acpi_status status;
 
-       ACPI_FUNCTION_TRACE("rs_convert_resources_to_aml");
+       ACPI_FUNCTION_TRACE(rs_convert_resources_to_aml);
+
+       /* Walk the resource descriptor list, convert each descriptor */
 
-       /* Convert each resource descriptor in the list */
+       while (aml < end_aml) {
 
-       while (1) {
-               /* Validate Resource Descriptor Type before dispatch */
+               /* Validate the (internal) Resource Type */
 
                if (resource->type > ACPI_RESOURCE_TYPE_MAX) {
-                       ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                         "Invalid descriptor type (%X) in resource list\n",
-                                         resource->type));
+                       ACPI_ERROR((AE_INFO,
+                                   "Invalid descriptor type (%X) in resource list",
+                                   resource->type));
                        return_ACPI_STATUS(AE_BAD_DATA);
                }
 
-               /* Perform the conversion per resource type */
+               /* Perform the conversion */
 
-               status =
-                   acpi_gbl_set_resource_dispatch[resource->type] (resource,
-                                                                   ACPI_CAST_PTR
-                                                                   (union
-                                                                    aml_resource,
-                                                                    aml_buffer));
+               status = acpi_rs_convert_resource_to_aml(resource, ACPI_CAST_PTR(union
+                                                                                aml_resource,
+                                                                                aml),
+                                                        acpi_gbl_set_resource_dispatch
+                                                        [resource->type]);
                if (ACPI_FAILURE(status)) {
-                       ACPI_REPORT_ERROR(("Could not convert resource (type %X) to AML, %s\n", resource->type, acpi_format_exception(status)));
+                       ACPI_EXCEPTION((AE_INFO, status,
+                                       "Could not convert resource (type %X) to AML",
+                                       resource->type));
                        return_ACPI_STATUS(status);
                }
 
                /* Perform final sanity check on the new AML resource descriptor */
 
                status =
-                   acpi_rs_validate_resource_length(ACPI_CAST_PTR
-                                                    (union aml_resource,
-                                                     aml_buffer));
+                   acpi_ut_validate_resource(ACPI_CAST_PTR
+                                             (union aml_resource, aml), NULL);
                if (ACPI_FAILURE(status)) {
                        return_ACPI_STATUS(status);
                }
@@ -318,23 +177,26 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
                /* Check for end-of-list, normal exit */
 
                if (resource->type == ACPI_RESOURCE_TYPE_END_TAG) {
+
                        /* An End Tag indicates the end of the input Resource Template */
 
                        return_ACPI_STATUS(AE_OK);
                }
 
-               /* Extract the total length of the new descriptor */
-               /* Set the aml_buffer to point to the next (output) resource descriptor */
-
-               aml_buffer +=
-                   acpi_rs_get_descriptor_length(ACPI_CAST_PTR
-                                                 (union aml_resource,
-                                                  aml_buffer));
+               /*
+                * Extract the total length of the new descriptor and set the
+                * Aml to point to the next (output) resource descriptor
+                */
+               aml += acpi_ut_get_descriptor_length(aml);
 
                /* Point to the next input resource descriptor */
 
                resource =
-                   ACPI_PTR_ADD(struct acpi_resource, resource,
+                   ACPI_ADD_PTR(struct acpi_resource, resource,
                                 resource->length);
        }
+
+       /* Completed buffer, but did not find an end_tag resource descriptor */
+
+       return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);
 }