Commit 9183ea62 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica:
  MAINTAINERS / ACPICA: Add ACPICA information to MAINTAINERS
  ACPICA: Update version to 20130823.
  ACPICA: SCI Handlers: Update handler interface, eliminate unnecessary argument.
  ACPICA: Cleanup exception codes.
  ACPICA: Tables: Cleanup RSDP signature codes.
  ACPICA: Tables: Cleanup table checksum verification code.
  ACPICA: Debugger: Add new command to display full namespace pathnames.
  ACPICA: Operation region support: Never free the handler "context" pointer.
  ACPICA: Add support for host-installed SCI handlers.
  ACPICA: Validate start object for acpi_walk_namespace.
  ACPICA: Debugger: Prevent possible command line buffer overflow, kernel behavior is not affected.
  ACPICA: Linux-specific header: enable "aarch64" 64-bit build.
  ACPICA: Debug output: small formatting update, no functional change.
  ACPICA: acpi_read: On error, do not modify the return value target location.
  ACPICA: Improve error message for "too many parent prefixes" condition.
parents 31c466c1 3774929d

MAINTAINERS

+14 −0
Original line number Diff line number Diff line
@@ -253,6 +253,20 @@ F: drivers/pci/*acpi* 
F:	drivers/pci/*/*acpi*

F:	drivers/pci/*/*/*acpi*



ACPI COMPONENT ARCHITECTURE (ACPICA)

M:	Robert Moore <robert.moore@intel.com>

M:	Lv Zheng <lv.zheng@intel.com>

M:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

L:	linux-acpi@vger.kernel.org

L:	devel@acpica.org

W:	https://acpica.org/

W:	https://github.com/acpica/acpica/

Q:	https://patchwork.kernel.org/project/linux-acpi/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

S:	Supported

F:	drivers/acpi/acpica/

F:	include/acpi/



ACPI FAN DRIVER

M:	Zhang Rui <rui.zhang@intel.com>

L:	linux-acpi@vger.kernel.org

drivers/acpi/acpica/acdebug.h

+4 −1
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ void acpi_db_display_handlers(void); 
ACPI_HW_DEPENDENT_RETURN_VOID(void

			      acpi_db_generate_gpe(char *gpe_arg,

						   char *block_arg))

 ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_generate_sci(void))



/*

 * dbconvert - miscellaneous conversion routines
@@ -154,6 +155,8 @@ void acpi_db_set_scope(char *name); 


void acpi_db_dump_namespace(char *start_arg, char *depth_arg);



void acpi_db_dump_namespace_paths(void);



void acpi_db_dump_namespace_by_owner(char *owner_arg, char *depth_arg);



acpi_status acpi_db_find_name_in_namespace(char *name_arg);

drivers/acpi/acpica/acevents.h

+3 −3
Original line number Diff line number Diff line
@@ -242,11 +242,11 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj, 
 */

u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context);



u32 acpi_ev_install_sci_handler(void);

u32 acpi_ev_sci_dispatch(void);



acpi_status acpi_ev_remove_sci_handler(void);

u32 acpi_ev_install_sci_handler(void);



u32 acpi_ev_initialize_SCI(u32 program_SCI);

acpi_status acpi_ev_remove_all_sci_handlers(void);



ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_ev_terminate(void))

#endif				/* __ACEVENTS_H__  */

drivers/acpi/acpica/acglobal.h

+11 −7
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ ACPI_EXTERN acpi_table_handler acpi_gbl_table_handler; 
ACPI_EXTERN void *acpi_gbl_table_handler_context;

ACPI_EXTERN struct acpi_walk_state *acpi_gbl_breakpoint_walk;

ACPI_EXTERN acpi_interface_handler acpi_gbl_interface_handler;

ACPI_EXTERN struct acpi_sci_handler_info *acpi_gbl_sci_handler_list;



/* Owner ID support */
@@ -445,13 +446,6 @@ ACPI_EXTERN u8 acpi_gbl_db_opt_tables; 
ACPI_EXTERN u8 acpi_gbl_db_opt_stats;

ACPI_EXTERN u8 acpi_gbl_db_opt_ini_methods;

ACPI_EXTERN u8 acpi_gbl_db_opt_no_region_support;



ACPI_EXTERN char *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];

ACPI_EXTERN acpi_object_type acpi_gbl_db_arg_types[ACPI_DEBUGGER_MAX_ARGS];

ACPI_EXTERN char acpi_gbl_db_line_buf[ACPI_DB_LINE_BUFFER_SIZE];

ACPI_EXTERN char acpi_gbl_db_parsed_buf[ACPI_DB_LINE_BUFFER_SIZE];

ACPI_EXTERN char acpi_gbl_db_scope_buf[80];

ACPI_EXTERN char acpi_gbl_db_debug_filename[80];

ACPI_EXTERN u8 acpi_gbl_db_output_to_file;

ACPI_EXTERN char *acpi_gbl_db_buffer;

ACPI_EXTERN char *acpi_gbl_db_filename;
@@ -459,6 +453,16 @@ ACPI_EXTERN u32 acpi_gbl_db_debug_level; 
ACPI_EXTERN u32 acpi_gbl_db_console_debug_level;

ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_db_scope_node;



ACPI_EXTERN char *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];

ACPI_EXTERN acpi_object_type acpi_gbl_db_arg_types[ACPI_DEBUGGER_MAX_ARGS];



/* These buffers should all be the same size */



ACPI_EXTERN char acpi_gbl_db_line_buf[ACPI_DB_LINE_BUFFER_SIZE];

ACPI_EXTERN char acpi_gbl_db_parsed_buf[ACPI_DB_LINE_BUFFER_SIZE];

ACPI_EXTERN char acpi_gbl_db_scope_buf[ACPI_DB_LINE_BUFFER_SIZE];

ACPI_EXTERN char acpi_gbl_db_debug_filename[ACPI_DB_LINE_BUFFER_SIZE];



/*

 * Statistic globals

 */

drivers/acpi/acpica/aclocal.h

+8 −0
Original line number Diff line number Diff line
@@ -398,6 +398,14 @@ struct acpi_simple_repair_info { 
 *

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



/* Dispatch info for each host-installed SCI handler */



struct acpi_sci_handler_info {

	struct acpi_sci_handler_info *next;

	acpi_sci_handler address;	/* Address of handler */

	void *context;		/* Context to be passed to handler */

};



/* Dispatch info for each GPE -- either a method or handler, cannot be both */



struct acpi_gpe_handler_info {

CRA Git | Maintained and supported by SUSTech CRA and CCSE