Commit 991371e0 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki

ACPICA: Update/clarify messages for control method failures

ACPICA commit 2efd616e5b1c960f407763e6782f7dc259ea55df

Attempting to improve error messages to clarify that errors
are bubbled up from the original error, possibly across nested
methods.

Link: https://github.com/acpica/acpica/commit/2efd616eSigned-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 90791fbb
...@@ -160,12 +160,12 @@ acpi_db_execute_method(struct acpi_db_method_info *info, ...@@ -160,12 +160,12 @@ acpi_db_execute_method(struct acpi_db_method_info *info,
} }
ACPI_EXCEPTION((AE_INFO, status, ACPI_EXCEPTION((AE_INFO, status,
"while executing %s from debugger", "while executing %s from AML Debugger",
info->pathname)); info->pathname));
if (status == AE_BUFFER_OVERFLOW) { if (status == AE_BUFFER_OVERFLOW) {
ACPI_ERROR((AE_INFO, ACPI_ERROR((AE_INFO,
"Possible overflow of internal debugger " "Possible buffer overflow within AML Debugger "
"buffer (size 0x%X needed 0x%X)", "buffer (size 0x%X needed 0x%X)",
ACPI_DEBUG_BUFFER_SIZE, ACPI_DEBUG_BUFFER_SIZE,
(u32)return_obj->length)); (u32)return_obj->length));
......
...@@ -523,12 +523,12 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state) ...@@ -523,12 +523,12 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
if (status == AE_ABORT_METHOD) { if (status == AE_ABORT_METHOD) {
acpi_ns_print_node_pathname(walk_state-> acpi_ns_print_node_pathname(walk_state->
method_node, method_node,
"Method aborted:"); "Aborting method");
acpi_os_printf("\n"); acpi_os_printf("\n");
} else { } else {
ACPI_ERROR_METHOD ACPI_ERROR_METHOD("Aborting method",
("Method parse/execution failed", walk_state->method_node, NULL,
walk_state->method_node, NULL, status); status);
} }
acpi_ex_enter_interpreter(); acpi_ex_enter_interpreter();
......
...@@ -183,19 +183,19 @@ acpi_ut_prefixed_namespace_error(const char *module_name, ...@@ -183,19 +183,19 @@ acpi_ut_prefixed_namespace_error(const char *module_name,
case AE_ALREADY_EXISTS: case AE_ALREADY_EXISTS:
acpi_os_printf(ACPI_MSG_BIOS_ERROR); acpi_os_printf(ACPI_MSG_BIOS_ERROR);
message = "Failure creating"; message = "Failure creating named object";
break; break;
case AE_NOT_FOUND: case AE_NOT_FOUND:
acpi_os_printf(ACPI_MSG_BIOS_ERROR); acpi_os_printf(ACPI_MSG_BIOS_ERROR);
message = "Could not resolve"; message = "Could not resolve symbol";
break; break;
default: default:
acpi_os_printf(ACPI_MSG_ERROR); acpi_os_printf(ACPI_MSG_ERROR);
message = "Failure resolving"; message = "Failure resolving symbol";
break; break;
} }
...@@ -317,7 +317,8 @@ acpi_ut_method_error(const char *module_name, ...@@ -317,7 +317,8 @@ acpi_ut_method_error(const char *module_name,
} }
acpi_ns_print_node_pathname(node, message); acpi_ns_print_node_pathname(node, message);
acpi_os_printf(", %s", acpi_format_exception(method_status)); acpi_os_printf(" due to previous error (%s)",
acpi_format_exception(method_status));
ACPI_MSG_SUFFIX; ACPI_MSG_SUFFIX;
ACPI_MSG_REDIRECT_END; ACPI_MSG_REDIRECT_END;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment