[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, 21 insertions, 10 deletions

diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c
index 5a9b91fe93d2..f1af655ff113 100644
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/dispatcher/dswexec.c
@@ -100,7 +100,8 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
         if (result_obj) {
                 status = acpi_ds_result_pop(&obj_desc, walk_state);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("Could not get result from predicate evaluation, %s\n", acpi_format_exception(status)));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Could not get result from predicate evaluation"));
 
                         return_ACPI_STATUS(status);
                 }
@@ -121,8 +122,9 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
         }
 
         if (!obj_desc) {
-                ACPI_REPORT_ERROR(("No predicate obj_desc=%p State=%p\n",
-                                   obj_desc, walk_state));
+                ACPI_ERROR((AE_INFO,
+                            "No predicate obj_desc=%p State=%p",
+                            obj_desc, walk_state));
 
                 return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
@@ -137,7 +139,10 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
         }
 
         if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) {
-                ACPI_REPORT_ERROR(("Bad predicate (not an integer) obj_desc=%p State=%p Type=%X\n", obj_desc, walk_state, ACPI_GET_OBJECT_TYPE(obj_desc)));
+                ACPI_ERROR((AE_INFO,
+                            "Bad predicate (not an integer) obj_desc=%p State=%p Type=%X",
+                            obj_desc, walk_state,
+                            ACPI_GET_OBJECT_TYPE(obj_desc)));
 
                 status = AE_AML_OPERAND_TYPE;
                 goto cleanup;
@@ -356,8 +361,8 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
         op_class = walk_state->op_info->class;
 
         if (op_class == AML_CLASS_UNKNOWN) {
-                ACPI_REPORT_ERROR(("Unknown opcode %X\n",
-                                   op->common.aml_opcode));
+                ACPI_ERROR((AE_INFO, "Unknown opcode %X",
+                            op->common.aml_opcode));
                 return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
         }
 
@@ -447,7 +452,10 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                                 walk_state->operands[1]->reference.offset)) {
                                 status = AE_OK;
                         } else {
-                                ACPI_REPORT_ERROR(("[%s]: Could not resolve operands, %s\n", acpi_ps_get_opcode_name(walk_state->opcode), acpi_format_exception(status)));
+                                ACPI_EXCEPTION((AE_INFO, status,
+                                                "While resolving operands for [%s]",
+                                                acpi_ps_get_opcode_name
+                                                (walk_state->opcode)));
                         }
                 }
 
@@ -666,8 +674,8 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
 
                 case AML_TYPE_UNDEFINED:
 
-                        ACPI_REPORT_ERROR(("Undefined opcode type Op=%p\n",
-                                           op));
+                        ACPI_ERROR((AE_INFO,
+                                    "Undefined opcode type Op=%p", op));
                         return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
 
                 case AML_TYPE_BOGUS:
@@ -679,7 +687,10 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
 
                 default:
 
-                        ACPI_REPORT_ERROR(("Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p\n", op_class, op_type, op->common.aml_opcode, op));
+                        ACPI_ERROR((AE_INFO,
+                                    "Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p",
+                                    op_class, op_type, op->common.aml_opcode,
+                                    op));
 
                         status = AE_NOT_IMPLEMENTED;
                         break;