Commit 5b9ddd0d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica:
  ACPICA: Update version to 20150930
  ACPICA: Debugger: Fix dead lock issue ocurred in single stepping mode
  ACPI: Enable build of AML interpreter debugger
  ACPICA: Debugger: Add thread ID support so that single step mode can only apply to the debugger thread
  ACPICA: Debugger: Fix "terminate" command by cleaning up subsystem shutdown logic
  ACPICA: Debugger: Fix "quit/exit" command by cleaning up user commands termination logic
  ACPICA: Linuxize: Export debugger files to Linux
  ACPICA: iASL: General cleanup of the file suffix #defines
  ACPICA: Improve typechecking, both compile-time and runtime
  ACPICA: Update NFIT table to rename a flags field
  ACPICA: Debugger: Update mutexes used for multithreaded debugger
  ACPICA: Update exception code for "file not found" error
  ACPICA: iASL: Add symbolic operator support for Index() operator
  ACPICA: Remove unnecessary conditional compilation
parents ba210f5d b3196882

drivers/acpi/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -57,6 +57,15 @@ config ACPI_SYSTEM_POWER_STATES_SUPPORT 
config ACPI_CCA_REQUIRED

	bool



config ACPI_DEBUGGER

	bool "In-kernel debugger (EXPERIMENTAL)"

	select ACPI_DEBUG

	help

	  Enable in-kernel debugging facilities: statistics, internal

	  object dump, single step control method execution.

	  This is still under development, currently enabling this only

	  results in the compilation of the ACPICA debugger files.



config ACPI_SLEEP

	bool

	depends on SUSPEND || HIBERNATION

drivers/acpi/acpica/Makefile

+17 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ acpi-y += \ 
	rsaddr.o	\

	rscalc.o	\

	rscreate.o	\

	rsdump.o	\

	rsdumpinfo.o	\

	rsinfo.o	\

	rsio.o		\
@@ -178,7 +177,24 @@ acpi-y += \ 
	utxferror.o	\

	utxfmutex.o



acpi-$(CONFIG_ACPI_DEBUGGER) +=	\

	dbcmds.o		\

	dbconvert.o		\

	dbdisply.o		\

	dbexec.o		\

	dbhistry.o		\

	dbinput.o		\

	dbmethod.o		\

	dbnames.o		\

	dbobject.o		\

	dbstats.o		\

	dbutils.o		\

	dbxface.o		\

	rsdump.o		\



acpi-$(ACPI_FUTURE_USAGE) +=	\

	dbfileio.o		\

	dbtest.o		\

	utcache.o		\

	utfileio.o		\

	utprint.o		\

drivers/acpi/acpica/acapps.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ 
	acpi_os_printf (" %-18s%s\n", name, description);



#define FILE_SUFFIX_DISASSEMBLY     "dsl"

#define ACPI_TABLE_FILE_SUFFIX      ".dat"

#define FILE_SUFFIX_BINARY_TABLE    ".dat"	/* Needs the dot */



/*

 * getopt

drivers/acpi/acpica/acdebug.h

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ 
#ifndef __ACDEBUG_H__

#define __ACDEBUG_H__



/* The debugger is used in conjunction with the disassembler most of time */



#ifdef ACPI_DISASSEMBLER

#include "acdisasm.h"

#endif



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



struct acpi_db_command_info {

drivers/acpi/acpica/acglobal.h

+6 −1
Original line number Diff line number Diff line
@@ -325,9 +325,9 @@ ACPI_GLOBAL(struct acpi_external_file *, acpi_gbl_external_file_list); 


#ifdef ACPI_DEBUGGER



ACPI_INIT_GLOBAL(u8, acpi_gbl_db_terminate_threads, FALSE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_abort_method, FALSE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_method_executing, FALSE);

ACPI_INIT_GLOBAL(acpi_thread_id, acpi_gbl_db_thread_id, ACPI_INVALID_THREAD_ID);



ACPI_GLOBAL(u8, acpi_gbl_db_opt_no_ini_methods);

ACPI_GLOBAL(u8, acpi_gbl_db_opt_no_region_support);
@@ -337,6 +337,8 @@ ACPI_GLOBAL(char *, acpi_gbl_db_filename); 
ACPI_GLOBAL(u32, acpi_gbl_db_debug_level);

ACPI_GLOBAL(u32, acpi_gbl_db_console_debug_level);

ACPI_GLOBAL(struct acpi_namespace_node *, acpi_gbl_db_scope_node);

ACPI_GLOBAL(u8, acpi_gbl_db_terminate_loop);

ACPI_GLOBAL(u8, acpi_gbl_db_threads_terminated);



ACPI_GLOBAL(char *, acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS]);

ACPI_GLOBAL(acpi_object_type, acpi_gbl_db_arg_types[ACPI_DEBUGGER_MAX_ARGS]);
@@ -358,6 +360,9 @@ ACPI_GLOBAL(u16, acpi_gbl_node_type_count_misc); 
ACPI_GLOBAL(u32, acpi_gbl_num_nodes);

ACPI_GLOBAL(u32, acpi_gbl_num_objects);



ACPI_GLOBAL(acpi_mutex, acpi_gbl_db_command_ready);

ACPI_GLOBAL(acpi_mutex, acpi_gbl_db_command_complete);



#endif				/* ACPI_DEBUGGER */



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE