[ACPI] ACPICA 20051117

Fixed a problem in the AML parser where the method thread
count could be decremented below zero if any errors
occurred during the method parse phase. This should
eliminate AE_AML_METHOD_LIMIT exceptions seen on some
machines. This also fixed a related regression with the
mechanism that detects and corrects methods that cannot
properly handle reentrancy (related to the deployment of
the new OwnerId mechanism.)

Eliminated the pre-parsing of control methods (to detect
errors) during table load. Related to the problem above,
this was causing unwind issues if any errors occurred
during the parse, and it seemed to be overkill. A table
load should not be aborted if there are problems with
any single control method, thus rendering this feature
rather pointless.

Fixed a problem with the new table-driven resource manager
where an internal buffer overflow could occur for small
resource templates.

Implemented a new external interface, acpi_get_vendor_resource()
This interface will find and return a vendor-defined
resource descriptor within a _CRS or _PRS
method via an ACPI 3.0 UUID match. (from Bjorn Helgaas)

Removed the length limit (200) on string objects as
per the upcoming ACPI 3.0A specification. This affects
the following areas of the interpreter: 1) any implicit
conversion of a Buffer to a String, 2) a String object
result of the ASL Concatentate operator, 3) the String
object result of the ASL ToString operator.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index eca7439ee9da..c2c4d9079c6c 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -300,7 +300,7 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)
                 /* Point to the next object */
 
                 resource =
-                    ACPI_PTR_ADD(struct acpi_resource, resource,
+                    ACPI_ADD_PTR(struct acpi_resource, resource,
                                  resource->length);
         }
 
@@ -374,8 +374,7 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                          * Get the number of bits set in the 16-bit IRQ mask
                          */
                         ACPI_MOVE_16_TO_16(&temp16, buffer);
-                        extra_struct_bytes =
-                            acpi_rs_count_set_bits(temp16) * sizeof(u32);
+                        extra_struct_bytes = acpi_rs_count_set_bits(temp16);
                         break;
 
                 case ACPI_RESOURCE_NAME_DMA:
@@ -383,8 +382,7 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                          * DMA Resource:
                          * Get the number of bits set in the 8-bit DMA mask
                          */
-                        extra_struct_bytes =
-                            acpi_rs_count_set_bits(*buffer) * sizeof(u32);
+                        extra_struct_bytes = acpi_rs_count_set_bits(*buffer);
                         break;
 
                 case ACPI_RESOURCE_NAME_VENDOR_SMALL:
@@ -399,9 +397,9 @@ acpi_rs_get_list_length(u8 * aml_buffer,
 
                 case ACPI_RESOURCE_NAME_END_TAG:
                         /*
-                         * End Tag: This is the normal exit
+                         * End Tag: This is the normal exit, add size of end_tag
                          */
-                        *size_needed = buffer_size;
+                        *size_needed = buffer_size + ACPI_RS_SIZE_MIN;
                         return_ACPI_STATUS(AE_OK);
 
                 case ACPI_RESOURCE_NAME_VENDOR_LARGE:
@@ -466,7 +464,7 @@ acpi_rs_get_list_length(u8 * aml_buffer,
 
                 temp16 = (u16) (acpi_gbl_resource_struct_sizes[resource_index] +
                                 extra_struct_bytes);
-                buffer_size += (u32) ACPI_ALIGN_RESOURCE_SIZE(temp16);
+                buffer_size += (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(temp16);
 
                 /*
                  * Point to the next resource within the stream