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

Commit cc84e262 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: iASL/Disassembler: Write ACPI errors to stderr instead of output file 



This keeps the output files clean of random error messages that
may originate from within the namespace/interpreter code.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 31b3d4c3

drivers/acpi/acpica/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -45,4 +45,4 @@ acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o 
acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \

		utcopy.o utdelete.o utglobal.o utmath.o utobject.o \

		utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o \

		utosi.o
 
		utosi.o utxferror.o

drivers/acpi/acpica/acmacros.h

+2 −2
Original line number Diff line number Diff line
@@ -338,8 +338,8 @@ 
 * 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_ns_report_error (AE_INFO, s, e);

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

#define ACPI_ERROR_NAMESPACE(s, e)      acpi_ut_namespace_error (AE_INFO, s, 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

+0 −12
Original line number Diff line number Diff line
@@ -338,18 +338,6 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node *node); 


u32 acpi_ns_local(acpi_object_type type);



void

acpi_ns_report_error(const char *module_name,

		     u32 line_number,

		     const char *internal_name, acpi_status lookup_status);



void

acpi_ns_report_method_error(const char *module_name,

			    u32 line_number,

			    const char *message,

			    struct acpi_namespace_node *node,

			    const char *path, acpi_status lookup_status);



void

acpi_ns_print_node_pathname(struct acpi_namespace_node *node, const char *msg);

drivers/acpi/acpica/acutils.h

+27 −12
Original line number Diff line number Diff line
@@ -486,17 +486,6 @@ u8 acpi_ut_valid_acpi_char(char character, u32 position); 


acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer);



void ACPI_INTERNAL_VAR_XFACE

acpi_ut_predefined_warning(const char *module_name,

			   u32 line_number,

			   char *pathname,

			   u8 node_flags, const char *format, ...);



void ACPI_INTERNAL_VAR_XFACE

acpi_ut_predefined_info(const char *module_name,

			u32 line_number,

			char *pathname, u8 node_flags, const char *format, ...);



/* Values for Base above (16=Hex, 10=Decimal) */



#define ACPI_ANY_BASE        0
@@ -587,6 +576,32 @@ acpi_status 
acpi_ut_create_list(char *list_name,

		    u16 object_size, struct acpi_memory_list **return_cache);



#endif

#endif				/* ACPI_DBG_TRACK_ALLOCATIONS */



/*

 * utxferror - various error/warning output functions

 */

void ACPI_INTERNAL_VAR_XFACE

acpi_ut_predefined_warning(const char *module_name,

			   u32 line_number,

			   char *pathname,

			   u8 node_flags, const char *format, ...);



void ACPI_INTERNAL_VAR_XFACE

acpi_ut_predefined_info(const char *module_name,

			u32 line_number,

			char *pathname, u8 node_flags, const char *format, ...);



void

acpi_ut_namespace_error(const char *module_name,

			u32 line_number,

			const char *internal_name, acpi_status lookup_status);



void

acpi_ut_method_error(const char *module_name,

		     u32 line_number,

		     const char *message,

		     struct acpi_namespace_node *node,

		     const char *path, acpi_status lookup_status);



#endif				/* _ACUTILS_H */

drivers/acpi/acpica/nsutils.c

+0 −98
Original line number Diff line number Diff line
@@ -58,104 +58,6 @@ static u8 acpi_ns_valid_path_separator(char sep); 
acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);

#endif



/*******************************************************************************

 *

 * FUNCTION:    acpi_ns_report_error

 *

 * PARAMETERS:  module_name         - Caller's module name (for error output)

 *              line_number         - Caller's line number (for error output)

 *              internal_name       - Name or path of the namespace node

 *              lookup_status       - Exception code from NS lookup

 *

 * RETURN:      None

 *

 * DESCRIPTION: Print warning message with full pathname

 *

 ******************************************************************************/



void

acpi_ns_report_error(const char *module_name,

		     u32 line_number,

		     const char *internal_name, acpi_status lookup_status)

{

	acpi_status status;

	u32 bad_name;

	char *name = NULL;



	acpi_os_printf("ACPI Error (%s-%04d): ", module_name, line_number);



	if (lookup_status == AE_BAD_CHARACTER) {



		/* There is a non-ascii character in the name */



		ACPI_MOVE_32_TO_32(&bad_name,

				   ACPI_CAST_PTR(u32, internal_name));

		acpi_os_printf("[0x%4.4X] (NON-ASCII)", bad_name);

	} else {

		/* Convert path to external format */



		status = acpi_ns_externalize_name(ACPI_UINT32_MAX,

						  internal_name, NULL, &name);



		/* Print target name */



		if (ACPI_SUCCESS(status)) {

			acpi_os_printf("[%s]", name);

		} else {

			acpi_os_printf("[COULD NOT EXTERNALIZE NAME]");

		}



		if (name) {

			ACPI_FREE(name);

		}

	}



	acpi_os_printf(" Namespace lookup failure, %s\n",

		       acpi_format_exception(lookup_status));

}



/*******************************************************************************

 *

 * FUNCTION:    acpi_ns_report_method_error

 *

 * PARAMETERS:  module_name         - Caller's module name (for error output)

 *              line_number         - Caller's line number (for error output)

 *              Message             - Error message to use on failure

 *              prefix_node         - Prefix relative to the path

 *              Path                - Path to the node (optional)

 *              method_status       - Execution status

 *

 * RETURN:      None

 *

 * DESCRIPTION: Print warning message with full pathname

 *

 ******************************************************************************/



void

acpi_ns_report_method_error(const char *module_name,

			    u32 line_number,

			    const char *message,

			    struct acpi_namespace_node *prefix_node,

			    const char *path, acpi_status method_status)

{

	acpi_status status;

	struct acpi_namespace_node *node = prefix_node;



	acpi_os_printf("ACPI Error (%s-%04d): ", module_name, line_number);



	if (path) {

		status =

		    acpi_ns_get_node(prefix_node, path, ACPI_NS_NO_UPSEARCH,

				     &node);

		if (ACPI_FAILURE(status)) {

			acpi_os_printf("[Could not get node by pathname]");

		}

	}



	acpi_ns_print_node_pathname(node, message);

	acpi_os_printf(", %s\n", acpi_format_exception(method_status));

}



/*******************************************************************************

 *

 * FUNCTION:    acpi_ns_print_node_pathname