mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
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: Lv Zheng <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>
This commit is contained in:
parent
f988f24ee7
commit
4d946f7970
17 changed files with 43 additions and 49 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -635,9 +635,7 @@ void
|
|||
acpi_ut_free_and_track(void *address,
|
||||
u32 component, const char *module, u32 line);
|
||||
|
||||
#ifdef ACPI_FUTURE_USAGE
|
||||
void acpi_ut_dump_allocation_info(void);
|
||||
#endif /* ACPI_FUTURE_USAGE */
|
||||
|
||||
void acpi_ut_dump_allocations(u32 component, const char *module);
|
||||
|
||||
|
|
|
|||
|
|
@ -405,7 +405,7 @@ cleanup:
|
|||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
|
||||
#endif /* ACPI_FUTURE_USAGE */
|
||||
#endif
|
||||
|
||||
#if (!ACPI_REDUCED_HARDWARE)
|
||||
/*******************************************************************************
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,
|
|||
|
||||
#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
|
||||
|
||||
#ifdef ACPI_FUTURE_USAGE
|
||||
static acpi_status
|
||||
acpi_ns_dump_one_object_path(acpi_handle obj_handle,
|
||||
u32 level, void *context, void **return_value);
|
||||
|
|
@ -68,7 +67,6 @@ acpi_ns_dump_one_object_path(acpi_handle obj_handle,
|
|||
static acpi_status
|
||||
acpi_ns_get_max_depth(acpi_handle obj_handle,
|
||||
u32 level, void *context, void **return_value);
|
||||
#endif /* ACPI_FUTURE_USAGE */
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
|
|
@ -625,7 +623,6 @@ cleanup:
|
|||
return (AE_OK);
|
||||
}
|
||||
|
||||
#ifdef ACPI_FUTURE_USAGE
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_ns_dump_objects
|
||||
|
|
@ -680,9 +677,7 @@ acpi_ns_dump_objects(acpi_object_type type,
|
|||
|
||||
(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
|
||||
}
|
||||
#endif /* ACPI_FUTURE_USAGE */
|
||||
|
||||
#ifdef ACPI_FUTURE_USAGE
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_ns_dump_one_object_path, acpi_ns_get_max_depth
|
||||
|
|
@ -810,7 +805,6 @@ acpi_ns_dump_object_paths(acpi_object_type type,
|
|||
|
||||
(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
|
||||
}
|
||||
#endif /* ACPI_FUTURE_USAGE */
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
|
|
|
|||
|
|
@ -183,7 +183,6 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef ACPI_FUTURE_USAGE
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_ps_get_depth_next
|
||||
|
|
@ -317,4 +316,3 @@ union acpi_parse_object *acpi_ps_get_child(union acpi_parse_object *op)
|
|||
return (child);
|
||||
}
|
||||
#endif
|
||||
#endif /* ACPI_FUTURE_USAGE */
|
||||
|
|
|
|||
|
|
@ -205,7 +205,6 @@ u8 acpi_ps_is_leading_char(u32 c)
|
|||
/*
|
||||
* Get op's name (4-byte name segment) or 0 if unnamed
|
||||
*/
|
||||
#ifdef ACPI_FUTURE_USAGE
|
||||
u32 acpi_ps_get_name(union acpi_parse_object * op)
|
||||
{
|
||||
|
||||
|
|
@ -219,7 +218,6 @@ u32 acpi_ps_get_name(union acpi_parse_object * op)
|
|||
|
||||
return (op->named.name);
|
||||
}
|
||||
#endif /* ACPI_FUTURE_USAGE */
|
||||
|
||||
/*
|
||||
* Set op's name
|
||||
|
|
|
|||
|
|
@ -564,7 +564,6 @@ acpi_rs_get_crs_method_data(struct acpi_namespace_node *node,
|
|||
*
|
||||
******************************************************************************/
|
||||
|
||||
#ifdef ACPI_FUTURE_USAGE
|
||||
acpi_status
|
||||
acpi_rs_get_prs_method_data(struct acpi_namespace_node *node,
|
||||
struct acpi_buffer *ret_buffer)
|
||||
|
|
@ -596,7 +595,6 @@ acpi_rs_get_prs_method_data(struct acpi_namespace_node *node,
|
|||
acpi_ut_remove_reference(obj_desc);
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
#endif /* ACPI_FUTURE_USAGE */
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ acpi_get_current_resources(acpi_handle device_handle,
|
|||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL(acpi_get_current_resources)
|
||||
#ifdef ACPI_FUTURE_USAGE
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_get_possible_resources
|
||||
|
|
@ -262,7 +262,7 @@ acpi_get_possible_resources(acpi_handle device_handle,
|
|||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL(acpi_get_possible_resources)
|
||||
#endif /* ACPI_FUTURE_USAGE */
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_set_current_resources
|
||||
|
|
|
|||
|
|
@ -253,7 +253,7 @@ acpi_install_initialization_handler(acpi_init_handler handler, u32 function)
|
|||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL(acpi_install_initialization_handler)
|
||||
#endif /* ACPI_FUTURE_USAGE */
|
||||
#endif
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
|
|
|
|||
|
|
@ -66,8 +66,6 @@ struct acpi_os_dpc {
|
|||
/* stuff for debugger support */
|
||||
int acpi_in_debugger;
|
||||
EXPORT_SYMBOL(acpi_in_debugger);
|
||||
|
||||
extern char line_buf[80];
|
||||
#endif /*ENABLE_DEBUGGER */
|
||||
|
||||
static int (*__acpi_os_prepare_sleep)(u8 sleep_state, u32 pm1a_ctrl,
|
||||
|
|
@ -1345,15 +1343,13 @@ acpi_status acpi_os_signal_semaphore(acpi_handle handle, u32 units)
|
|||
return AE_OK;
|
||||
}
|
||||
|
||||
#ifdef ACPI_FUTURE_USAGE
|
||||
u32 acpi_os_get_line(char *buffer)
|
||||
acpi_status acpi_os_get_line(char *buffer, u32 buffer_length, u32 *bytes_read)
|
||||
{
|
||||
|
||||
#ifdef ENABLE_DEBUGGER
|
||||
if (acpi_in_debugger) {
|
||||
u32 chars;
|
||||
|
||||
kdb_read(buffer, sizeof(line_buf));
|
||||
kdb_read(buffer, buffer_length);
|
||||
|
||||
/* remove the CR kdb includes */
|
||||
chars = strlen(buffer) - 1;
|
||||
|
|
@ -1361,9 +1357,8 @@ u32 acpi_os_get_line(char *buffer)
|
|||
}
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
return AE_OK;
|
||||
}
|
||||
#endif /* ACPI_FUTURE_USAGE */
|
||||
|
||||
acpi_status acpi_os_signal(u32 function, void *info)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue