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

Commit 407aa3ff authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica: (41 commits)
  ACPICA: Update version to 20160422
  ACPICA: Move all ASCII utilities to a common file
  ACPICA: ACPI 2.0, Hardware: Add access_width/bit_offset support for acpi_hw_write()
  ACPICA: ACPI 2.0, Hardware: Add access_width/bit_offset support in acpi_hw_read()
  ACPICA: Executer: Introduce a set of macros to handle bit width mask generation
  ACPICA: Hardware: Add optimized access bit width support
  ACPICA: Utilities: Add ACPI_IS_ALIGNED() macro
  ACPICA: Renamed some #defined flag constants for clarity
  ACPICA: ACPI 6.0, tools/iasl: Add support for new resource descriptors
  ACPICA: ACPI 6.0: Update _BIX support for new package element
  ACPICA: ACPI 6.1: Support for new PCCT subtable
  ACPICA: Refactor evaluate_object to reduce nesting
  ACPICA: Divergence: remove unwanted spaces for typedef
  ACPICA: Update version to 20160318
  ACPICA: Namespace: Reorder \_SB._INI to make sure it is evaluated before _REG evaluations
  ACPICA: Events: Fix an issue that _REG association can happen before namespace is initialized
  ACPICA: Tables: Fix wrong MLC condition for dynamic table loading
  ACPICA: Interpreter: Fix wrong conditions for acpi_ev_install_region_handlers() invocation
  ACPICA: Hardware: Enhance acpi_hw_validate_register() with access_width/bit_offset awareness
  Utilities: Fix missing parentheses in ACPI_GET_BITS()/ACPI_SET_BITS()
  ...
parents 44549e8f d1ce3bb9

drivers/acpi/acpica/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ acpi-y += \ 
	evxfregn.o

	evxfregn.o





acpi-y +=		\

acpi-y +=		\

	exconcat.o	\

	exconfig.o	\

	exconfig.o	\

	exconvrt.o	\

	exconvrt.o	\

	excreate.o	\

	excreate.o	\
@@ -149,6 +150,7 @@ acpi-y += \ 
acpi-y +=		\

acpi-y +=		\

	utaddress.o	\

	utaddress.o	\

	utalloc.o	\

	utalloc.o	\

	utascii.o	\

	utbuffer.o	\

	utbuffer.o	\

	utcopy.o	\

	utcopy.o	\

	utexcep.o	\

	utexcep.o	\

drivers/acpi/acpica/acdebug.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ 
#define ACPI_DEBUG_BUFFER_SIZE  0x4000	/* 16K buffer for return objects */

#define ACPI_DEBUG_BUFFER_SIZE  0x4000	/* 16K buffer for return objects */





struct acpi_db_command_info {

struct acpi_db_command_info {

	char *name;		/* Command Name */

	const char *name;	/* Command Name */

	u8 min_args;		/* Minimum arguments required */

	u8 min_args;		/* Minimum arguments required */

};

};
@@ -64,7 +64,7 @@ struct acpi_db_command_help { 
};

};





struct acpi_db_argument_info {

struct acpi_db_argument_info {

	char *name;		/* Argument Name */

	const char *name;	/* Argument Name */

};

};





struct acpi_db_execute_walk {

struct acpi_db_execute_walk {

drivers/acpi/acpica/acevents.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -72,6 +72,7 @@ acpi_status acpi_ev_init_global_lock_handler(void); 
ACPI_HW_DEPENDENT_RETURN_OK(acpi_status

ACPI_HW_DEPENDENT_RETURN_OK(acpi_status

			    acpi_ev_acquire_global_lock(u16 timeout))

			    acpi_ev_acquire_global_lock(u16 timeout))

ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_ev_release_global_lock(void))

ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_ev_release_global_lock(void))



acpi_status acpi_ev_remove_global_lock_handler(void);

acpi_status acpi_ev_remove_global_lock_handler(void);





/*

/*
@@ -198,8 +199,6 @@ void 
acpi_ev_detach_region(union acpi_operand_object *region_obj,

acpi_ev_detach_region(union acpi_operand_object *region_obj,

		      u8 acpi_ns_is_locked);

		      u8 acpi_ns_is_locked);





void acpi_ev_associate_reg_method(union acpi_operand_object *region_obj);



void

void

acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,

acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,

			    acpi_adr_space_type space_id, u32 function);

			    acpi_adr_space_type space_id, u32 function);

drivers/acpi/acpica/acglobal.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -187,6 +187,8 @@ extern const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT]; 
extern const char *acpi_gbl_lowest_dstate_names[ACPI_NUM_sx_w_METHODS];

extern const char *acpi_gbl_lowest_dstate_names[ACPI_NUM_sx_w_METHODS];

extern const char *acpi_gbl_highest_dstate_names[ACPI_NUM_sx_d_METHODS];

extern const char *acpi_gbl_highest_dstate_names[ACPI_NUM_sx_d_METHODS];

extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];

extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];

extern const char acpi_gbl_lower_hex_digits[];

extern const char acpi_gbl_upper_hex_digits[];

extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES];

extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES];





#ifdef ACPI_DBG_TRACK_ALLOCATIONS

#ifdef ACPI_DBG_TRACK_ALLOCATIONS
@@ -361,6 +363,15 @@ ACPI_GLOBAL(u32, acpi_gbl_num_objects); 




#endif				/* ACPI_DEBUGGER */

#endif				/* ACPI_DEBUGGER */





#if defined (ACPI_DISASSEMBLER) || defined (ACPI_ASL_COMPILER)



ACPI_GLOBAL(const char, *acpi_gbl_pld_panel_list[]);

ACPI_GLOBAL(const char, *acpi_gbl_pld_vertical_position_list[]);

ACPI_GLOBAL(const char, *acpi_gbl_pld_horizontal_position_list[]);

ACPI_GLOBAL(const char, *acpi_gbl_pld_shape_list[]);



#endif



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

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

 *

 *

 * Application globals

 * Application globals

drivers/acpi/acpica/acinterp.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ 
typedef const struct acpi_exdump_info {

typedef const struct acpi_exdump_info {

	u8 opcode;

	u8 opcode;

	u8 offset;

	u8 offset;

	char *name;

	const char *name;





} acpi_exdump_info;

} acpi_exdump_info;