Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: 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

drivers/acpi/acpica/dbexec.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

drivers/acpi/acpica/psparse.c

+4 −4
Original line number Diff line number Diff line
@@ -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();

drivers/acpi/acpica/uterror.c

+5 −4
Original line number Diff line number Diff line
@@ -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;