/samples/

author	Brian Norris	2015-09-14 03:41:29 +0200
committer	Brian Norris	2015-09-14 03:41:29 +0200
commit	db66e32e0d2ae1f5070faa589aa460b75780ab47 (patch)
tree	feafcfb8f6ae92fabcd4de7d83e839cc301530bc /drivers
parent	mtd: spi-nor: Zap unneeded write_enable from write_reg (diff)
parent	Linux 4.3-rc1 (diff)
download	kernel-qcow2-linux-db66e32e0d2ae1f5070faa589aa460b75780ab47.tar.gz kernel-qcow2-linux-db66e32e0d2ae1f5070faa589aa460b75780ab47.tar.xz kernel-qcow2-linux-db66e32e0d2ae1f5070faa589aa460b75780ab47.zip

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 6e973b8e3a3b..46b4a8e0f859 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig

source "drivers/mcb/Kconfig"

source "drivers/ras/Kconfig"

source "drivers/thunderbolt/Kconfig"

source "drivers/nvdimm/Kconfig"

diff --git a/drivers/Makefile b/drivers/Makefile
index b64b49f6e01b..b250b36b54f2 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile

obj-$(CONFIG_GENERIC_PHY) += phy/

# GPIO must come after pinctrl as gpios may need to mux pins etc

obj-$(CONFIG_PCI) += pci/

obj-$(CONFIG_FMC) += fmc/

obj-$(CONFIG_POWERCAP) += powercap/

obj-$(CONFIG_MCB) += mcb/

obj-$(CONFIG_RAS) += ras/

obj-$(CONFIG_THUNDERBOLT) += thunderbolt/

obj-$(CONFIG_CORESIGHT) += hwtracing/coresight/

obj-$(CONFIG_ANDROID) += android/

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 114cf48085ab..5d1015c26ff4 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig

This driver supports ACPI-controlled docking stations and removable

drive bays such as the IBM Ultrabay and the Dell Module Bay.

depends on X86 || IA64

- This driver installs ACPI as the idle handler for Linux and uses

- ACPI C2 and C3 processor states to save power on systems that

+ This driver adds support for the ACPI Processor package. It is required

+ by several flavors of cpufreq performance-state, thermal, throttling and

To compile this driver as a module, choose M here:

the module will be called processor.

tristate "ACPI NVDIMM Firmware Interface Table (NFIT)"

depends on PHYS_ADDR_T_64BIT

Infrastructure to probe ACPI 6 compliant platforms for

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 8321430d7f24..b5e7cd8a9c71 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile

# Power management related files

acpi-$(CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT) += sleep.o

acpi-$(CONFIG_ACPI_SLEEP) += proc.o

@@ -80,8 +80,10 @@ obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o

obj-$(CONFIG_ACPI_BGRT) += bgrt.o

# processor has its own "processor." module_param namespace

+processor-$(CONFIG_ACPI_CPU_FREQ_PSS) += processor_throttling.o \

processor-$(CONFIG_CPU_FREQ) += processor_perflib.o

obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o

diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 9b5354a2cd08..f71b756b05c4 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

* General Public License for more details.

- * You should have received a copy of the GNU General Public License along

- * with this program; if not, write to the Free Software Foundation, Inc.,

* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
index 3984ea96e5f7..a450e7af877c 100644
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c

#include <linux/clkdev.h>

#include <linux/acpi.h>

#include <linux/err.h>

#include <linux/pm.h>

#include "internal.h"

diff --git a/drivers/acpi/acpi_ipmi.c b/drivers/acpi/acpi_ipmi.c
index ac0f52f6df2b..f77956c3fd45 100644
--- a/drivers/acpi/acpi_ipmi.c
+++ b/drivers/acpi/acpi_ipmi.c

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

* General Public License for more details.

- * You should have received a copy of the GNU General Public License along

- * with this program; if not, write to the Free Software Foundation, Inc.,

* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 569ee090343f..f51bd0d0bc17 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c

#include <linux/acpi.h>

#include <linux/clkdev.h>

#include <linux/clk-provider.h>

#include <linux/err.h>

#define LPSS_CLK_DIVIDER BIT(2)

#define LPSS_LTR BIT(3)

#define LPSS_SAVE_CTX BIT(4)

struct lpss_private_data;

@@ -156,6 +156,10 @@ static const struct lpss_device_desc byt_pwm_dev_desc = {

.flags = LPSS_SAVE_CTX,

static const struct lpss_device_desc byt_uart_dev_desc = {

.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX,

.clk_con_id = "baudclk",

@@ -163,6 +167,14 @@ static const struct lpss_device_desc byt_uart_dev_desc = {

.setup = lpss_uart_setup,

+ .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX

static const struct lpss_device_desc byt_spi_dev_desc = {

.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX,

.prv_offset = 0x400,

@@ -178,8 +190,15 @@ static const struct lpss_device_desc byt_i2c_dev_desc = {

.setup = byt_i2c_setup,

static struct lpss_device_desc bsw_spi_dev_desc = {

- .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX,

+ .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX

.prv_offset = 0x400,

.setup = lpss_deassert_reset,

@@ -214,11 +233,12 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = {

/* Braswell LPSS devices */

{ "8086228E", LPSS_ADDR(bsw_spi_dev_desc) },

{ "INT3430", LPSS_ADDR(lpt_dev_desc) },

{ "INT3431", LPSS_ADDR(lpt_dev_desc) },

{ "INT3432", LPSS_ADDR(lpt_i2c_dev_desc) },

@@ -352,13 +372,16 @@ static int acpi_lpss_create_device(struct acpi_device *adev,

pdata->mmio_size = resource_size(rentry->res);

pdata->mmio_base = ioremap(rentry->res->start,

acpi_dev_free_resource_list(&resource_list);

pdata->dev_desc = dev_desc;

if (dev_desc->setup)

@@ -555,9 +578,14 @@ static void acpi_lpss_restore_ctx(struct device *dev,

* The following delay is needed or the subsequent write operations may

* fail. The LPSS devices are actually PCI devices and the PCI spec

* expects 10ms delay before the device can be accessed after D3 to D0

+ * transition. However some platforms like BSW does not need this delay.

for (i = 0; i < LPSS_PRV_REG_COUNT; i++) {

unsigned long offset = i * sizeof(u32);

diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index ee28f4d15625..6b0d3ef7309c 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c

* NON INFRINGEMENT. See the GNU General Public License for more

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

* ACPI based HotPlug driver that supports Memory Hotplug

* This driver fields notifications from firmware for memory add

* and remove operations and alerts the VM of the affected memory

diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 00b39802d7ec..ae307ff36acb 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c

* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for

- * You should have received a copy of the GNU General Public License along with

- * this program; if not, write to the Free Software Foundation, Inc.,

#include <linux/kernel.h>

diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c
index ff6d8adc9cda..c58940b231d6 100644
--- a/drivers/acpi/acpi_pnp.c
+++ b/drivers/acpi/acpi_pnp.c

@@ -19,8 +19,6 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {

{"PNP0600"}, /* Generic ESDI/IDE/ATA compatible hard disk controller */

{"IFX0101"}, /* Infineon TPMs */

{"IFX0102"}, /* Infineon TPMs */

@@ -153,6 +151,7 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {

{"AEI0250"}, /* PROLiNK 1456VH ISA PnP K56flex Fax Modem */

{"AEI1240"}, /* Actiontec ISA PNP 56K X2 Fax Modem */

{"AKY1021"}, /* Rockwell 56K ACF II Fax+Data+Voice Modem */

{"AZT4001"}, /* AZT3005 PnP SOUND DEVICE */

{"BDP3336"}, /* Best Data Products Inc. Smart One 336F PnP Modem */

{"BRI0A49"}, /* Boca Complete Ofc Communicator 14.4 Data-FAX */

diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index 92a5f738e370..985b8a83184e 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c

@@ -485,7 +485,7 @@ static const struct acpi_device_id processor_device_ids[] = {

-static struct acpi_scan_handler __refdata processor_handler = {

.ids = processor_device_ids,

.attach = acpi_processor_add,

#ifdef CONFIG_ACPI_HOTPLUG_CPU

diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index 8c2fe2f2f9fd..5778e8e4313a 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

* General Public License for more details.

- * You should have received a copy of the GNU General Public License along

- * with this program; if not, write to the Free Software Foundation, Inc.,

* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index c1a963581dc0..fedcc16b56cc 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile

diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index 43685dd36c77..eb2e926d8218 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h

#define PARAM_LIST(pl) pl

-#define DBTEST_OUTPUT_LEVEL(lvl) if (acpi_gbl_db_opt_verbose)

#define EX_NO_SINGLE_STEP 1

#define EX_SINGLE_STEP 2

* dbxface - external debugger interfaces

acpi_db_single_step(struct acpi_walk_state *walk_state,

union acpi_parse_object *op, u32 op_type);

@@ -102,6 +95,8 @@ void acpi_db_display_interfaces(char *action_arg, char *interface_name_arg);

acpi_status acpi_db_sleep(char *object_arg);

+void acpi_db_trace(char *enable_arg, char *method_arg, char *once_arg);

void acpi_db_display_locks(void);

void acpi_db_display_resources(char *object_arg);

@@ -262,6 +257,23 @@ char *acpi_db_get_next_token(char *string,

char **next, acpi_object_type * return_type);

+void acpi_db_decode_internal_object(union acpi_operand_object *obj_desc);

+acpi_db_display_internal_object(union acpi_operand_object *obj_desc,

+void acpi_db_decode_arguments(struct acpi_walk_state *walk_state);

+void acpi_db_decode_locals(struct acpi_walk_state *walk_state);

* dbstats - Generation and display of ACPI table statistics

void acpi_db_generate_statistics(union acpi_parse_object *root, u8 is_method);

diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
index 408f04bcaab4..7094dc89eb81 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h

acpi_ds_result_push(union acpi_operand_object *object,

struct acpi_walk_state *walk_state);

#endif /* _ACDISPAT_H_ */

diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 53f96a370762..09f37b516808 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h

@@ -58,11 +58,12 @@ ACPI_GLOBAL(struct acpi_table_list, acpi_gbl_root_table_list);

ACPI_GLOBAL(struct acpi_table_header *, acpi_gbl_DSDT);

ACPI_GLOBAL(struct acpi_table_header, acpi_gbl_original_dsdt_header);

+ACPI_INIT_GLOBAL(u32, acpi_gbl_dsdt_index, ACPI_INVALID_TABLE_INDEX);

+ACPI_INIT_GLOBAL(u32, acpi_gbl_facs_index, ACPI_INVALID_TABLE_INDEX);

+ACPI_INIT_GLOBAL(u32, acpi_gbl_xfacs_index, ACPI_INVALID_TABLE_INDEX);

#if (!ACPI_REDUCED_HARDWARE)

ACPI_GLOBAL(struct acpi_table_facs *, acpi_gbl_FACS);

#endif /* !ACPI_REDUCED_HARDWARE */

@@ -235,6 +236,10 @@ ACPI_INIT_GLOBAL(u32, acpi_gbl_nesting_level, 0);

ACPI_GLOBAL(struct acpi_thread_state *, acpi_gbl_current_walk_list);

+/* Maximum number of While() loop iterations before forced abort */

/* Control method single step flag */

ACPI_GLOBAL(u8, acpi_gbl_cm_single_step);

@@ -290,8 +295,6 @@ ACPI_GLOBAL(u32, acpi_fixed_event_count[ACPI_NUM_FIXED_EVENTS]);

ACPI_GLOBAL(u32, acpi_gbl_original_dbg_level);

ACPI_GLOBAL(u32, acpi_gbl_original_dbg_layer);

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

@@ -309,9 +312,10 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_no_resource_disassembly, FALSE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_ignore_noop_operator, FALSE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_cstyle_disassembly, TRUE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_force_aml_disassembly, FALSE);

ACPI_GLOBAL(u8, acpi_gbl_num_external_methods);

ACPI_GLOBAL(u32, acpi_gbl_resolved_external_methods);

ACPI_GLOBAL(struct acpi_external_list *, acpi_gbl_external_list);

@@ -346,8 +350,8 @@ ACPI_GLOBAL(char, acpi_gbl_db_debug_filename[ACPI_DB_LINE_BUFFER_SIZE]);

-ACPI_GLOBAL(u16, acpi_gbl_obj_type_count[ACPI_TYPE_NS_NODE_MAX + 1]);

-ACPI_GLOBAL(u16, acpi_gbl_node_type_count[ACPI_TYPE_NS_NODE_MAX + 1]);

+ACPI_GLOBAL(u16, acpi_gbl_obj_type_count[ACPI_TOTAL_TYPES]);

+ACPI_GLOBAL(u16, acpi_gbl_node_type_count[ACPI_TOTAL_TYPES]);

ACPI_GLOBAL(u16, acpi_gbl_obj_type_count_misc);

ACPI_GLOBAL(u16, acpi_gbl_node_type_count_misc);

ACPI_GLOBAL(u32, acpi_gbl_num_nodes);

diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index 7ac98000b46b..e820ed8f173f 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h

acpi_ex_do_debug_object(union acpi_operand_object *source_desc,

u32 level, u32 index);

+acpi_ex_start_trace_method(struct acpi_namespace_node *method_node,

+acpi_ex_stop_trace_method(struct acpi_namespace_node *method_node,

* exfield - ACPI AML (p-code) execution - field manipulation

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index bc600969c6a1..6f708267ad8c 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h

#ifdef ACPI_LARGE_NAMESPACE_NODE

union acpi_parse_object *op;

#define ACPI_ROOT_ORIGIN_ALLOCATED (1)

#define ACPI_ROOT_ALLOW_RESIZE (2)

struct acpi_find_context {

#define ACPI_NUM_RTYPES 5 /* Number of actual object types */

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

* Event typedefs and structs

union acpi_parse_object *arg; /* arguments and contained ops */

+#if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG_OUTPUT)

#define ACPI_DISASM_ONLY_MEMBERS(a) a;

#define ACPI_DISASM_ONLY_MEMBERS(a)

u8 descriptor_type; /* To differentiate various internal objs */\

u8 flags; /* Type of Op */\

u16 aml_opcode; /* AML opcode */\

union acpi_parse_object *next; /* Next op */\

struct acpi_namespace_node *node; /* For use by interpreter */\

union acpi_parse_value value; /* Value or args associated with the opcode */\

* Index of current thread inside all them created.

char num_threads_str[11];

char id_of_thread_str[11];

#define ACPI_DB_CONSOLE_OUTPUT 0x02

#define ACPI_DB_DUPLICATE_OUTPUT 0x03

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

diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index c240bdf824f2..e85366ceb15a 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h

#define ACPI_MUL_32(a) _ACPI_MUL(a, 5)

#define ACPI_MOD_32(a) _ACPI_MOD(a, 32)

* Rounding macros (Power of two boundaries only)

diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 0dd088290d80..ea0d9076d408 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h

@@ -272,17 +272,20 @@ acpi_ns_check_package(struct acpi_evaluate_info *info,

u32 acpi_ns_opens_scope(acpi_object_type type);

-acpi_ns_build_external_path(struct acpi_namespace_node *node,

char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node);

+acpi_ns_build_normalized_path(struct acpi_namespace_node *node,

+char *acpi_ns_get_normalized_pathname(struct acpi_namespace_node *node,

char *acpi_ns_name_of_current_scope(struct acpi_walk_state *walk_state);

acpi_ns_handle_to_pathname(acpi_handle target_handle,

acpi_ns_pattern_match(struct acpi_namespace_node *obj_node, char *search_for);

diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index c81d98d09cac..0bd02c4a5f75 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h

union acpi_operand_object *mutex;

acpi_internal_method implementation;

diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index 0cdd2fce493a..6021ccfb0b1c 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h

@@ -225,11 +225,11 @@ void acpi_ps_delete_parse_tree(union acpi_parse_object *root);

* psutils - parser utilities

void acpi_ps_init_op(union acpi_parse_object *op, u16 opcode);

+union acpi_parse_object *acpi_ps_alloc_op(u16 opcode, u8 *aml);

void acpi_ps_free_op(union acpi_parse_object *op);

diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 44997ca02ae2..f9992dced1f9 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h

u8 namespace_override; /* Override existing objects */

u8 result_size; /* Total elements for the result stack */

u8 result_count; /* Current number of occupied elements of result stack */

u32 method_breakpoint; /* For single stepping */

u32 user_breakpoint; /* User AML breakpoint */

diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 7e0b6f1bec9c..f7731f260c31 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h

struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index);

+acpi_tb_install_table_with_override(struct acpi_table_desc *new_table_desc,

acpi_tb_install_fixed_table(acpi_physical_address address,

acpi_status acpi_tb_parse_root_table(acpi_physical_address rsdp_address);

#endif /* __ACTABLES_H__ */

diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 6de0d3573037..fb2aa5066f3f 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h

#define DB_QWORD_DISPLAY 8

+acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer);

* utglobal - Global data structures and procedures

acpi_status acpi_ut_init_globals(void);

@@ -205,8 +216,6 @@ acpi_status acpi_ut_hardware_initialize(void);

void acpi_ut_subsystem_shutdown(void);

* utcopy - Object construction and conversion interfaces

@@ -508,7 +517,7 @@ const struct acpi_exception_info *acpi_ut_validate_exception(acpi_status

u8 acpi_ut_is_pci_root_bridge(char *id);

+#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP || defined ACPI_NAMES_APP)

u8 acpi_ut_is_aml_table(struct acpi_table_header *table);

@@ -567,16 +576,6 @@ acpi_ut_get_resource_end_tag(union acpi_operand_object *obj_desc, u8 **end_tag);

* utstring - String and character utilities

-acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer);

void acpi_ut_print_string(char *string, u16 max_length);

#if defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP

diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c
index 3e6989738e85..e2ab59e39162 100644
--- a/drivers/acpi/acpica/dsargs.c
+++ b/drivers/acpi/acpica/dsargs.c

@@ -86,7 +86,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,

/* Allocate a new parser op to be the root of the parsed tree */

return_ACPI_STATUS(AE_NO_MEMORY);

@@ -129,7 +129,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,

/* Evaluate the deferred arguments */

return_ACPI_STATUS(AE_NO_MEMORY);

diff --git a/drivers/acpi/acpica/dscontrol.c b/drivers/acpi/acpica/dscontrol.c
index 39da9da62bbf..435fc16e2f83 100644
--- a/drivers/acpi/acpica/dscontrol.c
+++ b/drivers/acpi/acpica/dscontrol.c

@@ -212,7 +212,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,

control_state->control.loop_count++;

if (control_state->control.loop_count >

status = AE_AML_INFINITE_LOOP;

diff --git a/drivers/acpi/acpica/dsdebug.c b/drivers/acpi/acpica/dsdebug.c
new file mode 100644
index 000000000000..309556efc553
--- /dev/null
+++ b/drivers/acpi/acpica/dsdebug.c

+/******************************************************************************

+ * Module Name: dsdebug - Parser/Interpreter interface - debugging

+ *****************************************************************************/

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * 1. Redistributions of source code must retain the above copyright

+ * notice, this list of conditions, and the following disclaimer,

+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer

+ * substantially similar to the "NO WARRANTY" disclaimer below

+ * ("Disclaimer") and any redistribution must be conditioned upon

+ * including a substantially similar Disclaimer requirement for further

+ * 3. Neither the names of the above-listed copyright holders nor the names

+ * of any contributors may be used to endorse or promote products derived

+ * from this software without specific prior written permission.

+ * Alternatively, this software may be distributed under the terms of the

+ * GNU General Public License ("GPL") version 2 as published by the Free

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR

+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING

+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+acpi_ds_print_node_pathname(struct acpi_namespace_node *node,

+/*******************************************************************************

+ ******************************************************************************/

+acpi_ds_print_node_pathname(struct acpi_namespace_node *node,

+ /* Convert handle to full pathname and print it (with supplied message) */

+/*******************************************************************************

+ * DESCRIPTION: Called when a method has been aborted because of an error.

+ ******************************************************************************/

+ * If there is no Thread, we are not actually executing a method.

+ * This can happen when the iASL compiler calls the interpreter

+ acpi_ds_print_node_pathname(walk_state->method_node, NULL);

+ * NOTE: the method call parse subtree is already deleted at this

diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c
index 95779e8ec3bb..920f1b199bc6 100644
--- a/drivers/acpi/acpica/dsinit.c
+++ b/drivers/acpi/acpica/dsinit.c

@@ -237,12 +237,22 @@ acpi_ds_initialize_objects(u32 table_index,

return_ACPI_STATUS(status);

ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,

- "Table [%4.4s] (id %4.4X) - %4u Objects with %3u Devices, "

+ "Table [%4.4s:%8.8s] (id %.2X) - %4u Objects with %3u Devices, "

info.non_serial_method_count,

info.serialized_method_count));

diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index 85bb951430d9..bc32f3194afe 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c

#include "acdispat.h"

#include "acinterp.h"

#include "acnamesp.h"

#include "acparser.h"

#include "amlcode.h"

#define _COMPONENT ACPI_DISPATCHER

ACPI_MODULE_NAME("dsmethod")

@@ -103,7 +101,7 @@ acpi_ds_auto_serialize_method(struct acpi_namespace_node *node,

/* Create/Init a root op for the method parse tree */

+ op = acpi_ps_alloc_op(AML_METHOD_OP, obj_desc->method.aml_start);

return_ACPI_STATUS(AE_NO_MEMORY);

@@ -205,7 +203,7 @@ acpi_ds_detect_named_opcodes(struct acpi_walk_state *walk_state,

* DESCRIPTION: Called on method error. Invoke the global exception handler if

- * present, dump the method data if the disassembler is configured

+ * present, dump the method data if the debugger is configured

* Note: Allows the exception handler to change the status code

@@ -214,6 +212,8 @@ acpi_ds_detect_named_opcodes(struct acpi_walk_state *walk_state,

acpi_ds_method_error(acpi_status status, struct acpi_walk_state * walk_state)

ACPI_FUNCTION_ENTRY();

/* Ignore AE_OK and control exception codes */

@@ -234,26 +234,30 @@ acpi_ds_method_error(acpi_status status, struct acpi_walk_state * walk_state)

* Handler can map the exception code to anything it wants, including

* AE_OK, in which case the executing method will not be aborted.

status = acpi_gbl_exception_handler(status,

walk_state->method_node ?

walk_state->method_node->

acpi_ex_enter_interpreter();

acpi_ds_clear_implicit_return(walk_state);

if (ACPI_FAILURE(status)) {

+ acpi_ds_dump_method_stack(status, walk_state, walk_state->op);

- /* Display method locals/args if disassembler is present */

- acpi_dm_dump_method_info(status, walk_state, walk_state->op);

@@ -328,6 +332,8 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,

return_ACPI_STATUS(AE_NULL_ENTRY);

+ acpi_ex_start_trace_method(method_node, obj_desc, walk_state);

/* Prevent wraparound of thread count */

if (obj_desc->method.thread_count == ACPI_UINT8_MAX) {

/* On error, we must terminate the method properly */

acpi_ds_terminate_control_method(obj_desc, next_walk_state);

return_ACPI_STATUS(status);

@@ -826,5 +830,8 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,

+ acpi_ex_stop_trace_method((struct acpi_namespace_node *)method_desc->

diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index ea0cc4e08f80..81d7b9863e32 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c

@@ -480,8 +480,8 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,

union acpi_operand_object **operand;

struct acpi_namespace_node *node;

union acpi_parse_object *next_op;

struct acpi_table_header *table;

ACPI_FUNCTION_TRACE_PTR(ds_eval_table_region_operands, op);

@@ -504,6 +504,8 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,

return_ACPI_STATUS(status);

* Resolve the Signature string, oem_id string,

* and oem_table_id string operands

@@ -511,32 +513,34 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,

status = acpi_ex_resolve_operands(op->common.aml_opcode,

ACPI_WALK_OPERANDS, walk_state);

if (ACPI_FAILURE(status)) {

/* Find the ACPI table */

status = acpi_tb_find_table(operand[0]->string.pointer,

operand[1]->string.pointer,

operand[2]->string.pointer, &table_index);

if (ACPI_FAILURE(status)) {

status = acpi_get_table_by_index(table_index, &table);

if (ACPI_FAILURE(status)) {

obj_desc = acpi_ns_get_attached_object(node);

obj_desc->region.address = ACPI_PTR_TO_PHYSADDR(table);

@@ -551,6 +555,11 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,

obj_desc->region.flags |= AOPOBJ_DATA_VALID;

return_ACPI_STATUS(status);

diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index 845ff44919c3..097188a6b1c1 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c

@@ -388,7 +388,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,

/* Create a new op */

+ op = acpi_ps_alloc_op(walk_state->opcode, walk_state->aml);

return_ACPI_STATUS(AE_NO_MEMORY);

diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c
index fcaa30c611fb..e2c08cd79aca 100644
--- a/drivers/acpi/acpica/dswload2.c
+++ b/drivers/acpi/acpica/dswload2.c

@@ -335,7 +335,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,

/* Create a new op */

+ op = acpi_ps_alloc_op(walk_state->opcode, walk_state->aml);

return_ACPI_STATUS(AE_NO_MEMORY);

diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 2ba28a63fb68..5ee79a16fe33 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c

@@ -626,9 +626,17 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,

acpi_adr_space_type space_id)

ACPI_FUNCTION_TRACE(ev_execute_reg_methods);

* Run all _REG methods for all Operation Regions for this space ID. This

* is a separate walk in order to handle any interdependencies between

@@ -637,7 +645,7 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,

status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, node, ACPI_UINT32_MAX,

ACPI_NS_WALK_UNLOCK, acpi_ev_reg_run,

/* Special case for EC: handle "orphan" _REG methods with no region */

@@ -645,6 +653,11 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,

acpi_ev_orphan_ec_reg_method(node);

return_ACPI_STATUS(status);

@@ -664,10 +677,10 @@ acpi_ev_reg_run(acpi_handle obj_handle,

union acpi_operand_object *obj_desc;

struct acpi_namespace_node *node;

/* Convert and validate the device handle */

@@ -696,13 +709,14 @@ acpi_ev_reg_run(acpi_handle obj_handle,

/* Object is a Region */

/* This region is for a different address space, just ignore it */

status = acpi_ev_execute_reg_method(obj_desc, ACPI_REG_CONNECT);

diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 24a4c5c2b124..b540913c11ac 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c

@@ -162,14 +162,6 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,

ACPI_FUNCTION_TRACE(ex_load_table_op);

- /* Validate lengths for the Signature, oem_id, and oem_table_id strings */

/* Find the ACPI table in the RSDT/XSDT */

status = acpi_tb_find_table(operand[0]->string.pointer,

diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index aaeea4840aaa..ccb7219bdcee 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c

obj_desc->method.aml_start = aml_start;

obj_desc->method.aml_length = aml_length;

* Disassemble the method flags. Split off the arg_count, Serialized

diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index 815442bbd051..de92458236f5 100644
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c

#include <acpi/acpi.h>

#include "accommon.h"

#include "acinterp.h"

#define _COMPONENT ACPI_EXECUTER

ACPI_MODULE_NAME("exdebug")

+static union acpi_operand_object *acpi_gbl_trace_method_object = NULL;

+static const char *acpi_ex_get_trace_event_name(acpi_trace_event_type type);

#ifndef ACPI_NO_ERROR_MESSAGES

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

* enabled if necessary.

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

acpi_ex_do_debug_object(union acpi_operand_object *source_desc,

u32 level, u32 index)

@@ -308,3 +319,316 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,

+/*******************************************************************************

+ * PARAMETERS: name - Whether method name should be matched,

+ ******************************************************************************/

+ * 1. If the tracer is started, acpi_gbl_trace_method_object should have

+ * 2. If the tracer is not started, acpi_gbl_trace_method_name should be

+ * 3. If the tracer is oneshot style, acpi_gbl_trace_method_name should

+ * not be cleared by the trace stopper during the first match

+/*******************************************************************************

+ ******************************************************************************/

+static const char *acpi_ex_get_trace_event_name(acpi_trace_event_type type)

+/*******************************************************************************

+ ******************************************************************************/

+/*******************************************************************************

+ ******************************************************************************/

+acpi_ex_start_trace_method(struct acpi_namespace_node *method_node,

+ pathname = acpi_ns_get_normalized_pathname(method_node, TRUE);