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

Commit 9695a980 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica: (22 commits)
  ACPICA: Fix for ill-formed GUID strings for NFIT tables.
  ACPICA: acpihelp: Update for new NFIT table GUIDs.
  ACPICA: Update version to 20150515.
  ACPICA: ACPI 6.0: Add support for NFIT table.
  ACPICA: acpi_help: Add option to display all known/supported ACPI tables.
  ACPICA: iASL/disassembler - fix possible fault for -e option.
  ACPICA: ACPI 6.0: Add changes for DRTM table.
  ACPICA: ACPI 6.0: Add support for IORT table.
  ACPICA: ACPI 6.0: Add ACPI_SUB_PTR().
  ACPICA: ACPI 6.0: Add changes for MADT table.
  ACPICA: Hardware: Fix a resource leak issue in acpi_hw_build_pci_list().
  ACPICA: Dispatcher: Fix a resource leak issue in acpi_ds_auto_serialize_method().
  ACPICA: ACPI 6.0: Add changes for LPIT table.
  ACPICA: ACPI 6.0: Add changes for FADT table.
  ACPICA: ACPI 6.0: Add support for WPBT table.
  ACPICA: iASL: Enhance detection of non-ascii or corrupted input files.
  ACPICA: Parser: Move a couple externals to the proper header.
  ACPICA: ACPI 6.0: Add support for XENV table.
  ACPICA: ACPI 6.0: Add support for new predefined names.
  ACPICA: ACPI 6.0: Add support for STAO table.
  ...
parents 0f57d867 f3b6ced2

drivers/acpi/acpica/acdebug.h

+3 −1
Original line number Diff line number Diff line
@@ -231,7 +231,9 @@ void acpi_db_open_debug_file(char *name); 
acpi_status acpi_db_load_acpi_table(char *filename);



acpi_status

acpi_db_get_table_from_file(char *filename, struct acpi_table_header **table);

acpi_db_get_table_from_file(char *filename,

			    struct acpi_table_header **table,

			    u8 must_be_aml_table);



/*

 * dbhistry - debugger HISTORY command

drivers/acpi/acpica/aclocal.h

+15 −0
Original line number Diff line number Diff line
@@ -352,11 +352,21 @@ struct acpi_package_info3 { 
	u16 reserved;

};



struct acpi_package_info4 {

	u8 type;

	u8 object_type1;

	u8 count1;

	u8 sub_object_types;

	u8 pkg_count;

	u16 reserved;

};



union acpi_predefined_info {

	struct acpi_name_info info;

	struct acpi_package_info ret_info;

	struct acpi_package_info2 ret_info2;

	struct acpi_package_info3 ret_info3;

	struct acpi_package_info4 ret_info4;

};



/* Reset to default packing */
@@ -1165,4 +1175,9 @@ struct ah_uuid { 
	char *string;

};



struct ah_table {

	char *signature;

	char *description;

};



#endif				/* __ACLOCAL_H__ */

drivers/acpi/acpica/acparser.h

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ 
 *

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



extern const u8 acpi_gbl_short_op_index[];

extern const u8 acpi_gbl_long_op_index[];



/*

 * psxface - Parser external interfaces

 */

drivers/acpi/acpica/acpredef.h

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

 *      (Used for _DLM)

 *

 * ACPI_PTYPE2_VAR_VAR: Variable number of subpackages, each of either a

 *      constant or variable length. The subpackages are preceded by a

 *      constant number of objects.

 *      (Used for _LPI, _RDI)

 *

 * 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.
@@ -123,7 +128,8 @@ enum acpi_return_package_types { 
	ACPI_PTYPE2_MIN = 8,

	ACPI_PTYPE2_REV_FIXED = 9,

	ACPI_PTYPE2_FIX_VAR = 10,

	ACPI_PTYPE2_UUID_PAIR = 11

	ACPI_PTYPE2_VAR_VAR = 11,

	ACPI_PTYPE2_UUID_PAIR = 12

};



/* Support macros for users of the predefined info table */
@@ -172,7 +178,7 @@ enum acpi_return_package_types { 
 * These are the names that can actually be evaluated via acpi_evaluate_object.

 * Not present in this table are the following:

 *

 *      1) Predefined/Reserved names that are never evaluated via

 *      1) Predefined/Reserved names that are not usually evaluated via

 *         acpi_evaluate_object:

 *              _Lxx and _Exx GPE methods

 *              _Qxx EC methods
@@ -361,6 +367,9 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
	  METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Fixed-length (4 Int) */

	PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0),



	{{"_BTH", METHOD_1ARGS(ACPI_TYPE_INTEGER),	/* ACPI 6.0 */

	  METHOD_NO_RETURN_VALUE}},



	{{"_BTM", METHOD_1ARGS(ACPI_TYPE_INTEGER),

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
@@ -390,6 +399,9 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
	PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0,

		     0, 0, 0),



	{{"_CR3", METHOD_0ARGS,	/* ACPI 6.0 */

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},



	{{"_CRS", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
@@ -445,7 +457,7 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
	{{"_DOS", METHOD_1ARGS(ACPI_TYPE_INTEGER),

	  METHOD_NO_RETURN_VALUE}},



	{{"_DSD", METHOD_0ARGS,

	{{"_DSD", METHOD_0ARGS,	/* ACPI 6.0 */

	  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),
@@ -604,6 +616,12 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
	  METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Variable-length (1 Int(rev), n Pkg (2 Int) */

	PACKAGE_INFO(ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0),



	{{"_LPI", METHOD_0ARGS,	/* ACPI 6.0 */

	  METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Variable-length (3 Int, n Pkg (10 Int/Buf) */

	PACKAGE_INFO(ACPI_PTYPE2_VAR_VAR, ACPI_RTYPE_INTEGER, 3,

		     ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER | ACPI_RTYPE_STRING,

		     10, 0),



	{{"_MAT", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
@@ -624,6 +642,9 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
		       ACPI_TYPE_INTEGER),

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},



	{{"_MTL", METHOD_0ARGS,	/* ACPI 6.0 */

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},



	{{"_NTT", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
@@ -716,6 +737,10 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
	  METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Variable-length (Refs) */

	PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),



	{{"_PRR", METHOD_0ARGS,	/* ACPI 6.0 */

	  METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Fixed-length (1 Ref) */

	PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_REFERENCE, 1, 0, 0, 0),



	{{"_PRS", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
@@ -796,6 +821,11 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
	{{"_PXM", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},



	{{"_RDI", METHOD_0ARGS,	/* ACPI 6.0 */

	  METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Variable-length (1 Int, n Pkg (m Ref)) */

	PACKAGE_INFO(ACPI_PTYPE2_VAR_VAR, ACPI_RTYPE_INTEGER, 1,

		     ACPI_RTYPE_REFERENCE, 0, 0),



	{{"_REG", METHOD_2ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),

	  METHOD_NO_RETURN_VALUE}},
@@ -808,6 +838,9 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
	{{"_ROM", METHOD_2ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),

	  METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},



	{{"_RST", METHOD_0ARGS,	/* ACPI 6.0 */

	  METHOD_NO_RETURN_VALUE}},



	{{"_RTV", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
@@ -935,6 +968,9 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
	{{"_TDL", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},



	{{"_TFP", METHOD_0ARGS,	/* ACPI 6.0 */

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},



	{{"_TIP", METHOD_1ARGS(ACPI_TYPE_INTEGER),

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
@@ -959,6 +995,9 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
	  METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Variable-length (Pkgs) each 5 Int with count */

	PACKAGE_INFO(ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 5, 0, 0, 0),



	{{"_TSN", METHOD_0ARGS,	/* ACPI 6.0 */

	  METHOD_RETURNS(ACPI_RTYPE_REFERENCE)}},



	{{"_TSP", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},

drivers/acpi/acpica/acutils.h

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ extern const u8 _acpi_ctype[]; 
#define _ACPI_DI     0x04	/* '0'-'9' */

#define _ACPI_LO     0x02	/* 'a'-'z' */

#define _ACPI_PU     0x10	/* punctuation */

#define _ACPI_SP     0x08	/* space */

#define _ACPI_SP     0x08	/* space, tab, CR, LF, VT, FF */

#define _ACPI_UP     0x01	/* 'A'-'Z' */

#define _ACPI_XD     0x80	/* '0'-'9', 'A'-'F', 'a'-'f' */