aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/executer
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2006-01-27 16:43:00 -0500
committerLen Brown <len.brown@intel.com>2006-01-31 03:25:09 -0500
commitb8e4d89357fc434618a59c1047cac72641191805 (patch)
treeac97fcc6fdc277c682365900663872c96f2420bd /drivers/acpi/executer
parent292dd876ee765c478b27c93cc51e93a558ed58bf (diff)
[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>
Diffstat (limited to 'drivers/acpi/executer')
-rw-r--r--drivers/acpi/executer/exconfig.c4
-rw-r--r--drivers/acpi/executer/exconvrt.c11
-rw-r--r--drivers/acpi/executer/excreate.c4
-rw-r--r--drivers/acpi/executer/exfield.c9
-rw-r--r--drivers/acpi/executer/exfldio.c65
-rw-r--r--drivers/acpi/executer/exmisc.c43
-rw-r--r--drivers/acpi/executer/exmutex.c26
-rw-r--r--drivers/acpi/executer/exnames.c13
-rw-r--r--drivers/acpi/executer/exoparg1.c57
-rw-r--r--drivers/acpi/executer/exoparg2.c30
-rw-r--r--drivers/acpi/executer/exoparg3.c8
-rw-r--r--drivers/acpi/executer/exoparg6.c11
-rw-r--r--drivers/acpi/executer/exprep.c25
-rw-r--r--drivers/acpi/executer/exregion.c9
-rw-r--r--drivers/acpi/executer/exresnte.c37
-rw-r--r--drivers/acpi/executer/exresolv.c37
-rw-r--r--drivers/acpi/executer/exresop.c96
-rw-r--r--drivers/acpi/executer/exstore.c18
-rw-r--r--drivers/acpi/executer/exstoren.c17
-rw-r--r--drivers/acpi/executer/exsystem.c4
-rw-r--r--drivers/acpi/executer/exutils.c10
21 files changed, 350 insertions, 184 deletions
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index 109d0255a5bb..a29782fe3ecf 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -413,7 +413,9 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
413 (!ACPI_STRNCMP(table_ptr->signature, 413 (!ACPI_STRNCMP(table_ptr->signature,
414 acpi_gbl_table_data[ACPI_TABLE_SSDT].signature, 414 acpi_gbl_table_data[ACPI_TABLE_SSDT].signature,
415 acpi_gbl_table_data[ACPI_TABLE_SSDT].sig_length))) { 415 acpi_gbl_table_data[ACPI_TABLE_SSDT].sig_length))) {
416 ACPI_REPORT_ERROR(("Table has invalid signature [%4.4s], must be SSDT or PSDT\n", table_ptr->signature)); 416 ACPI_ERROR((AE_INFO,
417 "Table has invalid signature [%4.4s], must be SSDT or PSDT",
418 table_ptr->signature));
417 status = AE_BAD_SIGNATURE; 419 status = AE_BAD_SIGNATURE;
418 goto cleanup; 420 goto cleanup;
419 } 421 }
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index e6f55cf8ad31..e6d52e12d77a 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -641,7 +641,9 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
641 break; 641 break;
642 642
643 default: 643 default:
644 ACPI_REPORT_ERROR(("Bad destination type during conversion: %X\n", destination_type)); 644 ACPI_ERROR((AE_INFO,
645 "Bad destination type during conversion: %X",
646 destination_type));
645 status = AE_AML_INTERNAL; 647 status = AE_AML_INTERNAL;
646 break; 648 break;
647 } 649 }
@@ -654,7 +656,12 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
654 break; 656 break;
655 657
656 default: 658 default:
657 ACPI_REPORT_ERROR(("Unknown Target type ID 0x%X aml_opcode %X dest_type %s\n", GET_CURRENT_ARG_TYPE(walk_state->op_info->runtime_args), walk_state->opcode, acpi_ut_get_type_name(destination_type))); 659 ACPI_ERROR((AE_INFO,
660 "Unknown Target type ID 0x%X aml_opcode %X dest_type %s",
661 GET_CURRENT_ARG_TYPE(walk_state->op_info->
662 runtime_args),
663 walk_state->opcode,
664 acpi_ut_get_type_name(destination_type)));
658 status = AE_AML_INTERNAL; 665 status = AE_AML_INTERNAL;
659 } 666 }
660 667
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index da313dad576a..680575402835 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.c
@@ -300,8 +300,8 @@ acpi_ex_create_region(u8 * aml_start,
300 */ 300 */
301 if ((region_space >= ACPI_NUM_PREDEFINED_REGIONS) && 301 if ((region_space >= ACPI_NUM_PREDEFINED_REGIONS) &&
302 (region_space < ACPI_USER_REGION_BEGIN)) { 302 (region_space < ACPI_USER_REGION_BEGIN)) {
303 ACPI_REPORT_ERROR(("Invalid address_space type %X\n", 303 ACPI_ERROR((AE_INFO, "Invalid address_space type %X",
304 region_space)); 304 region_space));
305 return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID); 305 return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);
306 } 306 }
307 307
diff --git a/drivers/acpi/executer/exfield.c b/drivers/acpi/executer/exfield.c
index 78a76f91a1c9..e259201ce9a0 100644
--- a/drivers/acpi/executer/exfield.c
+++ b/drivers/acpi/executer/exfield.c
@@ -249,13 +249,18 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
249 * Source must be a buffer of sufficient size (ACPI_SMBUS_BUFFER_SIZE). 249 * Source must be a buffer of sufficient size (ACPI_SMBUS_BUFFER_SIZE).
250 */ 250 */
251 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_BUFFER) { 251 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_BUFFER) {
252 ACPI_REPORT_ERROR(("SMBus write requires Buffer, found type %s\n", acpi_ut_get_object_type_name(source_desc))); 252 ACPI_ERROR((AE_INFO,
253 "SMBus write requires Buffer, found type %s",
254 acpi_ut_get_object_type_name(source_desc)));
253 255
254 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 256 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
255 } 257 }
256 258
257 if (source_desc->buffer.length < ACPI_SMBUS_BUFFER_SIZE) { 259 if (source_desc->buffer.length < ACPI_SMBUS_BUFFER_SIZE) {
258 ACPI_REPORT_ERROR(("SMBus write requires Buffer of length %X, found length %X\n", ACPI_SMBUS_BUFFER_SIZE, source_desc->buffer.length)); 260 ACPI_ERROR((AE_INFO,
261 "SMBus write requires Buffer of length %X, found length %X",
262 ACPI_SMBUS_BUFFER_SIZE,
263 source_desc->buffer.length));
259 264
260 return_ACPI_STATUS(AE_AML_BUFFER_LIMIT); 265 return_ACPI_STATUS(AE_AML_BUFFER_LIMIT);
261 } 266 }
diff --git a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c
index 9fe27fd04a2f..bd1af35f7fcf 100644
--- a/drivers/acpi/executer/exfldio.c
+++ b/drivers/acpi/executer/exfldio.c
@@ -94,9 +94,9 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
94 /* We must have a valid region */ 94 /* We must have a valid region */
95 95
96 if (ACPI_GET_OBJECT_TYPE(rgn_desc) != ACPI_TYPE_REGION) { 96 if (ACPI_GET_OBJECT_TYPE(rgn_desc) != ACPI_TYPE_REGION) {
97 ACPI_REPORT_ERROR(("Needed Region, found type %X (%s)\n", 97 ACPI_ERROR((AE_INFO, "Needed Region, found type %X (%s)",
98 ACPI_GET_OBJECT_TYPE(rgn_desc), 98 ACPI_GET_OBJECT_TYPE(rgn_desc),
99 acpi_ut_get_object_type_name(rgn_desc))); 99 acpi_ut_get_object_type_name(rgn_desc)));
100 100
101 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 101 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
102 } 102 }
@@ -161,14 +161,28 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
161 * than the region itself. For example, a region of length one 161 * than the region itself. For example, a region of length one
162 * byte, and a field with Dword access specified. 162 * byte, and a field with Dword access specified.
163 */ 163 */
164 ACPI_REPORT_ERROR(("Field [%4.4s] access width (%d bytes) too large for region [%4.4s] (length %X)\n", acpi_ut_get_node_name(obj_desc->common_field.node), obj_desc->common_field.access_byte_width, acpi_ut_get_node_name(rgn_desc->region.node), rgn_desc->region.length)); 164 ACPI_ERROR((AE_INFO,
165 "Field [%4.4s] access width (%d bytes) too large for region [%4.4s] (length %X)",
166 acpi_ut_get_node_name(obj_desc->
167 common_field.node),
168 obj_desc->common_field.access_byte_width,
169 acpi_ut_get_node_name(rgn_desc->region.
170 node),
171 rgn_desc->region.length));
165 } 172 }
166 173
167 /* 174 /*
168 * Offset rounded up to next multiple of field width 175 * Offset rounded up to next multiple of field width
169 * exceeds region length, indicate an error 176 * exceeds region length, indicate an error
170 */ 177 */
171 ACPI_REPORT_ERROR(("Field [%4.4s] Base+Offset+Width %X+%X+%X is beyond end of region [%4.4s] (length %X)\n", acpi_ut_get_node_name(obj_desc->common_field.node), obj_desc->common_field.base_byte_offset, field_datum_byte_offset, obj_desc->common_field.access_byte_width, acpi_ut_get_node_name(rgn_desc->region.node), rgn_desc->region.length)); 178 ACPI_ERROR((AE_INFO,
179 "Field [%4.4s] Base+Offset+Width %X+%X+%X is beyond end of region [%4.4s] (length %X)",
180 acpi_ut_get_node_name(obj_desc->common_field.node),
181 obj_desc->common_field.base_byte_offset,
182 field_datum_byte_offset,
183 obj_desc->common_field.access_byte_width,
184 acpi_ut_get_node_name(rgn_desc->region.node),
185 rgn_desc->region.length));
172 186
173 return_ACPI_STATUS(AE_AML_REGION_LIMIT); 187 return_ACPI_STATUS(AE_AML_REGION_LIMIT);
174 } 188 }
@@ -252,17 +266,17 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
252 266
253 if (ACPI_FAILURE(status)) { 267 if (ACPI_FAILURE(status)) {
254 if (status == AE_NOT_IMPLEMENTED) { 268 if (status == AE_NOT_IMPLEMENTED) {
255 ACPI_REPORT_ERROR(("Region %s(%X) not implemented\n", 269 ACPI_ERROR((AE_INFO,
256 acpi_ut_get_region_name(rgn_desc-> 270 "Region %s(%X) not implemented",
257 region. 271 acpi_ut_get_region_name(rgn_desc->region.
258 space_id), 272 space_id),
259 rgn_desc->region.space_id)); 273 rgn_desc->region.space_id));
260 } else if (status == AE_NOT_EXIST) { 274 } else if (status == AE_NOT_EXIST) {
261 ACPI_REPORT_ERROR(("Region %s(%X) has no handler\n", 275 ACPI_ERROR((AE_INFO,
262 acpi_ut_get_region_name(rgn_desc-> 276 "Region %s(%X) has no handler",
263 region. 277 acpi_ut_get_region_name(rgn_desc->region.
264 space_id), 278 space_id),
265 rgn_desc->region.space_id)); 279 rgn_desc->region.space_id));
266 } 280 }
267 } 281 }
268 282
@@ -495,8 +509,8 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
495 509
496 default: 510 default:
497 511
498 ACPI_REPORT_ERROR(("Wrong object type in field I/O %X\n", 512 ACPI_ERROR((AE_INFO, "Wrong object type in field I/O %X",
499 ACPI_GET_OBJECT_TYPE(obj_desc))); 513 ACPI_GET_OBJECT_TYPE(obj_desc)));
500 status = AE_AML_INTERNAL; 514 status = AE_AML_INTERNAL;
501 break; 515 break;
502 } 516 }
@@ -599,10 +613,11 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
599 613
600 default: 614 default:
601 615
602 ACPI_REPORT_ERROR(("Unknown update_rule value: %X\n", 616 ACPI_ERROR((AE_INFO,
603 (obj_desc->common_field. 617 "Unknown update_rule value: %X",
604 field_flags & 618 (obj_desc->common_field.
605 AML_FIELD_UPDATE_RULE_MASK))); 619 field_flags &
620 AML_FIELD_UPDATE_RULE_MASK)));
606 return_ACPI_STATUS(AE_AML_OPERAND_VALUE); 621 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
607 } 622 }
608 } 623 }
@@ -657,7 +672,9 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
657 672
658 if (buffer_length < 673 if (buffer_length <
659 ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) { 674 ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) {
660 ACPI_REPORT_ERROR(("Field size %X (bits) is too large for buffer (%X)\n", obj_desc->common_field.bit_length, buffer_length)); 675 ACPI_ERROR((AE_INFO,
676 "Field size %X (bits) is too large for buffer (%X)",
677 obj_desc->common_field.bit_length, buffer_length));
661 678
662 return_ACPI_STATUS(AE_BUFFER_OVERFLOW); 679 return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
663 } 680 }
@@ -769,7 +786,9 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
769 786
770 if (buffer_length < 787 if (buffer_length <
771 ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) { 788 ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) {
772 ACPI_REPORT_ERROR(("Field size %X (bits) is too large for buffer (%X)\n", obj_desc->common_field.bit_length, buffer_length)); 789 ACPI_ERROR((AE_INFO,
790 "Field size %X (bits) is too large for buffer (%X)",
791 obj_desc->common_field.bit_length, buffer_length));
773 792
774 return_ACPI_STATUS(AE_BUFFER_OVERFLOW); 793 return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
775 } 794 }
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index 5ad34566738c..48c18d29222a 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -98,8 +98,8 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
98 98
99 default: 99 default:
100 100
101 ACPI_REPORT_ERROR(("Unknown Reference opcode %X\n", 101 ACPI_ERROR((AE_INFO, "Unknown Reference opcode %X",
102 obj_desc->reference.opcode)); 102 obj_desc->reference.opcode));
103 return_ACPI_STATUS(AE_AML_INTERNAL); 103 return_ACPI_STATUS(AE_AML_INTERNAL);
104 } 104 }
105 break; 105 break;
@@ -114,8 +114,8 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
114 114
115 default: 115 default:
116 116
117 ACPI_REPORT_ERROR(("Invalid descriptor type %X\n", 117 ACPI_ERROR((AE_INFO, "Invalid descriptor type %X",
118 ACPI_GET_DESCRIPTOR_TYPE(obj_desc))); 118 ACPI_GET_DESCRIPTOR_TYPE(obj_desc)));
119 return_ACPI_STATUS(AE_TYPE); 119 return_ACPI_STATUS(AE_TYPE);
120 } 120 }
121 121
@@ -166,15 +166,18 @@ acpi_ex_concat_template(union acpi_operand_object *operand0,
166 u8 *end_tag; 166 u8 *end_tag;
167 acpi_size length0; 167 acpi_size length0;
168 acpi_size length1; 168 acpi_size length1;
169 acpi_size new_length;
169 170
170 ACPI_FUNCTION_TRACE("ex_concat_template"); 171 ACPI_FUNCTION_TRACE("ex_concat_template");
171 172
172 /* 173 /*
173 * Find the end_tag descriptor in each resource template. 174 * Find the end_tag descriptor in each resource template.
174 * Note: returned pointers point TO the end_tag, not past it. 175 * Note1: returned pointers point TO the end_tag, not past it.
175 * 176 * Note2: zero-length buffers are allowed; treated like one end_tag
176 * Compute the length of each resource template
177 */ 177 */
178
179 /* Get the length of the first resource template */
180
178 status = acpi_ut_get_resource_end_tag(operand0, &end_tag); 181 status = acpi_ut_get_resource_end_tag(operand0, &end_tag);
179 if (ACPI_FAILURE(status)) { 182 if (ACPI_FAILURE(status)) {
180 return_ACPI_STATUS(status); 183 return_ACPI_STATUS(status);
@@ -182,19 +185,22 @@ acpi_ex_concat_template(union acpi_operand_object *operand0,
182 185
183 length0 = ACPI_PTR_DIFF(end_tag, operand0->buffer.pointer); 186 length0 = ACPI_PTR_DIFF(end_tag, operand0->buffer.pointer);
184 187
188 /* Get the length of the second resource template */
189
185 status = acpi_ut_get_resource_end_tag(operand1, &end_tag); 190 status = acpi_ut_get_resource_end_tag(operand1, &end_tag);
186 if (ACPI_FAILURE(status)) { 191 if (ACPI_FAILURE(status)) {
187 return_ACPI_STATUS(status); 192 return_ACPI_STATUS(status);
188 } 193 }
189 194
190 /* Include the end_tag in the second template length */ 195 length1 = ACPI_PTR_DIFF(end_tag, operand1->buffer.pointer);
196
197 /* Combine both lengths, minimum size will be 2 for end_tag */
191 198
192 length1 = ACPI_PTR_DIFF(end_tag, operand1->buffer.pointer) + 199 new_length = length0 + length1 + sizeof(struct aml_resource_end_tag);
193 sizeof(struct aml_resource_end_tag);
194 200
195 /* Create a new buffer object for the result */ 201 /* Create a new buffer object for the result (with one end_tag) */
196 202
197 return_desc = acpi_ut_create_buffer_object(length0 + length1); 203 return_desc = acpi_ut_create_buffer_object(new_length);
198 if (!return_desc) { 204 if (!return_desc) {
199 return_ACPI_STATUS(AE_NO_MEMORY); 205 return_ACPI_STATUS(AE_NO_MEMORY);
200 } 206 }
@@ -207,9 +213,10 @@ acpi_ex_concat_template(union acpi_operand_object *operand0,
207 ACPI_MEMCPY(new_buf, operand0->buffer.pointer, length0); 213 ACPI_MEMCPY(new_buf, operand0->buffer.pointer, length0);
208 ACPI_MEMCPY(new_buf + length0, operand1->buffer.pointer, length1); 214 ACPI_MEMCPY(new_buf + length0, operand1->buffer.pointer, length1);
209 215
210 /* Set the end_tag checksum to zero, means "ignore checksum" */ 216 /* Insert end_tag and set the checksum to zero, means "ignore checksum" */
211 217
212 new_buf[return_desc->buffer.length - 1] = 0; 218 new_buf[new_length - 1] = 0;
219 new_buf[new_length - 2] = ACPI_RESOURCE_NAME_END_TAG | 1;
213 220
214 /* Return the completed resource template */ 221 /* Return the completed resource template */
215 222
@@ -268,8 +275,8 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
268 break; 275 break;
269 276
270 default: 277 default:
271 ACPI_REPORT_ERROR(("Invalid object type: %X\n", 278 ACPI_ERROR((AE_INFO, "Invalid object type: %X",
272 ACPI_GET_OBJECT_TYPE(operand0))); 279 ACPI_GET_OBJECT_TYPE(operand0)));
273 status = AE_AML_INTERNAL; 280 status = AE_AML_INTERNAL;
274 } 281 }
275 282
@@ -370,8 +377,8 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
370 377
371 /* Invalid object type, should not happen here */ 378 /* Invalid object type, should not happen here */
372 379
373 ACPI_REPORT_ERROR(("Invalid object type: %X\n", 380 ACPI_ERROR((AE_INFO, "Invalid object type: %X",
374 ACPI_GET_OBJECT_TYPE(operand0))); 381 ACPI_GET_OBJECT_TYPE(operand0)));
375 status = AE_AML_INTERNAL; 382 status = AE_AML_INTERNAL;
376 goto cleanup; 383 goto cleanup;
377 } 384 }
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index 89b8ab79410b..f843b22e20b9 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -153,7 +153,9 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
153 /* Sanity check -- we must have a valid thread ID */ 153 /* Sanity check -- we must have a valid thread ID */
154 154
155 if (!walk_state->thread) { 155 if (!walk_state->thread) {
156 ACPI_REPORT_ERROR(("Cannot acquire Mutex [%4.4s], null thread info\n", acpi_ut_get_node_name(obj_desc->mutex.node))); 156 ACPI_ERROR((AE_INFO,
157 "Cannot acquire Mutex [%4.4s], null thread info",
158 acpi_ut_get_node_name(obj_desc->mutex.node)));
157 return_ACPI_STATUS(AE_AML_INTERNAL); 159 return_ACPI_STATUS(AE_AML_INTERNAL);
158 } 160 }
159 161
@@ -162,7 +164,9 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
162 * mutex. This mechanism provides some deadlock prevention 164 * mutex. This mechanism provides some deadlock prevention
163 */ 165 */
164 if (walk_state->thread->current_sync_level > obj_desc->mutex.sync_level) { 166 if (walk_state->thread->current_sync_level > obj_desc->mutex.sync_level) {
165 ACPI_REPORT_ERROR(("Cannot acquire Mutex [%4.4s], incorrect sync_level\n", acpi_ut_get_node_name(obj_desc->mutex.node))); 167 ACPI_ERROR((AE_INFO,
168 "Cannot acquire Mutex [%4.4s], incorrect sync_level",
169 acpi_ut_get_node_name(obj_desc->mutex.node)));
166 return_ACPI_STATUS(AE_AML_MUTEX_ORDER); 170 return_ACPI_STATUS(AE_AML_MUTEX_ORDER);
167 } 171 }
168 172
@@ -237,14 +241,18 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
237 /* The mutex must have been previously acquired in order to release it */ 241 /* The mutex must have been previously acquired in order to release it */
238 242
239 if (!obj_desc->mutex.owner_thread) { 243 if (!obj_desc->mutex.owner_thread) {
240 ACPI_REPORT_ERROR(("Cannot release Mutex [%4.4s], not acquired\n", acpi_ut_get_node_name(obj_desc->mutex.node))); 244 ACPI_ERROR((AE_INFO,
245 "Cannot release Mutex [%4.4s], not acquired",
246 acpi_ut_get_node_name(obj_desc->mutex.node)));
241 return_ACPI_STATUS(AE_AML_MUTEX_NOT_ACQUIRED); 247 return_ACPI_STATUS(AE_AML_MUTEX_NOT_ACQUIRED);
242 } 248 }
243 249
244 /* Sanity check -- we must have a valid thread ID */ 250 /* Sanity check -- we must have a valid thread ID */
245 251
246 if (!walk_state->thread) { 252 if (!walk_state->thread) {
247 ACPI_REPORT_ERROR(("Cannot release Mutex [%4.4s], null thread info\n", acpi_ut_get_node_name(obj_desc->mutex.node))); 253 ACPI_ERROR((AE_INFO,
254 "Cannot release Mutex [%4.4s], null thread info",
255 acpi_ut_get_node_name(obj_desc->mutex.node)));
248 return_ACPI_STATUS(AE_AML_INTERNAL); 256 return_ACPI_STATUS(AE_AML_INTERNAL);
249 } 257 }
250 258
@@ -255,7 +263,11 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
255 if ((obj_desc->mutex.owner_thread->thread_id != 263 if ((obj_desc->mutex.owner_thread->thread_id !=
256 walk_state->thread->thread_id) 264 walk_state->thread->thread_id)
257 && (obj_desc->mutex.semaphore != acpi_gbl_global_lock_semaphore)) { 265 && (obj_desc->mutex.semaphore != acpi_gbl_global_lock_semaphore)) {
258 ACPI_REPORT_ERROR(("Thread %X cannot release Mutex [%4.4s] acquired by thread %X\n", walk_state->thread->thread_id, acpi_ut_get_node_name(obj_desc->mutex.node), obj_desc->mutex.owner_thread->thread_id)); 266 ACPI_ERROR((AE_INFO,
267 "Thread %X cannot release Mutex [%4.4s] acquired by thread %X",
268 walk_state->thread->thread_id,
269 acpi_ut_get_node_name(obj_desc->mutex.node),
270 obj_desc->mutex.owner_thread->thread_id));
259 return_ACPI_STATUS(AE_AML_NOT_OWNER); 271 return_ACPI_STATUS(AE_AML_NOT_OWNER);
260 } 272 }
261 273
@@ -264,7 +276,9 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
264 * equal to the current sync level 276 * equal to the current sync level
265 */ 277 */
266 if (obj_desc->mutex.sync_level > walk_state->thread->current_sync_level) { 278 if (obj_desc->mutex.sync_level > walk_state->thread->current_sync_level) {
267 ACPI_REPORT_ERROR(("Cannot release Mutex [%4.4s], incorrect sync_level\n", acpi_ut_get_node_name(obj_desc->mutex.node))); 279 ACPI_ERROR((AE_INFO,
280 "Cannot release Mutex [%4.4s], incorrect sync_level",
281 acpi_ut_get_node_name(obj_desc->mutex.node)));
268 return_ACPI_STATUS(AE_AML_MUTEX_ORDER); 282 return_ACPI_STATUS(AE_AML_MUTEX_ORDER);
269 } 283 }
270 284
diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c
index de3216b6a4fc..054fe5e1a314 100644
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/executer/exnames.c
@@ -99,8 +99,8 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
99 */ 99 */
100 name_string = ACPI_MEM_ALLOCATE(size_needed); 100 name_string = ACPI_MEM_ALLOCATE(size_needed);
101 if (!name_string) { 101 if (!name_string) {
102 ACPI_REPORT_ERROR(("Could not allocate size %d\n", 102 ACPI_ERROR((AE_INFO,
103 size_needed)); 103 "Could not allocate size %d", size_needed));
104 return_PTR(NULL); 104 return_PTR(NULL);
105 } 105 }
106 106
@@ -168,7 +168,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
168 char_buf[0] = *aml_address; 168 char_buf[0] = *aml_address;
169 169
170 if ('0' <= char_buf[0] && char_buf[0] <= '9') { 170 if ('0' <= char_buf[0] && char_buf[0] <= '9') {
171 ACPI_REPORT_ERROR(("Invalid leading digit: %c\n", char_buf[0])); 171 ACPI_ERROR((AE_INFO, "Invalid leading digit: %c", char_buf[0]));
172 return_ACPI_STATUS(AE_CTRL_PENDING); 172 return_ACPI_STATUS(AE_CTRL_PENDING);
173 } 173 }
174 174
@@ -211,8 +211,9 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
211 * the required 4 211 * the required 4
212 */ 212 */
213 status = AE_AML_BAD_NAME; 213 status = AE_AML_BAD_NAME;
214 ACPI_REPORT_ERROR(("Bad character %02x in name, at %p\n", 214 ACPI_ERROR((AE_INFO,
215 *aml_address, aml_address)); 215 "Bad character %02x in name, at %p",
216 *aml_address, aml_address));
216 } 217 }
217 218
218 *in_aml_address = ACPI_CAST_PTR(u8, aml_address); 219 *in_aml_address = ACPI_CAST_PTR(u8, aml_address);
@@ -411,7 +412,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
411 if (AE_CTRL_PENDING == status && has_prefix) { 412 if (AE_CTRL_PENDING == status && has_prefix) {
412 /* Ran out of segments after processing a prefix */ 413 /* Ran out of segments after processing a prefix */
413 414
414 ACPI_REPORT_ERROR(("Malformed Name at %p\n", name_string)); 415 ACPI_ERROR((AE_INFO, "Malformed Name at %p", name_string));
415 status = AE_AML_BAD_NAME; 416 status = AE_AML_BAD_NAME;
416 } 417 }
417 418
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index bc8837ecb716..23d0823bcd5e 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -111,8 +111,8 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)
111 111
112 default: /* Unknown opcode */ 112 default: /* Unknown opcode */
113 113
114 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", 114 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
115 walk_state->opcode)); 115 walk_state->opcode));
116 status = AE_AML_BAD_OPCODE; 116 status = AE_AML_BAD_OPCODE;
117 break; 117 break;
118 } 118 }
@@ -189,8 +189,8 @@ acpi_status acpi_ex_opcode_1A_0T_0R(struct acpi_walk_state *walk_state)
189 189
190 default: /* Unknown opcode */ 190 default: /* Unknown opcode */
191 191
192 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", 192 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
193 walk_state->opcode)); 193 walk_state->opcode));
194 status = AE_AML_BAD_OPCODE; 194 status = AE_AML_BAD_OPCODE;
195 break; 195 break;
196 } 196 }
@@ -229,8 +229,8 @@ acpi_status acpi_ex_opcode_1A_1T_0R(struct acpi_walk_state *walk_state)
229 229
230 default: /* Unknown opcode */ 230 default: /* Unknown opcode */
231 231
232 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", 232 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
233 walk_state->opcode)); 233 walk_state->opcode));
234 status = AE_AML_BAD_OPCODE; 234 status = AE_AML_BAD_OPCODE;
235 goto cleanup; 235 goto cleanup;
236 } 236 }
@@ -349,7 +349,9 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
349 /* Check the range of the digit */ 349 /* Check the range of the digit */
350 350
351 if (temp32 > 9) { 351 if (temp32 > 9) {
352 ACPI_REPORT_ERROR(("BCD digit too large (not decimal): 0x%X\n", temp32)); 352 ACPI_ERROR((AE_INFO,
353 "BCD digit too large (not decimal): 0x%X",
354 temp32));
353 355
354 status = AE_AML_NUMERIC_OVERFLOW; 356 status = AE_AML_NUMERIC_OVERFLOW;
355 goto cleanup; 357 goto cleanup;
@@ -394,7 +396,10 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
394 /* Overflow if there is any data left in Digit */ 396 /* Overflow if there is any data left in Digit */
395 397
396 if (digit > 0) { 398 if (digit > 0) {
397 ACPI_REPORT_ERROR(("Integer too large to convert to BCD: %8.8X%8.8X\n", ACPI_FORMAT_UINT64(operand[0]->integer.value))); 399 ACPI_ERROR((AE_INFO,
400 "Integer too large to convert to BCD: %8.8X%8.8X",
401 ACPI_FORMAT_UINT64(operand[0]->
402 integer.value)));
398 status = AE_AML_NUMERIC_OVERFLOW; 403 status = AE_AML_NUMERIC_OVERFLOW;
399 goto cleanup; 404 goto cleanup;
400 } 405 }
@@ -521,16 +526,16 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
521 526
522 /* These are two obsolete opcodes */ 527 /* These are two obsolete opcodes */
523 528
524 ACPI_REPORT_ERROR(("%s is obsolete and not implemented\n", 529 ACPI_ERROR((AE_INFO,
525 acpi_ps_get_opcode_name(walk_state-> 530 "%s is obsolete and not implemented",
526 opcode))); 531 acpi_ps_get_opcode_name(walk_state->opcode)));
527 status = AE_SUPPORT; 532 status = AE_SUPPORT;
528 goto cleanup; 533 goto cleanup;
529 534
530 default: /* Unknown opcode */ 535 default: /* Unknown opcode */
531 536
532 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", 537 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
533 walk_state->opcode)); 538 walk_state->opcode));
534 status = AE_AML_BAD_OPCODE; 539 status = AE_AML_BAD_OPCODE;
535 goto cleanup; 540 goto cleanup;
536 } 541 }
@@ -636,10 +641,10 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
636 acpi_ex_resolve_operands(AML_LNOT_OP, &temp_desc, 641 acpi_ex_resolve_operands(AML_LNOT_OP, &temp_desc,
637 walk_state); 642 walk_state);
638 if (ACPI_FAILURE(status)) { 643 if (ACPI_FAILURE(status)) {
639 ACPI_REPORT_ERROR(("%s: bad operand(s) %s\n", 644 ACPI_EXCEPTION((AE_INFO, status,
640 acpi_ps_get_opcode_name(walk_state-> 645 "While resolving operands for [%s]",
641 opcode), 646 acpi_ps_get_opcode_name(walk_state->
642 acpi_format_exception(status))); 647 opcode)));
643 648
644 goto cleanup; 649 goto cleanup;
645 } 650 }
@@ -738,7 +743,9 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
738 break; 743 break;
739 744
740 default: 745 default:
741 ACPI_REPORT_ERROR(("Operand is not Buf/Int/Str/Pkg - found type %s\n", acpi_ut_get_type_name(type))); 746 ACPI_ERROR((AE_INFO,
747 "Operand is not Buf/Int/Str/Pkg - found type %s",
748 acpi_ut_get_type_name(type)));
742 status = AE_AML_OPERAND_TYPE; 749 status = AE_AML_OPERAND_TYPE;
743 goto cleanup; 750 goto cleanup;
744 } 751 }
@@ -935,7 +942,10 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
935 942
936 default: 943 default:
937 944
938 ACPI_REPORT_ERROR(("Unknown Index target_type %X in obj %p\n", operand[0]->reference.target_type, operand[0])); 945 ACPI_ERROR((AE_INFO,
946 "Unknown Index target_type %X in obj %p",
947 operand[0]->reference.
948 target_type, operand[0]));
939 status = AE_AML_OPERAND_TYPE; 949 status = AE_AML_OPERAND_TYPE;
940 goto cleanup; 950 goto cleanup;
941 } 951 }
@@ -961,7 +971,10 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
961 break; 971 break;
962 972
963 default: 973 default:
964 ACPI_REPORT_ERROR(("Unknown opcode in ref(%p) - %X\n", operand[0], operand[0]->reference.opcode)); 974 ACPI_ERROR((AE_INFO,
975 "Unknown opcode in ref(%p) - %X",
976 operand[0],
977 operand[0]->reference.opcode));
965 978
966 status = AE_TYPE; 979 status = AE_TYPE;
967 goto cleanup; 980 goto cleanup;
@@ -971,8 +984,8 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
971 984
972 default: 985 default:
973 986
974 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", 987 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
975 walk_state->opcode)); 988 walk_state->opcode));
976 status = AE_AML_BAD_OPCODE; 989 status = AE_AML_BAD_OPCODE;
977 goto cleanup; 990 goto cleanup;
978 } 991 }
diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c
index 7c59dda40946..e263a5ddd405 100644
--- a/drivers/acpi/executer/exoparg2.c
+++ b/drivers/acpi/executer/exoparg2.c
@@ -111,7 +111,9 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
111 /* Are notifies allowed on this object? */ 111 /* Are notifies allowed on this object? */
112 112
113 if (!acpi_ev_is_notify_object(node)) { 113 if (!acpi_ev_is_notify_object(node)) {
114 ACPI_REPORT_ERROR(("Unexpected notify object type [%s]\n", acpi_ut_get_type_name(node->type))); 114 ACPI_ERROR((AE_INFO,
115 "Unexpected notify object type [%s]",
116 acpi_ut_get_type_name(node->type)));
115 117
116 status = AE_AML_OPERAND_TYPE; 118 status = AE_AML_OPERAND_TYPE;
117 break; 119 break;
@@ -155,8 +157,8 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
155 157
156 default: 158 default:
157 159
158 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", 160 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
159 walk_state->opcode)); 161 walk_state->opcode));
160 status = AE_AML_BAD_OPCODE; 162 status = AE_AML_BAD_OPCODE;
161 } 163 }
162 164
@@ -220,8 +222,8 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)
220 222
221 default: 223 default:
222 224
223 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", 225 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
224 walk_state->opcode)); 226 walk_state->opcode));
225 status = AE_AML_BAD_OPCODE; 227 status = AE_AML_BAD_OPCODE;
226 goto cleanup; 228 goto cleanup;
227 } 229 }
@@ -389,7 +391,10 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
389 /* Object to be indexed is a Package */ 391 /* Object to be indexed is a Package */
390 392
391 if (index >= operand[0]->package.count) { 393 if (index >= operand[0]->package.count) {
392 ACPI_REPORT_ERROR(("Index value (%X%8.8X) beyond package end (%X)\n", ACPI_FORMAT_UINT64(index), operand[0]->package.count)); 394 ACPI_ERROR((AE_INFO,
395 "Index value (%X%8.8X) beyond package end (%X)",
396 ACPI_FORMAT_UINT64(index),
397 operand[0]->package.count));
393 status = AE_AML_PACKAGE_LIMIT; 398 status = AE_AML_PACKAGE_LIMIT;
394 goto cleanup; 399 goto cleanup;
395 } 400 }
@@ -402,7 +407,10 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
402 /* Object to be indexed is a Buffer/String */ 407 /* Object to be indexed is a Buffer/String */
403 408
404 if (index >= operand[0]->buffer.length) { 409 if (index >= operand[0]->buffer.length) {
405 ACPI_REPORT_ERROR(("Index value (%X%8.8X) beyond end of buffer (%X)\n", ACPI_FORMAT_UINT64(index), operand[0]->buffer.length)); 410 ACPI_ERROR((AE_INFO,
411 "Index value (%X%8.8X) beyond end of buffer (%X)",
412 ACPI_FORMAT_UINT64(index),
413 operand[0]->buffer.length));
406 status = AE_AML_BUFFER_LIMIT; 414 status = AE_AML_BUFFER_LIMIT;
407 goto cleanup; 415 goto cleanup;
408 } 416 }
@@ -434,8 +442,8 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
434 442
435 default: 443 default:
436 444
437 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", 445 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
438 walk_state->opcode)); 446 walk_state->opcode));
439 status = AE_AML_BAD_OPCODE; 447 status = AE_AML_BAD_OPCODE;
440 break; 448 break;
441 } 449 }
@@ -539,8 +547,8 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
539 547
540 default: 548 default:
541 549
542 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", 550 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
543 walk_state->opcode)); 551 walk_state->opcode));
544 status = AE_AML_BAD_OPCODE; 552 status = AE_AML_BAD_OPCODE;
545 goto cleanup; 553 goto cleanup;
546 } 554 }
diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c
index a979b338a491..6a3a883cb8a3 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/executer/exoparg3.c
@@ -119,8 +119,8 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)
119 119
120 default: 120 default:
121 121
122 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", 122 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
123 walk_state->opcode)); 123 walk_state->opcode));
124 status = AE_AML_BAD_OPCODE; 124 status = AE_AML_BAD_OPCODE;
125 goto cleanup; 125 goto cleanup;
126 } 126 }
@@ -243,8 +243,8 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
243 243
244 default: 244 default:
245 245
246 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", 246 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
247 walk_state->opcode)); 247 walk_state->opcode));
248 status = AE_AML_BAD_OPCODE; 248 status = AE_AML_BAD_OPCODE;
249 goto cleanup; 249 goto cleanup;
250 } 250 }
diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c
index 05e7f9b67f29..e043d924444f 100644
--- a/drivers/acpi/executer/exoparg6.c
+++ b/drivers/acpi/executer/exoparg6.c
@@ -234,7 +234,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
234 234
235 if ((operand[1]->integer.value > MAX_MATCH_OPERATOR) || 235 if ((operand[1]->integer.value > MAX_MATCH_OPERATOR) ||
236 (operand[3]->integer.value > MAX_MATCH_OPERATOR)) { 236 (operand[3]->integer.value > MAX_MATCH_OPERATOR)) {
237 ACPI_REPORT_ERROR(("Match operator out of range\n")); 237 ACPI_ERROR((AE_INFO, "Match operator out of range"));
238 status = AE_AML_OPERAND_VALUE; 238 status = AE_AML_OPERAND_VALUE;
239 goto cleanup; 239 goto cleanup;
240 } 240 }
@@ -243,7 +243,10 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
243 243
244 index = operand[5]->integer.value; 244 index = operand[5]->integer.value;
245 if (index >= operand[0]->package.count) { 245 if (index >= operand[0]->package.count) {
246 ACPI_REPORT_ERROR(("Index (%X%8.8X) beyond package end (%X)\n", ACPI_FORMAT_UINT64(index), operand[0]->package.count)); 246 ACPI_ERROR((AE_INFO,
247 "Index (%X%8.8X) beyond package end (%X)",
248 ACPI_FORMAT_UINT64(index),
249 operand[0]->package.count));
247 status = AE_AML_PACKAGE_LIMIT; 250 status = AE_AML_PACKAGE_LIMIT;
248 goto cleanup; 251 goto cleanup;
249 } 252 }
@@ -312,8 +315,8 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
312 315
313 default: 316 default:
314 317
315 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", 318 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
316 walk_state->opcode)); 319 walk_state->opcode));
317 status = AE_AML_BAD_OPCODE; 320 status = AE_AML_BAD_OPCODE;
318 goto cleanup; 321 goto cleanup;
319 } 322 }
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index 3bde780c94cf..7719ae5d4f16 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -274,7 +274,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
274 default: 274 default:
275 /* Invalid field access type */ 275 /* Invalid field access type */
276 276
277 ACPI_REPORT_ERROR(("Unknown field access type %X\n", access)); 277 ACPI_ERROR((AE_INFO, "Unknown field access type %X", access));
278 return_UINT32(0); 278 return_UINT32(0);
279 } 279 }
280 280
@@ -421,13 +421,15 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
421 421
422 if (info->field_type != ACPI_TYPE_LOCAL_INDEX_FIELD) { 422 if (info->field_type != ACPI_TYPE_LOCAL_INDEX_FIELD) {
423 if (!info->region_node) { 423 if (!info->region_node) {
424 ACPI_REPORT_ERROR(("Null region_node\n")); 424 ACPI_ERROR((AE_INFO, "Null region_node"));
425 return_ACPI_STATUS(AE_AML_NO_OPERAND); 425 return_ACPI_STATUS(AE_AML_NO_OPERAND);
426 } 426 }
427 427
428 type = acpi_ns_get_type(info->region_node); 428 type = acpi_ns_get_type(info->region_node);
429 if (type != ACPI_TYPE_REGION) { 429 if (type != ACPI_TYPE_REGION) {
430 ACPI_REPORT_ERROR(("Needed Region, found type %X (%s)\n", type, acpi_ut_get_type_name(type))); 430 ACPI_ERROR((AE_INFO,
431 "Needed Region, found type %X (%s)",
432 type, acpi_ut_get_type_name(type)));
431 433
432 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 434 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
433 } 435 }
@@ -496,17 +498,17 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
496 498
497 case ACPI_TYPE_LOCAL_INDEX_FIELD: 499 case ACPI_TYPE_LOCAL_INDEX_FIELD:
498 500
501 /* Get the Index and Data registers */
502
499 obj_desc->index_field.index_obj = 503 obj_desc->index_field.index_obj =
500 acpi_ns_get_attached_object(info->register_node); 504 acpi_ns_get_attached_object(info->register_node);
501 obj_desc->index_field.data_obj = 505 obj_desc->index_field.data_obj =
502 acpi_ns_get_attached_object(info->data_register_node); 506 acpi_ns_get_attached_object(info->data_register_node);
503 obj_desc->index_field.value = (u32)
504 (info->field_bit_position /
505 ACPI_MUL_8(obj_desc->field.access_byte_width));
506 507
507 if (!obj_desc->index_field.data_obj 508 if (!obj_desc->index_field.data_obj
508 || !obj_desc->index_field.index_obj) { 509 || !obj_desc->index_field.index_obj) {
509 ACPI_REPORT_ERROR(("Null Index Object during field prep\n")); 510 ACPI_ERROR((AE_INFO,
511 "Null Index Object during field prep"));
510 acpi_ut_delete_object_desc(obj_desc); 512 acpi_ut_delete_object_desc(obj_desc);
511 return_ACPI_STATUS(AE_AML_INTERNAL); 513 return_ACPI_STATUS(AE_AML_INTERNAL);
512 } 514 }
@@ -516,6 +518,15 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
516 acpi_ut_add_reference(obj_desc->index_field.data_obj); 518 acpi_ut_add_reference(obj_desc->index_field.data_obj);
517 acpi_ut_add_reference(obj_desc->index_field.index_obj); 519 acpi_ut_add_reference(obj_desc->index_field.index_obj);
518 520
521 /*
522 * The value written to the Index register is the byte offset of the
523 * target field
524 * Note: may change code to: ACPI_DIV_8 (Info->field_bit_position)
525 */
526 obj_desc->index_field.value = (u32)
527 (info->field_bit_position /
528 ACPI_MUL_8(obj_desc->field.access_byte_width));
529
519 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 530 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
520 "index_field: bit_off %X, Off %X, Value %X, Gran %X, Index %p, Data %p\n", 531 "index_field: bit_off %X, Off %X, Value %X, Gran %X, Index %p, Data %p\n",
521 obj_desc->index_field.start_field_bit_offset, 532 obj_desc->index_field.start_field_bit_offset,
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 82983575cca6..6a4cfdff606d 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -103,8 +103,8 @@ acpi_ex_system_memory_space_handler(u32 function,
103 break; 103 break;
104 104
105 default: 105 default:
106 ACPI_REPORT_ERROR(("Invalid system_memory width %d\n", 106 ACPI_ERROR((AE_INFO, "Invalid system_memory width %d",
107 bit_width)); 107 bit_width));
108 return_ACPI_STATUS(AE_AML_OPERAND_VALUE); 108 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
109 } 109 }
110 110
@@ -158,7 +158,10 @@ acpi_ex_system_memory_space_handler(u32 function,
158 (void **)&mem_info-> 158 (void **)&mem_info->
159 mapped_logical_address); 159 mapped_logical_address);
160 if (ACPI_FAILURE(status)) { 160 if (ACPI_FAILURE(status)) {
161 ACPI_REPORT_ERROR(("Could not map memory at %8.8X%8.8X, size %X\n", ACPI_FORMAT_UINT64(address), (u32) window_size)); 161 ACPI_ERROR((AE_INFO,
162 "Could not map memory at %8.8X%8.8X, size %X",
163 ACPI_FORMAT_UINT64(address),
164 (u32) window_size));
162 mem_info->mapped_length = 0; 165 mem_info->mapped_length = 0;
163 return_ACPI_STATUS(status); 166 return_ACPI_STATUS(status);
164 } 167 }
diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c
index a5cca7eda210..01b26c80d22b 100644
--- a/drivers/acpi/executer/exresnte.c
+++ b/drivers/acpi/executer/exresnte.c
@@ -122,7 +122,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
122 } 122 }
123 123
124 if (!source_desc) { 124 if (!source_desc) {
125 ACPI_REPORT_ERROR(("No object attached to node %p\n", node)); 125 ACPI_ERROR((AE_INFO, "No object attached to node %p", node));
126 return_ACPI_STATUS(AE_AML_NO_OPERAND); 126 return_ACPI_STATUS(AE_AML_NO_OPERAND);
127 } 127 }
128 128
@@ -134,9 +134,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
134 case ACPI_TYPE_PACKAGE: 134 case ACPI_TYPE_PACKAGE:
135 135
136 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_PACKAGE) { 136 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_PACKAGE) {
137 ACPI_REPORT_ERROR(("Object not a Package, type %s\n", 137 ACPI_ERROR((AE_INFO, "Object not a Package, type %s",
138 acpi_ut_get_object_type_name 138 acpi_ut_get_object_type_name(source_desc)));
139 (source_desc)));
140 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 139 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
141 } 140 }
142 141
@@ -152,9 +151,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
152 case ACPI_TYPE_BUFFER: 151 case ACPI_TYPE_BUFFER:
153 152
154 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_BUFFER) { 153 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_BUFFER) {
155 ACPI_REPORT_ERROR(("Object not a Buffer, type %s\n", 154 ACPI_ERROR((AE_INFO, "Object not a Buffer, type %s",
156 acpi_ut_get_object_type_name 155 acpi_ut_get_object_type_name(source_desc)));
157 (source_desc)));
158 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 156 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
159 } 157 }
160 158
@@ -170,9 +168,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
170 case ACPI_TYPE_STRING: 168 case ACPI_TYPE_STRING:
171 169
172 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_STRING) { 170 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_STRING) {
173 ACPI_REPORT_ERROR(("Object not a String, type %s\n", 171 ACPI_ERROR((AE_INFO, "Object not a String, type %s",
174 acpi_ut_get_object_type_name 172 acpi_ut_get_object_type_name(source_desc)));
175 (source_desc)));
176 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 173 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
177 } 174 }
178 175
@@ -185,9 +182,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
185 case ACPI_TYPE_INTEGER: 182 case ACPI_TYPE_INTEGER:
186 183
187 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_INTEGER) { 184 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_INTEGER) {
188 ACPI_REPORT_ERROR(("Object not a Integer, type %s\n", 185 ACPI_ERROR((AE_INFO, "Object not a Integer, type %s",
189 acpi_ut_get_object_type_name 186 acpi_ut_get_object_type_name(source_desc)));
190 (source_desc)));
191 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 187 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
192 } 188 }
193 189
@@ -231,8 +227,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
231 227
232 case ACPI_TYPE_ANY: 228 case ACPI_TYPE_ANY:
233 229
234 ACPI_REPORT_ERROR(("Untyped entry %p, no attached object!\n", 230 ACPI_ERROR((AE_INFO,
235 node)); 231 "Untyped entry %p, no attached object!", node));
236 232
237 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); /* Cannot be AE_TYPE */ 233 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); /* Cannot be AE_TYPE */
238 234
@@ -251,7 +247,11 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
251 default: 247 default:
252 /* No named references are allowed here */ 248 /* No named references are allowed here */
253 249
254 ACPI_REPORT_ERROR(("Unsupported Reference opcode %X (%s)\n", source_desc->reference.opcode, acpi_ps_get_opcode_name(source_desc->reference.opcode))); 250 ACPI_ERROR((AE_INFO,
251 "Unsupported Reference opcode %X (%s)",
252 source_desc->reference.opcode,
253 acpi_ps_get_opcode_name(source_desc->
254 reference.opcode)));
255 255
256 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 256 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
257 } 257 }
@@ -261,8 +261,9 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
261 261
262 /* Default case is for unknown types */ 262 /* Default case is for unknown types */
263 263
264 ACPI_REPORT_ERROR(("Node %p - Unknown object type %X\n", 264 ACPI_ERROR((AE_INFO,
265 node, entry_type)); 265 "Node %p - Unknown object type %X",
266 node, entry_type));
266 267
267 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 268 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
268 269
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,
81 ACPI_FUNCTION_TRACE_PTR("ex_resolve_to_value", stack_ptr); 81 ACPI_FUNCTION_TRACE_PTR("ex_resolve_to_value", stack_ptr);
82 82
83 if (!stack_ptr || !*stack_ptr) { 83 if (!stack_ptr || !*stack_ptr) {
84 ACPI_REPORT_ERROR(("Internal - null pointer\n")); 84 ACPI_ERROR((AE_INFO, "Internal - null pointer"));
85 return_ACPI_STATUS(AE_AML_NO_OPERAND); 85 return_ACPI_STATUS(AE_AML_NO_OPERAND);
86 } 86 }
87 87
@@ -97,7 +97,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
97 } 97 }
98 98
99 if (!*stack_ptr) { 99 if (!*stack_ptr) {
100 ACPI_REPORT_ERROR(("Internal - null pointer\n")); 100 ACPI_ERROR((AE_INFO, "Internal - null pointer"));
101 return_ACPI_STATUS(AE_AML_NO_OPERAND); 101 return_ACPI_STATUS(AE_AML_NO_OPERAND);
102 } 102 }
103 } 103 }
@@ -227,7 +227,9 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
227 * A NULL object descriptor means an unitialized element of 227 * A NULL object descriptor means an unitialized element of
228 * the package, can't dereference it 228 * the package, can't dereference it
229 */ 229 */
230 ACPI_REPORT_ERROR(("Attempt to deref an Index to NULL pkg element Idx=%p\n", stack_desc)); 230 ACPI_ERROR((AE_INFO,
231 "Attempt to deref an Index to NULL pkg element Idx=%p",
232 stack_desc));
231 status = AE_AML_UNINITIALIZED_ELEMENT; 233 status = AE_AML_UNINITIALIZED_ELEMENT;
232 } 234 }
233 break; 235 break;
@@ -236,7 +238,10 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
236 238
237 /* Invalid reference object */ 239 /* Invalid reference object */
238 240
239 ACPI_REPORT_ERROR(("Unknown target_type %X in Index/Reference obj %p\n", stack_desc->reference.target_type, stack_desc)); 241 ACPI_ERROR((AE_INFO,
242 "Unknown target_type %X in Index/Reference obj %p",
243 stack_desc->reference.target_type,
244 stack_desc));
240 status = AE_AML_INTERNAL; 245 status = AE_AML_INTERNAL;
241 break; 246 break;
242 } 247 }
@@ -261,7 +266,10 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
261 266
262 default: 267 default:
263 268
264 ACPI_REPORT_ERROR(("Unknown Reference opcode %X (%s) in %p\n", opcode, acpi_ps_get_opcode_name(opcode), stack_desc)); 269 ACPI_ERROR((AE_INFO,
270 "Unknown Reference opcode %X (%s) in %p",
271 opcode, acpi_ps_get_opcode_name(opcode),
272 stack_desc));
265 status = AE_AML_INTERNAL; 273 status = AE_AML_INTERNAL;
266 break; 274 break;
267 } 275 }
@@ -383,10 +391,9 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
383 391
384 if (ACPI_GET_DESCRIPTOR_TYPE(node) != 392 if (ACPI_GET_DESCRIPTOR_TYPE(node) !=
385 ACPI_DESC_TYPE_NAMED) { 393 ACPI_DESC_TYPE_NAMED) {
386 ACPI_REPORT_ERROR(("Not a NS node %p [%s]\n", 394 ACPI_ERROR((AE_INFO, "Not a NS node %p [%s]",
387 node, 395 node,
388 acpi_ut_get_descriptor_name 396 acpi_ut_get_descriptor_name(node)));
389 (node)));
390 return_ACPI_STATUS(AE_AML_INTERNAL); 397 return_ACPI_STATUS(AE_AML_INTERNAL);
391 } 398 }
392 399
@@ -442,10 +449,9 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
442 449
443 if (ACPI_GET_DESCRIPTOR_TYPE(node) != 450 if (ACPI_GET_DESCRIPTOR_TYPE(node) !=
444 ACPI_DESC_TYPE_NAMED) { 451 ACPI_DESC_TYPE_NAMED) {
445 ACPI_REPORT_ERROR(("Not a NS node %p [%s]\n", 452 ACPI_ERROR((AE_INFO, "Not a NS node %p [%s]",
446 node, 453 node,
447 acpi_ut_get_descriptor_name 454 acpi_ut_get_descriptor_name(node)));
448 (node)));
449 return_ACPI_STATUS(AE_AML_INTERNAL); 455 return_ACPI_STATUS(AE_AML_INTERNAL);
450 } 456 }
451 457
@@ -514,8 +520,9 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
514 520
515 default: 521 default:
516 522
517 ACPI_REPORT_ERROR(("Unknown Reference subtype %X\n", 523 ACPI_ERROR((AE_INFO,
518 obj_desc->reference.opcode)); 524 "Unknown Reference subtype %X",
525 obj_desc->reference.opcode));
519 return_ACPI_STATUS(AE_AML_INTERNAL); 526 return_ACPI_STATUS(AE_AML_INTERNAL);
520 } 527 }
521 } 528 }
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index 804faebf825c..a1c000f5a415 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -46,6 +46,7 @@
46#include <acpi/amlcode.h> 46#include <acpi/amlcode.h>
47#include <acpi/acparser.h> 47#include <acpi/acparser.h>
48#include <acpi/acinterp.h> 48#include <acpi/acinterp.h>
49#include <acpi/acnamesp.h>
49 50
50#define _COMPONENT ACPI_EXECUTER 51#define _COMPONENT ACPI_EXECUTER
51ACPI_MODULE_NAME("exresop") 52ACPI_MODULE_NAME("exresop")
@@ -95,9 +96,10 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
95 } 96 }
96 97
97 if (type_needed != this_type) { 98 if (type_needed != this_type) {
98 ACPI_REPORT_ERROR(("Needed type [%s], found [%s] %p\n", 99 ACPI_ERROR((AE_INFO,
99 acpi_ut_get_type_name(type_needed), 100 "Needed type [%s], found [%s] %p",
100 acpi_ut_get_type_name(this_type), object)); 101 acpi_ut_get_type_name(type_needed),
102 acpi_ut_get_type_name(this_type), object));
101 103
102 return (AE_AML_OPERAND_TYPE); 104 return (AE_AML_OPERAND_TYPE);
103 } 105 }
@@ -150,7 +152,7 @@ acpi_ex_resolve_operands(u16 opcode,
150 152
151 arg_types = op_info->runtime_args; 153 arg_types = op_info->runtime_args;
152 if (arg_types == ARGI_INVALID_OPCODE) { 154 if (arg_types == ARGI_INVALID_OPCODE) {
153 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", opcode)); 155 ACPI_ERROR((AE_INFO, "Unknown AML opcode %X", opcode));
154 156
155 return_ACPI_STATUS(AE_AML_INTERNAL); 157 return_ACPI_STATUS(AE_AML_INTERNAL);
156 } 158 }
@@ -168,8 +170,8 @@ acpi_ex_resolve_operands(u16 opcode,
168 */ 170 */
169 while (GET_CURRENT_ARG_TYPE(arg_types)) { 171 while (GET_CURRENT_ARG_TYPE(arg_types)) {
170 if (!stack_ptr || !*stack_ptr) { 172 if (!stack_ptr || !*stack_ptr) {
171 ACPI_REPORT_ERROR(("Null stack entry at %p\n", 173 ACPI_ERROR((AE_INFO, "Null stack entry at %p",
172 stack_ptr)); 174 stack_ptr));
173 175
174 return_ACPI_STATUS(AE_AML_INTERNAL); 176 return_ACPI_STATUS(AE_AML_INTERNAL);
175 } 177 }
@@ -187,6 +189,22 @@ acpi_ex_resolve_operands(u16 opcode,
187 189
188 object_type = 190 object_type =
189 ((struct acpi_namespace_node *)obj_desc)->type; 191 ((struct acpi_namespace_node *)obj_desc)->type;
192
193 /*
194 * Resolve an alias object. The construction of these objects
195 * guarantees that there is only one level of alias indirection;
196 * thus, the attached object is always the aliased namespace node
197 */
198 if (object_type == ACPI_TYPE_LOCAL_ALIAS) {
199 obj_desc =
200 acpi_ns_get_attached_object((struct
201 acpi_namespace_node
202 *)obj_desc);
203 *stack_ptr = obj_desc;
204 object_type =
205 ((struct acpi_namespace_node *)obj_desc)->
206 type;
207 }
190 break; 208 break;
191 209
192 case ACPI_DESC_TYPE_OPERAND: 210 case ACPI_DESC_TYPE_OPERAND:
@@ -198,7 +216,9 @@ acpi_ex_resolve_operands(u16 opcode,
198 /* Check for bad acpi_object_type */ 216 /* Check for bad acpi_object_type */
199 217
200 if (!acpi_ut_valid_object_type(object_type)) { 218 if (!acpi_ut_valid_object_type(object_type)) {
201 ACPI_REPORT_ERROR(("Bad operand object type [%X]\n", object_type)); 219 ACPI_ERROR((AE_INFO,
220 "Bad operand object type [%X]",
221 object_type));
202 222
203 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 223 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
204 } 224 }
@@ -236,7 +256,10 @@ acpi_ex_resolve_operands(u16 opcode,
236 break; 256 break;
237 257
238 default: 258 default:
239 ACPI_REPORT_ERROR(("Operand is a Reference, Unknown Reference Opcode: %X\n", obj_desc->reference.opcode)); 259 ACPI_ERROR((AE_INFO,
260 "Operand is a Reference, Unknown Reference Opcode: %X",
261 obj_desc->reference.
262 opcode));
240 263
241 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 264 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
242 } 265 }
@@ -247,10 +270,10 @@ acpi_ex_resolve_operands(u16 opcode,
247 270
248 /* Invalid descriptor */ 271 /* Invalid descriptor */
249 272
250 ACPI_REPORT_ERROR(("Invalid descriptor %p [%s]\n", 273 ACPI_ERROR((AE_INFO,
251 obj_desc, 274 "Invalid descriptor %p [%s]",
252 acpi_ut_get_descriptor_name 275 obj_desc,
253 (obj_desc))); 276 acpi_ut_get_descriptor_name(obj_desc)));
254 277
255 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 278 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
256 } 279 }
@@ -408,7 +431,10 @@ acpi_ex_resolve_operands(u16 opcode,
408 acpi_ex_convert_to_integer(obj_desc, stack_ptr, 16); 431 acpi_ex_convert_to_integer(obj_desc, stack_ptr, 16);
409 if (ACPI_FAILURE(status)) { 432 if (ACPI_FAILURE(status)) {
410 if (status == AE_TYPE) { 433 if (status == AE_TYPE) {
411 ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc)); 434 ACPI_ERROR((AE_INFO,
435 "Needed [Integer/String/Buffer], found [%s] %p",
436 acpi_ut_get_object_type_name
437 (obj_desc), obj_desc));
412 438
413 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 439 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
414 } 440 }
@@ -431,7 +457,10 @@ acpi_ex_resolve_operands(u16 opcode,
431 status = acpi_ex_convert_to_buffer(obj_desc, stack_ptr); 457 status = acpi_ex_convert_to_buffer(obj_desc, stack_ptr);
432 if (ACPI_FAILURE(status)) { 458 if (ACPI_FAILURE(status)) {
433 if (status == AE_TYPE) { 459 if (status == AE_TYPE) {
434 ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc)); 460 ACPI_ERROR((AE_INFO,
461 "Needed [Integer/String/Buffer], found [%s] %p",
462 acpi_ut_get_object_type_name
463 (obj_desc), obj_desc));
435 464
436 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 465 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
437 } 466 }
@@ -455,7 +484,10 @@ acpi_ex_resolve_operands(u16 opcode,
455 ACPI_IMPLICIT_CONVERT_HEX); 484 ACPI_IMPLICIT_CONVERT_HEX);
456 if (ACPI_FAILURE(status)) { 485 if (ACPI_FAILURE(status)) {
457 if (status == AE_TYPE) { 486 if (status == AE_TYPE) {
458 ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc)); 487 ACPI_ERROR((AE_INFO,
488 "Needed [Integer/String/Buffer], found [%s] %p",
489 acpi_ut_get_object_type_name
490 (obj_desc), obj_desc));
459 491
460 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 492 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
461 } 493 }
@@ -481,7 +513,10 @@ acpi_ex_resolve_operands(u16 opcode,
481 break; 513 break;
482 514
483 default: 515 default:
484 ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc)); 516 ACPI_ERROR((AE_INFO,
517 "Needed [Integer/String/Buffer], found [%s] %p",
518 acpi_ut_get_object_type_name
519 (obj_desc), obj_desc));
485 520
486 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 521 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
487 } 522 }
@@ -515,7 +550,10 @@ acpi_ex_resolve_operands(u16 opcode,
515 break; 550 break;
516 551
517 default: 552 default:
518 ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc)); 553 ACPI_ERROR((AE_INFO,
554 "Needed [Integer/String/Buffer], found [%s] %p",
555 acpi_ut_get_object_type_name
556 (obj_desc), obj_desc));
519 557
520 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 558 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
521 } 559 }
@@ -539,7 +577,10 @@ acpi_ex_resolve_operands(u16 opcode,
539 break; 577 break;
540 578
541 default: 579 default:
542 ACPI_REPORT_ERROR(("Needed [Buffer/String/Package/Reference], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc)); 580 ACPI_ERROR((AE_INFO,
581 "Needed [Buffer/String/Package/Reference], found [%s] %p",
582 acpi_ut_get_object_type_name
583 (obj_desc), obj_desc));
543 584
544 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 585 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
545 } 586 }
@@ -558,7 +599,10 @@ acpi_ex_resolve_operands(u16 opcode,
558 break; 599 break;
559 600
560 default: 601 default:
561 ACPI_REPORT_ERROR(("Needed [Buffer/String/Package], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc)); 602 ACPI_ERROR((AE_INFO,
603 "Needed [Buffer/String/Package], found [%s] %p",
604 acpi_ut_get_object_type_name
605 (obj_desc), obj_desc));
562 606
563 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 607 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
564 } 608 }
@@ -578,7 +622,10 @@ acpi_ex_resolve_operands(u16 opcode,
578 break; 622 break;
579 623
580 default: 624 default:
581 ACPI_REPORT_ERROR(("Needed [Region/region_field], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc)); 625 ACPI_ERROR((AE_INFO,
626 "Needed [Region/region_field], found [%s] %p",
627 acpi_ut_get_object_type_name
628 (obj_desc), obj_desc));
582 629
583 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 630 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
584 } 631 }
@@ -620,7 +667,10 @@ acpi_ex_resolve_operands(u16 opcode,
620 break; 667 break;
621 } 668 }
622 669
623 ACPI_REPORT_ERROR(("Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc)); 670 ACPI_ERROR((AE_INFO,
671 "Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p",
672 acpi_ut_get_object_type_name
673 (obj_desc), obj_desc));
624 674
625 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 675 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
626 } 676 }
@@ -630,7 +680,9 @@ acpi_ex_resolve_operands(u16 opcode,
630 680
631 /* Unknown type */ 681 /* Unknown type */
632 682
633 ACPI_REPORT_ERROR(("Internal - Unknown ARGI (required operand) type %X\n", this_arg_type)); 683 ACPI_ERROR((AE_INFO,
684 "Internal - Unknown ARGI (required operand) type %X",
685 this_arg_type));
634 686
635 return_ACPI_STATUS(AE_BAD_PARAMETER); 687 return_ACPI_STATUS(AE_BAD_PARAMETER);
636 } 688 }
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 202ebe1eb957..3f020c0e2b95 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -250,7 +250,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
250 /* Validate parameters */ 250 /* Validate parameters */
251 251
252 if (!source_desc || !dest_desc) { 252 if (!source_desc || !dest_desc) {
253 ACPI_REPORT_ERROR(("Null parameter\n")); 253 ACPI_ERROR((AE_INFO, "Null parameter"));
254 return_ACPI_STATUS(AE_AML_NO_OPERAND); 254 return_ACPI_STATUS(AE_AML_NO_OPERAND);
255 } 255 }
256 256
@@ -290,7 +290,10 @@ acpi_ex_store(union acpi_operand_object *source_desc,
290 290
291 /* Destination is not a Reference object */ 291 /* Destination is not a Reference object */
292 292
293 ACPI_REPORT_ERROR(("Target is not a Reference or Constant object - %s [%p]\n", acpi_ut_get_object_type_name(dest_desc), dest_desc)); 293 ACPI_ERROR((AE_INFO,
294 "Target is not a Reference or Constant object - %s [%p]",
295 acpi_ut_get_object_type_name(dest_desc),
296 dest_desc));
294 297
295 ACPI_DUMP_STACK_ENTRY(source_desc); 298 ACPI_DUMP_STACK_ENTRY(source_desc);
296 ACPI_DUMP_STACK_ENTRY(dest_desc); 299 ACPI_DUMP_STACK_ENTRY(dest_desc);
@@ -357,8 +360,8 @@ acpi_ex_store(union acpi_operand_object *source_desc,
357 360
358 default: 361 default:
359 362
360 ACPI_REPORT_ERROR(("Unknown Reference opcode %X\n", 363 ACPI_ERROR((AE_INFO, "Unknown Reference opcode %X",
361 ref_desc->reference.opcode)); 364 ref_desc->reference.opcode));
362 ACPI_DUMP_ENTRY(ref_desc, ACPI_LV_ERROR); 365 ACPI_DUMP_ENTRY(ref_desc, ACPI_LV_ERROR);
363 366
364 status = AE_AML_INTERNAL; 367 status = AE_AML_INTERNAL;
@@ -487,7 +490,9 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
487 490
488 /* All other types are invalid */ 491 /* All other types are invalid */
489 492
490 ACPI_REPORT_ERROR(("Source must be Integer/Buffer/String type, not %s\n", acpi_ut_get_object_type_name(source_desc))); 493 ACPI_ERROR((AE_INFO,
494 "Source must be Integer/Buffer/String type, not %s",
495 acpi_ut_get_object_type_name(source_desc)));
491 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 496 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
492 } 497 }
493 498
@@ -497,7 +502,8 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
497 break; 502 break;
498 503
499 default: 504 default:
500 ACPI_REPORT_ERROR(("Target is not a Package or buffer_field\n")); 505 ACPI_ERROR((AE_INFO,
506 "Target is not a Package or buffer_field"));
501 status = AE_AML_OPERAND_TYPE; 507 status = AE_AML_OPERAND_TYPE;
502 break; 508 break;
503 } 509 }
diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 25bbc1d78547..42967baf760d 100644
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -123,7 +123,10 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
123 && (source_desc->reference.opcode == AML_LOAD_OP))) { 123 && (source_desc->reference.opcode == AML_LOAD_OP))) {
124 /* Conversion successful but still not a valid type */ 124 /* Conversion successful but still not a valid type */
125 125
126 ACPI_REPORT_ERROR(("Cannot assign type %s to %s (must be type Int/Str/Buf)\n", acpi_ut_get_object_type_name(source_desc), acpi_ut_get_type_name(target_type))); 126 ACPI_ERROR((AE_INFO,
127 "Cannot assign type %s to %s (must be type Int/Str/Buf)",
128 acpi_ut_get_object_type_name(source_desc),
129 acpi_ut_get_type_name(target_type)));
127 status = AE_AML_OPERAND_TYPE; 130 status = AE_AML_OPERAND_TYPE;
128 } 131 }
129 break; 132 break;
@@ -131,9 +134,11 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
131 case ACPI_TYPE_LOCAL_ALIAS: 134 case ACPI_TYPE_LOCAL_ALIAS:
132 case ACPI_TYPE_LOCAL_METHOD_ALIAS: 135 case ACPI_TYPE_LOCAL_METHOD_ALIAS:
133 136
134 /* Aliases are resolved by acpi_ex_prep_operands */ 137 /*
135 138 * All aliases should have been resolved earlier, during the
136 ACPI_REPORT_ERROR(("Store into Alias - should never happen\n")); 139 * operand resolution phase.
140 */
141 ACPI_ERROR((AE_INFO, "Store into an unresolved Alias object"));
137 status = AE_AML_INTERNAL; 142 status = AE_AML_INTERNAL;
138 break; 143 break;
139 144
@@ -276,8 +281,8 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
276 /* 281 /*
277 * All other types come here. 282 * All other types come here.
278 */ 283 */
279 ACPI_REPORT_WARNING(("Store into type %s not implemented\n", 284 ACPI_WARNING((AE_INFO, "Store into type %s not implemented",
280 acpi_ut_get_object_type_name(dest_desc))); 285 acpi_ut_get_object_type_name(dest_desc)));
281 286
282 status = AE_NOT_IMPLEMENTED; 287 status = AE_NOT_IMPLEMENTED;
283 break; 288 break;
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c
index 9a3684d3cf87..ea9144f42e1f 100644
--- a/drivers/acpi/executer/exsystem.c
+++ b/drivers/acpi/executer/exsystem.c
@@ -129,8 +129,8 @@ acpi_status acpi_ex_system_do_stall(u32 how_long)
129 * (ACPI specifies 100 usec as max, but this gives some slack in 129 * (ACPI specifies 100 usec as max, but this gives some slack in
130 * order to support existing BIOSs) 130 * order to support existing BIOSs)
131 */ 131 */
132 ACPI_REPORT_ERROR(("Time parameter is too large (%d)\n", 132 ACPI_ERROR((AE_INFO, "Time parameter is too large (%d)",
133 how_long)); 133 how_long));
134 status = AE_AML_OPERAND_VALUE; 134 status = AE_AML_OPERAND_VALUE;
135 } else { 135 } else {
136 acpi_os_stall(how_long); 136 acpi_os_stall(how_long);
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index 990c40e0c041..f73a61aeb7ec 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -91,7 +91,7 @@ acpi_status acpi_ex_enter_interpreter(void)
91 91
92 status = acpi_ut_acquire_mutex(ACPI_MTX_EXECUTE); 92 status = acpi_ut_acquire_mutex(ACPI_MTX_EXECUTE);
93 if (ACPI_FAILURE(status)) { 93 if (ACPI_FAILURE(status)) {
94 ACPI_REPORT_ERROR(("Could not acquire interpreter mutex\n")); 94 ACPI_ERROR((AE_INFO, "Could not acquire interpreter mutex"));
95 } 95 }
96 96
97 return_ACPI_STATUS(status); 97 return_ACPI_STATUS(status);
@@ -127,7 +127,7 @@ void acpi_ex_exit_interpreter(void)
127 127
128 status = acpi_ut_release_mutex(ACPI_MTX_EXECUTE); 128 status = acpi_ut_release_mutex(ACPI_MTX_EXECUTE);
129 if (ACPI_FAILURE(status)) { 129 if (ACPI_FAILURE(status)) {
130 ACPI_REPORT_ERROR(("Could not release interpreter mutex\n")); 130 ACPI_ERROR((AE_INFO, "Could not release interpreter mutex"));
131 } 131 }
132 132
133 return_VOID; 133 return_VOID;
@@ -200,7 +200,8 @@ u8 acpi_ex_acquire_global_lock(u32 field_flags)
200 if (ACPI_SUCCESS(status)) { 200 if (ACPI_SUCCESS(status)) {
201 locked = TRUE; 201 locked = TRUE;
202 } else { 202 } else {
203 ACPI_REPORT_ERROR(("Could not acquire Global Lock, %s\n", acpi_format_exception(status))); 203 ACPI_EXCEPTION((AE_INFO, status,
204 "Could not acquire Global Lock"));
204 } 205 }
205 } 206 }
206 207
@@ -235,7 +236,8 @@ void acpi_ex_release_global_lock(u8 locked_by_me)
235 if (ACPI_FAILURE(status)) { 236 if (ACPI_FAILURE(status)) {
236 /* Report the error, but there isn't much else we can do */ 237 /* Report the error, but there isn't much else we can do */
237 238
238 ACPI_REPORT_ERROR(("Could not release ACPI Global Lock, %s\n", acpi_format_exception(status))); 239 ACPI_EXCEPTION((AE_INFO, status,
240 "Could not release ACPI Global Lock"));
239 } 241 }
240 } 242 }
241 243
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-11 07:54:18 -0500