aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/dispatcher
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/dispatcher')
-rw-r--r--drivers/acpi/dispatcher/dsfield.c34
-rw-r--r--drivers/acpi/dispatcher/dsinit.c14
-rw-r--r--drivers/acpi/dispatcher/dsmethod.c6
-rw-r--r--drivers/acpi/dispatcher/dsmthdat.c25
-rw-r--r--drivers/acpi/dispatcher/dsobject.c20
-rw-r--r--drivers/acpi/dispatcher/dsopcode.c45
-rw-r--r--drivers/acpi/dispatcher/dsutils.c15
-rw-r--r--drivers/acpi/dispatcher/dswexec.c31
-rw-r--r--drivers/acpi/dispatcher/dswload.c26
-rw-r--r--drivers/acpi/dispatcher/dswscope.c4
-rw-r--r--drivers/acpi/dispatcher/dswstate.c94
11 files changed, 196 insertions, 118 deletions
diff --git a/drivers/acpi/dispatcher/dsfield.c b/drivers/acpi/dispatcher/dsfield.c
index f3a008ff1eae..76bc0463f6de 100644
--- a/drivers/acpi/dispatcher/dsfield.c
+++ b/drivers/acpi/dispatcher/dsfield.c
@@ -128,7 +128,7 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
128 ACPI_IMODE_LOAD_PASS1, flags, walk_state, 128 ACPI_IMODE_LOAD_PASS1, flags, walk_state,
129 &(node)); 129 &(node));
130 if (ACPI_FAILURE(status)) { 130 if (ACPI_FAILURE(status)) {
131 ACPI_REPORT_NSERROR(arg->common.value.string, status); 131 ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
132 return_ACPI_STATUS(status); 132 return_ACPI_STATUS(status);
133 } 133 }
134 } 134 }
@@ -232,7 +232,8 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
232 + (acpi_integer) arg->common.value.size; 232 + (acpi_integer) arg->common.value.size;
233 233
234 if (position > ACPI_UINT32_MAX) { 234 if (position > ACPI_UINT32_MAX) {
235 ACPI_REPORT_ERROR(("Bit offset within field too large (> 0xFFFFFFFF)\n")); 235 ACPI_ERROR((AE_INFO,
236 "Bit offset within field too large (> 0xFFFFFFFF)"));
236 return_ACPI_STATUS(AE_SUPPORT); 237 return_ACPI_STATUS(AE_SUPPORT);
237 } 238 }
238 239
@@ -268,8 +269,8 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
268 ACPI_NS_DONT_OPEN_SCOPE, 269 ACPI_NS_DONT_OPEN_SCOPE,
269 walk_state, &info->field_node); 270 walk_state, &info->field_node);
270 if (ACPI_FAILURE(status)) { 271 if (ACPI_FAILURE(status)) {
271 ACPI_REPORT_NSERROR((char *)&arg->named.name, 272 ACPI_ERROR_NAMESPACE((char *)&arg->named.name,
272 status); 273 status);
273 if (status != AE_ALREADY_EXISTS) { 274 if (status != AE_ALREADY_EXISTS) {
274 return_ACPI_STATUS(status); 275 return_ACPI_STATUS(status);
275 } 276 }
@@ -293,7 +294,11 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
293 + (acpi_integer) arg->common.value.size; 294 + (acpi_integer) arg->common.value.size;
294 295
295 if (position > ACPI_UINT32_MAX) { 296 if (position > ACPI_UINT32_MAX) {
296 ACPI_REPORT_ERROR(("Field [%4.4s] bit offset too large (> 0xFFFFFFFF)\n", ACPI_CAST_PTR(char, &info->field_node->name))); 297 ACPI_ERROR((AE_INFO,
298 "Field [%4.4s] bit offset too large (> 0xFFFFFFFF)",
299 ACPI_CAST_PTR(char,
300 &info->field_node->
301 name)));
297 return_ACPI_STATUS(AE_SUPPORT); 302 return_ACPI_STATUS(AE_SUPPORT);
298 } 303 }
299 304
@@ -302,8 +307,9 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
302 307
303 default: 308 default:
304 309
305 ACPI_REPORT_ERROR(("Invalid opcode in field list: %X\n", 310 ACPI_ERROR((AE_INFO,
306 arg->common.aml_opcode)); 311 "Invalid opcode in field list: %X",
312 arg->common.aml_opcode));
307 return_ACPI_STATUS(AE_AML_BAD_OPCODE); 313 return_ACPI_STATUS(AE_AML_BAD_OPCODE);
308 } 314 }
309 315
@@ -348,7 +354,7 @@ acpi_ds_create_field(union acpi_parse_object *op,
348 ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT, 354 ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
349 walk_state, &region_node); 355 walk_state, &region_node);
350 if (ACPI_FAILURE(status)) { 356 if (ACPI_FAILURE(status)) {
351 ACPI_REPORT_NSERROR(arg->common.value.name, status); 357 ACPI_ERROR_NAMESPACE(arg->common.value.name, status);
352 return_ACPI_STATUS(status); 358 return_ACPI_STATUS(status);
353 } 359 }
354 } 360 }
@@ -430,8 +436,8 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
430 ACPI_NS_ERROR_IF_FOUND, 436 ACPI_NS_ERROR_IF_FOUND,
431 walk_state, &node); 437 walk_state, &node);
432 if (ACPI_FAILURE(status)) { 438 if (ACPI_FAILURE(status)) {
433 ACPI_REPORT_NSERROR((char *)&arg->named.name, 439 ACPI_ERROR_NAMESPACE((char *)&arg->named.name,
434 status); 440 status);
435 if (status != AE_ALREADY_EXISTS) { 441 if (status != AE_ALREADY_EXISTS) {
436 return_ACPI_STATUS(status); 442 return_ACPI_STATUS(status);
437 } 443 }
@@ -487,7 +493,7 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,
487 ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT, 493 ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
488 walk_state, &region_node); 494 walk_state, &region_node);
489 if (ACPI_FAILURE(status)) { 495 if (ACPI_FAILURE(status)) {
490 ACPI_REPORT_NSERROR(arg->common.value.name, status); 496 ACPI_ERROR_NAMESPACE(arg->common.value.name, status);
491 return_ACPI_STATUS(status); 497 return_ACPI_STATUS(status);
492 } 498 }
493 } 499 }
@@ -501,7 +507,7 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,
501 ACPI_NS_SEARCH_PARENT, walk_state, 507 ACPI_NS_SEARCH_PARENT, walk_state,
502 &info.register_node); 508 &info.register_node);
503 if (ACPI_FAILURE(status)) { 509 if (ACPI_FAILURE(status)) {
504 ACPI_REPORT_NSERROR(arg->common.value.string, status); 510 ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
505 return_ACPI_STATUS(status); 511 return_ACPI_STATUS(status);
506 } 512 }
507 513
@@ -559,7 +565,7 @@ acpi_ds_create_index_field(union acpi_parse_object *op,
559 ACPI_NS_SEARCH_PARENT, walk_state, 565 ACPI_NS_SEARCH_PARENT, walk_state,
560 &info.register_node); 566 &info.register_node);
561 if (ACPI_FAILURE(status)) { 567 if (ACPI_FAILURE(status)) {
562 ACPI_REPORT_NSERROR(arg->common.value.string, status); 568 ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
563 return_ACPI_STATUS(status); 569 return_ACPI_STATUS(status);
564 } 570 }
565 571
@@ -572,7 +578,7 @@ acpi_ds_create_index_field(union acpi_parse_object *op,
572 ACPI_NS_SEARCH_PARENT, walk_state, 578 ACPI_NS_SEARCH_PARENT, walk_state,
573 &info.data_register_node); 579 &info.data_register_node);
574 if (ACPI_FAILURE(status)) { 580 if (ACPI_FAILURE(status)) {
575 ACPI_REPORT_NSERROR(arg->common.value.string, status); 581 ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
576 return_ACPI_STATUS(status); 582 return_ACPI_STATUS(status);
577 } 583 }
578 584
diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c
index 258fbdfaa69c..e65a07ad2422 100644
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/dispatcher/dsinit.c
@@ -105,7 +105,10 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
105 105
106 status = acpi_ds_initialize_region(obj_handle); 106 status = acpi_ds_initialize_region(obj_handle);
107 if (ACPI_FAILURE(status)) { 107 if (ACPI_FAILURE(status)) {
108 ACPI_REPORT_ERROR(("Region %p [%4.4s] - Init failure, %s\n", obj_handle, acpi_ut_get_node_name(obj_handle), acpi_format_exception(status))); 108 ACPI_EXCEPTION((AE_INFO, status,
109 "During Region initialization %p [%4.4s]",
110 obj_handle,
111 acpi_ut_get_node_name(obj_handle)));
109 } 112 }
110 113
111 info->op_region_count++; 114 info->op_region_count++;
@@ -144,7 +147,11 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
144 */ 147 */
145 status = acpi_ds_parse_method(obj_handle); 148 status = acpi_ds_parse_method(obj_handle);
146 if (ACPI_FAILURE(status)) { 149 if (ACPI_FAILURE(status)) {
147 ACPI_REPORT_ERROR(("\n+Method %p [%4.4s] - parse failure, %s\n", obj_handle, acpi_ut_get_node_name(obj_handle), acpi_format_exception(status))); 150 ACPI_ERROR((AE_INFO,
151 "Method %p [%4.4s] - parse failure, %s",
152 obj_handle,
153 acpi_ut_get_node_name(obj_handle),
154 acpi_format_exception(status)));
148 155
149 /* This parse failed, but we will continue parsing more methods */ 156 /* This parse failed, but we will continue parsing more methods */
150 } 157 }
@@ -206,8 +213,7 @@ acpi_ds_initialize_objects(struct acpi_table_desc * table_desc,
206 status = acpi_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX, 213 status = acpi_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX,
207 acpi_ds_init_one_object, &info, NULL); 214 acpi_ds_init_one_object, &info, NULL);
208 if (ACPI_FAILURE(status)) { 215 if (ACPI_FAILURE(status)) {
209 ACPI_REPORT_ERROR(("walk_namespace failed, %s\n", 216 ACPI_EXCEPTION((AE_INFO, status, "During walk_namespace"));
210 acpi_format_exception(status)));
211 } 217 }
212 218
213 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, 219 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index d861add3fc1f..c475546535b6 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -141,7 +141,8 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node * method_node,
141 /* Prevent wraparound of thread count */ 141 /* Prevent wraparound of thread count */
142 142
143 if (obj_desc->method.thread_count == ACPI_UINT8_MAX) { 143 if (obj_desc->method.thread_count == ACPI_UINT8_MAX) {
144 ACPI_REPORT_ERROR(("Method reached maximum reentrancy limit (255)\n")); 144 ACPI_ERROR((AE_INFO,
145 "Method reached maximum reentrancy limit (255)"));
145 return_ACPI_STATUS(AE_AML_METHOD_LIMIT); 146 return_ACPI_STATUS(AE_AML_METHOD_LIMIT);
146 } 147 }
147 148
@@ -470,7 +471,8 @@ void acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state)
470 acpi_os_signal_semaphore(walk_state->method_desc->method. 471 acpi_os_signal_semaphore(walk_state->method_desc->method.
471 semaphore, 1); 472 semaphore, 1);
472 if (ACPI_FAILURE(status)) { 473 if (ACPI_FAILURE(status)) {
473 ACPI_REPORT_ERROR(("Could not signal method semaphore\n")); 474 ACPI_ERROR((AE_INFO,
475 "Could not signal method semaphore"));
474 476
475 /* Ignore error and continue cleanup */ 477 /* Ignore error and continue cleanup */
476 } 478 }
diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c
index ce33c34f87c6..c025674f938b 100644
--- a/drivers/acpi/dispatcher/dsmthdat.c
+++ b/drivers/acpi/dispatcher/dsmthdat.c
@@ -260,7 +260,9 @@ acpi_ds_method_data_get_node(u16 opcode,
260 case AML_LOCAL_OP: 260 case AML_LOCAL_OP:
261 261
262 if (index > ACPI_METHOD_MAX_LOCAL) { 262 if (index > ACPI_METHOD_MAX_LOCAL) {
263 ACPI_REPORT_ERROR(("Local index %d is invalid (max %d)\n", index, ACPI_METHOD_MAX_LOCAL)); 263 ACPI_ERROR((AE_INFO,
264 "Local index %d is invalid (max %d)",
265 index, ACPI_METHOD_MAX_LOCAL));
264 return_ACPI_STATUS(AE_AML_INVALID_INDEX); 266 return_ACPI_STATUS(AE_AML_INVALID_INDEX);
265 } 267 }
266 268
@@ -272,8 +274,9 @@ acpi_ds_method_data_get_node(u16 opcode,
272 case AML_ARG_OP: 274 case AML_ARG_OP:
273 275
274 if (index > ACPI_METHOD_MAX_ARG) { 276 if (index > ACPI_METHOD_MAX_ARG) {
275 ACPI_REPORT_ERROR(("Arg index %d is invalid (max %d)\n", 277 ACPI_ERROR((AE_INFO,
276 index, ACPI_METHOD_MAX_ARG)); 278 "Arg index %d is invalid (max %d)",
279 index, ACPI_METHOD_MAX_ARG));
277 return_ACPI_STATUS(AE_AML_INVALID_INDEX); 280 return_ACPI_STATUS(AE_AML_INVALID_INDEX);
278 } 281 }
279 282
@@ -283,7 +286,7 @@ acpi_ds_method_data_get_node(u16 opcode,
283 break; 286 break;
284 287
285 default: 288 default:
286 ACPI_REPORT_ERROR(("Opcode %d is invalid\n", opcode)); 289 ACPI_ERROR((AE_INFO, "Opcode %d is invalid", opcode));
287 return_ACPI_STATUS(AE_AML_BAD_OPCODE); 290 return_ACPI_STATUS(AE_AML_BAD_OPCODE);
288 } 291 }
289 292
@@ -374,7 +377,7 @@ acpi_ds_method_data_get_value(u16 opcode,
374 /* Validate the object descriptor */ 377 /* Validate the object descriptor */
375 378
376 if (!dest_desc) { 379 if (!dest_desc) {
377 ACPI_REPORT_ERROR(("Null object descriptor pointer\n")); 380 ACPI_ERROR((AE_INFO, "Null object descriptor pointer"));
378 return_ACPI_STATUS(AE_BAD_PARAMETER); 381 return_ACPI_STATUS(AE_BAD_PARAMETER);
379 } 382 }
380 383
@@ -419,18 +422,24 @@ acpi_ds_method_data_get_value(u16 opcode,
419 switch (opcode) { 422 switch (opcode) {
420 case AML_ARG_OP: 423 case AML_ARG_OP:
421 424
422 ACPI_REPORT_ERROR(("Uninitialized Arg[%d] at node %p\n", index, node)); 425 ACPI_ERROR((AE_INFO,
426 "Uninitialized Arg[%d] at node %p",
427 index, node));
423 428
424 return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG); 429 return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG);
425 430
426 case AML_LOCAL_OP: 431 case AML_LOCAL_OP:
427 432
428 ACPI_REPORT_ERROR(("Uninitialized Local[%d] at node %p\n", index, node)); 433 ACPI_ERROR((AE_INFO,
434 "Uninitialized Local[%d] at node %p",
435 index, node));
429 436
430 return_ACPI_STATUS(AE_AML_UNINITIALIZED_LOCAL); 437 return_ACPI_STATUS(AE_AML_UNINITIALIZED_LOCAL);
431 438
432 default: 439 default:
433 ACPI_REPORT_ERROR(("Not a Arg/Local opcode: %X\n", opcode)); 440 ACPI_ERROR((AE_INFO,
441 "Not a Arg/Local opcode: %X",
442 opcode));
434 return_ACPI_STATUS(AE_AML_INTERNAL); 443 return_ACPI_STATUS(AE_AML_INTERNAL);
435 } 444 }
436 } 445 }
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index dc116d679a58..8b21f0f9e517 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.c
@@ -129,8 +129,8 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
129 129
130 return_ACPI_STATUS(AE_OK); 130 return_ACPI_STATUS(AE_OK);
131 } else { 131 } else {
132 ACPI_REPORT_NSERROR(op->common.value. 132 ACPI_ERROR_NAMESPACE(op->common.value.
133 string, status); 133 string, status);
134 } 134 }
135 135
136 return_ACPI_STATUS(status); 136 return_ACPI_STATUS(status);
@@ -214,7 +214,9 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
214 byte_list = arg->named.next; 214 byte_list = arg->named.next;
215 if (byte_list) { 215 if (byte_list) {
216 if (byte_list->common.aml_opcode != AML_INT_BYTELIST_OP) { 216 if (byte_list->common.aml_opcode != AML_INT_BYTELIST_OP) {
217 ACPI_REPORT_ERROR(("Expecting bytelist, got AML opcode %X in op %p\n", byte_list->common.aml_opcode, byte_list)); 217 ACPI_ERROR((AE_INFO,
218 "Expecting bytelist, got AML opcode %X in op %p",
219 byte_list->common.aml_opcode, byte_list));
218 220
219 acpi_ut_remove_reference(obj_desc); 221 acpi_ut_remove_reference(obj_desc);
220 return (AE_TYPE); 222 return (AE_TYPE);
@@ -540,7 +542,9 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
540 542
541 default: 543 default:
542 544
543 ACPI_REPORT_ERROR(("Unknown constant opcode %X\n", opcode)); 545 ACPI_ERROR((AE_INFO,
546 "Unknown constant opcode %X",
547 opcode));
544 status = AE_AML_OPERAND_TYPE; 548 status = AE_AML_OPERAND_TYPE;
545 break; 549 break;
546 } 550 }
@@ -555,8 +559,8 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
555 break; 559 break;
556 560
557 default: 561 default:
558 ACPI_REPORT_ERROR(("Unknown Integer type %X\n", 562 ACPI_ERROR((AE_INFO, "Unknown Integer type %X",
559 op_info->type)); 563 op_info->type));
560 status = AE_AML_OPERAND_TYPE; 564 status = AE_AML_OPERAND_TYPE;
561 break; 565 break;
562 } 566 }
@@ -634,8 +638,8 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
634 638
635 default: 639 default:
636 640
637 ACPI_REPORT_ERROR(("Unimplemented data type: %X\n", 641 ACPI_ERROR((AE_INFO, "Unimplemented data type: %X",
638 ACPI_GET_OBJECT_TYPE(obj_desc))); 642 ACPI_GET_OBJECT_TYPE(obj_desc)));
639 643
640 status = AE_AML_OPERAND_TYPE; 644 status = AE_AML_OPERAND_TYPE;
641 break; 645 break;
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index 60414ee84b0a..6229c10674e1 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -245,7 +245,9 @@ acpi_status acpi_ds_get_buffer_arguments(union acpi_operand_object *obj_desc)
245 245
246 node = obj_desc->buffer.node; 246 node = obj_desc->buffer.node;
247 if (!node) { 247 if (!node) {
248 ACPI_REPORT_ERROR(("No pointer back to NS node in buffer obj %p\n", obj_desc)); 248 ACPI_ERROR((AE_INFO,
249 "No pointer back to NS node in buffer obj %p",
250 obj_desc));
249 return_ACPI_STATUS(AE_AML_INTERNAL); 251 return_ACPI_STATUS(AE_AML_INTERNAL);
250 } 252 }
251 253
@@ -287,8 +289,9 @@ acpi_status acpi_ds_get_package_arguments(union acpi_operand_object *obj_desc)
287 289
288 node = obj_desc->package.node; 290 node = obj_desc->package.node;
289 if (!node) { 291 if (!node) {
290 ACPI_REPORT_ERROR(("No pointer back to NS node in package %p\n", 292 ACPI_ERROR((AE_INFO,
291 obj_desc)); 293 "No pointer back to NS node in package %p",
294 obj_desc));
292 return_ACPI_STATUS(AE_AML_INTERNAL); 295 return_ACPI_STATUS(AE_AML_INTERNAL);
293 } 296 }
294 297
@@ -413,7 +416,9 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
413 /* Host object must be a Buffer */ 416 /* Host object must be a Buffer */
414 417
415 if (ACPI_GET_OBJECT_TYPE(buffer_desc) != ACPI_TYPE_BUFFER) { 418 if (ACPI_GET_OBJECT_TYPE(buffer_desc) != ACPI_TYPE_BUFFER) {
416 ACPI_REPORT_ERROR(("Target of Create Field is not a Buffer object - %s\n", acpi_ut_get_object_type_name(buffer_desc))); 419 ACPI_ERROR((AE_INFO,
420 "Target of Create Field is not a Buffer object - %s",
421 acpi_ut_get_object_type_name(buffer_desc)));
417 422
418 status = AE_AML_OPERAND_TYPE; 423 status = AE_AML_OPERAND_TYPE;
419 goto cleanup; 424 goto cleanup;
@@ -425,9 +430,10 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
425 * after resolution in acpi_ex_resolve_operands(). 430 * after resolution in acpi_ex_resolve_operands().
426 */ 431 */
427 if (ACPI_GET_DESCRIPTOR_TYPE(result_desc) != ACPI_DESC_TYPE_NAMED) { 432 if (ACPI_GET_DESCRIPTOR_TYPE(result_desc) != ACPI_DESC_TYPE_NAMED) {
428 ACPI_REPORT_ERROR(("(%s) destination not a NS Node [%s]\n", 433 ACPI_ERROR((AE_INFO,
429 acpi_ps_get_opcode_name(aml_opcode), 434 "(%s) destination not a NS Node [%s]",
430 acpi_ut_get_descriptor_name(result_desc))); 435 acpi_ps_get_opcode_name(aml_opcode),
436 acpi_ut_get_descriptor_name(result_desc)));
431 437
432 status = AE_AML_OPERAND_TYPE; 438 status = AE_AML_OPERAND_TYPE;
433 goto cleanup; 439 goto cleanup;
@@ -450,7 +456,8 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
450 /* Must have a valid (>0) bit count */ 456 /* Must have a valid (>0) bit count */
451 457
452 if (bit_count == 0) { 458 if (bit_count == 0) {
453 ACPI_REPORT_ERROR(("Attempt to create_field of length 0\n")); 459 ACPI_ERROR((AE_INFO,
460 "Attempt to create_field of length zero"));
454 status = AE_AML_OPERAND_VALUE; 461 status = AE_AML_OPERAND_VALUE;
455 goto cleanup; 462 goto cleanup;
456 } 463 }
@@ -503,8 +510,8 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
503 510
504 default: 511 default:
505 512
506 ACPI_REPORT_ERROR(("Unknown field creation opcode %02x\n", 513 ACPI_ERROR((AE_INFO,
507 aml_opcode)); 514 "Unknown field creation opcode %02x", aml_opcode));
508 status = AE_AML_BAD_OPCODE; 515 status = AE_AML_BAD_OPCODE;
509 goto cleanup; 516 goto cleanup;
510 } 517 }
@@ -512,7 +519,12 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
512 /* Entire field must fit within the current length of the buffer */ 519 /* Entire field must fit within the current length of the buffer */
513 520
514 if ((bit_offset + bit_count) > (8 * (u32) buffer_desc->buffer.length)) { 521 if ((bit_offset + bit_count) > (8 * (u32) buffer_desc->buffer.length)) {
515 ACPI_REPORT_ERROR(("Field [%4.4s] size %d exceeds Buffer [%4.4s] size %d (bits)\n", acpi_ut_get_node_name(result_desc), bit_offset + bit_count, acpi_ut_get_node_name(buffer_desc->buffer.node), 8 * (u32) buffer_desc->buffer.length)); 522 ACPI_ERROR((AE_INFO,
523 "Field [%4.4s] at %d exceeds Buffer [%4.4s] size %d (bits)",
524 acpi_ut_get_node_name(result_desc),
525 bit_offset + bit_count,
526 acpi_ut_get_node_name(buffer_desc->buffer.node),
527 8 * (u32) buffer_desc->buffer.length));
516 status = AE_AML_BUFFER_LIMIT; 528 status = AE_AML_BUFFER_LIMIT;
517 goto cleanup; 529 goto cleanup;
518 } 530 }
@@ -618,10 +630,9 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
618 "after acpi_ex_resolve_operands"); 630 "after acpi_ex_resolve_operands");
619 631
620 if (ACPI_FAILURE(status)) { 632 if (ACPI_FAILURE(status)) {
621 ACPI_REPORT_ERROR(("(%s) bad operand(s) (%X)\n", 633 ACPI_ERROR((AE_INFO, "(%s) bad operand(s) (%X)",
622 acpi_ps_get_opcode_name(op->common. 634 acpi_ps_get_opcode_name(op->common.aml_opcode),
623 aml_opcode), 635 status));
624 status));
625 636
626 return_ACPI_STATUS(status); 637 return_ACPI_STATUS(status);
627 } 638 }
@@ -1145,8 +1156,8 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
1145 1156
1146 default: 1157 default:
1147 1158
1148 ACPI_REPORT_ERROR(("Unknown control opcode=%X Op=%p\n", 1159 ACPI_ERROR((AE_INFO, "Unknown control opcode=%X Op=%p",
1149 op->common.aml_opcode, op)); 1160 op->common.aml_opcode, op));
1150 1161
1151 status = AE_AML_BAD_OPCODE; 1162 status = AE_AML_BAD_OPCODE;
1152 break; 1163 break;
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index cd9aa7faa57b..53356a591ac1 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -176,7 +176,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
176 /* Must have both an Op and a Result Object */ 176 /* Must have both an Op and a Result Object */
177 177
178 if (!op) { 178 if (!op) {
179 ACPI_REPORT_ERROR(("Null Op\n")); 179 ACPI_ERROR((AE_INFO, "Null Op"));
180 return_UINT8(TRUE); 180 return_UINT8(TRUE);
181 } 181 }
182 182
@@ -216,7 +216,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
216 parent_info = 216 parent_info =
217 acpi_ps_get_opcode_info(op->common.parent->common.aml_opcode); 217 acpi_ps_get_opcode_info(op->common.parent->common.aml_opcode);
218 if (parent_info->class == AML_CLASS_UNKNOWN) { 218 if (parent_info->class == AML_CLASS_UNKNOWN) {
219 ACPI_REPORT_ERROR(("Unknown parent opcode Op=%p\n", op)); 219 ACPI_ERROR((AE_INFO, "Unknown parent opcode Op=%p", op));
220 return_UINT8(FALSE); 220 return_UINT8(FALSE);
221 } 221 }
222 222
@@ -343,7 +343,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,
343 ACPI_FUNCTION_TRACE_PTR("ds_delete_result_if_not_used", result_obj); 343 ACPI_FUNCTION_TRACE_PTR("ds_delete_result_if_not_used", result_obj);
344 344
345 if (!op) { 345 if (!op) {
346 ACPI_REPORT_ERROR(("Null Op\n")); 346 ACPI_ERROR((AE_INFO, "Null Op"));
347 return_VOID; 347 return_VOID;
348 } 348 }
349 349
@@ -566,7 +566,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
566 } 566 }
567 567
568 if (ACPI_FAILURE(status)) { 568 if (ACPI_FAILURE(status)) {
569 ACPI_REPORT_NSERROR(name_string, status); 569 ACPI_ERROR_NAMESPACE(name_string, status);
570 } 570 }
571 } 571 }
572 572
@@ -634,7 +634,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
634 * Only error is underflow, and this indicates 634 * Only error is underflow, and this indicates
635 * a missing or null operand! 635 * a missing or null operand!
636 */ 636 */
637 ACPI_REPORT_ERROR(("Missing or null operand, %s\n", acpi_format_exception(status))); 637 ACPI_EXCEPTION((AE_INFO, status,
638 "Missing or null operand"));
638 return_ACPI_STATUS(status); 639 return_ACPI_STATUS(status);
639 } 640 }
640 } else { 641 } else {
@@ -726,7 +727,7 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
726 */ 727 */
727 (void)acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state); 728 (void)acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state);
728 729
729 ACPI_REPORT_ERROR(("While creating Arg %d - %s\n", 730 ACPI_EXCEPTION((AE_INFO, status, "While creating Arg %d",
730 (arg_count + 1), acpi_format_exception(status))); 731 (arg_count + 1)));
731 return_ACPI_STATUS(status); 732 return_ACPI_STATUS(status);
732} 733}
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,
100 if (result_obj) { 100 if (result_obj) {
101 status = acpi_ds_result_pop(&obj_desc, walk_state); 101 status = acpi_ds_result_pop(&obj_desc, walk_state);
102 if (ACPI_FAILURE(status)) { 102 if (ACPI_FAILURE(status)) {
103 ACPI_REPORT_ERROR(("Could not get result from predicate evaluation, %s\n", acpi_format_exception(status))); 103 ACPI_EXCEPTION((AE_INFO, status,
104 "Could not get result from predicate evaluation"));
104 105
105 return_ACPI_STATUS(status); 106 return_ACPI_STATUS(status);
106 } 107 }
@@ -121,8 +122,9 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
121 } 122 }
122 123
123 if (!obj_desc) { 124 if (!obj_desc) {
124 ACPI_REPORT_ERROR(("No predicate obj_desc=%p State=%p\n", 125 ACPI_ERROR((AE_INFO,
125 obj_desc, walk_state)); 126 "No predicate obj_desc=%p State=%p",
127 obj_desc, walk_state));
126 128
127 return_ACPI_STATUS(AE_AML_NO_OPERAND); 129 return_ACPI_STATUS(AE_AML_NO_OPERAND);
128 } 130 }
@@ -137,7 +139,10 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
137 } 139 }
138 140
139 if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) { 141 if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) {
140 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))); 142 ACPI_ERROR((AE_INFO,
143 "Bad predicate (not an integer) obj_desc=%p State=%p Type=%X",
144 obj_desc, walk_state,
145 ACPI_GET_OBJECT_TYPE(obj_desc)));
141 146
142 status = AE_AML_OPERAND_TYPE; 147 status = AE_AML_OPERAND_TYPE;
143 goto cleanup; 148 goto cleanup;
@@ -356,8 +361,8 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
356 op_class = walk_state->op_info->class; 361 op_class = walk_state->op_info->class;
357 362
358 if (op_class == AML_CLASS_UNKNOWN) { 363 if (op_class == AML_CLASS_UNKNOWN) {
359 ACPI_REPORT_ERROR(("Unknown opcode %X\n", 364 ACPI_ERROR((AE_INFO, "Unknown opcode %X",
360 op->common.aml_opcode)); 365 op->common.aml_opcode));
361 return_ACPI_STATUS(AE_NOT_IMPLEMENTED); 366 return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
362 } 367 }
363 368
@@ -447,7 +452,10 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
447 walk_state->operands[1]->reference.offset)) { 452 walk_state->operands[1]->reference.offset)) {
448 status = AE_OK; 453 status = AE_OK;
449 } else { 454 } else {
450 ACPI_REPORT_ERROR(("[%s]: Could not resolve operands, %s\n", acpi_ps_get_opcode_name(walk_state->opcode), acpi_format_exception(status))); 455 ACPI_EXCEPTION((AE_INFO, status,
456 "While resolving operands for [%s]",
457 acpi_ps_get_opcode_name
458 (walk_state->opcode)));
451 } 459 }
452 } 460 }
453 461
@@ -666,8 +674,8 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
666 674
667 case AML_TYPE_UNDEFINED: 675 case AML_TYPE_UNDEFINED:
668 676
669 ACPI_REPORT_ERROR(("Undefined opcode type Op=%p\n", 677 ACPI_ERROR((AE_INFO,
670 op)); 678 "Undefined opcode type Op=%p", op));
671 return_ACPI_STATUS(AE_NOT_IMPLEMENTED); 679 return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
672 680
673 case AML_TYPE_BOGUS: 681 case AML_TYPE_BOGUS:
@@ -679,7 +687,10 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
679 687
680 default: 688 default:
681 689
682 ACPI_REPORT_ERROR(("Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p\n", op_class, op_type, op->common.aml_opcode, op)); 690 ACPI_ERROR((AE_INFO,
691 "Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p",
692 op_class, op_type, op->common.aml_opcode,
693 op));
683 694
684 status = AE_NOT_IMPLEMENTED; 695 status = AE_NOT_IMPLEMENTED;
685 break; 696 break;
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 4cad6afa82f7..d3d24da31c81 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -187,7 +187,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
187 } 187 }
188#endif 188#endif
189 if (ACPI_FAILURE(status)) { 189 if (ACPI_FAILURE(status)) {
190 ACPI_REPORT_NSERROR(path, status); 190 ACPI_ERROR_NAMESPACE(path, status);
191 return_ACPI_STATUS(status); 191 return_ACPI_STATUS(status);
192 } 192 }
193 193
@@ -233,7 +233,9 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
233 233
234 /* All other types are an error */ 234 /* All other types are an error */
235 235
236 ACPI_REPORT_ERROR(("Invalid type (%s) for target of Scope operator [%4.4s] (Cannot override)\n", acpi_ut_get_type_name(node->type), path)); 236 ACPI_ERROR((AE_INFO,
237 "Invalid type (%s) for target of Scope operator [%4.4s] (Cannot override)",
238 acpi_ut_get_type_name(node->type), path));
237 239
238 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 240 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
239 } 241 }
@@ -300,7 +302,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
300 ACPI_IMODE_LOAD_PASS1, flags, walk_state, 302 ACPI_IMODE_LOAD_PASS1, flags, walk_state,
301 &(node)); 303 &(node));
302 if (ACPI_FAILURE(status)) { 304 if (ACPI_FAILURE(status)) {
303 ACPI_REPORT_NSERROR(path, status); 305 ACPI_ERROR_NAMESPACE(path, status);
304 return_ACPI_STATUS(status); 306 return_ACPI_STATUS(status);
305 } 307 }
306 break; 308 break;
@@ -618,10 +620,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
618 if (status == AE_NOT_FOUND) { 620 if (status == AE_NOT_FOUND) {
619 status = AE_OK; 621 status = AE_OK;
620 } else { 622 } else {
621 ACPI_REPORT_NSERROR(buffer_ptr, status); 623 ACPI_ERROR_NAMESPACE(buffer_ptr, status);
622 } 624 }
623#else 625#else
624 ACPI_REPORT_NSERROR(buffer_ptr, status); 626 ACPI_ERROR_NAMESPACE(buffer_ptr, status);
625#endif 627#endif
626 return_ACPI_STATUS(status); 628 return_ACPI_STATUS(status);
627 } 629 }
@@ -651,7 +653,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
651 * Scope (DEB) { ... } 653 * Scope (DEB) { ... }
652 */ 654 */
653 655
654 ACPI_REPORT_WARNING(("Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)\n", buffer_ptr, acpi_ut_get_type_name(node->type))); 656 ACPI_WARNING((AE_INFO,
657 "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)",
658 buffer_ptr,
659 acpi_ut_get_type_name(node->type)));
655 660
656 node->type = ACPI_TYPE_ANY; 661 node->type = ACPI_TYPE_ANY;
657 walk_state->scope_info->common.value = ACPI_TYPE_ANY; 662 walk_state->scope_info->common.value = ACPI_TYPE_ANY;
@@ -661,7 +666,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
661 666
662 /* All other types are an error */ 667 /* All other types are an error */
663 668
664 ACPI_REPORT_ERROR(("Invalid type (%s) for target of Scope operator [%4.4s]\n", acpi_ut_get_type_name(node->type), buffer_ptr)); 669 ACPI_ERROR((AE_INFO,
670 "Invalid type (%s) for target of Scope operator [%4.4s]",
671 acpi_ut_get_type_name(node->type),
672 buffer_ptr));
665 673
666 return (AE_AML_OPERAND_TYPE); 674 return (AE_AML_OPERAND_TYPE);
667 } 675 }
@@ -714,7 +722,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
714 } 722 }
715 723
716 if (ACPI_FAILURE(status)) { 724 if (ACPI_FAILURE(status)) {
717 ACPI_REPORT_NSERROR(buffer_ptr, status); 725 ACPI_ERROR_NAMESPACE(buffer_ptr, status);
718 return_ACPI_STATUS(status); 726 return_ACPI_STATUS(status);
719 } 727 }
720 728
@@ -1112,7 +1120,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
1112 */ 1120 */
1113 op->common.node = new_node; 1121 op->common.node = new_node;
1114 } else { 1122 } else {
1115 ACPI_REPORT_NSERROR(arg->common.value.string, status); 1123 ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
1116 } 1124 }
1117 break; 1125 break;
1118 1126
diff --git a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c
index e7fc88ca47ba..ada21ef4a174 100644
--- a/drivers/acpi/dispatcher/dswscope.c
+++ b/drivers/acpi/dispatcher/dswscope.c
@@ -107,14 +107,14 @@ acpi_ds_scope_stack_push(struct acpi_namespace_node *node,
107 if (!node) { 107 if (!node) {
108 /* Invalid scope */ 108 /* Invalid scope */
109 109
110 ACPI_REPORT_ERROR(("Null scope parameter\n")); 110 ACPI_ERROR((AE_INFO, "Null scope parameter"));
111 return_ACPI_STATUS(AE_BAD_PARAMETER); 111 return_ACPI_STATUS(AE_BAD_PARAMETER);
112 } 112 }
113 113
114 /* Make sure object type is valid */ 114 /* Make sure object type is valid */
115 115
116 if (!acpi_ut_valid_object_type(type)) { 116 if (!acpi_ut_valid_object_type(type)) {
117 ACPI_REPORT_WARNING(("Invalid object type: 0x%X\n", type)); 117 ACPI_WARNING((AE_INFO, "Invalid object type: 0x%X", type));
118 } 118 }
119 119
120 /* Allocate a new scope object */ 120 /* Allocate a new scope object */
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 61aae2dcc5e2..fa78cb74ee36 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -92,23 +92,23 @@ acpi_ds_result_remove(union acpi_operand_object **object,
92 92
93 state = walk_state->results; 93 state = walk_state->results;
94 if (!state) { 94 if (!state) {
95 ACPI_REPORT_ERROR(("No result object pushed! State=%p\n", 95 ACPI_ERROR((AE_INFO, "No result object pushed! State=%p",
96 walk_state)); 96 walk_state));
97 return (AE_NOT_EXIST); 97 return (AE_NOT_EXIST);
98 } 98 }
99 99
100 if (index >= ACPI_OBJ_MAX_OPERAND) { 100 if (index >= ACPI_OBJ_MAX_OPERAND) {
101 ACPI_REPORT_ERROR(("Index out of range: %X State=%p Num=%X\n", 101 ACPI_ERROR((AE_INFO,
102 index, walk_state, 102 "Index out of range: %X State=%p Num=%X",
103 state->results.num_results)); 103 index, walk_state, state->results.num_results));
104 } 104 }
105 105
106 /* Check for a valid result object */ 106 /* Check for a valid result object */
107 107
108 if (!state->results.obj_desc[index]) { 108 if (!state->results.obj_desc[index]) {
109 ACPI_REPORT_ERROR(("Null operand! State=%p #Ops=%X, Index=%X\n", 109 ACPI_ERROR((AE_INFO,
110 walk_state, state->results.num_results, 110 "Null operand! State=%p #Ops=%X, Index=%X",
111 index)); 111 walk_state, state->results.num_results, index));
112 return (AE_AML_NO_RETURN_VALUE); 112 return (AE_AML_NO_RETURN_VALUE);
113 } 113 }
114 114
@@ -160,8 +160,8 @@ acpi_ds_result_pop(union acpi_operand_object ** object,
160 } 160 }
161 161
162 if (!state->results.num_results) { 162 if (!state->results.num_results) {
163 ACPI_REPORT_ERROR(("Result stack is empty! State=%p\n", 163 ACPI_ERROR((AE_INFO, "Result stack is empty! State=%p",
164 walk_state)); 164 walk_state));
165 return (AE_AML_NO_RETURN_VALUE); 165 return (AE_AML_NO_RETURN_VALUE);
166 } 166 }
167 167
@@ -188,7 +188,7 @@ acpi_ds_result_pop(union acpi_operand_object ** object,
188 } 188 }
189 } 189 }
190 190
191 ACPI_REPORT_ERROR(("No result objects! State=%p\n", walk_state)); 191 ACPI_ERROR((AE_INFO, "No result objects! State=%p", walk_state));
192 return (AE_AML_NO_RETURN_VALUE); 192 return (AE_AML_NO_RETURN_VALUE);
193} 193}
194 194
@@ -217,14 +217,14 @@ acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,
217 217
218 state = walk_state->results; 218 state = walk_state->results;
219 if (!state) { 219 if (!state) {
220 ACPI_REPORT_ERROR(("No result object pushed! State=%p\n", 220 ACPI_ERROR((AE_INFO,
221 walk_state)); 221 "No result object pushed! State=%p", walk_state));
222 return (AE_NOT_EXIST); 222 return (AE_NOT_EXIST);
223 } 223 }
224 224
225 if (!state->results.num_results) { 225 if (!state->results.num_results) {
226 ACPI_REPORT_ERROR(("No result objects! State=%p\n", 226 ACPI_ERROR((AE_INFO, "No result objects! State=%p",
227 walk_state)); 227 walk_state));
228 return (AE_AML_NO_RETURN_VALUE); 228 return (AE_AML_NO_RETURN_VALUE);
229 } 229 }
230 230
@@ -244,9 +244,10 @@ acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,
244 /* Check for a valid result object */ 244 /* Check for a valid result object */
245 245
246 if (!*object) { 246 if (!*object) {
247 ACPI_REPORT_ERROR(("Null operand! State=%p #Ops=%X Index=%X\n", 247 ACPI_ERROR((AE_INFO,
248 walk_state, state->results.num_results, 248 "Null operand! State=%p #Ops=%X Index=%X",
249 (u32) index)); 249 walk_state, state->results.num_results,
250 (u32) index));
250 return (AE_AML_NO_RETURN_VALUE); 251 return (AE_AML_NO_RETURN_VALUE);
251 } 252 }
252 253
@@ -281,19 +282,21 @@ acpi_ds_result_push(union acpi_operand_object * object,
281 282
282 state = walk_state->results; 283 state = walk_state->results;
283 if (!state) { 284 if (!state) {
284 ACPI_REPORT_ERROR(("No result stack frame during push\n")); 285 ACPI_ERROR((AE_INFO, "No result stack frame during push"));
285 return (AE_AML_INTERNAL); 286 return (AE_AML_INTERNAL);
286 } 287 }
287 288
288 if (state->results.num_results == ACPI_OBJ_NUM_OPERANDS) { 289 if (state->results.num_results == ACPI_OBJ_NUM_OPERANDS) {
289 ACPI_REPORT_ERROR(("Result stack overflow: Obj=%p State=%p Num=%X\n", object, walk_state, state->results.num_results)); 290 ACPI_ERROR((AE_INFO,
291 "Result stack overflow: Obj=%p State=%p Num=%X",
292 object, walk_state, state->results.num_results));
290 return (AE_STACK_OVERFLOW); 293 return (AE_STACK_OVERFLOW);
291 } 294 }
292 295
293 if (!object) { 296 if (!object) {
294 ACPI_REPORT_ERROR(("Null Object! Obj=%p State=%p Num=%X\n", 297 ACPI_ERROR((AE_INFO,
295 object, walk_state, 298 "Null Object! Obj=%p State=%p Num=%X",
296 state->results.num_results)); 299 object, walk_state, state->results.num_results));
297 return (AE_BAD_PARAMETER); 300 return (AE_BAD_PARAMETER);
298 } 301 }
299 302
@@ -402,7 +405,9 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
402 /* Check for stack overflow */ 405 /* Check for stack overflow */
403 406
404 if (walk_state->num_operands >= ACPI_OBJ_NUM_OPERANDS) { 407 if (walk_state->num_operands >= ACPI_OBJ_NUM_OPERANDS) {
405 ACPI_REPORT_ERROR(("Object stack overflow! Obj=%p State=%p #Ops=%X\n", object, walk_state, walk_state->num_operands)); 408 ACPI_ERROR((AE_INFO,
409 "Object stack overflow! Obj=%p State=%p #Ops=%X",
410 object, walk_state, walk_state->num_operands));
406 return (AE_STACK_OVERFLOW); 411 return (AE_STACK_OVERFLOW);
407 } 412 }
408 413
@@ -446,7 +451,10 @@ acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state * walk_state)
446 /* Check for stack underflow */ 451 /* Check for stack underflow */
447 452
448 if (walk_state->num_operands == 0) { 453 if (walk_state->num_operands == 0) {
449 ACPI_REPORT_ERROR(("Object stack underflow! Count=%X State=%p #Ops=%X\n", pop_count, walk_state, walk_state->num_operands)); 454 ACPI_ERROR((AE_INFO,
455 "Object stack underflow! Count=%X State=%p #Ops=%X",
456 pop_count, walk_state,
457 walk_state->num_operands));
450 return (AE_STACK_UNDERFLOW); 458 return (AE_STACK_UNDERFLOW);
451 } 459 }
452 460
@@ -489,7 +497,10 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
489 /* Check for stack underflow */ 497 /* Check for stack underflow */
490 498
491 if (walk_state->num_operands == 0) { 499 if (walk_state->num_operands == 0) {
492 ACPI_REPORT_ERROR(("Object stack underflow! Count=%X State=%p #Ops=%X\n", pop_count, walk_state, walk_state->num_operands)); 500 ACPI_ERROR((AE_INFO,
501 "Object stack underflow! Count=%X State=%p #Ops=%X",
502 pop_count, walk_state,
503 walk_state->num_operands));
493 return (AE_STACK_UNDERFLOW); 504 return (AE_STACK_UNDERFLOW);
494 } 505 }
495 506
@@ -806,14 +817,14 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
806 } 817 }
807 818
808 if (walk_state->data_type != ACPI_DESC_TYPE_WALK) { 819 if (walk_state->data_type != ACPI_DESC_TYPE_WALK) {
809 ACPI_REPORT_ERROR(("%p is not a valid walk state\n", 820 ACPI_ERROR((AE_INFO, "%p is not a valid walk state",
810 walk_state)); 821 walk_state));
811 return; 822 return;
812 } 823 }
813 824
814 if (walk_state->parser_state.scope) { 825 if (walk_state->parser_state.scope) {
815 ACPI_REPORT_ERROR(("%p walk still has a scope list\n", 826 ACPI_ERROR((AE_INFO, "%p walk still has a scope list",
816 walk_state)); 827 walk_state));
817 } 828 }
818 829
819 /* Always must free any linked control states */ 830 /* Always must free any linked control states */
@@ -872,18 +883,24 @@ acpi_ds_result_insert(void *object,
872 883
873 state = walk_state->results; 884 state = walk_state->results;
874 if (!state) { 885 if (!state) {
875 ACPI_REPORT_ERROR(("No result object pushed! State=%p\n", 886 ACPI_ERROR((AE_INFO, "No result object pushed! State=%p",
876 walk_state)); 887 walk_state));
877 return (AE_NOT_EXIST); 888 return (AE_NOT_EXIST);
878 } 889 }
879 890
880 if (index >= ACPI_OBJ_NUM_OPERANDS) { 891 if (index >= ACPI_OBJ_NUM_OPERANDS) {
881 ACPI_REPORT_ERROR(("Index out of range: %X Obj=%p State=%p Num=%X\n", index, object, walk_state, state->results.num_results)); 892 ACPI_ERROR((AE_INFO,
893 "Index out of range: %X Obj=%p State=%p Num=%X",
894 index, object, walk_state,
895 state->results.num_results));
882 return (AE_BAD_PARAMETER); 896 return (AE_BAD_PARAMETER);
883 } 897 }
884 898
885 if (!object) { 899 if (!object) {
886 ACPI_REPORT_ERROR(("Null Object! Index=%X Obj=%p State=%p Num=%X\n", index, object, walk_state, state->results.num_results)); 900 ACPI_ERROR((AE_INFO,
901 "Null Object! Index=%X Obj=%p State=%p Num=%X",
902 index, object, walk_state,
903 state->results.num_results));
887 return (AE_BAD_PARAMETER); 904 return (AE_BAD_PARAMETER);
888 } 905 }
889 906
@@ -957,7 +974,9 @@ acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
957 /* Check for stack underflow */ 974 /* Check for stack underflow */
958 975
959 if (walk_state->num_operands == 0) { 976 if (walk_state->num_operands == 0) {
960 ACPI_REPORT_ERROR(("Missing operand/stack empty! State=%p #Ops=%X\n", walk_state, walk_state->num_operands)); 977 ACPI_ERROR((AE_INFO,
978 "Missing operand/stack empty! State=%p #Ops=%X",
979 walk_state, walk_state->num_operands));
961 *object = NULL; 980 *object = NULL;
962 return (AE_AML_NO_OPERAND); 981 return (AE_AML_NO_OPERAND);
963 } 982 }
@@ -969,8 +988,9 @@ acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
969 /* Check for a valid operand */ 988 /* Check for a valid operand */
970 989
971 if (!walk_state->operands[walk_state->num_operands]) { 990 if (!walk_state->operands[walk_state->num_operands]) {
972 ACPI_REPORT_ERROR(("Null operand! State=%p #Ops=%X\n", 991 ACPI_ERROR((AE_INFO,
973 walk_state, walk_state->num_operands)); 992 "Null operand! State=%p #Ops=%X",
993 walk_state, walk_state->num_operands));
974 *object = NULL; 994 *object = NULL;
975 return (AE_AML_NO_OPERAND); 995 return (AE_AML_NO_OPERAND);
976 } 996 }
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-13 18:00:55 -0500