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/2efd616e
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/dbexec.c b/drivers/acpi/acpica/dbexec.c
index 6abb6b8..bb43305 100644 (file)
--- a/drivers/acpi/acpica/dbexec.c
+++ b/drivers/acpi/acpica/dbexec.c
@@ -160,12 +160,12 @@ acpi_db_execute_method(struct acpi_db_method_info *info,
                }
 
                ACPI_EXCEPTION((AE_INFO, status,
-                               "while executing %s from debugger",
+                               "while executing %s from AML Debugger",
                                info->pathname));
 
                if (status == AE_BUFFER_OVERFLOW) {
                        ACPI_ERROR((AE_INFO,
-                                   "Possible overflow of internal debugger "
+                                   "Possible buffer overflow within AML Debugger "
                                    "buffer (size 0x%X needed 0x%X)",
                                    ACPI_DEBUG_BUFFER_SIZE,
                                    (u32)return_obj->length));

diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index 3f381ff..9b38653 100644 (file)
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -523,12 +523,12 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                        if (status == AE_ABORT_METHOD) {
                                acpi_ns_print_node_pathname(walk_state->
                                                            method_node,
-                                                           "Method aborted:");
+                                                           "Aborting method");
                                acpi_os_printf("\n");
                        } else {
-                               ACPI_ERROR_METHOD
-                                   ("Method parse/execution failed",
-                                    walk_state->method_node, NULL, status);
+                               ACPI_ERROR_METHOD("Aborting method",
+                                                 walk_state->method_node, NULL,
+                                                 status);
                        }
                        acpi_ex_enter_interpreter();
 

diff --git a/drivers/acpi/acpica/uterror.c b/drivers/acpi/acpica/uterror.c
index e474302..0754573 100644 (file)
--- a/drivers/acpi/acpica/uterror.c
+++ b/drivers/acpi/acpica/uterror.c
@@ -183,19 +183,19 @@ acpi_ut_prefixed_namespace_error(const char *module_name,
        case AE_ALREADY_EXISTS:
 
                acpi_os_printf(ACPI_MSG_BIOS_ERROR);
-               message = "Failure creating";
+               message = "Failure creating named object";
                break;
 
        case AE_NOT_FOUND:
 
                acpi_os_printf(ACPI_MSG_BIOS_ERROR);
-               message = "Could not resolve";
+               message = "Could not resolve symbol";
                break;
 
        default:
 
                acpi_os_printf(ACPI_MSG_ERROR);
-               message = "Failure resolving";
+               message = "Failure resolving symbol";
                break;
        }
 
@@ -317,7 +317,8 @@ acpi_ut_method_error(const char *module_name,
        }
 
        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_REDIRECT_END;