Commit 16ccf829 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Enhance error messages from namespace create/lookup operations 

ACPICA commit b09c8d7bdc8c5a3db0a8d38bfd6182c023885e12

1) Emit the full pathname (scope+name) instead of just the name
2) For AE_ALREADY_EXISTS and AE_NOT_FOUND, use the "firmware error"
string to point to the true problem.

Link: https://github.com/acpica/acpica/commit/b09c8d7b


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 4b9b1de7

drivers/acpi/acpica/acmacros.h

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ 
 * the plist contains a set of parens to allow variable-length lists.

 * These macros are used for both the debug and non-debug versions of the code.

 */

#define ACPI_ERROR_NAMESPACE(s, e)          acpi_ut_namespace_error (AE_INFO, s, e);

#define ACPI_ERROR_NAMESPACE(s, p, e)       acpi_ut_prefixed_namespace_error (AE_INFO, s, p, e);

#define ACPI_ERROR_METHOD(s, n, p, e)       acpi_ut_method_error (AE_INFO, s, n, p, e);

#define ACPI_WARN_PREDEFINED(plist)         acpi_ut_predefined_warning plist

#define ACPI_INFO_PREDEFINED(plist)         acpi_ut_predefined_info plist

drivers/acpi/acpica/acnamesp.h

+3 −0
Original line number Diff line number Diff line
@@ -289,6 +289,9 @@ acpi_ns_build_normalized_path(struct acpi_namespace_node *node, 
char *acpi_ns_get_normalized_pathname(struct acpi_namespace_node *node,

				      u8 no_trailing);



char *acpi_ns_build_prefixed_pathname(union acpi_generic_state *prefix_scope,

				      const char *internal_path);



char *acpi_ns_name_of_current_scope(struct acpi_walk_state *walk_state);



acpi_status

drivers/acpi/acpica/acutils.h

+7 −5
Original line number Diff line number Diff line
@@ -126,10 +126,10 @@ extern const char *acpi_gbl_ptyp_decode[]; 
#endif



#ifndef ACPI_MSG_BIOS_ERROR

#define ACPI_MSG_BIOS_ERROR     "ACPI BIOS Error (bug): "

#define ACPI_MSG_BIOS_ERROR     "Firmware Error (ACPI): "

#endif

#ifndef ACPI_MSG_BIOS_WARNING

#define ACPI_MSG_BIOS_WARNING   "ACPI BIOS Warning (bug): "

#define ACPI_MSG_BIOS_WARNING   "Firmware Warning (ACPI): "

#endif



/*
@@ -734,9 +734,11 @@ acpi_ut_predefined_bios_error(const char *module_name, 
			      u8 node_flags, const char *format, ...);



void

acpi_ut_namespace_error(const char *module_name,

acpi_ut_prefixed_namespace_error(const char *module_name,

				 u32 line_number,

			const char *internal_name, acpi_status lookup_status);

				 union acpi_generic_state *prefix_scope,

				 const char *internal_name,

				 acpi_status lookup_status);



void

acpi_ut_method_error(const char *module_name,

drivers/acpi/acpica/dsfield.c

+19 −9
Original line number Diff line number Diff line
@@ -209,7 +209,8 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op, 
					ACPI_IMODE_LOAD_PASS1, flags,

					walk_state, &node);

		if (ACPI_FAILURE(status)) {

			ACPI_ERROR_NAMESPACE(arg->common.value.string, status);

			ACPI_ERROR_NAMESPACE(walk_state->scope_info,

					     arg->common.value.string, status);

			return_ACPI_STATUS(status);

		}

	}
@@ -383,7 +384,9 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info, 
							walk_state,

							&info->connection_node);

				if (ACPI_FAILURE(status)) {

					ACPI_ERROR_NAMESPACE(child->common.

					ACPI_ERROR_NAMESPACE(walk_state->

							     scope_info,

							     child->common.

							     value.name,

							     status);

					return_ACPI_STATUS(status);
@@ -402,7 +405,8 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info, 
						ACPI_NS_DONT_OPEN_SCOPE,

						walk_state, &info->field_node);

			if (ACPI_FAILURE(status)) {

				ACPI_ERROR_NAMESPACE((char *)&arg->named.name,

				ACPI_ERROR_NAMESPACE(walk_state->scope_info,

						     (char *)&arg->named.name,

						     status);

				return_ACPI_STATUS(status);

			} else {
@@ -498,7 +502,8 @@ acpi_ds_create_field(union acpi_parse_object *op, 
							&region_node);

#endif

		if (ACPI_FAILURE(status)) {

			ACPI_ERROR_NAMESPACE(arg->common.value.name, status);

			ACPI_ERROR_NAMESPACE(walk_state->scope_info,

					     arg->common.value.name, status);

			return_ACPI_STATUS(status);

		}

	}
@@ -618,7 +623,8 @@ acpi_ds_init_field_objects(union acpi_parse_object *op, 
						ACPI_IMODE_LOAD_PASS1, flags,

						walk_state, &node);

			if (ACPI_FAILURE(status)) {

				ACPI_ERROR_NAMESPACE((char *)&arg->named.name,

				ACPI_ERROR_NAMESPACE(walk_state->scope_info,

						     (char *)&arg->named.name,

						     status);

				if (status != AE_ALREADY_EXISTS) {

					return_ACPI_STATUS(status);
@@ -681,7 +687,8 @@ acpi_ds_create_bank_field(union acpi_parse_object *op, 
							&region_node);

#endif

		if (ACPI_FAILURE(status)) {

			ACPI_ERROR_NAMESPACE(arg->common.value.name, status);

			ACPI_ERROR_NAMESPACE(walk_state->scope_info,

					     arg->common.value.name, status);

			return_ACPI_STATUS(status);

		}

	}
@@ -695,7 +702,8 @@ acpi_ds_create_bank_field(union acpi_parse_object *op, 
			   ACPI_NS_SEARCH_PARENT, walk_state,

			   &info.register_node);

	if (ACPI_FAILURE(status)) {

		ACPI_ERROR_NAMESPACE(arg->common.value.string, status);

		ACPI_ERROR_NAMESPACE(walk_state->scope_info,

				     arg->common.value.string, status);

		return_ACPI_STATUS(status);

	}
@@ -765,7 +773,8 @@ acpi_ds_create_index_field(union acpi_parse_object *op, 
			   ACPI_NS_SEARCH_PARENT, walk_state,

			   &info.register_node);

	if (ACPI_FAILURE(status)) {

		ACPI_ERROR_NAMESPACE(arg->common.value.string, status);

		ACPI_ERROR_NAMESPACE(walk_state->scope_info,

				     arg->common.value.string, status);

		return_ACPI_STATUS(status);

	}
@@ -778,7 +787,8 @@ acpi_ds_create_index_field(union acpi_parse_object *op, 
			   ACPI_NS_SEARCH_PARENT, walk_state,

			   &info.data_register_node);

	if (ACPI_FAILURE(status)) {

		ACPI_ERROR_NAMESPACE(arg->common.value.string, status);

		ACPI_ERROR_NAMESPACE(walk_state->scope_info,

				     arg->common.value.string, status);

		return_ACPI_STATUS(status);

	}

drivers/acpi/acpica/dsobject.c

+3 −1
Original line number Diff line number Diff line
@@ -112,7 +112,9 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state, 
							 acpi_namespace_node,

							 &(op->common.node)));

				if (ACPI_FAILURE(status)) {

					ACPI_ERROR_NAMESPACE(op->common.value.

					ACPI_ERROR_NAMESPACE(walk_state->

							     scope_info,

							     op->common.value.

							     string, status);

					return_ACPI_STATUS(status);

				}

CRA Git | Maintained and supported by SUSTech CRA and CCSE