Parent repository is http://linux-acpi.bkbits.net/linux-acpi-test-2.6.3
======== ChangeSet 1.1577 ========
D 1.1577 04/02/19 22:50:12-08:00 akpm@mnm.(none) 37095 37094 0/0/1
P ChangeSet
C Merge mnm.(none):/usr/src/bk25 into mnm.(none):/usr/src/bk-acpi
------------------------------------------------
diff -Nru a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c
--- a/drivers/acpi/dispatcher/dsmthdat.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/dispatcher/dsmthdat.c Thu Feb 19 22:58:46 2004
@@ -206,8 +206,7 @@
* Store the argument in the method/walk descriptor.
* Do not copy the arg in order to implement call by reference
*/
- status = acpi_ds_method_data_set_value (AML_ARG_OP, index, params[index],
- walk_state);
+ status = acpi_ds_method_data_set_value (AML_ARG_OP, index, params[index], walk_state);
if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
}
@@ -465,6 +464,7 @@
return_ACPI_STATUS (AE_AML_UNINITIALIZED_LOCAL);
default:
+ ACPI_REPORT_ERROR (("Not Arg/Local opcode: %X\n", opcode));
return_ACPI_STATUS (AE_AML_INTERNAL);
}
}
@@ -597,7 +597,10 @@
/*
* If the reference count on the object is more than one, we must
- * take a copy of the object before we store.
+ * take a copy of the object before we store. A reference count
+ * of exactly 1 means that the object was just created during the
+ * evaluation of an expression, and we can safely use it since it
+ * is not used anywhere else.
*/
new_obj_desc = obj_desc;
if (obj_desc->common.reference_count > 1) {
diff -Nru a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
--- a/drivers/acpi/dispatcher/dsobject.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/dispatcher/dsobject.c Thu Feb 19 22:58:46 2004
@@ -582,6 +582,11 @@
obj_desc->reference.opcode = AML_ARG_OP;
obj_desc->reference.offset = opcode - AML_ARG_OP;
+
+#ifndef ACPI_NO_METHOD_EXECUTION
+ status = acpi_ds_method_data_get_node (AML_ARG_OP, obj_desc->reference.offset,
+ walk_state, (struct acpi_namespace_node **) &obj_desc->reference.object);
+#endif
break;
default: /* Other literals, etc.. */
diff -Nru a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
--- a/drivers/acpi/dispatcher/dsopcode.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/dispatcher/dsopcode.c Thu Feb 19 22:58:46 2004
@@ -243,8 +243,8 @@
node = obj_desc->buffer.node;
if (!node) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
- "No pointer back to NS node in buffer %p\n", obj_desc));
+ ACPI_REPORT_ERROR ((
+ "No pointer back to NS node in buffer obj %p\n", obj_desc));
return_ACPI_STATUS (AE_AML_INTERNAL);
}
@@ -290,7 +290,7 @@
node = obj_desc->package.node;
if (!node) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ ACPI_REPORT_ERROR ((
"No pointer back to NS node in package %p\n", obj_desc));
return_ACPI_STATUS (AE_AML_INTERNAL);
}
diff -Nru a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
--- a/drivers/acpi/dispatcher/dsutils.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/dispatcher/dsutils.c Thu Feb 19 22:58:46 2004
@@ -280,7 +280,8 @@
/*
* Attempt to resolve each of the valid operands
- * Method arguments are passed by value, not by reference
+ * Method arguments are passed by reference, not by value. This means
+ * that the actual objects are passed, not copies of the objects.
*/
for (i = 0; i < walk_state->num_operands; i++) {
status = acpi_ex_resolve_to_value (&walk_state->operands[i], walk_state);
diff -Nru a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
--- a/drivers/acpi/dispatcher/dswstate.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/dispatcher/dswstate.c Thu Feb 19 22:58:46 2004
@@ -328,7 +328,7 @@
state = walk_state->results;
if (!state) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No result stack frame\n"));
+ ACPI_REPORT_ERROR (("No result stack frame during push\n"));
return (AE_AML_INTERNAL);
}
diff -Nru a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
--- a/drivers/acpi/executer/exconvrt.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/executer/exconvrt.c Thu Feb 19 22:58:46 2004
@@ -55,8 +55,9 @@
*
* FUNCTION: acpi_ex_convert_to_integer
*
- * PARAMETERS: *obj_desc - Object to be converted. Must be an
+ * PARAMETERS: obj_desc - Object to be converted. Must be an
* Integer, Buffer, or String
+ * result_desc - Where the new Integer object is returned
* walk_state - Current method state
*
* RETURN: Status
@@ -189,8 +190,9 @@
*
* FUNCTION: acpi_ex_convert_to_buffer
*
- * PARAMETERS: *obj_desc - Object to be converted. Must be an
+ * PARAMETERS: obj_desc - Object to be converted. Must be an
* Integer, Buffer, or String
+ * result_desc - Where the new buffer object is returned
* walk_state - Current method state
*
* RETURN: Status
@@ -319,6 +321,7 @@
ACPI_FUNCTION_ENTRY ();
+
if (data_width < sizeof (acpi_integer)) {
leading_zero = FALSE;
length = data_width;
@@ -328,22 +331,21 @@
length = sizeof (acpi_integer);
}
-
switch (base) {
case 10:
remainder = 0;
- for (i = ACPI_MAX_DECIMAL_DIGITS; i > 0 ; i--) {
+ for (i = ACPI_MAX_DECIMAL_DIGITS; i > 0; i--) {
/* Divide by nth factor of 10 */
digit = integer;
- for (j = 1; j < i; j++) {
+ for (j = 0; j < i; j++) {
(void) acpi_ut_short_divide (&digit, 10, &digit, &remainder);
}
/* Create the decimal digit */
- if (digit != 0) {
+ if (remainder != 0) {
leading_zero = FALSE;
}
@@ -354,6 +356,7 @@
}
break;
+
case 16:
/* Copy the integer to the buffer */
@@ -372,13 +375,14 @@
}
break;
+
default:
break;
}
/*
* Since leading zeros are supressed, we must check for the case where
- * the integer equals 0.
+ * the integer equals 0
*
* Finally, null terminate the string and return the length
*/
@@ -396,8 +400,11 @@
*
* FUNCTION: acpi_ex_convert_to_string
*
- * PARAMETERS: *obj_desc - Object to be converted. Must be an
- * Integer, Buffer, or String
+ * PARAMETERS: obj_desc - Object to be converted. Must be an
+ * Integer, Buffer, or String
+ * result_desc - Where the string object is returned
+ * Base - 10 or 16
+ * max_length - Max length of the returned string
* walk_state - Current method state
*
* RETURN: Status
@@ -415,10 +422,10 @@
struct acpi_walk_state *walk_state)
{
union acpi_operand_object *ret_desc;
- u32 i;
- u32 string_length;
u8 *new_buf;
u8 *pointer;
+ u32 string_length;
+ u32 i;
ACPI_FUNCTION_TRACE_PTR ("ex_convert_to_string", obj_desc);
@@ -539,7 +546,6 @@
return_ACPI_STATUS (AE_TYPE);
}
-
/*
* If we are about to overwrite the original object on the operand stack,
* we must remove a reference on the original object because we are
@@ -562,6 +568,7 @@
*
* PARAMETERS: destination_type - Current type of the destination
* source_desc - Source object to be converted.
+ * result_desc - Where the converted object is returned
* walk_state - Current method state
*
* RETURN: Status
@@ -653,6 +660,8 @@
default:
+ ACPI_REPORT_ERROR (("Bad destination type during conversion: %X\n",
+ destination_type));
status = AE_AML_INTERNAL;
break;
}
@@ -672,6 +681,8 @@
GET_CURRENT_ARG_TYPE (walk_state->op_info->runtime_args),
walk_state->op_info->name, acpi_ut_get_type_name (destination_type)));
+ ACPI_REPORT_ERROR (("Bad Target Type (ARGI): %X\n",
+ GET_CURRENT_ARG_TYPE (walk_state->op_info->runtime_args)))
status = AE_AML_INTERNAL;
}
diff -Nru a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c
--- a/drivers/acpi/executer/exfldio.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/executer/exfldio.c Thu Feb 19 22:58:46 2004
@@ -507,8 +507,8 @@
default:
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%p, Wrong object type - %s\n",
- obj_desc, acpi_ut_get_object_type_name (obj_desc)));
+ ACPI_REPORT_ERROR (("Wrong object type in field I/O %X\n",
+ ACPI_GET_OBJECT_TYPE (obj_desc)));
status = AE_AML_INTERNAL;
break;
}
diff -Nru a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
--- a/drivers/acpi/executer/exmisc.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/executer/exmisc.c Thu Feb 19 22:58:46 2004
@@ -103,7 +103,7 @@
default:
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown Reference subtype %X\n",
+ ACPI_REPORT_ERROR (("Unknown Reference subtype in get ref %X\n",
obj_desc->reference.opcode));
return_ACPI_STATUS (AE_AML_INTERNAL);
}
@@ -121,8 +121,8 @@
default:
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%p has invalid descriptor [%s]\n",
- obj_desc, acpi_ut_get_descriptor_name (obj_desc)));
+ ACPI_REPORT_ERROR (("Invalid descriptor type in get ref: %X\n",
+ ACPI_GET_DESCRIPTOR_TYPE (obj_desc)));
return_ACPI_STATUS (AE_TYPE);
}
@@ -349,6 +349,8 @@
/* Invalid object type, should not happen here */
+ ACPI_REPORT_ERROR (("Concat - invalid obj type: %X\n",
+ ACPI_GET_OBJECT_TYPE (obj_desc1)));
status = AE_AML_INTERNAL;
return_desc = NULL;
}
diff -Nru a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c
--- a/drivers/acpi/executer/exoparg2.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/executer/exoparg2.c Thu Feb 19 22:58:46 2004
@@ -329,6 +329,8 @@
break;
default:
+ ACPI_REPORT_ERROR (("Concat - invalid obj type: %X\n",
+ ACPI_GET_OBJECT_TYPE (operand[0])));
status = AE_AML_INTERNAL;
}
@@ -433,7 +435,7 @@
}
return_desc->reference.target_type = ACPI_TYPE_PACKAGE;
- return_desc->reference.object = operand[0]->package.elements [index];
+ return_desc->reference.object = operand[0];
return_desc->reference.where = &operand[0]->package.elements [index];
}
else {
diff -Nru a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
--- a/drivers/acpi/executer/exprep.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/executer/exprep.c Thu Feb 19 22:58:46 2004
@@ -507,7 +507,7 @@
(info->field_bit_position / ACPI_MUL_8 (obj_desc->field.access_byte_width));
if (!obj_desc->index_field.data_obj || !obj_desc->index_field.index_obj) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Null Index Object\n"));
+ ACPI_REPORT_ERROR (("Null Index Object during field prep\n"));
return_ACPI_STATUS (AE_AML_INTERNAL);
}
diff -Nru a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
--- a/drivers/acpi/executer/exresolv.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/executer/exresolv.c Thu Feb 19 22:58:46 2004
@@ -238,8 +238,8 @@
/* Invalid reference object */
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
- "Unknown target_type %X in Index/Reference obj %p\n",
+ ACPI_REPORT_ERROR ((
+ "During resolve, Unknown target_type %X in Index/Reference obj %p\n",
stack_desc->reference.target_type, stack_desc));
status = AE_AML_INTERNAL;
break;
@@ -258,7 +258,7 @@
default:
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown Reference opcode %X (%s) in %p\n",
+ ACPI_REPORT_ERROR (("During resolve, Unknown Reference opcode %X (%s) in %p\n",
opcode, acpi_ps_get_opcode_name (opcode), stack_desc));
status = AE_AML_INTERNAL;
break;
diff -Nru a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
--- a/drivers/acpi/executer/exresop.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/executer/exresop.c Thu Feb 19 22:58:46 2004
@@ -154,7 +154,7 @@
arg_types = op_info->runtime_args;
if (arg_types == ARGI_INVALID_OPCODE) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Internal - %X is not a valid AML opcode\n",
+ ACPI_REPORT_ERROR (("resolve_operands: %X is not a valid AML opcode\n",
opcode));
return_ACPI_STATUS (AE_AML_INTERNAL);
@@ -172,7 +172,7 @@
*/
while (GET_CURRENT_ARG_TYPE (arg_types)) {
if (!stack_ptr || !*stack_ptr) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Internal - null stack entry at %p\n",
+ ACPI_REPORT_ERROR (("resolve_operands: Null stack entry at %p\n",
stack_ptr));
return_ACPI_STATUS (AE_AML_INTERNAL);
diff -Nru a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
--- a/drivers/acpi/executer/exstore.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/executer/exstore.c Thu Feb 19 22:58:46 2004
@@ -125,7 +125,7 @@
default:
- /* Destination is not an Reference */
+ /* Destination is not a Reference object */
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Destination is not a Reference or Constant object [%p]\n", dest_desc));
@@ -189,35 +189,38 @@
switch (ACPI_GET_OBJECT_TYPE (source_desc)) {
case ACPI_TYPE_INTEGER:
- ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "%8.8X%8.8X\n",
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "0x%8.8X%8.8X\n",
ACPI_FORMAT_UINT64 (source_desc->integer.value)));
break;
case ACPI_TYPE_BUFFER:
- ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "Length %.2X\n",
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "Length 0x%.2X",
(u32) source_desc->buffer.length));
+ ACPI_DUMP_BUFFER (source_desc->buffer.pointer,
+ (source_desc->buffer.length < 32) ? source_desc->buffer.length : 32);
break;
case ACPI_TYPE_STRING:
- ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "%s\n", source_desc->string.pointer));
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "Length 0x%.2X, \"%s\"\n",
+ source_desc->string.length, source_desc->string.pointer));
break;
case ACPI_TYPE_PACKAGE:
- ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "Elements Ptr - %p\n",
- source_desc->package.elements));
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "Size 0x%.2X Elements Ptr - %p\n",
+ source_desc->package.count, source_desc->package.elements));
break;
default:
- ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "Type %s %p\n",
- acpi_ut_get_object_type_name (source_desc), source_desc));
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "%p\n",
+ source_desc));
break;
}
@@ -227,7 +230,7 @@
default:
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown Reference opcode %X\n",
+ ACPI_REPORT_ERROR (("ex_store: Unknown Reference opcode %X\n",
ref_desc->reference.opcode));
ACPI_DUMP_ENTRY (ref_desc, ACPI_LV_ERROR);
@@ -263,6 +266,7 @@
union acpi_operand_object *obj_desc;
union acpi_operand_object *new_desc;
u8 value = 0;
+ u32 i;
ACPI_FUNCTION_TRACE ("ex_store_object_to_index");
@@ -283,6 +287,7 @@
/*
* The object at *(index_desc->Reference.Where) is the
* element within the package that is to be modified.
+ * The parent package object is at index_desc->Reference.Object
*/
obj_desc = *(index_desc->reference.where);
@@ -307,6 +312,12 @@
/* If same as the original source, add a reference */
if (new_desc == source_desc) {
+ acpi_ut_add_reference (new_desc);
+ }
+
+ /* Increment reference count by the ref count of the parent package -1 */
+
+ for (i = 1; i < ((union acpi_operand_object *) index_desc->reference.object)->common.reference_count; i++) {
acpi_ut_add_reference (new_desc);
}
}
diff -Nru a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
--- a/drivers/acpi/executer/exstoren.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/executer/exstoren.c Thu Feb 19 22:58:46 2004
@@ -112,6 +112,12 @@
}
}
+ /* For copy_object, no further validation necessary */
+
+ if (walk_state->opcode == AML_COPY_OP) {
+ break;
+ }
+
/*
* Must have a Integer, Buffer, or String
*/
@@ -136,7 +142,7 @@
/*
* Aliases are resolved by acpi_ex_prep_operands
*/
- ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "Store into Alias - should never happen\n"));
+ ACPI_REPORT_ERROR (("Store into Alias - should never happen\n"));
status = AE_AML_INTERNAL;
break;
diff -Nru a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
--- a/drivers/acpi/namespace/nsaccess.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/namespace/nsaccess.c Thu Feb 19 22:58:46 2004
@@ -314,7 +314,7 @@
else {
prefix_node = scope_info->scope.node;
if (ACPI_GET_DESCRIPTOR_TYPE (prefix_node) != ACPI_DESC_TYPE_NAMED) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%p Not a namespace node [%s]\n",
+ ACPI_REPORT_ERROR (("ns_lookup: %p is not a namespace node [%s]\n",
prefix_node, acpi_ut_get_descriptor_name (prefix_node)));
return_ACPI_STATUS (AE_AML_INTERNAL);
}
diff -Nru a/drivers/acpi/parser/psargs.c b/drivers/acpi/parser/psargs.c
--- a/drivers/acpi/parser/psargs.c Thu Feb 19 22:58:46 2004
+++ b/drivers/acpi/parser/psargs.c Thu Feb 19 22:58:46 2004
@@ -315,8 +315,8 @@
acpi_ps_append_arg (arg, name_op);
if (!method_desc) {
- ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
- "Control Method - %p has no attached object\n",
+ ACPI_REPORT_ERROR ((
+ "ps_get_next_namepath: Control Method %p has no attached object\n",
node));
return_ACPI_STATUS (AE_AML_INTERNAL);
}
diff -Nru a/include/acpi/acconfig.h b/include/acpi/acconfig.h
--- a/include/acpi/acconfig.h Thu Feb 19 22:58:46 2004
+++ b/include/acpi/acconfig.h Thu Feb 19 22:58:46 2004
@@ -64,7 +64,7 @@
/* Version string */
-#define ACPI_CA_VERSION 0x20040116
+#define ACPI_CA_VERSION 0x20040211
/* Maximum objects in the various object caches */