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

Commit 6912897d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' into linux-next 

* acpica: (22 commits)
  ACPI: Set length even for TYPE_END_TAG acpi resource
  ACPICA: Update version to 20130214
  ACPICA: Object repair: Allow 0-length packages for variable-length packages
  ACPICA: Disassembler: Add warnings for unresolved control methods
  ACPICA: Return object repair: Add resource template repairs
  ACPICA: Return object repair: Add string-to-unicode conversion
  ACPICA: Split object conversion functions to a new file
  ACPICA: Add mechanism for early object repairs on a per-name basis
  ACPICA: Remove trailing comma in enum declarations
  ACPICA: Add exception descriptions to exception info table
  ACPICA: Add macros to exception code definitions
  ACPICA: Regression fix: reinstate safe exit macros
  ACPICA: Update for ACPI 5 hardware-reduced feature
  ACPICA: Add parens within macros around parameter names
  ACPICA: Add macros to access pointer to next object in the descriptor list
  ACPICA: Update error/debug messages for fixed events
  ACPICA: Fix a long-standing bug in local cache
  ACPICA: iASL/Disassembler: Add support for MTMR table
  ACPICA: iASL/Disassembler: Add support for VRTC table
  ACPICA: Update RASF table definition
  ...
parents 16b53e7e f084dbb9

drivers/acpi/acpica/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o 
acpi-y +=		\

	nsaccess.o	\

	nsalloc.o	\

	nsconvert.o	\

	nsdump.o	\

	nseval.o	\

	nsinit.o	\

drivers/acpi/acpica/acglobal.h

+3 −1
Original line number Diff line number Diff line
@@ -413,10 +413,12 @@ ACPI_EXTERN u8 acpi_gbl_db_output_flags; 


#ifdef ACPI_DISASSEMBLER



u8 ACPI_INIT_GLOBAL(acpi_gbl_ignore_noop_operator, FALSE);

ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_ignore_noop_operator, FALSE);



ACPI_EXTERN u8 acpi_gbl_db_opt_disasm;

ACPI_EXTERN u8 acpi_gbl_db_opt_verbose;

ACPI_EXTERN u8 acpi_gbl_num_external_methods;

ACPI_EXTERN u32 acpi_gbl_resolved_external_methods;

ACPI_EXTERN struct acpi_external_list *acpi_gbl_external_list;

ACPI_EXTERN struct acpi_external_file *acpi_gbl_external_file_list;

#endif

drivers/acpi/acpica/aclocal.h

+16 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ struct acpi_predefined_data { 
	union acpi_operand_object *parent_package;

	struct acpi_namespace_node *node;

	u32 flags;

	u32 return_btype;

	u8 node_flags;

};
@@ -371,6 +372,20 @@ struct acpi_predefined_data { 
#define ACPI_OBJECT_REPAIRED    1

#define ACPI_OBJECT_WRAPPED     2



/* Return object auto-repair info */



typedef acpi_status(*acpi_object_converter) (union acpi_operand_object

					     *original_object,

					     union acpi_operand_object

					     **converted_object);



struct acpi_simple_repair_info {

	char name[ACPI_NAME_SIZE];

	u32 unexpected_btypes;

	u32 package_index;

	acpi_object_converter object_converter;

};



/*

 * Bitmapped return value types

 * Note: the actual data types must be contiguous, a loop in nspredef.c
@@ -1037,6 +1052,7 @@ struct acpi_external_list { 
	u16 length;

	u8 type;

	u8 flags;

	u8 resolved;

};



/* Values for Flags field above */

drivers/acpi/acpica/acmacros.h

+4 −2
Original line number Diff line number Diff line
@@ -322,10 +322,12 @@ 
 * where a pointer to an object of type union acpi_operand_object can also

 * appear. This macro is used to distinguish them.

 *

 * The "Descriptor" field is the first field in both structures.

 * The "DescriptorType" field is the second field in both structures.

 */

#define ACPI_GET_DESCRIPTOR_PTR(d)      (((union acpi_descriptor *)(void *)(d))->common.common_pointer)

#define ACPI_SET_DESCRIPTOR_PTR(d, p)   (((union acpi_descriptor *)(void *)(d))->common.common_pointer = (p))

#define ACPI_GET_DESCRIPTOR_TYPE(d)     (((union acpi_descriptor *)(void *)(d))->common.descriptor_type)

#define ACPI_SET_DESCRIPTOR_TYPE(d, t)  (((union acpi_descriptor *)(void *)(d))->common.descriptor_type = t)

#define ACPI_SET_DESCRIPTOR_TYPE(d, t)  (((union acpi_descriptor *)(void *)(d))->common.descriptor_type = (t))



/*

 * Macros for the master AML opcode table

drivers/acpi/acpica/acnamesp.h

+24 −1
Original line number Diff line number Diff line
@@ -166,6 +166,29 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent); 


int acpi_ns_compare_names(char *name1, char *name2);



/*

 * nsconvert - Dynamic object conversion routines

 */

acpi_status

acpi_ns_convert_to_integer(union acpi_operand_object *original_object,

			   union acpi_operand_object **return_object);



acpi_status

acpi_ns_convert_to_string(union acpi_operand_object *original_object,

			  union acpi_operand_object **return_object);



acpi_status

acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,

			  union acpi_operand_object **return_object);



acpi_status

acpi_ns_convert_to_unicode(union acpi_operand_object *original_object,

			   union acpi_operand_object **return_object);



acpi_status

acpi_ns_convert_to_resource(union acpi_operand_object *original_object,

			    union acpi_operand_object **return_object);



/*

 * nsdump - Namespace dump/print utilities

 */
@@ -289,7 +312,7 @@ acpi_ns_get_attached_data(struct acpi_namespace_node *node, 
 * predefined methods/objects

 */

acpi_status

acpi_ns_repair_object(struct acpi_predefined_data *data,

acpi_ns_simple_repair(struct acpi_predefined_data *data,

		      u32 expected_btypes,

		      u32 package_index,

		      union acpi_operand_object **return_object_ptr);