Commit 4d946f79 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPI: Enable build of AML interpreter debugger 



This patch enables ACPICA debugger files using a configurable
CONFIG_ACPI_DEBUGGER configuration item. Those debugger related code that
was originally masked as ACPI_FUTURE_USAGE now gets unmasked.

Necessary OSL stubs are also added in this patch:
1. acpi_os_readable(): This should be arch specific in Linux, while this
    patch doesn't introduce real implementation and a complex mechanism to
    allow architecture specific acpi_os_readable() to be implemented to
    validate the address. It may be done by future commits.
2. acpi_os_get_line(): This is used to obtain debugger command input. This
    patch only introduces a simple KDB concept example in it and the
    example should be co-working with the code implemented in
    acpi_os_printf(). Since this KDB example won't be compiled unless
    ENABLE_DEBUGGER is defined and it seems Linux has already stopped to
    use ENABLE_DEBUGGER, thus do not expect it can work properly.

This patch also cleans up all other ACPI_FUTURE_USAGE surroundings
accordingly.
1. Since linkage error can be automatically detected, declaration in the
   headers needn't be surrounded by ACPI_FUTURE_USAGE.
   So only the following separate exported fuction bodies are masked by
   this macro (other exported fucntions may have already been masked at
   entire module level via drivers/acpi/acpica/Makefile):
     acpi_install_exception_handler()
     acpi_subsystem_status()
     acpi_get_system_info()
     acpi_get_statistics()
     acpi_install_initialization_handler()
2. Since strip can automatically zap the no-user functions, functions that
   are not marked with ACPI_EXPORT_SYMBOL() needn't get surrounded by
   ACPI_FUTURE_USAGE.
   So the following function which is not used by Linux kernel now won't
   get surrounded by this macro:
     acpi_ps_get_name()

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f988f24e

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
@@ -177,8 +177,24 @@ acpi-y += \ 
	utxferror.o	\

	utxfmutex.o



acpi-$(ACPI_FUTURE_USAGE) +=	\

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/acinterp.h

+0 −2
Original line number Diff line number Diff line
@@ -397,12 +397,10 @@ void 
acpi_ex_dump_operands(union acpi_operand_object **operands,

		      const char *opcode_name, u32 num_opcodes);



#ifdef	ACPI_FUTURE_USAGE

void

acpi_ex_dump_object_descriptor(union acpi_operand_object *object, u32 flags);



void acpi_ex_dump_namespace_node(struct acpi_namespace_node *node, u32 flags);

#endif				/* ACPI_FUTURE_USAGE */



/*

 * exnames - AML namestring support

drivers/acpi/acpica/acnamesp.h

+0 −4
Original line number Diff line number Diff line
@@ -193,9 +193,7 @@ acpi_ns_convert_to_resource(union acpi_operand_object *original_object, 
/*

 * nsdump - Namespace dump/print utilities

 */

#ifdef	ACPI_FUTURE_USAGE

void acpi_ns_dump_tables(acpi_handle search_base, u32 max_depth);

#endif				/* ACPI_FUTURE_USAGE */



void acpi_ns_dump_entry(acpi_handle handle, u32 debug_level);
@@ -208,7 +206,6 @@ acpi_status 
acpi_ns_dump_one_object(acpi_handle obj_handle,

			u32 level, void *context, void **return_value);



#ifdef	ACPI_FUTURE_USAGE

void

acpi_ns_dump_objects(acpi_object_type type,

		     u8 display_type,
@@ -220,7 +217,6 @@ acpi_ns_dump_object_paths(acpi_object_type type, 
			  u8 display_type,

			  u32 max_depth,

			  acpi_owner_id owner_id, acpi_handle start_handle);

#endif				/* ACPI_FUTURE_USAGE */



/*

 * nseval - Namespace evaluation functions

drivers/acpi/acpica/acparser.h

+0 −4
Original line number Diff line number Diff line
@@ -194,10 +194,8 @@ union acpi_parse_object *acpi_ps_find(union acpi_parse_object *scope, 


union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn);



#ifdef	ACPI_FUTURE_USAGE

union acpi_parse_object *acpi_ps_get_depth_next(union acpi_parse_object *origin,

						union acpi_parse_object *op);

#endif				/* ACPI_FUTURE_USAGE */



/*

 * pswalk - parse tree walk routines
@@ -235,9 +233,7 @@ void acpi_ps_free_op(union acpi_parse_object *op); 


u8 acpi_ps_is_leading_char(u32 c);



#ifdef	ACPI_FUTURE_USAGE

u32 acpi_ps_get_name(union acpi_parse_object *op);

#endif				/* ACPI_FUTURE_USAGE */



void acpi_ps_set_name(union acpi_parse_object *op, u32 name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE