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

Commit 8b80c0f1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica:
  ACPICA: Update version to 20140724.
  ACPICA: ACPI 5.1: Update for PCCT table changes.
  ACPICA/ARM: ACPI 5.1: Update for GTDT table changes.
  ACPICA/ARM: ACPI 5.1: Update for MADT changes.
  ACPICA/ARM: ACPI 5.1: Update for FADT changes.
  ACPICA: ACPI 5.1: Support for the _CCA predifined name.
  ACPICA: ACPI 5.1: New notify value for System Affinity Update.
  ACPICA: ACPI 5.1: Support for the _DSD predefined name.
  ACPICA: Debug object: Add current value of Timer() to debug line prefix.
  ACPICA: acpihelp: Add UUID support, restructure some existing files.
  ACPICA: Utilities: Fix local printf issue.
  ACPICA: Tables: Update for DMAR table changes.
  ACPICA: Remove some extraneous printf arguments.
  ACPICA: Update for comments/formatting. No functional changes.
  ACPICA: Disassembler: Add support for the ToUUID opererator (macro).
  ACPICA: Remove a redundant cast to acpi_size for ACPI_OFFSET() macro.
  ACPICA: Work around an ancient GCC bug.
parents 49c68fd4 796ca778

drivers/acpi/acpica/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ acpi-y += \ 
	uterror.o	\

	uteval.o	\

	utglobal.o	\

	uthex.o		\

	utids.o		\

	utinit.o	\

	utlock.o	\
@@ -175,5 +176,10 @@ acpi-y += \ 
	utxferror.o	\

	utxfmutex.o



acpi-$(ACPI_FUTURE_USAGE) += utfileio.o utprint.o uttrack.o utcache.o

acpi-$(ACPI_FUTURE_USAGE) +=	\

	utcache.o		\

	utfileio.o		\

	utprint.o		\

	uttrack.o		\

	utuuid.o

drivers/acpi/acpica/aclocal.h

+12 −6
Original line number Diff line number Diff line
@@ -730,12 +730,13 @@ union acpi_parse_value { 
#define ACPI_DASM_STRING                0x02	/* Buffer is a ASCII string */

#define ACPI_DASM_UNICODE               0x03	/* Buffer is a Unicode string */

#define ACPI_DASM_PLD_METHOD            0x04	/* Buffer is a _PLD method bit-packed buffer */

#define ACPI_DASM_EISAID                0x05	/* Integer is an EISAID */

#define ACPI_DASM_MATCHOP               0x06	/* Parent opcode is a Match() operator */

#define ACPI_DASM_LNOT_PREFIX           0x07	/* Start of a Lnot_equal (etc.) pair of opcodes */

#define ACPI_DASM_LNOT_SUFFIX           0x08	/* End  of a Lnot_equal (etc.) pair of opcodes */

#define ACPI_DASM_HID_STRING            0x09	/* String is a _HID or _CID */

#define ACPI_DASM_IGNORE                0x0A	/* Not used at this time */

#define ACPI_DASM_UUID                  0x05	/* Buffer is a UUID/GUID */

#define ACPI_DASM_EISAID                0x06	/* Integer is an EISAID */

#define ACPI_DASM_MATCHOP               0x07	/* Parent opcode is a Match() operator */

#define ACPI_DASM_LNOT_PREFIX           0x08	/* Start of a Lnot_equal (etc.) pair of opcodes */

#define ACPI_DASM_LNOT_SUFFIX           0x09	/* End  of a Lnot_equal (etc.) pair of opcodes */

#define ACPI_DASM_HID_STRING            0x0A	/* String is a _HID or _CID */

#define ACPI_DASM_IGNORE                0x0B	/* Not used at this time */



/*

 * Generic operation (for example:  If, While, Store)
@@ -1154,4 +1155,9 @@ struct ah_device_id { 
	char *description;

};



struct ah_uuid {

	char *description;

	char *string;

};



#endif				/* __ACLOCAL_H__ */

drivers/acpi/acpica/acpredef.h

+15 −1
Original line number Diff line number Diff line
@@ -105,6 +105,11 @@ 
 *      count = 0 (optional)

 *      (Used for _DLM)

 *

 * ACPI_PTYPE2_UUID_PAIR: Each subpackage is preceded by a UUID Buffer. The UUID

 *      defines the format of the package. Zero-length parent package is

 *      allowed.

 *      (Used for _DSD)

 *

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



enum acpi_return_package_types {
@@ -117,7 +122,8 @@ enum acpi_return_package_types { 
	ACPI_PTYPE2_FIXED = 7,

	ACPI_PTYPE2_MIN = 8,

	ACPI_PTYPE2_REV_FIXED = 9,

	ACPI_PTYPE2_FIX_VAR = 10

	ACPI_PTYPE2_FIX_VAR = 10,

	ACPI_PTYPE2_UUID_PAIR = 11

};



/* Support macros for users of the predefined info table */
@@ -364,6 +370,9 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
	{{"_CBA", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},	/* See PCI firmware spec 3.0 */



	{{"_CCA", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},	/* ACPI 5.1 */



	{{"_CDM", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
@@ -436,6 +445,11 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
	{{"_DOS", METHOD_1ARGS(ACPI_TYPE_INTEGER),

	  METHOD_NO_RETURN_VALUE}},



	{{"_DSD", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Variable-length (Pkgs) each: 1 Buf, 1 Pkg */

	PACKAGE_INFO(ACPI_PTYPE2_UUID_PAIR, ACPI_RTYPE_BUFFER, 1,

		     ACPI_RTYPE_PACKAGE, 1, 0),



	{{"_DSM",

	  METHOD_4ARGS(ACPI_TYPE_BUFFER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER,

		       ACPI_TYPE_PACKAGE),

drivers/acpi/acpica/acutils.h

+9 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ char *acpi_ut_get_event_name(u32 event_id); 


char acpi_ut_hex_to_ascii_char(u64 integer, u32 position);



u8 acpi_ut_ascii_char_to_hex(int hex_char);



u8 acpi_ut_valid_object_type(acpi_object_type type);



/*
@@ -759,6 +761,8 @@ const struct ah_predefined_name *acpi_ah_match_predefined_name(char *nameseg); 


const struct ah_device_id *acpi_ah_match_hardware_id(char *hid);



const char *acpi_ah_match_uuid(u8 *data);



/*

 * utprint - printf/vprintf output functions

 */
@@ -778,4 +782,9 @@ int acpi_ut_file_vprintf(ACPI_FILE file, const char *format, va_list args); 
int acpi_ut_file_printf(ACPI_FILE file, const char *format, ...);

#endif



/*

 * utuuid -- UUID support functions

 */

void acpi_ut_convert_string_to_uuid(char *in_string, u8 *uuid_buffer);



#endif				/* _ACUTILS_H */

drivers/acpi/acpica/exdebug.c

+10 −1
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc, 
			u32 level, u32 index)

{

	u32 i;

	u32 timer;



	ACPI_FUNCTION_TRACE_PTR(ex_do_debug_object, source_desc);
@@ -85,12 +86,20 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc, 
		return_VOID;

	}



	/*

	 * We will emit the current timer value (in microseconds) with each

	 * debug output. Only need the lower 26 bits. This allows for 67

	 * million microseconds or 67 seconds before rollover.

	 */

	timer = ((u32)acpi_os_get_timer() / 10);	/* (100 nanoseconds to microseconds) */

	timer &= 0x03FFFFFF;



	/*

	 * Print line header as long as we are not in the middle of an

	 * object display

	 */

	if (!((level > 0) && index == 0)) {

		acpi_os_printf("[ACPI Debug] %*s", level, " ");

		acpi_os_printf("[ACPI Debug %.8u] %*s", timer, level, " ");

	}



	/* Display the index for package output only */