[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, 74 insertions, 22 deletions

diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index 804faebf825..a1c000f5a41 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -46,6 +46,7 @@
 #include <acpi/amlcode.h>
 #include <acpi/acparser.h>
 #include <acpi/acinterp.h>
+#include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exresop")
@@ -95,9 +96,10 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
         }
 
         if (type_needed != this_type) {
-                ACPI_REPORT_ERROR(("Needed type [%s], found [%s] %p\n",
-                                   acpi_ut_get_type_name(type_needed),
-                                   acpi_ut_get_type_name(this_type), object));
+                ACPI_ERROR((AE_INFO,
+                            "Needed type [%s], found [%s] %p",
+                            acpi_ut_get_type_name(type_needed),
+                            acpi_ut_get_type_name(this_type), object));
 
                 return (AE_AML_OPERAND_TYPE);
         }
@@ -150,7 +152,7 @@ acpi_ex_resolve_operands(u16 opcode,
 
         arg_types = op_info->runtime_args;
         if (arg_types == ARGI_INVALID_OPCODE) {
-                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X", opcode));
 
                 return_ACPI_STATUS(AE_AML_INTERNAL);
         }
@@ -168,8 +170,8 @@ acpi_ex_resolve_operands(u16 opcode,
          */
         while (GET_CURRENT_ARG_TYPE(arg_types)) {
                 if (!stack_ptr || !*stack_ptr) {
-                        ACPI_REPORT_ERROR(("Null stack entry at %p\n",
-                                           stack_ptr));
+                        ACPI_ERROR((AE_INFO, "Null stack entry at %p",
+                                    stack_ptr));
 
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
@@ -187,6 +189,22 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         object_type =
                             ((struct acpi_namespace_node *)obj_desc)->type;
+
+                        /*
+                         * Resolve an alias object. The construction of these objects
+                         * guarantees that there is only one level of alias indirection;
+                         * thus, the attached object is always the aliased namespace node
+                         */
+                        if (object_type == ACPI_TYPE_LOCAL_ALIAS) {
+                                obj_desc =
+                                    acpi_ns_get_attached_object((struct
+                                                                 acpi_namespace_node
+                                                                 *)obj_desc);
+                                *stack_ptr = obj_desc;
+                                object_type =
+                                    ((struct acpi_namespace_node *)obj_desc)->
+                                    type;
+                        }
                         break;
 
                 case ACPI_DESC_TYPE_OPERAND:
@@ -198,7 +216,9 @@ acpi_ex_resolve_operands(u16 opcode,
                         /* Check for bad acpi_object_type */
 
                         if (!acpi_ut_valid_object_type(object_type)) {
-                                ACPI_REPORT_ERROR(("Bad operand object type [%X]\n", object_type));
+                                ACPI_ERROR((AE_INFO,
+                                            "Bad operand object type [%X]",
+                                            object_type));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -236,7 +256,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                         break;
 
                                 default:
-                                        ACPI_REPORT_ERROR(("Operand is a Reference, Unknown Reference Opcode: %X\n", obj_desc->reference.opcode));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Operand is a Reference, Unknown Reference Opcode: %X",
+                                                    obj_desc->reference.
+                                                    opcode));
 
                                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                 }
@@ -247,10 +270,10 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         /* Invalid descriptor */
 
-                        ACPI_REPORT_ERROR(("Invalid descriptor %p [%s]\n",
-                                           obj_desc,
-                                           acpi_ut_get_descriptor_name
-                                           (obj_desc)));
+                        ACPI_ERROR((AE_INFO,
+                                    "Invalid descriptor %p [%s]",
+                                    obj_desc,
+                                    acpi_ut_get_descriptor_name(obj_desc)));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
@@ -408,7 +431,10 @@ acpi_ex_resolve_operands(u16 opcode,
                             acpi_ex_convert_to_integer(obj_desc, stack_ptr, 16);
                         if (ACPI_FAILURE(status)) {
                                 if (status == AE_TYPE) {
-                                        ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Needed [Integer/String/Buffer], found [%s] %p",
+                                                    acpi_ut_get_object_type_name
+                                                    (obj_desc), obj_desc));
 
                                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                 }
@@ -431,7 +457,10 @@ acpi_ex_resolve_operands(u16 opcode,
                         status = acpi_ex_convert_to_buffer(obj_desc, stack_ptr);
                         if (ACPI_FAILURE(status)) {
                                 if (status == AE_TYPE) {
-                                        ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Needed [Integer/String/Buffer], found [%s] %p",
+                                                    acpi_ut_get_object_type_name
+                                                    (obj_desc), obj_desc));
 
                                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                 }
@@ -455,7 +484,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                                            ACPI_IMPLICIT_CONVERT_HEX);
                         if (ACPI_FAILURE(status)) {
                                 if (status == AE_TYPE) {
-                                        ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Needed [Integer/String/Buffer], found [%s] %p",
+                                                    acpi_ut_get_object_type_name
+                                                    (obj_desc), obj_desc));
 
                                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                 }
@@ -481,7 +513,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Needed [Integer/String/Buffer], found [%s] %p",
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -515,7 +550,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Needed [Integer/String/Buffer], found [%s] %p",
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -539,7 +577,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_REPORT_ERROR(("Needed [Buffer/String/Package/Reference], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Needed [Buffer/String/Package/Reference], found [%s] %p",
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -558,7 +599,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_REPORT_ERROR(("Needed [Buffer/String/Package], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Needed [Buffer/String/Package], found [%s] %p",
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -578,7 +622,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_REPORT_ERROR(("Needed [Region/region_field], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Needed [Region/region_field], found [%s] %p",
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -620,7 +667,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                         break;
                                 }
 
-                                ACPI_REPORT_ERROR(("Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p",
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -630,7 +680,9 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         /* Unknown type */
 
-                        ACPI_REPORT_ERROR(("Internal - Unknown ARGI (required operand) type %X\n", this_arg_type));
+                        ACPI_ERROR((AE_INFO,
+                                    "Internal - Unknown ARGI (required operand) type %X",
+                                    this_arg_type));
 
                         return_ACPI_STATUS(AE_BAD_PARAMETER);
                 }