[ACPI] ACPICA 20060127

Implemented support in the Resource Manager to allow
unresolved namestring references within resource package
objects for the _PRT method. This support is in addition
to the previously implemented unresolved reference
support within the AML parser. If the interpreter slack
mode is enabled (true on Linux unless acpi=strict),
these unresolved references will be passed through
to the caller as a NULL package entry.
http://bugzilla.kernel.org/show_bug.cgi?id=5741

Implemented and deployed new macros and functions for
error and warning messages across the subsystem. These
macros are simpler and generate less code than their
predecessors. The new macros ACPI_ERROR, ACPI_EXCEPTION,
ACPI_WARNING, and ACPI_INFO replace the ACPI_REPORT_*
macros.

Implemented the acpi_cpu_flags type to simplify host OS
integration of the Acquire/Release Lock OSL interfaces.
Suggested by Steven Rostedt and Andrew Morton.

Fixed a problem where Alias ASL operators are sometimes
not correctly resolved. causing AE_AML_INTERNAL
http://bugzilla.kernel.org/show_bug.cgi?id=5189
http://bugzilla.kernel.org/show_bug.cgi?id=5674

Fixed several problems with the implementation of the
ConcatenateResTemplate ASL operator. As per the ACPI
specification, zero length buffers are now treated as a
single EndTag. One-length buffers always cause a fatal
exception. Non-zero length buffers that do not end with
a full 2-byte EndTag cause a fatal exception.

Fixed a possible structure overwrite in the
AcpiGetObjectInfo external interface. (With assistance
from Thomas Renninger)

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

1 files changed, 22 insertions, 15 deletions

diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index ae2d2da00844..1deed492fe88 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -81,7 +81,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
         ACPI_FUNCTION_TRACE_PTR("ex_resolve_to_value", stack_ptr);
 
         if (!stack_ptr || !*stack_ptr) {
-                ACPI_REPORT_ERROR(("Internal - null pointer\n"));
+                ACPI_ERROR((AE_INFO, "Internal - null pointer"));
                 return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
 
@@ -97,7 +97,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
                 }
 
                 if (!*stack_ptr) {
-                        ACPI_REPORT_ERROR(("Internal - null pointer\n"));
+                        ACPI_ERROR((AE_INFO, "Internal - null pointer"));
                         return_ACPI_STATUS(AE_AML_NO_OPERAND);
                 }
         }
@@ -227,7 +227,9 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                                          * A NULL object descriptor means an unitialized element of
                                          * the package, can't dereference it
                                          */
-                                        ACPI_REPORT_ERROR(("Attempt to deref an Index to NULL pkg element Idx=%p\n", stack_desc));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Attempt to deref an Index to NULL pkg element Idx=%p",
+                                                    stack_desc));
                                         status = AE_AML_UNINITIALIZED_ELEMENT;
                                 }
                                 break;
@@ -236,7 +238,10 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 
                                 /* Invalid reference object */
 
-                                ACPI_REPORT_ERROR(("Unknown target_type %X in Index/Reference obj %p\n", stack_desc->reference.target_type, stack_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Unknown target_type %X in Index/Reference obj %p",
+                                            stack_desc->reference.target_type,
+                                            stack_desc));
                                 status = AE_AML_INTERNAL;
                                 break;
                         }
@@ -261,7 +266,10 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 
                 default:
 
-                        ACPI_REPORT_ERROR(("Unknown Reference opcode %X (%s) in %p\n", opcode, acpi_ps_get_opcode_name(opcode), stack_desc));
+                        ACPI_ERROR((AE_INFO,
+                                    "Unknown Reference opcode %X (%s) in %p",
+                                    opcode, acpi_ps_get_opcode_name(opcode),
+                                    stack_desc));
                         status = AE_AML_INTERNAL;
                         break;
                 }
@@ -383,10 +391,9 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
 
                         if (ACPI_GET_DESCRIPTOR_TYPE(node) !=
                             ACPI_DESC_TYPE_NAMED) {
-                                ACPI_REPORT_ERROR(("Not a NS node %p [%s]\n",
-                                                   node,
-                                                   acpi_ut_get_descriptor_name
-                                                   (node)));
+                                ACPI_ERROR((AE_INFO, "Not a NS node %p [%s]",
+                                            node,
+                                            acpi_ut_get_descriptor_name(node)));
                                 return_ACPI_STATUS(AE_AML_INTERNAL);
                         }
 
@@ -442,10 +449,9 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
 
                         if (ACPI_GET_DESCRIPTOR_TYPE(node) !=
                             ACPI_DESC_TYPE_NAMED) {
-                                ACPI_REPORT_ERROR(("Not a NS node %p [%s]\n",
-                                                   node,
-                                                   acpi_ut_get_descriptor_name
-                                                   (node)));
+                                ACPI_ERROR((AE_INFO, "Not a NS node %p [%s]",
+                                            node,
+                                            acpi_ut_get_descriptor_name(node)));
                                 return_ACPI_STATUS(AE_AML_INTERNAL);
                         }
 
@@ -514,8 +520,9 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
 
                 default:
 
-                        ACPI_REPORT_ERROR(("Unknown Reference subtype %X\n",
-                                           obj_desc->reference.opcode));
+                        ACPI_ERROR((AE_INFO,
+                                    "Unknown Reference subtype %X",
+                                    obj_desc->reference.opcode));
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
         }