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

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

ACPICA: Reduce severity of predefined repair messages, Warning to Info 

Since the object was successfully repaired, a Warning is too
severe.  Reduced to Info for now. We may eventually change these
messages to debug-only. ACPICA BZ 812.

http://www.acpica.org/bugzilla/show_bug.cgi?id=812



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 cc3316e7

drivers/acpi/acpica/acmacros.h

+3 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ 
#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_WARN_PREDEFINED(plist)     acpi_ut_predefined_warning plist

#define ACPI_INFO_PREDEFINED(plist)     acpi_ut_predefined_info plist



#else
@@ -349,6 +350,8 @@ 
#define ACPI_ERROR_NAMESPACE(s, e)

#define ACPI_ERROR_METHOD(s, n, p, e)

#define ACPI_WARN_PREDEFINED(plist)

#define ACPI_INFO_PREDEFINED(plist)



#endif		/* ACPI_NO_ERROR_MESSAGES */



/*

drivers/acpi/acpica/acutils.h

+5 −0
Original line number Diff line number Diff line
@@ -481,6 +481,11 @@ acpi_ut_predefined_warning(const char *module_name, 
			   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

drivers/acpi/acpica/nsrepair.c

+4 −4
Original line number Diff line number Diff line
@@ -185,14 +185,14 @@ acpi_ns_repair_object(struct acpi_predefined_data *data, 
			return_object->common.reference_count--;

		}



		ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,

		ACPI_INFO_PREDEFINED((AE_INFO, data->pathname, data->node_flags,

				      "Converted %s to expected %s at index %u",

				      acpi_ut_get_object_type_name

				      (return_object),

				      acpi_ut_get_object_type_name(new_object),

				      package_index));

	} else {

		ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,

		ACPI_INFO_PREDEFINED((AE_INFO, data->pathname, data->node_flags,

				      "Converted %s to expected %s",

				      acpi_ut_get_object_type_name

				      (return_object),
@@ -254,8 +254,8 @@ acpi_ns_repair_package_list(struct acpi_predefined_data *data, 
	*obj_desc_ptr = pkg_obj_desc;

	data->flags |= ACPI_OBJECT_REPAIRED;



	ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,

			      "Incorrectly formed Package, attempting repair"));

	ACPI_INFO_PREDEFINED((AE_INFO, data->pathname, data->node_flags,

			      "Repaired Incorrectly formed Package"));



	return (AE_OK);

}

drivers/acpi/acpica/utmisc.c

+42 −0
Original line number Diff line number Diff line
@@ -1161,3 +1161,45 @@ acpi_ut_predefined_warning(const char *module_name, 
	ACPI_COMMON_MSG_SUFFIX;

	va_end(args);

}



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

 *

 * FUNCTION:    acpi_ut_predefined_info

 *

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

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

 *              Pathname        - Full pathname to the node

 *              node_flags      - From Namespace node for the method/object

 *              Format          - Printf format string + additional args

 *

 * RETURN:      None

 *

 * DESCRIPTION: Info messages for the predefined validation module. Messages

 *              are only emitted the first time a problem with a particular

 *              method/object is detected. This prevents a flood of

 *              messages for methods that are repeatedly evaluated.

 *

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



void ACPI_INTERNAL_VAR_XFACE

acpi_ut_predefined_info(const char *module_name,

			u32 line_number,

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

{

	va_list args;



	/*

	 * Warning messages for this method/object will be disabled after the

	 * first time a validation fails or an object is successfully repaired.

	 */

	if (node_flags & ANOBJ_EVALUATED) {

		return;

	}



	acpi_os_printf("ACPI Info for %s: ", pathname);



	va_start(args, format);

	acpi_os_vprintf(format, args);

	ACPI_COMMON_MSG_SUFFIX;

	va_end(args);

}