Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release

100 files changed, 5623 insertions, 1805 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 93d2c7971df6..746411518802 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -360,4 +360,13 @@ config ACPI_SBS
           To compile this driver as a module, choose M here:
           the modules will be called sbs and sbshc.
 
+config ACPI_HED
+        tristate "Hardware Error Device"
+        help
+          This driver supports the Hardware Error Device (PNP0C33),
+          which is used to report some hardware errors notified via
+          SCI, mainly the corrected errors.
+
+source "drivers/acpi/apei/Kconfig"
+
 endif   # ACPI
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index a8d8998dd5c5..6ee33169e1dc 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -19,7 +19,7 @@ obj-y				+= acpi.o \
 
 # All the builtin files are in the "acpi." module_param namespace.
 acpi-y                          += osl.o utils.o reboot.o
-acpi-y                          += hest.o
+acpi-y                          += atomicio.o
 
 # sleep related files
 acpi-y                          += wakeup.o
@@ -59,6 +59,7 @@ obj-$(CONFIG_ACPI_BATTERY)	+= battery.o
 obj-$(CONFIG_ACPI_SBS)          += sbshc.o
 obj-$(CONFIG_ACPI_SBS)          += sbs.o
 obj-$(CONFIG_ACPI_POWER_METER)  += power_meter.o
+obj-$(CONFIG_ACPI_HED)          += hed.o
 
 # processor has its own "processor." module_param namespace
 processor-y                     := processor_driver.o processor_throttling.o
@@ -66,3 +67,5 @@ processor-y			+= processor_idle.o processor_thermal.o
 processor-$(CONFIG_CPU_FREQ)    += processor_perflib.o
 
 obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
+
+obj-$(CONFIG_ACPI_APEI)         += apei/
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 62122134693b..d269a8f3329c 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -43,6 +43,10 @@ static DEFINE_MUTEX(isolated_cpus_lock);
 #define CPUID5_ECX_EXTENSIONS_SUPPORTED (0x1)
 #define CPUID5_ECX_INTERRUPT_BREAK      (0x2)
 static unsigned long power_saving_mwait_eax;
+
+static unsigned char tsc_detected_unstable;
+static unsigned char tsc_marked_unstable;
+
 static void power_saving_mwait_init(void)
 {
         unsigned int eax, ebx, ecx, edx;
@@ -87,8 +91,8 @@ static void power_saving_mwait_init(void)
 
                 /*FALL THROUGH*/
         default:
-                /* TSC could halt in idle, so notify users */
-                mark_tsc_unstable("TSC halts in idle");
+                /* TSC could halt in idle */
+                tsc_detected_unstable = 1;
         }
 #endif
 }
@@ -168,16 +172,14 @@ static int power_saving_thread(void *data)
 
                 do_sleep = 0;
 
-                current_thread_info()->status &= ~TS_POLLING;
-                /*
-                 * TS_POLLING-cleared state must be visible before we test
-                 * NEED_RESCHED:
-                 */
-                smp_mb();
-
                 expire_time = jiffies + HZ * (100 - idle_pct) / 100;
 
                 while (!need_resched()) {
+                        if (tsc_detected_unstable && !tsc_marked_unstable) {
+                                /* TSC could halt in idle, so notify users */
+                                mark_tsc_unstable("TSC halts in idle");
+                                tsc_marked_unstable = 1;
+                        }
                         local_irq_disable();
                         cpu = smp_processor_id();
                         clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER,
@@ -200,8 +202,6 @@ static int power_saving_thread(void *data)
                         }
                 }
 
-                current_thread_info()->status |= TS_POLLING;
-
                 /*
                  * current sched_rt has threshold for rt task running time.
                  * When a rt task uses 95% CPU time, the rt thread will be
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index 7423052ece5a..d93cc06f4bf8 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -14,12 +14,12 @@ acpi-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \
 
 acpi-y += evevent.o  evregion.o  evsci.o    evxfevnt.o \
          evmisc.o   evrgnini.o  evxface.o  evxfregn.o \
-         evgpe.o    evgpeblk.o
+         evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o
 
 acpi-y += exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\
          exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\
          excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.o \
-         exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o
+         exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o  exdebug.o
 
 acpi-y += hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o hwvalid.o
 
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index 3e6ba99e4053..64d1e5c2d4ae 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -73,8 +73,10 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node *node,
                              u32 notify_value);
 
 /*
- * evgpe - GPE handling and dispatch
+ * evgpe - Low-level GPE support
  */
+u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);
+
 acpi_status
 acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info);
 
@@ -85,19 +87,13 @@ acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);
 struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
                                                        u32 gpe_number);
 
+struct acpi_gpe_event_info *acpi_ev_low_get_gpe_info(u32 gpe_number,
+                                                     struct acpi_gpe_block_info
+                                                     *gpe_block);
+
 /*
- * evgpeblk
+ * evgpeblk - Upper-level GPE block support
  */
-u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info);
-
-acpi_status
-acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context);
-
-acpi_status
-acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
-                            struct acpi_gpe_block_info *gpe_block,
-                            void *context);
-
 acpi_status
 acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
                          struct acpi_generic_address *gpe_block_address,
@@ -116,12 +112,37 @@ u32
 acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info,
                      u32 gpe_number);
 
-u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);
+/*
+ * evgpeinit - GPE initialization and update
+ */
+acpi_status acpi_ev_gpe_initialize(void);
+
+void acpi_ev_update_gpes(acpi_owner_id table_owner_id);
 
 acpi_status
-acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info);
+acpi_ev_match_gpe_method(acpi_handle obj_handle,
+                         u32 level, void *context, void **return_value);
 
-acpi_status acpi_ev_gpe_initialize(void);
+acpi_status
+acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
+                          u32 level, void *context, void **return_value);
+
+/*
+ * evgpeutil - GPE utilities
+ */
+acpi_status
+acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context);
+
+u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info);
+
+struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number);
+
+acpi_status acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt);
+
+acpi_status
+acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                            struct acpi_gpe_block_info *gpe_block,
+                            void *context);
 
 /*
  * evregion - Address Space handling
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index f8dd8f250ac4..9070f1fe8f17 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -112,6 +112,19 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_leave_wake_gpes_disabled, TRUE);
  */
 u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE);
 
+/*
+ * Optionally enable output from the AML Debug Object.
+ */
+u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE);
+
+/*
+ * Optionally copy the entire DSDT to local memory (instead of simply
+ * mapping it.) There are some BIOSs that corrupt or replace the original
+ * DSDT, creating the need for this option. Default is FALSE, do not copy
+ * the DSDT.
+ */
+u8 ACPI_INIT_GLOBAL(acpi_gbl_copy_dsdt_locally, FALSE);
+
 /* acpi_gbl_FADT is a local copy of the FADT, converted to a common format. */
 
 struct acpi_table_fadt acpi_gbl_FADT;
@@ -145,11 +158,10 @@ ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;
  ****************************************************************************/
 
 /*
- * acpi_gbl_root_table_list is the master list of ACPI tables found in the
- * RSDT/XSDT.
- *
+ * acpi_gbl_root_table_list is the master list of ACPI tables that were
+ * found in the RSDT/XSDT.
  */
-ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list;
+ACPI_EXTERN struct acpi_table_list acpi_gbl_root_table_list;
 ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS;
 
 /* These addresses are calculated from the FADT Event Block addresses */
@@ -160,6 +172,11 @@ ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1a_enable;
 ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1b_status;
 ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1b_enable;
 
+/* DSDT information. Used to check for DSDT corruption */
+
+ACPI_EXTERN struct acpi_table_header *acpi_gbl_DSDT;
+ACPI_EXTERN struct acpi_table_header acpi_gbl_original_dsdt_header;
+
 /*
  * Handle both ACPI 1.0 and ACPI 2.0 Integer widths. The integer width is
  * determined by the revision of the DSDT: If the DSDT revision is less than
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index 6df3f8428168..049e203bd621 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h
@@ -121,6 +121,13 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
                                struct acpi_walk_state *walk_state);
 
 /*
+ * exdebug - AML debug object
+ */
+void
+acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
+                        u32 level, u32 index);
+
+/*
  * exfield - ACPI AML (p-code) execution - field manipulation
  */
 acpi_status
@@ -274,7 +281,7 @@ acpi_status
 acpi_ex_system_do_notify_op(union acpi_operand_object *value,
                             union acpi_operand_object *obj_desc);
 
-acpi_status acpi_ex_system_do_suspend(u64 time);
+acpi_status acpi_ex_system_do_sleep(u64 time);
 
 acpi_status acpi_ex_system_do_stall(u32 time);
 
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 24b8faa5c395..147a7e6bd38f 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -213,12 +213,12 @@ struct acpi_namespace_node {
 #define ANOBJ_IS_BIT_OFFSET             0x40    /* i_aSL only: Reference is a bit offset */
 #define ANOBJ_IS_REFERENCED             0x80    /* i_aSL only: Object was referenced */
 
-/* One internal RSDT for table management */
+/* Internal ACPI table management - master table list */
 
-struct acpi_internal_rsdt {
-        struct acpi_table_desc *tables;
-        u32 count;
-        u32 size;
+struct acpi_table_list {
+        struct acpi_table_desc *tables; /* Table descriptor array */
+        u32 current_table_count;        /* Tables currently in the array */
+        u32 max_table_count;    /* Max tables array will hold */
         u8 flags;
 };
 
@@ -427,8 +427,8 @@ struct acpi_gpe_event_info {
         struct acpi_gpe_register_info *register_info;   /* Backpointer to register info */
         u8 flags;               /* Misc info about this GPE */
         u8 gpe_number;          /* This GPE */
-        u8 runtime_count;
-        u8 wakeup_count;
+        u8 runtime_count;       /* References to a run GPE */
+        u8 wakeup_count;        /* References to a wake GPE */
 };
 
 /* Information about a GPE register pair, one per each status/enable pair in an array */
@@ -454,6 +454,7 @@ struct acpi_gpe_block_info {
         struct acpi_gpe_event_info *event_info; /* One for each GPE */
         struct acpi_generic_address block_address;      /* Base address of the block */
         u32 register_count;     /* Number of register pairs in block */
+        u16 gpe_count;          /* Number of individual GPEs in block */
         u8 block_base_number;   /* Base GPE number for this block */
 };
 
@@ -469,6 +470,10 @@ struct acpi_gpe_xrupt_info {
 struct acpi_gpe_walk_info {
         struct acpi_namespace_node *gpe_device;
         struct acpi_gpe_block_info *gpe_block;
+        u16 count;
+        acpi_owner_id owner_id;
+        u8 enable_this_gpe;
+        u8 execute_by_owner_id;
 };
 
 struct acpi_gpe_device_info {
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 8ff3b741df28..62a576e34361 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -107,6 +107,10 @@ u8 acpi_tb_checksum(u8 *buffer, u32 length);
 acpi_status
 acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length);
 
+void acpi_tb_check_dsdt_header(void);
+
+struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index);
+
 void
 acpi_tb_install_table(acpi_physical_address address,
                       char *signature, u32 table_index);
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index bb13817e0c31..347bee1726f1 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -323,7 +323,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                 default:
 
                         ACPI_ERROR((AE_INFO,
-                                    "Invalid opcode in field list: %X",
+                                    "Invalid opcode in field list: 0x%X",
                                     arg->common.aml_opcode));
                         return_ACPI_STATUS(AE_AML_BAD_OPCODE);
                 }
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index 721039233aa7..2a9a561c2f01 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -225,7 +225,7 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
                     (walk_state->thread->current_sync_level >
                      obj_desc->method.mutex->mutex.sync_level)) {
                         ACPI_ERROR((AE_INFO,
-                                    "Cannot acquire Mutex for method [%4.4s], current SyncLevel is too large (%d)",
+                                    "Cannot acquire Mutex for method [%4.4s], current SyncLevel is too large (%u)",
                                     acpi_ut_get_node_name(method_node),
                                     walk_state->thread->current_sync_level));
 
diff --git a/drivers/acpi/acpica/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c
index cc343b959540..f3d52f59250b 100644
--- a/drivers/acpi/acpica/dsmthdat.c
+++ b/drivers/acpi/acpica/dsmthdat.c
@@ -262,7 +262,7 @@ acpi_ds_method_data_get_node(u8 type,
 
                 if (index > ACPI_METHOD_MAX_LOCAL) {
                         ACPI_ERROR((AE_INFO,
-                                    "Local index %d is invalid (max %d)",
+                                    "Local index %u is invalid (max %u)",
                                     index, ACPI_METHOD_MAX_LOCAL));
                         return_ACPI_STATUS(AE_AML_INVALID_INDEX);
                 }
@@ -276,7 +276,7 @@ acpi_ds_method_data_get_node(u8 type,
 
                 if (index > ACPI_METHOD_MAX_ARG) {
                         ACPI_ERROR((AE_INFO,
-                                    "Arg index %d is invalid (max %d)",
+                                    "Arg index %u is invalid (max %u)",
                                     index, ACPI_METHOD_MAX_ARG));
                         return_ACPI_STATUS(AE_AML_INVALID_INDEX);
                 }
@@ -287,7 +287,7 @@ acpi_ds_method_data_get_node(u8 type,
                 break;
 
         default:
-                ACPI_ERROR((AE_INFO, "Type %d is invalid", type));
+                ACPI_ERROR((AE_INFO, "Type %u is invalid", type));
                 return_ACPI_STATUS(AE_TYPE);
         }
 
@@ -424,7 +424,7 @@ acpi_ds_method_data_get_value(u8 type,
                         case ACPI_REFCLASS_ARG:
 
                                 ACPI_ERROR((AE_INFO,
-                                            "Uninitialized Arg[%d] at node %p",
+                                            "Uninitialized Arg[%u] at node %p",
                                             index, node));
 
                                 return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG);
@@ -440,7 +440,7 @@ acpi_ds_method_data_get_value(u8 type,
                         default:
 
                                 ACPI_ERROR((AE_INFO,
-                                            "Not a Arg/Local opcode: %X",
+                                            "Not a Arg/Local opcode: 0x%X",
                                             type));
                                 return_ACPI_STATUS(AE_AML_INTERNAL);
                         }
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index 891e08bf560b..3607adcaf085 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -288,7 +288,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
         if (byte_list) {
                 if (byte_list->common.aml_opcode != AML_INT_BYTELIST_OP) {
                         ACPI_ERROR((AE_INFO,
-                                    "Expecting bytelist, got AML opcode %X in op %p",
+                                    "Expecting bytelist, found AML opcode 0x%X in op %p",
                                     byte_list->common.aml_opcode, byte_list));
 
                         acpi_ut_remove_reference(obj_desc);
@@ -511,7 +511,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
                 }
 
                 ACPI_INFO((AE_INFO,
-                           "Actual Package length (0x%X) is larger than NumElements field (0x%X), truncated\n",
+                           "Actual Package length (%u) is larger than NumElements field (%u), truncated\n",
                            i, element_count));
         } else if (i < element_count) {
                 /*
@@ -519,7 +519,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
                  * Note: this is not an error, the package is padded out with NULLs.
                  */
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Package List length (0x%X) smaller than NumElements count (0x%X), padded with null elements\n",
+                                  "Package List length (%u) smaller than NumElements count (%u), padded with null elements\n",
                                   i, element_count));
         }
 
@@ -701,7 +701,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                         default:
 
                                 ACPI_ERROR((AE_INFO,
-                                            "Unknown constant opcode %X",
+                                            "Unknown constant opcode 0x%X",
                                             opcode));
                                 status = AE_AML_OPERAND_TYPE;
                                 break;
@@ -717,7 +717,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                         break;
 
                 default:
-                        ACPI_ERROR((AE_INFO, "Unknown Integer type %X",
+                        ACPI_ERROR((AE_INFO, "Unknown Integer type 0x%X",
                                     op_info->type));
                         status = AE_AML_OPERAND_TYPE;
                         break;
@@ -806,7 +806,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                         default:
 
                                 ACPI_ERROR((AE_INFO,
-                                            "Unimplemented reference type for AML opcode: %4.4X",
+                                            "Unimplemented reference type for AML opcode: 0x%4.4X",
                                             opcode));
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -816,7 +816,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unimplemented data type: %X",
+                ACPI_ERROR((AE_INFO, "Unimplemented data type: 0x%X",
                             obj_desc->common.type));
 
                 status = AE_AML_OPERAND_TYPE;
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index bf980cadb1e8..53a7e416f33e 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -292,7 +292,7 @@ acpi_status acpi_ds_get_buffer_arguments(union acpi_operand_object *obj_desc)
         node = obj_desc->buffer.node;
         if (!node) {
                 ACPI_ERROR((AE_INFO,
-                            "No pointer back to NS node in buffer obj %p",
+                            "No pointer back to namespace node in buffer object %p",
                             obj_desc));
                 return_ACPI_STATUS(AE_AML_INTERNAL);
         }
@@ -336,7 +336,7 @@ acpi_status acpi_ds_get_package_arguments(union acpi_operand_object *obj_desc)
         node = obj_desc->package.node;
         if (!node) {
                 ACPI_ERROR((AE_INFO,
-                            "No pointer back to NS node in package %p",
+                            "No pointer back to namespace node in package %p",
                             obj_desc));
                 return_ACPI_STATUS(AE_AML_INTERNAL);
         }
@@ -580,7 +580,8 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
         default:
 
                 ACPI_ERROR((AE_INFO,
-                            "Unknown field creation opcode %02x", aml_opcode));
+                            "Unknown field creation opcode 0x%02X",
+                            aml_opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
@@ -589,7 +590,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
 
         if ((bit_offset + bit_count) > (8 * (u32) buffer_desc->buffer.length)) {
                 ACPI_ERROR((AE_INFO,
-                            "Field [%4.4s] at %d exceeds Buffer [%4.4s] size %d (bits)",
+                            "Field [%4.4s] at %u exceeds Buffer [%4.4s] size %u (bits)",
                             acpi_ut_get_node_name(result_desc),
                             bit_offset + bit_count,
                             acpi_ut_get_node_name(buffer_desc->buffer.node),
@@ -693,7 +694,7 @@ acpi_ds_eval_buffer_field_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)) {
-                ACPI_ERROR((AE_INFO, "(%s) bad operand(s) (%X)",
+                ACPI_ERROR((AE_INFO, "(%s) bad operand(s), status 0x%X",
                             acpi_ps_get_opcode_name(op->common.aml_opcode),
                             status));
 
@@ -1461,7 +1462,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unknown control opcode=%X Op=%p",
+                ACPI_ERROR((AE_INFO, "Unknown control opcode=0x%X Op=%p",
                             op->common.aml_opcode, op));
 
                 status = AE_AML_BAD_OPCODE;
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index 6b76c486d784..d555b374e314 100644
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -140,7 +140,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
 
         if (local_obj_desc->common.type != ACPI_TYPE_INTEGER) {
                 ACPI_ERROR((AE_INFO,
-                            "Bad predicate (not an integer) ObjDesc=%p State=%p Type=%X",
+                            "Bad predicate (not an integer) ObjDesc=%p State=%p Type=0x%X",
                             obj_desc, walk_state, obj_desc->common.type));
 
                 status = AE_AML_OPERAND_TYPE;
@@ -354,7 +354,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
         op_class = walk_state->op_info->class;
 
         if (op_class == AML_CLASS_UNKNOWN) {
-                ACPI_ERROR((AE_INFO, "Unknown opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown opcode 0x%X",
                             op->common.aml_opcode));
                 return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
         }
@@ -678,7 +678,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                 default:
 
                         ACPI_ERROR((AE_INFO,
-                                    "Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p",
+                                    "Unimplemented opcode, class=0x%X type=0x%X Opcode=-0x%X Op=%p",
                                     op_class, op_type, op->common.aml_opcode,
                                     op));
 
diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
index 050df8164165..83155dd8671e 100644
--- a/drivers/acpi/acpica/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -179,7 +179,7 @@ acpi_ds_result_push(union acpi_operand_object * object,
 
         if (!object) {
                 ACPI_ERROR((AE_INFO,
-                            "Null Object! Obj=%p State=%p Num=%X",
+                            "Null Object! Obj=%p State=%p Num=%u",
                             object, walk_state, walk_state->result_count));
                 return (AE_BAD_PARAMETER);
         }
@@ -223,7 +223,7 @@ static acpi_status acpi_ds_result_stack_push(struct acpi_walk_state *walk_state)
 
         if (((u32) walk_state->result_size + ACPI_RESULTS_FRAME_OBJ_NUM) >
             ACPI_RESULTS_OBJ_NUM_MAX) {
-                ACPI_ERROR((AE_INFO, "Result stack overflow: State=%p Num=%X",
+                ACPI_ERROR((AE_INFO, "Result stack overflow: State=%p Num=%u",
                             walk_state, walk_state->result_size));
                 return (AE_STACK_OVERFLOW);
         }
@@ -314,7 +314,7 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
 
         if (walk_state->num_operands >= ACPI_OBJ_NUM_OPERANDS) {
                 ACPI_ERROR((AE_INFO,
-                            "Object stack overflow! Obj=%p State=%p #Ops=%X",
+                            "Object stack overflow! Obj=%p State=%p #Ops=%u",
                             object, walk_state, walk_state->num_operands));
                 return (AE_STACK_OVERFLOW);
         }
@@ -365,7 +365,7 @@ acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state * walk_state)
 
                 if (walk_state->num_operands == 0) {
                         ACPI_ERROR((AE_INFO,
-                                    "Object stack underflow! Count=%X State=%p #Ops=%X",
+                                    "Object stack underflow! Count=%X State=%p #Ops=%u",
                                     pop_count, walk_state,
                                     walk_state->num_operands));
                         return (AE_STACK_UNDERFLOW);
@@ -377,7 +377,7 @@ acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state * walk_state)
                 walk_state->operands[walk_state->num_operands] = NULL;
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Count=%X State=%p #Ops=%X\n",
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Count=%X State=%p #Ops=%u\n",
                           pop_count, walk_state, walk_state->num_operands));
 
         return (AE_OK);
diff --git a/drivers/acpi/acpica/evevent.c b/drivers/acpi/acpica/evevent.c
index c1e6f472d435..f5795915a2e9 100644
--- a/drivers/acpi/acpica/evevent.c
+++ b/drivers/acpi/acpica/evevent.c
@@ -302,7 +302,7 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
                                               ACPI_DISABLE_EVENT);
 
                 ACPI_ERROR((AE_INFO,
-                            "No installed handler for fixed event [%08X]",
+                            "No installed handler for fixed event [0x%08X]",
                             event));
 
                 return (ACPI_INTERRUPT_NOT_HANDLED);
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index 78c55508aff5..a221ad404167 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -60,7 +60,8 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context);
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Updates GPE register enable masks based on the GPE type
+ * DESCRIPTION: Updates GPE register enable masks based upon whether there are
+ *              references (either wake or run) to this GPE
  *
  ******************************************************************************/
 
@@ -81,14 +82,20 @@ acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info)
             (1 <<
              (gpe_event_info->gpe_number - gpe_register_info->base_gpe_number));
 
+        /* Clear the wake/run bits up front */
+
         ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake, register_bit);
         ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
 
-        if (gpe_event_info->runtime_count)
+        /* Set the mask bits only if there are references to this GPE */
+
+        if (gpe_event_info->runtime_count) {
                 ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
+        }
 
-        if (gpe_event_info->wakeup_count)
+        if (gpe_event_info->wakeup_count) {
                 ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
+        }
 
         return_ACPI_STATUS(AE_OK);
 }
@@ -101,7 +108,10 @@ acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Enable a GPE based on the GPE type
+ * DESCRIPTION: Hardware-enable a GPE. Always enables the GPE, regardless
+ *              of type or number of references.
+ *
+ * Note: The GPE lock should be already acquired when this function is called.
  *
  ******************************************************************************/
 
@@ -109,20 +119,36 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 {
         acpi_status status;
 
+
         ACPI_FUNCTION_TRACE(ev_enable_gpe);
 
-        /* Make sure HW enable masks are updated */
+
+        /*
+         * We will only allow a GPE to be enabled if it has either an
+         * associated method (_Lxx/_Exx) or a handler. Otherwise, the
+         * GPE will be immediately disabled by acpi_ev_gpe_dispatch the
+         * first time it fires.
+         */
+        if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK)) {
+                return_ACPI_STATUS(AE_NO_HANDLER);
+        }
+
+        /* Ensure the HW enable masks are current */
 
         status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
-        if (ACPI_FAILURE(status))
+        if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
+        }
+
+        /* Clear the GPE (of stale events) */
 
-        /* Clear the GPE (of stale events), then enable it */
         status = acpi_hw_clear_gpe(gpe_event_info);
-        if (ACPI_FAILURE(status))
+        if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
+        }
 
         /* Enable the requested GPE */
+
         status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
         return_ACPI_STATUS(status);
 }
@@ -135,7 +161,10 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Disable a GPE based on the GPE type
+ * DESCRIPTION: Hardware-disable a GPE. Always disables the requested GPE,
+ *              regardless of the type or number of references.
+ *
+ * Note: The GPE lock should be already acquired when this function is called.
  *
  ******************************************************************************/
 
@@ -145,24 +174,71 @@ acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
         ACPI_FUNCTION_TRACE(ev_disable_gpe);
 
-        /* Make sure HW enable masks are updated */
+
+        /*
+         * Note: Always disable the GPE, even if we think that that it is already
+         * disabled. It is possible that the AML or some other code has enabled
+         * the GPE behind our back.
+         */
+
+        /* Ensure the HW enable masks are current */
 
         status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
-        if (ACPI_FAILURE(status))
+        if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
+        }
 
         /*
-         * Even if we don't know the GPE type, make sure that we always
-         * disable it. low_disable_gpe will just clear the enable bit for this
-         * GPE and write it. It will not write out the current GPE enable mask,
-         * since this may inadvertently enable GPEs too early, if a rogue GPE has
-         * come in during ACPICA initialization - possibly as a result of AML or
-         * other code that has enabled the GPE.
+         * Always H/W disable this GPE, even if we don't know the GPE type.
+         * Simply clear the enable bit for this particular GPE, but do not
+         * write out the current GPE enable mask since this may inadvertently
+         * enable GPEs too early. An example is a rogue GPE that has arrived
+         * during ACPICA initialization - possibly because AML or other code
+         * has enabled the GPE.
          */
         status = acpi_hw_low_disable_gpe(gpe_event_info);
         return_ACPI_STATUS(status);
 }
 
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_low_get_gpe_info
+ *
+ * PARAMETERS:  gpe_number          - Raw GPE number
+ *              gpe_block           - A GPE info block
+ *
+ * RETURN:      A GPE event_info struct. NULL if not a valid GPE (The gpe_number
+ *              is not within the specified GPE block)
+ *
+ * DESCRIPTION: Returns the event_info struct associated with this GPE. This is
+ *              the low-level implementation of ev_get_gpe_event_info.
+ *
+ ******************************************************************************/
+
+struct acpi_gpe_event_info *acpi_ev_low_get_gpe_info(u32 gpe_number,
+                                                     struct acpi_gpe_block_info
+                                                     *gpe_block)
+{
+        u32 gpe_index;
+
+        /*
+         * Validate that the gpe_number is within the specified gpe_block.
+         * (Two steps)
+         */
+        if (!gpe_block || (gpe_number < gpe_block->block_base_number)) {
+                return (NULL);
+        }
+
+        gpe_index = gpe_number - gpe_block->block_base_number;
+        if (gpe_index >= gpe_block->gpe_count) {
+                return (NULL);
+        }
+
+        return (&gpe_block->event_info[gpe_index]);
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ev_get_gpe_event_info
@@ -184,29 +260,23 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
                                                        u32 gpe_number)
 {
         union acpi_operand_object *obj_desc;
-        struct acpi_gpe_block_info *gpe_block;
+        struct acpi_gpe_event_info *gpe_info;
         u32 i;
 
         ACPI_FUNCTION_ENTRY();
 
-        /* A NULL gpe_block means use the FADT-defined GPE block(s) */
+        /* A NULL gpe_device means use the FADT-defined GPE block(s) */
 
         if (!gpe_device) {
 
                 /* Examine GPE Block 0 and 1 (These blocks are permanent) */
 
                 for (i = 0; i < ACPI_MAX_GPE_BLOCKS; i++) {
-                        gpe_block = acpi_gbl_gpe_fadt_blocks[i];
-                        if (gpe_block) {
-                                if ((gpe_number >= gpe_block->block_base_number)
-                                    && (gpe_number <
-                                        gpe_block->block_base_number +
-                                        (gpe_block->register_count * 8))) {
-                                        return (&gpe_block->
-                                                event_info[gpe_number -
-                                                           gpe_block->
-                                                           block_base_number]);
-                                }
+                        gpe_info = acpi_ev_low_get_gpe_info(gpe_number,
+                                                            acpi_gbl_gpe_fadt_blocks
+                                                            [i]);
+                        if (gpe_info) {
+                                return (gpe_info);
                         }
                 }
 
@@ -223,16 +293,8 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
                 return (NULL);
         }
 
-        gpe_block = obj_desc->device.gpe_block;
-
-        if ((gpe_number >= gpe_block->block_base_number) &&
-            (gpe_number <
-             gpe_block->block_base_number + (gpe_block->register_count * 8))) {
-                return (&gpe_block->
-                        event_info[gpe_number - gpe_block->block_base_number]);
-        }
-
-        return (NULL);
+        return (acpi_ev_low_get_gpe_info
+                (gpe_number, obj_desc->device.gpe_block));
 }
 
 /*******************************************************************************
@@ -389,7 +451,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
                 return_VOID;
         }
 
-        /* Set the GPE flags for return to enabled state */
+        /* Update the GPE register masks for return to enabled state */
 
         (void)acpi_ev_update_gpe_enable_masks(gpe_event_info);
 
@@ -499,7 +561,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                 status = acpi_hw_clear_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to clear GPE[%2X]",
+                                        "Unable to clear GPE[0x%2X]",
                                         gpe_number));
                         return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
@@ -532,7 +594,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                         status = acpi_hw_clear_gpe(gpe_event_info);
                         if (ACPI_FAILURE(status)) {
                                 ACPI_EXCEPTION((AE_INFO, status,
-                                                "Unable to clear GPE[%2X]",
+                                        "Unable to clear GPE[0x%2X]",
                                                 gpe_number));
                                 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                         }
@@ -548,7 +610,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                 status = acpi_ev_disable_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to disable GPE[%2X]",
+                                        "Unable to disable GPE[0x%2X]",
                                         gpe_number));
                         return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
@@ -562,27 +624,30 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                                          gpe_event_info);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to queue handler for GPE[%2X] - event disabled",
+                                        "Unable to queue handler for GPE[0x%2X] - event disabled",
                                         gpe_number));
                 }
                 break;
 
         default:
 
-                /* No handler or method to run! */
-
+                /*
+                 * No handler or method to run!
+                 * 03/2010: This case should no longer be possible. We will not allow
+                 * a GPE to be enabled if it has no handler or method.
+                 */
                 ACPI_ERROR((AE_INFO,
-                            "No handler or method for GPE[%2X], disabling event",
+                            "No handler or method for GPE[0x%2X], disabling event",
                             gpe_number));
 
                 /*
-                 * Disable the GPE. The GPE will remain disabled until the ACPICA
-                 * Core Subsystem is restarted, or a handler is installed.
+                 * Disable the GPE. The GPE will remain disabled a handler
+                 * is installed or ACPICA is restarted.
                  */
                 status = acpi_ev_disable_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to disable GPE[%2X]",
+                                        "Unable to disable GPE[0x%2X]",
                                         gpe_number));
                         return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index fef721917eaf..7c28f2d9fd35 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -51,20 +51,6 @@ ACPI_MODULE_NAME("evgpeblk")
 
 /* Local prototypes */
 static acpi_status
-acpi_ev_save_method_info(acpi_handle obj_handle,
-                         u32 level, void *obj_desc, void **return_value);
-
-static acpi_status
-acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
-                          u32 level, void *info, void **return_value);
-
-static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
-                                                               interrupt_number);
-
-static acpi_status
-acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt);
-
-static acpi_status
 acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
                           u32 interrupt_number);
 
@@ -73,527 +59,6 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block);
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ev_valid_gpe_event
- *
- * PARAMETERS:  gpe_event_info              - Info for this GPE
- *
- * RETURN:      TRUE if the gpe_event is valid
- *
- * DESCRIPTION: Validate a GPE event. DO NOT CALL FROM INTERRUPT LEVEL.
- *              Should be called only when the GPE lists are semaphore locked
- *              and not subject to change.
- *
- ******************************************************************************/
-
-u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info)
-{
-        struct acpi_gpe_xrupt_info *gpe_xrupt_block;
-        struct acpi_gpe_block_info *gpe_block;
-
-        ACPI_FUNCTION_ENTRY();
-
-        /* No need for spin lock since we are not changing any list elements */
-
-        /* Walk the GPE interrupt levels */
-
-        gpe_xrupt_block = acpi_gbl_gpe_xrupt_list_head;
-        while (gpe_xrupt_block) {
-                gpe_block = gpe_xrupt_block->gpe_block_list_head;
-
-                /* Walk the GPE blocks on this interrupt level */
-
-                while (gpe_block) {
-                        if ((&gpe_block->event_info[0] <= gpe_event_info) &&
-                            (&gpe_block->event_info[((acpi_size)
-                                                     gpe_block->
-                                                     register_count) * 8] >
-                             gpe_event_info)) {
-                                return (TRUE);
-                        }
-
-                        gpe_block = gpe_block->next;
-                }
-
-                gpe_xrupt_block = gpe_xrupt_block->next;
-        }
-
-        return (FALSE);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ev_walk_gpe_list
- *
- * PARAMETERS:  gpe_walk_callback   - Routine called for each GPE block
- *              Context             - Value passed to callback
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Walk the GPE lists.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context)
-{
-        struct acpi_gpe_block_info *gpe_block;
-        struct acpi_gpe_xrupt_info *gpe_xrupt_info;
-        acpi_status status = AE_OK;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(ev_walk_gpe_list);
-
-        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
-
-        /* Walk the interrupt level descriptor list */
-
-        gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;
-        while (gpe_xrupt_info) {
-
-                /* Walk all Gpe Blocks attached to this interrupt level */
-
-                gpe_block = gpe_xrupt_info->gpe_block_list_head;
-                while (gpe_block) {
-
-                        /* One callback per GPE block */
-
-                        status =
-                            gpe_walk_callback(gpe_xrupt_info, gpe_block,
-                                              context);
-                        if (ACPI_FAILURE(status)) {
-                                if (status == AE_CTRL_END) {    /* Callback abort */
-                                        status = AE_OK;
-                                }
-                                goto unlock_and_exit;
-                        }
-
-                        gpe_block = gpe_block->next;
-                }
-
-                gpe_xrupt_info = gpe_xrupt_info->next;
-        }
-
-      unlock_and_exit:
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ev_delete_gpe_handlers
- *
- * PARAMETERS:  gpe_xrupt_info      - GPE Interrupt info
- *              gpe_block           - Gpe Block info
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Delete all Handler objects found in the GPE data structs.
- *              Used only prior to termination.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
-                            struct acpi_gpe_block_info *gpe_block,
-                            void *context)
-{
-        struct acpi_gpe_event_info *gpe_event_info;
-        u32 i;
-        u32 j;
-
-        ACPI_FUNCTION_TRACE(ev_delete_gpe_handlers);
-
-        /* Examine each GPE Register within the block */
-
-        for (i = 0; i < gpe_block->register_count; i++) {
-
-                /* Now look at the individual GPEs in this byte register */
-
-                for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
-                        gpe_event_info = &gpe_block->event_info[((acpi_size) i *
-                                                                 ACPI_GPE_REGISTER_WIDTH)
-                                                                + j];
-
-                        if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
-                            ACPI_GPE_DISPATCH_HANDLER) {
-                                ACPI_FREE(gpe_event_info->dispatch.handler);
-                                gpe_event_info->dispatch.handler = NULL;
-                                gpe_event_info->flags &=
-                                    ~ACPI_GPE_DISPATCH_MASK;
-                        }
-                }
-        }
-
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ev_save_method_info
- *
- * PARAMETERS:  Callback from walk_namespace
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Called from acpi_walk_namespace. Expects each object to be a
- *              control method under the _GPE portion of the namespace.
- *              Extract the name and GPE type from the object, saving this
- *              information for quick lookup during GPE dispatch
- *
- *              The name of each GPE control method is of the form:
- *              "_Lxx" or "_Exx"
- *              Where:
- *                  L      - means that the GPE is level triggered
- *                  E      - means that the GPE is edge triggered
- *                  xx     - is the GPE number [in HEX]
- *
- ******************************************************************************/
-
-static acpi_status
-acpi_ev_save_method_info(acpi_handle obj_handle,
-                         u32 level, void *obj_desc, void **return_value)
-{
-        struct acpi_gpe_block_info *gpe_block = (void *)obj_desc;
-        struct acpi_gpe_event_info *gpe_event_info;
-        u32 gpe_number;
-        char name[ACPI_NAME_SIZE + 1];
-        u8 type;
-
-        ACPI_FUNCTION_TRACE(ev_save_method_info);
-
-        /*
-         * _Lxx and _Exx GPE method support
-         *
-         * 1) Extract the name from the object and convert to a string
-         */
-        ACPI_MOVE_32_TO_32(name,
-                           &((struct acpi_namespace_node *)obj_handle)->name.
-                           integer);
-        name[ACPI_NAME_SIZE] = 0;
-
-        /*
-         * 2) Edge/Level determination is based on the 2nd character
-         *    of the method name
-         *
-         * NOTE: Default GPE type is RUNTIME. May be changed later to WAKE
-         * if a _PRW object is found that points to this GPE.
-         */
-        switch (name[1]) {
-        case 'L':
-                type = ACPI_GPE_LEVEL_TRIGGERED;
-                break;
-
-        case 'E':
-                type = ACPI_GPE_EDGE_TRIGGERED;
-                break;
-
-        default:
-                /* Unknown method type, just ignore it! */
-
-                ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
-                                  "Ignoring unknown GPE method type: %s "
-                                  "(name not of form _Lxx or _Exx)", name));
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /* Convert the last two characters of the name to the GPE Number */
-
-        gpe_number = ACPI_STRTOUL(&name[2], NULL, 16);
-        if (gpe_number == ACPI_UINT32_MAX) {
-
-                /* Conversion failed; invalid method, just ignore it */
-
-                ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
-                                  "Could not extract GPE number from name: %s "
-                                  "(name is not of form _Lxx or _Exx)", name));
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /* Ensure that we have a valid GPE number for this GPE block */
-
-        if ((gpe_number < gpe_block->block_base_number) ||
-            (gpe_number >= (gpe_block->block_base_number +
-                            (gpe_block->register_count * 8)))) {
-                /*
-                 * Not valid for this GPE block, just ignore it. However, it may be
-                 * valid for a different GPE block, since GPE0 and GPE1 methods both
-                 * appear under \_GPE.
-                 */
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /*
-         * Now we can add this information to the gpe_event_info block for use
-         * during dispatch of this GPE.
-         */
-        gpe_event_info =
-            &gpe_block->event_info[gpe_number - gpe_block->block_base_number];
-
-        gpe_event_info->flags = (u8) (type | ACPI_GPE_DISPATCH_METHOD);
-
-        gpe_event_info->dispatch.method_node =
-            (struct acpi_namespace_node *)obj_handle;
-
-        ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
-                          "Registered GPE method %s as GPE number 0x%.2X\n",
-                          name, gpe_number));
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ev_match_prw_and_gpe
- *
- * PARAMETERS:  Callback from walk_namespace
- *
- * RETURN:      Status. NOTE: We ignore errors so that the _PRW walk is
- *              not aborted on a single _PRW failure.
- *
- * DESCRIPTION: Called from acpi_walk_namespace. Expects each object to be a
- *              Device. Run the _PRW method. If present, extract the GPE
- *              number and mark the GPE as a WAKE GPE.
- *
- ******************************************************************************/
-
-static acpi_status
-acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
-                          u32 level, void *info, void **return_value)
-{
-        struct acpi_gpe_walk_info *gpe_info = (void *)info;
-        struct acpi_namespace_node *gpe_device;
-        struct acpi_gpe_block_info *gpe_block;
-        struct acpi_namespace_node *target_gpe_device;
-        struct acpi_gpe_event_info *gpe_event_info;
-        union acpi_operand_object *pkg_desc;
-        union acpi_operand_object *obj_desc;
-        u32 gpe_number;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(ev_match_prw_and_gpe);
-
-        /* Check for a _PRW method under this device */
-
-        status = acpi_ut_evaluate_object(obj_handle, METHOD_NAME__PRW,
-                                         ACPI_BTYPE_PACKAGE, &pkg_desc);
-        if (ACPI_FAILURE(status)) {
-
-                /* Ignore all errors from _PRW, we don't want to abort the subsystem */
-
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /* The returned _PRW package must have at least two elements */
-
-        if (pkg_desc->package.count < 2) {
-                goto cleanup;
-        }
-
-        /* Extract pointers from the input context */
-
-        gpe_device = gpe_info->gpe_device;
-        gpe_block = gpe_info->gpe_block;
-
-        /*
-         * The _PRW object must return a package, we are only interested in the
-         * first element
-         */
-        obj_desc = pkg_desc->package.elements[0];
-
-        if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
-
-                /* Use FADT-defined GPE device (from definition of _PRW) */
-
-                target_gpe_device = acpi_gbl_fadt_gpe_device;
-
-                /* Integer is the GPE number in the FADT described GPE blocks */
-
-                gpe_number = (u32) obj_desc->integer.value;
-        } else if (obj_desc->common.type == ACPI_TYPE_PACKAGE) {
-
-                /* Package contains a GPE reference and GPE number within a GPE block */
-
-                if ((obj_desc->package.count < 2) ||
-                    ((obj_desc->package.elements[0])->common.type !=
-                     ACPI_TYPE_LOCAL_REFERENCE) ||
-                    ((obj_desc->package.elements[1])->common.type !=
-                     ACPI_TYPE_INTEGER)) {
-                        goto cleanup;
-                }
-
-                /* Get GPE block reference and decode */
-
-                target_gpe_device =
-                    obj_desc->package.elements[0]->reference.node;
-                gpe_number = (u32) obj_desc->package.elements[1]->integer.value;
-        } else {
-                /* Unknown type, just ignore it */
-
-                goto cleanup;
-        }
-
-        /*
-         * Is this GPE within this block?
-         *
-         * TRUE if and only if these conditions are true:
-         *     1) The GPE devices match.
-         *     2) The GPE index(number) is within the range of the Gpe Block
-         *          associated with the GPE device.
-         */
-        if ((gpe_device == target_gpe_device) &&
-            (gpe_number >= gpe_block->block_base_number) &&
-            (gpe_number < gpe_block->block_base_number +
-             (gpe_block->register_count * 8))) {
-                gpe_event_info = &gpe_block->event_info[gpe_number -
-                                                        gpe_block->
-                                                        block_base_number];
-
-                gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
-        }
-
-      cleanup:
-        acpi_ut_remove_reference(pkg_desc);
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ev_get_gpe_xrupt_block
- *
- * PARAMETERS:  interrupt_number     - Interrupt for a GPE block
- *
- * RETURN:      A GPE interrupt block
- *
- * DESCRIPTION: Get or Create a GPE interrupt block. There is one interrupt
- *              block per unique interrupt level used for GPEs. Should be
- *              called only when the GPE lists are semaphore locked and not
- *              subject to change.
- *
- ******************************************************************************/
-
-static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
-                                                               interrupt_number)
-{
-        struct acpi_gpe_xrupt_info *next_gpe_xrupt;
-        struct acpi_gpe_xrupt_info *gpe_xrupt;
-        acpi_status status;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(ev_get_gpe_xrupt_block);
-
-        /* No need for lock since we are not changing any list elements here */
-
-        next_gpe_xrupt = acpi_gbl_gpe_xrupt_list_head;
-        while (next_gpe_xrupt) {
-                if (next_gpe_xrupt->interrupt_number == interrupt_number) {
-                        return_PTR(next_gpe_xrupt);
-                }
-
-                next_gpe_xrupt = next_gpe_xrupt->next;
-        }
-
-        /* Not found, must allocate a new xrupt descriptor */
-
-        gpe_xrupt = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_xrupt_info));
-        if (!gpe_xrupt) {
-                return_PTR(NULL);
-        }
-
-        gpe_xrupt->interrupt_number = interrupt_number;
-
-        /* Install new interrupt descriptor with spin lock */
-
-        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
-        if (acpi_gbl_gpe_xrupt_list_head) {
-                next_gpe_xrupt = acpi_gbl_gpe_xrupt_list_head;
-                while (next_gpe_xrupt->next) {
-                        next_gpe_xrupt = next_gpe_xrupt->next;
-                }
-
-                next_gpe_xrupt->next = gpe_xrupt;
-                gpe_xrupt->previous = next_gpe_xrupt;
-        } else {
-                acpi_gbl_gpe_xrupt_list_head = gpe_xrupt;
-        }
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-
-        /* Install new interrupt handler if not SCI_INT */
-
-        if (interrupt_number != acpi_gbl_FADT.sci_interrupt) {
-                status = acpi_os_install_interrupt_handler(interrupt_number,
-                                                           acpi_ev_gpe_xrupt_handler,
-                                                           gpe_xrupt);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Could not install GPE interrupt handler at level 0x%X",
-                                    interrupt_number));
-                        return_PTR(NULL);
-                }
-        }
-
-        return_PTR(gpe_xrupt);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ev_delete_gpe_xrupt
- *
- * PARAMETERS:  gpe_xrupt       - A GPE interrupt info block
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Remove and free a gpe_xrupt block. Remove an associated
- *              interrupt handler if not the SCI interrupt.
- *
- ******************************************************************************/
-
-static acpi_status
-acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
-{
-        acpi_status status;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(ev_delete_gpe_xrupt);
-
-        /* We never want to remove the SCI interrupt handler */
-
-        if (gpe_xrupt->interrupt_number == acpi_gbl_FADT.sci_interrupt) {
-                gpe_xrupt->gpe_block_list_head = NULL;
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /* Disable this interrupt */
-
-        status =
-            acpi_os_remove_interrupt_handler(gpe_xrupt->interrupt_number,
-                                             acpi_ev_gpe_xrupt_handler);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Unlink the interrupt block with lock */
-
-        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
-        if (gpe_xrupt->previous) {
-                gpe_xrupt->previous->next = gpe_xrupt->next;
-        } else {
-                /* No previous, update list head */
-
-                acpi_gbl_gpe_xrupt_list_head = gpe_xrupt->next;
-        }
-
-        if (gpe_xrupt->next) {
-                gpe_xrupt->next->previous = gpe_xrupt->previous;
-        }
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-
-        /* Free the block */
-
-        ACPI_FREE(gpe_xrupt);
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ev_install_gpe_block
  *
  * PARAMETERS:  gpe_block               - New GPE block
@@ -705,8 +170,7 @@ acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block)
                 acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
         }
 
-        acpi_current_gpe_count -=
-            gpe_block->register_count * ACPI_GPE_REGISTER_WIDTH;
+        acpi_current_gpe_count -= gpe_block->gpe_count;
 
         /* Free the gpe_block */
 
@@ -760,9 +224,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
          * Allocate the GPE event_info block. There are eight distinct GPEs
          * per register. Initialization to zeros is sufficient.
          */
-        gpe_event_info = ACPI_ALLOCATE_ZEROED(((acpi_size) gpe_block->
-                                               register_count *
-                                               ACPI_GPE_REGISTER_WIDTH) *
+        gpe_event_info = ACPI_ALLOCATE_ZEROED((acpi_size) gpe_block->gpe_count *
                                               sizeof(struct
                                                      acpi_gpe_event_info));
         if (!gpe_event_info) {
@@ -880,6 +342,7 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
 {
         acpi_status status;
         struct acpi_gpe_block_info *gpe_block;
+        struct acpi_gpe_walk_info walk_info;
 
         ACPI_FUNCTION_TRACE(ev_create_gpe_block);
 
@@ -897,6 +360,7 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
         /* Initialize the new GPE block */
 
         gpe_block->node = gpe_device;
+        gpe_block->gpe_count = (u16)(register_count * ACPI_GPE_REGISTER_WIDTH);
         gpe_block->register_count = register_count;
         gpe_block->block_base_number = gpe_block_base_number;
 
@@ -921,12 +385,17 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
                 return_ACPI_STATUS(status);
         }
 
-        /* Find all GPE methods (_Lxx, _Exx) for this block */
+        /* Find all GPE methods (_Lxx or_Exx) for this block */
+
+        walk_info.gpe_block = gpe_block;
+        walk_info.gpe_device = gpe_device;
+        walk_info.enable_this_gpe = FALSE;
+        walk_info.execute_by_owner_id = FALSE;
 
         status = acpi_ns_walk_namespace(ACPI_TYPE_METHOD, gpe_device,
                                         ACPI_UINT32_MAX, ACPI_NS_WALK_NO_UNLOCK,
-                                        acpi_ev_save_method_info, NULL,
-                                        gpe_block, NULL);
+                                        acpi_ev_match_gpe_method, NULL,
+                                        &walk_info, NULL);
 
         /* Return the new block */
 
@@ -938,14 +407,13 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
                           "GPE %02X to %02X [%4.4s] %u regs on int 0x%X\n",
                           (u32) gpe_block->block_base_number,
                           (u32) (gpe_block->block_base_number +
-                                 ((gpe_block->register_count *
-                                   ACPI_GPE_REGISTER_WIDTH) - 1)),
+                                (gpe_block->gpe_count - 1)),
                           gpe_device->name.ascii, gpe_block->register_count,
                           interrupt_number));
 
         /* Update global count of currently available GPEs */
 
-        acpi_current_gpe_count += register_count * ACPI_GPE_REGISTER_WIDTH;
+        acpi_current_gpe_count += gpe_block->gpe_count;
         return_ACPI_STATUS(AE_OK);
 }
 
@@ -969,10 +437,13 @@ acpi_status
 acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
                              struct acpi_gpe_block_info *gpe_block)
 {
+        acpi_status status;
         struct acpi_gpe_event_info *gpe_event_info;
-        struct acpi_gpe_walk_info gpe_info;
+        struct acpi_gpe_walk_info walk_info;
         u32 wake_gpe_count;
         u32 gpe_enabled_count;
+        u32 gpe_index;
+        u32 gpe_number;
         u32 i;
         u32 j;
 
@@ -995,210 +466,75 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
                  * definition a wake GPE and will not be enabled while the machine
                  * is running.
                  */
-                gpe_info.gpe_block = gpe_block;
-                gpe_info.gpe_device = gpe_device;
+                walk_info.gpe_block = gpe_block;
+                walk_info.gpe_device = gpe_device;
+                walk_info.execute_by_owner_id = FALSE;
 
-                acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+                status =
+                    acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
                                            ACPI_UINT32_MAX, ACPI_NS_WALK_UNLOCK,
                                            acpi_ev_match_prw_and_gpe, NULL,
-                                           &gpe_info, NULL);
+                                           &walk_info, NULL);
+                if (ACPI_FAILURE(status)) {
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "While executing _PRW methods"));
+                }
         }
 
         /*
-         * Enable all GPEs that have a corresponding method and aren't
+         * Enable all GPEs that have a corresponding method and are not
          * capable of generating wakeups. Any other GPEs within this block
-         * must be enabled via the acpi_enable_gpe() interface.
+         * must be enabled via the acpi_enable_gpe interface.
          */
         wake_gpe_count = 0;
         gpe_enabled_count = 0;
-        if (gpe_device == acpi_gbl_fadt_gpe_device)
+
+        if (gpe_device == acpi_gbl_fadt_gpe_device) {
                 gpe_device = NULL;
+        }
 
         for (i = 0; i < gpe_block->register_count; i++) {
                 for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
-                        acpi_status status;
-                        acpi_size gpe_index;
-                        int gpe_number;
 
                         /* Get the info block for this particular GPE */
-                        gpe_index = (acpi_size)i * ACPI_GPE_REGISTER_WIDTH + j;
+
+                        gpe_index = (i * ACPI_GPE_REGISTER_WIDTH) + j;
                         gpe_event_info = &gpe_block->event_info[gpe_index];
 
                         if (gpe_event_info->flags & ACPI_GPE_CAN_WAKE) {
                                 wake_gpe_count++;
-                                if (acpi_gbl_leave_wake_gpes_disabled)
+                                if (acpi_gbl_leave_wake_gpes_disabled) {
                                         continue;
+                                }
                         }
 
-                        if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_METHOD))
+                        /* Ignore GPEs that have no corresponding _Lxx/_Exx method */
+
+                        if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_METHOD)) {
                                 continue;
+                        }
+
+                        /* Enable this GPE */
 
                         gpe_number = gpe_index + gpe_block->block_base_number;
                         status = acpi_enable_gpe(gpe_device, gpe_number,
-                                                ACPI_GPE_TYPE_RUNTIME);
-                        if (ACPI_FAILURE(status))
-                                ACPI_ERROR((AE_INFO,
-                                                "Failed to enable GPE %02X\n",
-                                                gpe_number));
-                        else
-                                gpe_enabled_count++;
-                }
-        }
-
-        ACPI_DEBUG_PRINT((ACPI_DB_INIT,
-                          "Found %u Wake, Enabled %u Runtime GPEs in this block\n",
-                          wake_gpe_count, gpe_enabled_count));
-
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ev_gpe_initialize
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Initialize the GPE data structures
- *
- ******************************************************************************/
-
-acpi_status acpi_ev_gpe_initialize(void)
-{
-        u32 register_count0 = 0;
-        u32 register_count1 = 0;
-        u32 gpe_number_max = 0;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(ev_gpe_initialize);
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /*
-         * Initialize the GPE Block(s) defined in the FADT
-         *
-         * Why the GPE register block lengths are divided by 2:  From the ACPI
-         * Spec, section "General-Purpose Event Registers", we have:
-         *
-         * "Each register block contains two registers of equal length
-         *  GPEx_STS and GPEx_EN (where x is 0 or 1). The length of the
-         *  GPE0_STS and GPE0_EN registers is equal to half the GPE0_LEN
-         *  The length of the GPE1_STS and GPE1_EN registers is equal to
-         *  half the GPE1_LEN. If a generic register block is not supported
-         *  then its respective block pointer and block length values in the
-         *  FADT table contain zeros. The GPE0_LEN and GPE1_LEN do not need
-         *  to be the same size."
-         */
-
-        /*
-         * Determine the maximum GPE number for this machine.
-         *
-         * Note: both GPE0 and GPE1 are optional, and either can exist without
-         * the other.
-         *
-         * If EITHER the register length OR the block address are zero, then that
-         * particular block is not supported.
-         */
-        if (acpi_gbl_FADT.gpe0_block_length &&
-            acpi_gbl_FADT.xgpe0_block.address) {
-
-                /* GPE block 0 exists (has both length and address > 0) */
-
-                register_count0 = (u16) (acpi_gbl_FADT.gpe0_block_length / 2);
-
-                gpe_number_max =
-                    (register_count0 * ACPI_GPE_REGISTER_WIDTH) - 1;
-
-                /* Install GPE Block 0 */
-
-                status = acpi_ev_create_gpe_block(acpi_gbl_fadt_gpe_device,
-                                                  &acpi_gbl_FADT.xgpe0_block,
-                                                  register_count0, 0,
-                                                  acpi_gbl_FADT.sci_interrupt,
-                                                  &acpi_gbl_gpe_fadt_blocks[0]);
-
-                if (ACPI_FAILURE(status)) {
-                        ACPI_EXCEPTION((AE_INFO, status,
-                                        "Could not create GPE Block 0"));
-                }
-        }
-
-        if (acpi_gbl_FADT.gpe1_block_length &&
-            acpi_gbl_FADT.xgpe1_block.address) {
-
-                /* GPE block 1 exists (has both length and address > 0) */
-
-                register_count1 = (u16) (acpi_gbl_FADT.gpe1_block_length / 2);
-
-                /* Check for GPE0/GPE1 overlap (if both banks exist) */
-
-                if ((register_count0) &&
-                    (gpe_number_max >= acpi_gbl_FADT.gpe1_base)) {
-                        ACPI_ERROR((AE_INFO,
-                                    "GPE0 block (GPE 0 to %d) overlaps the GPE1 block "
-                                    "(GPE %d to %d) - Ignoring GPE1",
-                                    gpe_number_max, acpi_gbl_FADT.gpe1_base,
-                                    acpi_gbl_FADT.gpe1_base +
-                                    ((register_count1 *
-                                      ACPI_GPE_REGISTER_WIDTH) - 1)));
-
-                        /* Ignore GPE1 block by setting the register count to zero */
-
-                        register_count1 = 0;
-                } else {
-                        /* Install GPE Block 1 */
-
-                        status =
-                            acpi_ev_create_gpe_block(acpi_gbl_fadt_gpe_device,
-                                                     &acpi_gbl_FADT.xgpe1_block,
-                                                     register_count1,
-                                                     acpi_gbl_FADT.gpe1_base,
-                                                     acpi_gbl_FADT.
-                                                     sci_interrupt,
-                                                     &acpi_gbl_gpe_fadt_blocks
-                                                     [1]);
-
+                                                 ACPI_GPE_TYPE_RUNTIME);
                         if (ACPI_FAILURE(status)) {
                                 ACPI_EXCEPTION((AE_INFO, status,
-                                                "Could not create GPE Block 1"));
+                                                "Could not enable GPE 0x%02X",
+                                                gpe_number));
+                                continue;
                         }
 
-                        /*
-                         * GPE0 and GPE1 do not have to be contiguous in the GPE number
-                         * space. However, GPE0 always starts at GPE number zero.
-                         */
-                        gpe_number_max = acpi_gbl_FADT.gpe1_base +
-                            ((register_count1 * ACPI_GPE_REGISTER_WIDTH) - 1);
+                        gpe_enabled_count++;
                 }
         }
 
-        /* Exit if there are no GPE registers */
-
-        if ((register_count0 + register_count1) == 0) {
-
-                /* GPEs are not required by ACPI, this is OK */
-
+        if (gpe_enabled_count || wake_gpe_count) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INIT,
-                                  "There are no GPE blocks defined in the FADT\n"));
-                status = AE_OK;
-                goto cleanup;
-        }
-
-        /* Check for Max GPE number out-of-range */
-
-        if (gpe_number_max > ACPI_GPE_MAX) {
-                ACPI_ERROR((AE_INFO,
-                            "Maximum GPE number from FADT is too large: 0x%X",
-                            gpe_number_max));
-                status = AE_BAD_VALUE;
-                goto cleanup;
+                                  "Enabled %u Runtime GPEs, added %u Wake GPEs in this block\n",
+                                  gpe_enabled_count, wake_gpe_count));
         }
 
-      cleanup:
-        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
         return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c
new file mode 100644
index 000000000000..3f6c2d26410d
--- /dev/null
+++ b/drivers/acpi/acpica/evgpeinit.c
@@ -0,0 +1,653 @@
+/******************************************************************************
+ *
+ * Module Name: evgpeinit - System GPE initialization and update
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2010, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 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
+ *    binary redistribution.
+ * 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
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * 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
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acevents.h"
+#include "acnamesp.h"
+#include "acinterp.h"
+
+#define _COMPONENT          ACPI_EVENTS
+ACPI_MODULE_NAME("evgpeinit")
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_gpe_initialize
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Initialize the GPE data structures and the FADT GPE 0/1 blocks
+ *
+ ******************************************************************************/
+acpi_status acpi_ev_gpe_initialize(void)
+{
+        u32 register_count0 = 0;
+        u32 register_count1 = 0;
+        u32 gpe_number_max = 0;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(ev_gpe_initialize);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /*
+         * Initialize the GPE Block(s) defined in the FADT
+         *
+         * Why the GPE register block lengths are divided by 2:  From the ACPI
+         * Spec, section "General-Purpose Event Registers", we have:
+         *
+         * "Each register block contains two registers of equal length
+         *  GPEx_STS and GPEx_EN (where x is 0 or 1). The length of the
+         *  GPE0_STS and GPE0_EN registers is equal to half the GPE0_LEN
+         *  The length of the GPE1_STS and GPE1_EN registers is equal to
+         *  half the GPE1_LEN. If a generic register block is not supported
+         *  then its respective block pointer and block length values in the
+         *  FADT table contain zeros. The GPE0_LEN and GPE1_LEN do not need
+         *  to be the same size."
+         */
+
+        /*
+         * Determine the maximum GPE number for this machine.
+         *
+         * Note: both GPE0 and GPE1 are optional, and either can exist without
+         * the other.
+         *
+         * If EITHER the register length OR the block address are zero, then that
+         * particular block is not supported.
+         */
+        if (acpi_gbl_FADT.gpe0_block_length &&
+            acpi_gbl_FADT.xgpe0_block.address) {
+
+                /* GPE block 0 exists (has both length and address > 0) */
+
+                register_count0 = (u16)(acpi_gbl_FADT.gpe0_block_length / 2);
+
+                gpe_number_max =
+                    (register_count0 * ACPI_GPE_REGISTER_WIDTH) - 1;
+
+                /* Install GPE Block 0 */
+
+                status = acpi_ev_create_gpe_block(acpi_gbl_fadt_gpe_device,
+                                                  &acpi_gbl_FADT.xgpe0_block,
+                                                  register_count0, 0,
+                                                  acpi_gbl_FADT.sci_interrupt,
+                                                  &acpi_gbl_gpe_fadt_blocks[0]);
+
+                if (ACPI_FAILURE(status)) {
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Could not create GPE Block 0"));
+                }
+        }
+
+        if (acpi_gbl_FADT.gpe1_block_length &&
+            acpi_gbl_FADT.xgpe1_block.address) {
+
+                /* GPE block 1 exists (has both length and address > 0) */
+
+                register_count1 = (u16)(acpi_gbl_FADT.gpe1_block_length / 2);
+
+                /* Check for GPE0/GPE1 overlap (if both banks exist) */
+
+                if ((register_count0) &&
+                    (gpe_number_max >= acpi_gbl_FADT.gpe1_base)) {
+                        ACPI_ERROR((AE_INFO,
+                                    "GPE0 block (GPE 0 to %u) overlaps the GPE1 block "
+                                    "(GPE %u to %u) - Ignoring GPE1",
+                                    gpe_number_max, acpi_gbl_FADT.gpe1_base,
+                                    acpi_gbl_FADT.gpe1_base +
+                                    ((register_count1 *
+                                      ACPI_GPE_REGISTER_WIDTH) - 1)));
+
+                        /* Ignore GPE1 block by setting the register count to zero */
+
+                        register_count1 = 0;
+                } else {
+                        /* Install GPE Block 1 */
+
+                        status =
+                            acpi_ev_create_gpe_block(acpi_gbl_fadt_gpe_device,
+                                                     &acpi_gbl_FADT.xgpe1_block,
+                                                     register_count1,
+                                                     acpi_gbl_FADT.gpe1_base,
+                                                     acpi_gbl_FADT.
+                                                     sci_interrupt,
+                                                     &acpi_gbl_gpe_fadt_blocks
+                                                     [1]);
+
+                        if (ACPI_FAILURE(status)) {
+                                ACPI_EXCEPTION((AE_INFO, status,
+                                                "Could not create GPE Block 1"));
+                        }
+
+                        /*
+                         * GPE0 and GPE1 do not have to be contiguous in the GPE number
+                         * space. However, GPE0 always starts at GPE number zero.
+                         */
+                        gpe_number_max = acpi_gbl_FADT.gpe1_base +
+                            ((register_count1 * ACPI_GPE_REGISTER_WIDTH) - 1);
+                }
+        }
+
+        /* Exit if there are no GPE registers */
+
+        if ((register_count0 + register_count1) == 0) {
+
+                /* GPEs are not required by ACPI, this is OK */
+
+                ACPI_DEBUG_PRINT((ACPI_DB_INIT,
+                                  "There are no GPE blocks defined in the FADT\n"));
+                status = AE_OK;
+                goto cleanup;
+        }
+
+        /* Check for Max GPE number out-of-range */
+
+        if (gpe_number_max > ACPI_GPE_MAX) {
+                ACPI_ERROR((AE_INFO,
+                            "Maximum GPE number from FADT is too large: 0x%X",
+                            gpe_number_max));
+                status = AE_BAD_VALUE;
+                goto cleanup;
+        }
+
+      cleanup:
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+        return_ACPI_STATUS(AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_update_gpes
+ *
+ * PARAMETERS:  table_owner_id      - ID of the newly-loaded ACPI table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Check for new GPE methods (_Lxx/_Exx) made available as a
+ *              result of a Load() or load_table() operation. If new GPE
+ *              methods have been installed, register the new methods and
+ *              enable and runtime GPEs that are associated with them. Also,
+ *              run any newly loaded _PRW methods in order to discover any
+ *              new CAN_WAKE GPEs.
+ *
+ ******************************************************************************/
+
+void acpi_ev_update_gpes(acpi_owner_id table_owner_id)
+{
+        struct acpi_gpe_xrupt_info *gpe_xrupt_info;
+        struct acpi_gpe_block_info *gpe_block;
+        struct acpi_gpe_walk_info walk_info;
+        acpi_status status = AE_OK;
+        u32 new_wake_gpe_count = 0;
+
+        /* We will examine only _PRW/_Lxx/_Exx methods owned by this table */
+
+        walk_info.owner_id = table_owner_id;
+        walk_info.execute_by_owner_id = TRUE;
+        walk_info.count = 0;
+
+        if (acpi_gbl_leave_wake_gpes_disabled) {
+                /*
+                 * 1) Run any newly-loaded _PRW methods to find any GPEs that
+                 * can now be marked as CAN_WAKE GPEs. Note: We must run the
+                 * _PRW methods before we process the _Lxx/_Exx methods because
+                 * we will enable all runtime GPEs associated with the new
+                 * _Lxx/_Exx methods at the time we process those methods.
+                 *
+                 * Unlock interpreter so that we can run the _PRW methods.
+                 */
+                walk_info.gpe_block = NULL;
+                walk_info.gpe_device = NULL;
+
+                acpi_ex_exit_interpreter();
+
+                status =
+                    acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+                                           ACPI_UINT32_MAX,
+                                           ACPI_NS_WALK_NO_UNLOCK,
+                                           acpi_ev_match_prw_and_gpe, NULL,
+                                           &walk_info, NULL);
+                if (ACPI_FAILURE(status)) {
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "While executing _PRW methods"));
+                }
+
+                acpi_ex_enter_interpreter();
+                new_wake_gpe_count = walk_info.count;
+        }
+
+        /*
+         * 2) Find any _Lxx/_Exx GPE methods that have just been loaded.
+         *
+         * Any GPEs that correspond to new _Lxx/_Exx methods and are not
+         * marked as CAN_WAKE are immediately enabled.
+         *
+         * Examine the namespace underneath each gpe_device within the
+         * gpe_block lists.
+         */
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return;
+        }
+
+        walk_info.count = 0;
+        walk_info.enable_this_gpe = TRUE;
+
+        /* Walk the interrupt level descriptor list */
+
+        gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;
+        while (gpe_xrupt_info) {
+
+                /* Walk all Gpe Blocks attached to this interrupt level */
+
+                gpe_block = gpe_xrupt_info->gpe_block_list_head;
+                while (gpe_block) {
+                        walk_info.gpe_block = gpe_block;
+                        walk_info.gpe_device = gpe_block->node;
+
+                        status = acpi_ns_walk_namespace(ACPI_TYPE_METHOD,
+                                                        walk_info.gpe_device,
+                                                        ACPI_UINT32_MAX,
+                                                        ACPI_NS_WALK_NO_UNLOCK,
+                                                        acpi_ev_match_gpe_method,
+                                                        NULL, &walk_info, NULL);
+                        if (ACPI_FAILURE(status)) {
+                                ACPI_EXCEPTION((AE_INFO, status,
+                                                "While decoding _Lxx/_Exx methods"));
+                        }
+
+                        gpe_block = gpe_block->next;
+                }
+
+                gpe_xrupt_info = gpe_xrupt_info->next;
+        }
+
+        if (walk_info.count || new_wake_gpe_count) {
+                ACPI_INFO((AE_INFO,
+                           "Enabled %u new runtime GPEs, added %u new wakeup GPEs",
+                           walk_info.count, new_wake_gpe_count));
+        }
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+        return;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_match_gpe_method
+ *
+ * PARAMETERS:  Callback from walk_namespace
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Called from acpi_walk_namespace. Expects each object to be a
+ *              control method under the _GPE portion of the namespace.
+ *              Extract the name and GPE type from the object, saving this
+ *              information for quick lookup during GPE dispatch. Allows a
+ *              per-owner_id evaluation if execute_by_owner_id is TRUE in the
+ *              walk_info parameter block.
+ *
+ *              The name of each GPE control method is of the form:
+ *              "_Lxx" or "_Exx", where:
+ *                  L      - means that the GPE is level triggered
+ *                  E      - means that the GPE is edge triggered
+ *                  xx     - is the GPE number [in HEX]
+ *
+ * If walk_info->execute_by_owner_id is TRUE, we only execute examine GPE methods
+ *    with that owner.
+ * If walk_info->enable_this_gpe is TRUE, the GPE that is referred to by a GPE
+ *    method is immediately enabled (Used for Load/load_table operators)
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ev_match_gpe_method(acpi_handle obj_handle,
+                         u32 level, void *context, void **return_value)
+{
+        struct acpi_namespace_node *method_node =
+            ACPI_CAST_PTR(struct acpi_namespace_node, obj_handle);
+        struct acpi_gpe_walk_info *walk_info =
+            ACPI_CAST_PTR(struct acpi_gpe_walk_info, context);
+        struct acpi_gpe_event_info *gpe_event_info;
+        struct acpi_namespace_node *gpe_device;
+        acpi_status status;
+        u32 gpe_number;
+        char name[ACPI_NAME_SIZE + 1];
+        u8 type;
+
+        ACPI_FUNCTION_TRACE(ev_match_gpe_method);
+
+        /* Check if requested owner_id matches this owner_id */
+
+        if ((walk_info->execute_by_owner_id) &&
+            (method_node->owner_id != walk_info->owner_id)) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /*
+         * Match and decode the _Lxx and _Exx GPE method names
+         *
+         * 1) Extract the method name and null terminate it
+         */
+        ACPI_MOVE_32_TO_32(name, &method_node->name.integer);
+        name[ACPI_NAME_SIZE] = 0;
+
+        /* 2) Name must begin with an underscore */
+
+        if (name[0] != '_') {
+                return_ACPI_STATUS(AE_OK);      /* Ignore this method */
+        }
+
+        /*
+         * 3) Edge/Level determination is based on the 2nd character
+         *    of the method name
+         *
+         * NOTE: Default GPE type is RUNTIME only. Later, if a _PRW object is
+         * found that points to this GPE, the ACPI_GPE_CAN_WAKE flag is set.
+         */
+        switch (name[1]) {
+        case 'L':
+                type = ACPI_GPE_LEVEL_TRIGGERED;
+                break;
+
+        case 'E':
+                type = ACPI_GPE_EDGE_TRIGGERED;
+                break;
+
+        default:
+                /* Unknown method type, just ignore it */
+
+                ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
+                                  "Ignoring unknown GPE method type: %s "
+                                  "(name not of form _Lxx or _Exx)", name));
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* 4) The last two characters of the name are the hex GPE Number */
+
+        gpe_number = ACPI_STRTOUL(&name[2], NULL, 16);
+        if (gpe_number == ACPI_UINT32_MAX) {
+
+                /* Conversion failed; invalid method, just ignore it */
+
+                ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
+                                  "Could not extract GPE number from name: %s "
+                                  "(name is not of form _Lxx or _Exx)", name));
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* Ensure that we have a valid GPE number for this GPE block */
+
+        gpe_event_info =
+            acpi_ev_low_get_gpe_info(gpe_number, walk_info->gpe_block);
+        if (!gpe_event_info) {
+                /*
+                 * This gpe_number is not valid for this GPE block, just ignore it.
+                 * However, it may be valid for a different GPE block, since GPE0
+                 * and GPE1 methods both appear under \_GPE.
+                 */
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
+            ACPI_GPE_DISPATCH_HANDLER) {
+
+                /* If there is already a handler, ignore this GPE method */
+
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
+            ACPI_GPE_DISPATCH_METHOD) {
+                /*
+                 * If there is already a method, ignore this method. But check
+                 * for a type mismatch (if both the _Lxx AND _Exx exist)
+                 */
+                if (type != (gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK)) {
+                        ACPI_ERROR((AE_INFO,
+                                    "For GPE 0x%.2X, found both _L%2.2X and _E%2.2X methods",
+                                    gpe_number, gpe_number, gpe_number));
+                }
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /*
+         * Add the GPE information from above to the gpe_event_info block for
+         * use during dispatch of this GPE.
+         */
+        gpe_event_info->flags |= (u8)(type | ACPI_GPE_DISPATCH_METHOD);
+        gpe_event_info->dispatch.method_node = method_node;
+
+        /*
+         * Enable this GPE if requested. This only happens when during the
+         * execution of a Load or load_table operator. We have found a new
+         * GPE method and want to immediately enable the GPE if it is a
+         * runtime GPE.
+         */
+        if (walk_info->enable_this_gpe) {
+
+                /* Ignore GPEs that can wake the system */
+
+                if (!(gpe_event_info->flags & ACPI_GPE_CAN_WAKE) ||
+                    !acpi_gbl_leave_wake_gpes_disabled) {
+                        walk_info->count++;
+                        gpe_device = walk_info->gpe_device;
+
+                        if (gpe_device == acpi_gbl_fadt_gpe_device) {
+                                gpe_device = NULL;
+                        }
+
+                        status = acpi_enable_gpe(gpe_device, gpe_number,
+                                                 ACPI_GPE_TYPE_RUNTIME);
+                        if (ACPI_FAILURE(status)) {
+                                ACPI_EXCEPTION((AE_INFO, status,
+                                                "Could not enable GPE 0x%02X",
+                                                gpe_number));
+                        }
+                }
+        }
+
+        ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
+                          "Registered GPE method %s as GPE number 0x%.2X\n",
+                          name, gpe_number));
+        return_ACPI_STATUS(AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_match_prw_and_gpe
+ *
+ * PARAMETERS:  Callback from walk_namespace
+ *
+ * RETURN:      Status. NOTE: We ignore errors so that the _PRW walk is
+ *              not aborted on a single _PRW failure.
+ *
+ * DESCRIPTION: Called from acpi_walk_namespace. Expects each object to be a
+ *              Device. Run the _PRW method. If present, extract the GPE
+ *              number and mark the GPE as a CAN_WAKE GPE. Allows a
+ *              per-owner_id execution if execute_by_owner_id is TRUE in the
+ *              walk_info parameter block.
+ *
+ * If walk_info->execute_by_owner_id is TRUE, we only execute _PRWs with that
+ *    owner.
+ * If walk_info->gpe_device is NULL, we execute every _PRW found. Otherwise,
+ *    we only execute _PRWs that refer to the input gpe_device.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
+                          u32 level, void *context, void **return_value)
+{
+        struct acpi_gpe_walk_info *walk_info =
+            ACPI_CAST_PTR(struct acpi_gpe_walk_info, context);
+        struct acpi_namespace_node *gpe_device;
+        struct acpi_gpe_block_info *gpe_block;
+        struct acpi_namespace_node *target_gpe_device;
+        struct acpi_namespace_node *prw_node;
+        struct acpi_gpe_event_info *gpe_event_info;
+        union acpi_operand_object *pkg_desc;
+        union acpi_operand_object *obj_desc;
+        u32 gpe_number;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(ev_match_prw_and_gpe);
+
+        /* Check for a _PRW method under this device */
+
+        status = acpi_ns_get_node(obj_handle, METHOD_NAME__PRW,
+                                  ACPI_NS_NO_UPSEARCH, &prw_node);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* Check if requested owner_id matches this owner_id */
+
+        if ((walk_info->execute_by_owner_id) &&
+            (prw_node->owner_id != walk_info->owner_id)) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* Execute the _PRW */
+
+        status = acpi_ut_evaluate_object(prw_node, NULL,
+                                         ACPI_BTYPE_PACKAGE, &pkg_desc);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* The returned _PRW package must have at least two elements */
+
+        if (pkg_desc->package.count < 2) {
+                goto cleanup;
+        }
+
+        /* Extract pointers from the input context */
+
+        gpe_device = walk_info->gpe_device;
+        gpe_block = walk_info->gpe_block;
+
+        /*
+         * The _PRW object must return a package, we are only interested
+         * in the first element
+         */
+        obj_desc = pkg_desc->package.elements[0];
+
+        if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
+
+                /* Use FADT-defined GPE device (from definition of _PRW) */
+
+                target_gpe_device = NULL;
+                if (gpe_device) {
+                        target_gpe_device = acpi_gbl_fadt_gpe_device;
+                }
+
+                /* Integer is the GPE number in the FADT described GPE blocks */
+
+                gpe_number = (u32)obj_desc->integer.value;
+        } else if (obj_desc->common.type == ACPI_TYPE_PACKAGE) {
+
+                /* Package contains a GPE reference and GPE number within a GPE block */
+
+                if ((obj_desc->package.count < 2) ||
+                    ((obj_desc->package.elements[0])->common.type !=
+                     ACPI_TYPE_LOCAL_REFERENCE) ||
+                    ((obj_desc->package.elements[1])->common.type !=
+                     ACPI_TYPE_INTEGER)) {
+                        goto cleanup;
+                }
+
+                /* Get GPE block reference and decode */
+
+                target_gpe_device =
+                    obj_desc->package.elements[0]->reference.node;
+                gpe_number = (u32)obj_desc->package.elements[1]->integer.value;
+        } else {
+                /* Unknown type, just ignore it */
+
+                goto cleanup;
+        }
+
+        /* Get the gpe_event_info for this GPE */
+
+        if (gpe_device) {
+                /*
+                 * Is this GPE within this block?
+                 *
+                 * TRUE if and only if these conditions are true:
+                 *     1) The GPE devices match.
+                 *     2) The GPE index(number) is within the range of the Gpe Block
+                 *          associated with the GPE device.
+                 */
+                if (gpe_device != target_gpe_device) {
+                        goto cleanup;
+                }
+
+                gpe_event_info =
+                    acpi_ev_low_get_gpe_info(gpe_number, gpe_block);
+        } else {
+                /* gpe_device is NULL, just match the target_device and gpe_number */
+
+                gpe_event_info =
+                    acpi_ev_get_gpe_event_info(target_gpe_device, gpe_number);
+        }
+
+        if (gpe_event_info) {
+                if (!(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
+
+                        /* This GPE can wake the system */
+
+                        gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
+                        walk_info->count++;
+                }
+        }
+
+      cleanup:
+        acpi_ut_remove_reference(pkg_desc);
+        return_ACPI_STATUS(AE_OK);
+}
diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c
new file mode 100644
index 000000000000..19a0e513ea48
--- /dev/null
+++ b/drivers/acpi/acpica/evgpeutil.c
@@ -0,0 +1,337 @@
+/******************************************************************************
+ *
+ * Module Name: evgpeutil - GPE utilities
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2010, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 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
+ *    binary redistribution.
+ * 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
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * 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
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acevents.h"
+
+#define _COMPONENT          ACPI_EVENTS
+ACPI_MODULE_NAME("evgpeutil")
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_walk_gpe_list
+ *
+ * PARAMETERS:  gpe_walk_callback   - Routine called for each GPE block
+ *              Context             - Value passed to callback
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Walk the GPE lists.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context)
+{
+        struct acpi_gpe_block_info *gpe_block;
+        struct acpi_gpe_xrupt_info *gpe_xrupt_info;
+        acpi_status status = AE_OK;
+        acpi_cpu_flags flags;
+
+        ACPI_FUNCTION_TRACE(ev_walk_gpe_list);
+
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+
+        /* Walk the interrupt level descriptor list */
+
+        gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;
+        while (gpe_xrupt_info) {
+
+                /* Walk all Gpe Blocks attached to this interrupt level */
+
+                gpe_block = gpe_xrupt_info->gpe_block_list_head;
+                while (gpe_block) {
+
+                        /* One callback per GPE block */
+
+                        status =
+                            gpe_walk_callback(gpe_xrupt_info, gpe_block,
+                                              context);
+                        if (ACPI_FAILURE(status)) {
+                                if (status == AE_CTRL_END) {    /* Callback abort */
+                                        status = AE_OK;
+                                }
+                                goto unlock_and_exit;
+                        }
+
+                        gpe_block = gpe_block->next;
+                }
+
+                gpe_xrupt_info = gpe_xrupt_info->next;
+        }
+
+      unlock_and_exit:
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_valid_gpe_event
+ *
+ * PARAMETERS:  gpe_event_info              - Info for this GPE
+ *
+ * RETURN:      TRUE if the gpe_event is valid
+ *
+ * DESCRIPTION: Validate a GPE event. DO NOT CALL FROM INTERRUPT LEVEL.
+ *              Should be called only when the GPE lists are semaphore locked
+ *              and not subject to change.
+ *
+ ******************************************************************************/
+
+u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info)
+{
+        struct acpi_gpe_xrupt_info *gpe_xrupt_block;
+        struct acpi_gpe_block_info *gpe_block;
+
+        ACPI_FUNCTION_ENTRY();
+
+        /* No need for spin lock since we are not changing any list elements */
+
+        /* Walk the GPE interrupt levels */
+
+        gpe_xrupt_block = acpi_gbl_gpe_xrupt_list_head;
+        while (gpe_xrupt_block) {
+                gpe_block = gpe_xrupt_block->gpe_block_list_head;
+
+                /* Walk the GPE blocks on this interrupt level */
+
+                while (gpe_block) {
+                        if ((&gpe_block->event_info[0] <= gpe_event_info) &&
+                            (&gpe_block->event_info[gpe_block->gpe_count] >
+                             gpe_event_info)) {
+                                return (TRUE);
+                        }
+
+                        gpe_block = gpe_block->next;
+                }
+
+                gpe_xrupt_block = gpe_xrupt_block->next;
+        }
+
+        return (FALSE);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_get_gpe_xrupt_block
+ *
+ * PARAMETERS:  interrupt_number     - Interrupt for a GPE block
+ *
+ * RETURN:      A GPE interrupt block
+ *
+ * DESCRIPTION: Get or Create a GPE interrupt block. There is one interrupt
+ *              block per unique interrupt level used for GPEs. Should be
+ *              called only when the GPE lists are semaphore locked and not
+ *              subject to change.
+ *
+ ******************************************************************************/
+
+struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number)
+{
+        struct acpi_gpe_xrupt_info *next_gpe_xrupt;
+        struct acpi_gpe_xrupt_info *gpe_xrupt;
+        acpi_status status;
+        acpi_cpu_flags flags;
+
+        ACPI_FUNCTION_TRACE(ev_get_gpe_xrupt_block);
+
+        /* No need for lock since we are not changing any list elements here */
+
+        next_gpe_xrupt = acpi_gbl_gpe_xrupt_list_head;
+        while (next_gpe_xrupt) {
+                if (next_gpe_xrupt->interrupt_number == interrupt_number) {
+                        return_PTR(next_gpe_xrupt);
+                }
+
+                next_gpe_xrupt = next_gpe_xrupt->next;
+        }
+
+        /* Not found, must allocate a new xrupt descriptor */
+
+        gpe_xrupt = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_xrupt_info));
+        if (!gpe_xrupt) {
+                return_PTR(NULL);
+        }
+
+        gpe_xrupt->interrupt_number = interrupt_number;
+
+        /* Install new interrupt descriptor with spin lock */
+
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+        if (acpi_gbl_gpe_xrupt_list_head) {
+                next_gpe_xrupt = acpi_gbl_gpe_xrupt_list_head;
+                while (next_gpe_xrupt->next) {
+                        next_gpe_xrupt = next_gpe_xrupt->next;
+                }
+
+                next_gpe_xrupt->next = gpe_xrupt;
+                gpe_xrupt->previous = next_gpe_xrupt;
+        } else {
+                acpi_gbl_gpe_xrupt_list_head = gpe_xrupt;
+        }
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+
+        /* Install new interrupt handler if not SCI_INT */
+
+        if (interrupt_number != acpi_gbl_FADT.sci_interrupt) {
+                status = acpi_os_install_interrupt_handler(interrupt_number,
+                                                           acpi_ev_gpe_xrupt_handler,
+                                                           gpe_xrupt);
+                if (ACPI_FAILURE(status)) {
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not install GPE interrupt handler at level 0x%X",
+                                    interrupt_number));
+                        return_PTR(NULL);
+                }
+        }
+
+        return_PTR(gpe_xrupt);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_delete_gpe_xrupt
+ *
+ * PARAMETERS:  gpe_xrupt       - A GPE interrupt info block
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Remove and free a gpe_xrupt block. Remove an associated
+ *              interrupt handler if not the SCI interrupt.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
+{
+        acpi_status status;
+        acpi_cpu_flags flags;
+
+        ACPI_FUNCTION_TRACE(ev_delete_gpe_xrupt);
+
+        /* We never want to remove the SCI interrupt handler */
+
+        if (gpe_xrupt->interrupt_number == acpi_gbl_FADT.sci_interrupt) {
+                gpe_xrupt->gpe_block_list_head = NULL;
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* Disable this interrupt */
+
+        status =
+            acpi_os_remove_interrupt_handler(gpe_xrupt->interrupt_number,
+                                             acpi_ev_gpe_xrupt_handler);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Unlink the interrupt block with lock */
+
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+        if (gpe_xrupt->previous) {
+                gpe_xrupt->previous->next = gpe_xrupt->next;
+        } else {
+                /* No previous, update list head */
+
+                acpi_gbl_gpe_xrupt_list_head = gpe_xrupt->next;
+        }
+
+        if (gpe_xrupt->next) {
+                gpe_xrupt->next->previous = gpe_xrupt->previous;
+        }
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+
+        /* Free the block */
+
+        ACPI_FREE(gpe_xrupt);
+        return_ACPI_STATUS(AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_delete_gpe_handlers
+ *
+ * PARAMETERS:  gpe_xrupt_info      - GPE Interrupt info
+ *              gpe_block           - Gpe Block info
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Delete all Handler objects found in the GPE data structs.
+ *              Used only prior to termination.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                            struct acpi_gpe_block_info *gpe_block,
+                            void *context)
+{
+        struct acpi_gpe_event_info *gpe_event_info;
+        u32 i;
+        u32 j;
+
+        ACPI_FUNCTION_TRACE(ev_delete_gpe_handlers);
+
+        /* Examine each GPE Register within the block */
+
+        for (i = 0; i < gpe_block->register_count; i++) {
+
+                /* Now look at the individual GPEs in this byte register */
+
+                for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
+                        gpe_event_info = &gpe_block->event_info[((acpi_size) i *
+                                                                 ACPI_GPE_REGISTER_WIDTH)
+                                                                + j];
+
+                        if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
+                            ACPI_GPE_DISPATCH_HANDLER) {
+                                ACPI_FREE(gpe_event_info->dispatch.handler);
+                                gpe_event_info->dispatch.handler = NULL;
+                                gpe_event_info->flags &=
+                                    ~ACPI_GPE_DISPATCH_MASK;
+                        }
+                }
+        }
+
+        return_ACPI_STATUS(AE_OK);
+}
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index 9a3cb7045a32..df0aea9a8cfd 100644
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -590,7 +590,7 @@ void acpi_ev_terminate(void)
                         status = acpi_disable_event(i, 0);
                         if (ACPI_FAILURE(status)) {
                                 ACPI_ERROR((AE_INFO,
-                                            "Could not disable fixed event %d",
+                                            "Could not disable fixed event %u",
                                             (u32) i));
                         }
                 }
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index b40757955f9b..cc825023012a 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -142,7 +142,7 @@ acpi_install_fixed_event_handler(u32 event,
         if (ACPI_SUCCESS(status))
                 status = acpi_enable_event(event, 0);
         if (ACPI_FAILURE(status)) {
-                ACPI_WARNING((AE_INFO, "Could not enable fixed event %X",
+                ACPI_WARNING((AE_INFO, "Could not enable fixed event 0x%X",
                               event));
 
                 /* Remove the handler */
@@ -203,7 +203,7 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler)
 
         if (ACPI_FAILURE(status)) {
                 ACPI_WARNING((AE_INFO,
-                              "Could not write to fixed event enable register %X",
+                              "Could not write to fixed event enable register 0x%X",
                               event));
         } else {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X\n",
@@ -682,14 +682,13 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
 
         /* Parameter validation */
 
-        if ((!address) || (type > ACPI_GPE_XRUPT_TYPE_MASK)) {
-                status = AE_BAD_PARAMETER;
-                goto exit;
+        if ((!address) || (type & ~ACPI_GPE_XRUPT_TYPE_MASK)) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
         if (ACPI_FAILURE(status)) {
-                goto exit;
+                return_ACPI_STATUS(status);
         }
 
         /* Ensure that we have a valid GPE number */
@@ -720,6 +719,13 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
         handler->context = context;
         handler->method_node = gpe_event_info->dispatch.method_node;
 
+        /* Disable the GPE before installing the handler */
+
+        status = acpi_ev_disable_gpe(gpe_event_info);
+        if (ACPI_FAILURE (status)) {
+                goto unlock_and_exit;
+        }
+
         /* Install the handler */
 
         flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
@@ -733,12 +739,8 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
 
         acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
 
-      unlock_and_exit:
+unlock_and_exit:
         (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
-      exit:
-        if (ACPI_FAILURE(status))
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "Installing notify handler failed"));
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index 5ff32c78ea2d..d5a5efc043bf 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -69,7 +69,7 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
 acpi_status acpi_enable(void)
 {
-        acpi_status status = AE_OK;
+        acpi_status status;
 
         ACPI_FUNCTION_TRACE(acpi_enable);
 
@@ -84,21 +84,30 @@ acpi_status acpi_enable(void)
         if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INIT,
                                   "System is already in ACPI mode\n"));
-        } else {
-                /* Transition to ACPI mode */
+                return_ACPI_STATUS(AE_OK);
+        }
 
-                status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Could not transition to ACPI mode"));
-                        return_ACPI_STATUS(status);
-                }
+        /* Transition to ACPI mode */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_INIT,
-                                  "Transition to ACPI mode successful\n"));
+        status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI);
+        if (ACPI_FAILURE(status)) {
+                ACPI_ERROR((AE_INFO,
+                            "Could not transition to ACPI mode"));
+                return_ACPI_STATUS(status);
         }
 
-        return_ACPI_STATUS(status);
+        /* Sanity check that transition succeeded */
+
+        if (acpi_hw_get_mode() != ACPI_SYS_MODE_ACPI) {
+                ACPI_ERROR((AE_INFO,
+                            "Hardware did not enter ACPI mode"));
+                return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
+        }
+
+        ACPI_DEBUG_PRINT((ACPI_DB_INIT,
+                          "Transition to ACPI mode successful\n"));
+
+        return_ACPI_STATUS(AE_OK);
 }
 
 ACPI_EXPORT_SYMBOL(acpi_enable)
@@ -203,21 +212,26 @@ ACPI_EXPORT_SYMBOL(acpi_enable_event)
  *
  * FUNCTION:    acpi_set_gpe
  *
- * PARAMETERS:  gpe_device      - Parent GPE Device
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
  *              gpe_number      - GPE level within the GPE block
- *              action          - Enable or disable
- *                                Called from ISR or not
+ *              action          - ACPI_GPE_ENABLE or ACPI_GPE_DISABLE
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Enable or disable an ACPI event (general purpose)
+ * DESCRIPTION: Enable or disable an individual GPE. This function bypasses
+ *              the reference count mechanism used in the acpi_enable_gpe and
+ *              acpi_disable_gpe interfaces -- and should be used with care.
+ *
+ * Note: Typically used to disable a runtime GPE for short period of time,
+ * then re-enable it, without disturbing the existing reference counts. This
+ * is useful, for example, in the Embedded Controller (EC) driver.
  *
  ******************************************************************************/
 acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action)
 {
-        acpi_status status = AE_OK;
-        acpi_cpu_flags flags;
         struct acpi_gpe_event_info *gpe_event_info;
+        acpi_status status;
+        acpi_cpu_flags flags;
 
         ACPI_FUNCTION_TRACE(acpi_set_gpe);
 
@@ -243,7 +257,6 @@ acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action)
                 break;
 
         default:
-                ACPI_ERROR((AE_INFO, "Invalid action\n"));
                 status = AE_BAD_PARAMETER;
                 break;
         }
@@ -259,25 +272,31 @@ ACPI_EXPORT_SYMBOL(acpi_set_gpe)
  *
  * FUNCTION:    acpi_enable_gpe
  *
- * PARAMETERS:  gpe_device      - Parent GPE Device
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
  *              gpe_number      - GPE level within the GPE block
- *              type            - Purpose the GPE will be used for
+ *              gpe_type        - ACPI_GPE_TYPE_RUNTIME or ACPI_GPE_TYPE_WAKE
+ *                                or both
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Take a reference to a GPE and enable it if necessary
+ * DESCRIPTION: Add a reference to a GPE. On the first reference, the GPE is
+ *              hardware-enabled (for runtime GPEs), or the GPE register mask
+ *              is updated (for wake GPEs).
  *
  ******************************************************************************/
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type)
 {
         acpi_status status = AE_OK;
-        acpi_cpu_flags flags;
         struct acpi_gpe_event_info *gpe_event_info;
+        acpi_cpu_flags flags;
 
         ACPI_FUNCTION_TRACE(acpi_enable_gpe);
 
-        if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
+        /* Parameter validation */
+
+        if (!gpe_type || (gpe_type & ~ACPI_GPE_TYPE_WAKE_RUN)) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
 
         flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
 
@@ -289,26 +308,43 @@ acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
                 goto unlock_and_exit;
         }
 
-        if (type & ACPI_GPE_TYPE_RUNTIME) {
-                if (++gpe_event_info->runtime_count == 1) {
+        if (gpe_type & ACPI_GPE_TYPE_RUNTIME) {
+                if (gpe_event_info->runtime_count == ACPI_UINT8_MAX) {
+                        status = AE_LIMIT;      /* Too many references */
+                        goto unlock_and_exit;
+                }
+
+                gpe_event_info->runtime_count++;
+                if (gpe_event_info->runtime_count == 1) {
                         status = acpi_ev_enable_gpe(gpe_event_info);
-                        if (ACPI_FAILURE(status))
+                        if (ACPI_FAILURE(status)) {
                                 gpe_event_info->runtime_count--;
+                                goto unlock_and_exit;
+                        }
                 }
         }
 
-        if (type & ACPI_GPE_TYPE_WAKE) {
+        if (gpe_type & ACPI_GPE_TYPE_WAKE) {
+                /* The GPE must have the ability to wake the system */
+
                 if (!(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
-                        status = AE_BAD_PARAMETER;
+                        status = AE_TYPE;
+                        goto unlock_and_exit;
+                }
+
+                if (gpe_event_info->wakeup_count == ACPI_UINT8_MAX) {
+                        status = AE_LIMIT;      /* Too many references */
                         goto unlock_and_exit;
                 }
 
                 /*
-                 * Wake-up GPEs are only enabled right prior to putting the
-                 * system into a sleep state.
+                 * Update the enable mask on the first wakeup reference. Wake GPEs
+                 * are only hardware-enabled just before sleeping.
                  */
-                if (++gpe_event_info->wakeup_count == 1)
-                        acpi_ev_update_gpe_enable_masks(gpe_event_info);
+                gpe_event_info->wakeup_count++;
+                if (gpe_event_info->wakeup_count == 1) {
+                        (void)acpi_ev_update_gpe_enable_masks(gpe_event_info);
+                }
         }
 
 unlock_and_exit:
@@ -321,27 +357,34 @@ ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
  *
  * FUNCTION:    acpi_disable_gpe
  *
- * PARAMETERS:  gpe_device      - Parent GPE Device
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
  *              gpe_number      - GPE level within the GPE block
- *              type            - Purpose the GPE won't be used for any more
+ *              gpe_type        - ACPI_GPE_TYPE_RUNTIME or ACPI_GPE_TYPE_WAKE
+ *                                or both
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Release a reference to a GPE and disable it if necessary
+ * DESCRIPTION: Remove a reference to a GPE. When the last reference is
+ *              removed, only then is the GPE disabled (for runtime GPEs), or
+ *              the GPE mask bit disabled (for wake GPEs)
  *
  ******************************************************************************/
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type)
 {
         acpi_status status = AE_OK;
-        acpi_cpu_flags flags;
         struct acpi_gpe_event_info *gpe_event_info;
+        acpi_cpu_flags flags;
 
         ACPI_FUNCTION_TRACE(acpi_disable_gpe);
 
-        if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
+        /* Parameter validation */
+
+        if (!gpe_type || (gpe_type & ~ACPI_GPE_TYPE_WAKE_RUN)) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
 
         flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+
         /* Ensure that we have a valid GPE number */
 
         gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
@@ -350,18 +393,39 @@ acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
                 goto unlock_and_exit;
         }
 
-        if ((type & ACPI_GPE_TYPE_RUNTIME) && gpe_event_info->runtime_count) {
-                if (--gpe_event_info->runtime_count == 0)
+        /* Hardware-disable a runtime GPE on removal of the last reference */
+
+        if (gpe_type & ACPI_GPE_TYPE_RUNTIME) {
+                if (!gpe_event_info->runtime_count) {
+                        status = AE_LIMIT;      /* There are no references to remove */
+                        goto unlock_and_exit;
+                }
+
+                gpe_event_info->runtime_count--;
+                if (!gpe_event_info->runtime_count) {
                         status = acpi_ev_disable_gpe(gpe_event_info);
+                        if (ACPI_FAILURE(status)) {
+                                gpe_event_info->runtime_count++;
+                                goto unlock_and_exit;
+                        }
+                }
         }
 
-        if ((type & ACPI_GPE_TYPE_WAKE) && gpe_event_info->wakeup_count) {
-                /*
-                 * Wake-up GPEs are not enabled after leaving system sleep
-                 * states, so we don't need to disable them here.
-                 */
-                if (--gpe_event_info->wakeup_count == 0)
-                        acpi_ev_update_gpe_enable_masks(gpe_event_info);
+        /*
+         * Update masks for wake GPE on removal of the last reference.
+         * No need to hardware-disable wake GPEs here, they are not currently
+         * enabled.
+         */
+        if (gpe_type & ACPI_GPE_TYPE_WAKE) {
+                if (!gpe_event_info->wakeup_count) {
+                        status = AE_LIMIT;      /* There are no references to remove */
+                        goto unlock_and_exit;
+                }
+
+                gpe_event_info->wakeup_count--;
+                if (!gpe_event_info->wakeup_count) {
+                        (void)acpi_ev_update_gpe_enable_masks(gpe_event_info);
+                }
         }
 
 unlock_and_exit:
@@ -465,30 +529,23 @@ ACPI_EXPORT_SYMBOL(acpi_clear_event)
  *
  * FUNCTION:    acpi_clear_gpe
  *
- * PARAMETERS:  gpe_device      - Parent GPE Device
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
  *              gpe_number      - GPE level within the GPE block
- *              Flags           - Called from an ISR or not
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Clear an ACPI event (general purpose)
  *
  ******************************************************************************/
-acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
+acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number)
 {
         acpi_status status = AE_OK;
         struct acpi_gpe_event_info *gpe_event_info;
+        acpi_cpu_flags flags;
 
         ACPI_FUNCTION_TRACE(acpi_clear_gpe);
 
-        /* Use semaphore lock if not executing at interrupt level */
-
-        if (flags & ACPI_NOT_ISR) {
-                status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
 
         /* Ensure that we have a valid GPE number */
 
@@ -501,9 +558,7 @@ acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
         status = acpi_hw_clear_gpe(gpe_event_info);
 
       unlock_and_exit:
-        if (flags & ACPI_NOT_ISR) {
-                (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
-        }
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
         return_ACPI_STATUS(status);
 }
 
@@ -569,9 +624,8 @@ ACPI_EXPORT_SYMBOL(acpi_get_event_status)
  *
  * FUNCTION:    acpi_get_gpe_status
  *
- * PARAMETERS:  gpe_device      - Parent GPE Device
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
  *              gpe_number      - GPE level within the GPE block
- *              Flags           - Called from an ISR or not
  *              event_status    - Where the current status of the event will
  *                                be returned
  *
@@ -582,21 +636,15 @@ ACPI_EXPORT_SYMBOL(acpi_get_event_status)
  ******************************************************************************/
 acpi_status
 acpi_get_gpe_status(acpi_handle gpe_device,
-                    u32 gpe_number, u32 flags, acpi_event_status * event_status)
+                    u32 gpe_number, acpi_event_status *event_status)
 {
         acpi_status status = AE_OK;
         struct acpi_gpe_event_info *gpe_event_info;
+        acpi_cpu_flags flags;
 
         ACPI_FUNCTION_TRACE(acpi_get_gpe_status);
 
-        /* Use semaphore lock if not executing at interrupt level */
-
-        if (flags & ACPI_NOT_ISR) {
-                status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
 
         /* Ensure that we have a valid GPE number */
 
@@ -614,9 +662,7 @@ acpi_get_gpe_status(acpi_handle gpe_device,
                 *event_status |= ACPI_EVENT_FLAG_HANDLE;
 
       unlock_and_exit:
-        if (flags & ACPI_NOT_ISR) {
-                (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
-        }
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
         return_ACPI_STATUS(status);
 }
 
@@ -673,20 +719,15 @@ acpi_install_gpe_block(acpi_handle gpe_device,
                 goto unlock_and_exit;
         }
 
-        /* Run the _PRW methods and enable the GPEs */
-
-        status = acpi_ev_initialize_gpe_block(node, gpe_block);
-        if (ACPI_FAILURE(status)) {
-                goto unlock_and_exit;
-        }
-
-        /* Get the device_object attached to the node */
+        /* Install block in the device_object attached to the node */
 
         obj_desc = acpi_ns_get_attached_object(node);
         if (!obj_desc) {
 
-                /* No object, create a new one */
-
+                /*
+                 * No object, create a new one (Device nodes do not always have
+                 * an attached object)
+                 */
                 obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_DEVICE);
                 if (!obj_desc) {
                         status = AE_NO_MEMORY;
@@ -705,10 +746,14 @@ acpi_install_gpe_block(acpi_handle gpe_device,
                 }
         }
 
-        /* Install the GPE block in the device_object */
+        /* Now install the GPE block in the device_object */
 
         obj_desc->device.gpe_block = gpe_block;
 
+        /* Run the _PRW methods and enable the runtime GPEs in the new block */
+
+        status = acpi_ev_initialize_gpe_block(node, gpe_block);
+
       unlock_and_exit:
         (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
         return_ACPI_STATUS(status);
@@ -839,8 +884,7 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
         /* Increment Index by the number of GPEs in this block */
 
-        info->next_block_base_index +=
-            (gpe_block->register_count * ACPI_GPE_REGISTER_WIDTH);
+        info->next_block_base_index += gpe_block->gpe_count;
 
         if (info->index < info->next_block_base_index) {
                 /*
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 7e8b3bedc376..008621c5ad85 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -82,8 +82,9 @@ acpi_ex_add_table(u32 table_index,
                   struct acpi_namespace_node *parent_node,
                   union acpi_operand_object **ddb_handle)
 {
-        acpi_status status;
         union acpi_operand_object *obj_desc;
+        acpi_status status;
+        acpi_owner_id owner_id;
 
         ACPI_FUNCTION_TRACE(ex_add_table);
 
@@ -119,7 +120,14 @@ acpi_ex_add_table(u32 table_index,
         acpi_ns_exec_module_code_list();
         acpi_ex_enter_interpreter();
 
-        return_ACPI_STATUS(status);
+        /* Update GPEs for any new _PRW or _Lxx/_Exx methods. Ignore errors */
+
+        status = acpi_tb_get_owner_id(table_index, &owner_id);
+        if (ACPI_SUCCESS(status)) {
+                acpi_ev_update_gpes(owner_id);
+        }
+
+        return_ACPI_STATUS(AE_OK);
 }
 
 /*******************************************************************************
@@ -248,10 +256,8 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
 
         status = acpi_get_table_by_index(table_index, &table);
         if (ACPI_SUCCESS(status)) {
-                ACPI_INFO((AE_INFO,
-                           "Dynamic OEM Table Load - [%.4s] OemId [%.6s] OemTableId [%.8s]",
-                           table->signature, table->oem_id,
-                           table->oem_table_id));
+                ACPI_INFO((AE_INFO, "Dynamic OEM Table Load:"));
+                acpi_tb_print_table_header(0, table);
         }
 
         /* Invoke table handler if present */
@@ -525,6 +531,9 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                 return_ACPI_STATUS(status);
         }
 
+        ACPI_INFO((AE_INFO, "Dynamic OEM Table Load:"));
+        acpi_tb_print_table_header(0, table_desc.pointer);
+
         /* Remove the reference by added by acpi_ex_store above */
 
         acpi_ut_remove_reference(ddb_handle);
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index bda7aed0404b..b73bc50c5b76 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -650,7 +650,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
 
                 default:
                         ACPI_ERROR((AE_INFO,
-                                    "Bad destination type during conversion: %X",
+                                    "Bad destination type during conversion: 0x%X",
                                     destination_type));
                         status = AE_AML_INTERNAL;
                         break;
@@ -665,7 +665,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
 
         default:
                 ACPI_ERROR((AE_INFO,
-                            "Unknown Target type ID 0x%X AmlOpcode %X DestType %s",
+                            "Unknown Target type ID 0x%X AmlOpcode 0x%X DestType %s",
                             GET_CURRENT_ARG_TYPE(walk_state->op_info->
                                                  runtime_args),
                             walk_state->opcode,
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index 0aa57d938698..3c61b48c73f5 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -306,12 +306,12 @@ acpi_ex_create_region(u8 * aml_start,
          */
         if ((region_space >= ACPI_NUM_PREDEFINED_REGIONS) &&
             (region_space < ACPI_USER_REGION_BEGIN)) {
-                ACPI_ERROR((AE_INFO, "Invalid AddressSpace type %X",
+                ACPI_ERROR((AE_INFO, "Invalid AddressSpace type 0x%X",
                             region_space));
                 return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "Region Type - %s (%X)\n",
+        ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "Region Type - %s (0x%X)\n",
                           acpi_ut_get_region_name(region_space), region_space));
 
         /* Create the region descriptor */
diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
new file mode 100644
index 000000000000..be8c98b480d7
--- /dev/null
+++ b/drivers/acpi/acpica/exdebug.c
@@ -0,0 +1,261 @@
+/******************************************************************************
+ *
+ * Module Name: exdebug - Support for stores to the AML Debug Object
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2010, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 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
+ *    binary redistribution.
+ * 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
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * 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
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acinterp.h"
+
+#define _COMPONENT          ACPI_EXECUTER
+ACPI_MODULE_NAME("exdebug")
+
+#ifndef ACPI_NO_ERROR_MESSAGES
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ex_do_debug_object
+ *
+ * PARAMETERS:  source_desc         - Object to be output to "Debug Object"
+ *              Level               - Indentation level (used for packages)
+ *              Index               - Current package element, zero if not pkg
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Handles stores to the AML Debug Object. For example:
+ *              Store(INT1, Debug)
+ *
+ * This function is not compiled if ACPI_NO_ERROR_MESSAGES is set.
+ *
+ * This function is only enabled if acpi_gbl_enable_aml_debug_object is set, or
+ * if ACPI_LV_DEBUG_OBJECT is set in the acpi_dbg_level. Thus, in the normal
+ * operational case, stores to the debug object are ignored but can be easily
+ * enabled if necessary.
+ *
+ ******************************************************************************/
+void
+acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
+                        u32 level, u32 index)
+{
+        u32 i;
+
+        ACPI_FUNCTION_TRACE_PTR(ex_do_debug_object, source_desc);
+
+        /* Output must be enabled via the debug_object global or the dbg_level */
+
+        if (!acpi_gbl_enable_aml_debug_object &&
+            !(acpi_dbg_level & ACPI_LV_DEBUG_OBJECT)) {
+                return_VOID;
+        }
+
+        /*
+         * Print line header as long as we are not in the middle of an
+         * object display
+         */
+        if (!((level > 0) && index == 0)) {
+                acpi_os_printf("[ACPI Debug] %*s", level, " ");
+        }
+
+        /* Display the index for package output only */
+
+        if (index > 0) {
+                acpi_os_printf("(%.2u) ", index - 1);
+        }
+
+        if (!source_desc) {
+                acpi_os_printf("[Null Object]\n");
+                return_VOID;
+        }
+
+        if (ACPI_GET_DESCRIPTOR_TYPE(source_desc) == ACPI_DESC_TYPE_OPERAND) {
+                acpi_os_printf("%s ",
+                               acpi_ut_get_object_type_name(source_desc));
+
+                if (!acpi_ut_valid_internal_object(source_desc)) {
+                        acpi_os_printf("%p, Invalid Internal Object!\n",
+                                       source_desc);
+                        return_VOID;
+                }
+        } else if (ACPI_GET_DESCRIPTOR_TYPE(source_desc) ==
+                   ACPI_DESC_TYPE_NAMED) {
+                acpi_os_printf("%s: %p\n",
+                               acpi_ut_get_type_name(((struct
+                                                       acpi_namespace_node *)
+                                                      source_desc)->type),
+                               source_desc);
+                return_VOID;
+        } else {
+                return_VOID;
+        }
+
+        /* source_desc is of type ACPI_DESC_TYPE_OPERAND */
+
+        switch (source_desc->common.type) {
+        case ACPI_TYPE_INTEGER:
+
+                /* Output correct integer width */
+
+                if (acpi_gbl_integer_byte_width == 4) {
+                        acpi_os_printf("0x%8.8X\n",
+                                       (u32)source_desc->integer.value);
+                } else {
+                        acpi_os_printf("0x%8.8X%8.8X\n",
+                                       ACPI_FORMAT_UINT64(source_desc->integer.
+                                                          value));
+                }
+                break;
+
+        case ACPI_TYPE_BUFFER:
+
+                acpi_os_printf("[0x%.2X]\n", (u32)source_desc->buffer.length);
+                acpi_ut_dump_buffer2(source_desc->buffer.pointer,
+                                     (source_desc->buffer.length < 256) ?
+                                     source_desc->buffer.length : 256,
+                                     DB_BYTE_DISPLAY);
+                break;
+
+        case ACPI_TYPE_STRING:
+
+                acpi_os_printf("[0x%.2X] \"%s\"\n",
+                               source_desc->string.length,
+                               source_desc->string.pointer);
+                break;
+
+        case ACPI_TYPE_PACKAGE:
+
+                acpi_os_printf("[Contains 0x%.2X Elements]\n",
+                               source_desc->package.count);
+
+                /* Output the entire contents of the package */
+
+                for (i = 0; i < source_desc->package.count; i++) {
+                        acpi_ex_do_debug_object(source_desc->package.
+                                                elements[i], level + 4, i + 1);
+                }
+                break;
+
+        case ACPI_TYPE_LOCAL_REFERENCE:
+
+                acpi_os_printf("[%s] ",
+                               acpi_ut_get_reference_name(source_desc));
+
+                /* Decode the reference */
+
+                switch (source_desc->reference.class) {
+                case ACPI_REFCLASS_INDEX:
+
+                        acpi_os_printf("0x%X\n", source_desc->reference.value);
+                        break;
+
+                case ACPI_REFCLASS_TABLE:
+
+                        /* Case for ddb_handle */
+
+                        acpi_os_printf("Table Index 0x%X\n",
+                                       source_desc->reference.value);
+                        return;
+
+                default:
+                        break;
+                }
+
+                acpi_os_printf(" ");
+
+                /* Check for valid node first, then valid object */
+
+                if (source_desc->reference.node) {
+                        if (ACPI_GET_DESCRIPTOR_TYPE
+                            (source_desc->reference.node) !=
+                            ACPI_DESC_TYPE_NAMED) {
+                                acpi_os_printf
+                                    (" %p - Not a valid namespace node\n",
+                                     source_desc->reference.node);
+                        } else {
+                                acpi_os_printf("Node %p [%4.4s] ",
+                                               source_desc->reference.node,
+                                               (source_desc->reference.node)->
+                                               name.ascii);
+
+                                switch ((source_desc->reference.node)->type) {
+
+                                        /* These types have no attached object */
+
+                                case ACPI_TYPE_DEVICE:
+                                        acpi_os_printf("Device\n");
+                                        break;
+
+                                case ACPI_TYPE_THERMAL:
+                                        acpi_os_printf("Thermal Zone\n");
+                                        break;
+
+                                default:
+                                        acpi_ex_do_debug_object((source_desc->
+                                                                 reference.
+                                                                 node)->object,
+                                                                level + 4, 0);
+                                        break;
+                                }
+                        }
+                } else if (source_desc->reference.object) {
+                        if (ACPI_GET_DESCRIPTOR_TYPE
+                            (source_desc->reference.object) ==
+                            ACPI_DESC_TYPE_NAMED) {
+                                acpi_ex_do_debug_object(((struct
+                                                          acpi_namespace_node *)
+                                                         source_desc->reference.
+                                                         object)->object,
+                                                        level + 4, 0);
+                        } else {
+                                acpi_ex_do_debug_object(source_desc->reference.
+                                                        object, level + 4, 0);
+                        }
+                }
+                break;
+
+        default:
+
+                acpi_os_printf("%p\n", source_desc);
+                break;
+        }
+
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC, "\n"));
+        return_VOID;
+}
+#endif
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index 6c79fecbee42..f17d2ff0031b 100644
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -281,7 +281,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
 
                 if (source_desc->buffer.length < length) {
                         ACPI_ERROR((AE_INFO,
-                                    "SMBus or IPMI write requires Buffer of length %X, found length %X",
+                                    "SMBus or IPMI write requires Buffer of length %u, found length %u",
                                     length, source_desc->buffer.length));
 
                         return_ACPI_STATUS(AE_AML_BUFFER_LIMIT);
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c
index f68a216168be..a6dc26f0b3be 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -94,7 +94,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
         /* We must have a valid region */
 
         if (rgn_desc->common.type != ACPI_TYPE_REGION) {
-                ACPI_ERROR((AE_INFO, "Needed Region, found type %X (%s)",
+                ACPI_ERROR((AE_INFO, "Needed Region, found type 0x%X (%s)",
                             rgn_desc->common.type,
                             acpi_ut_get_object_type_name(rgn_desc)));
 
@@ -175,7 +175,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
                          * byte, and a field with Dword access specified.
                          */
                         ACPI_ERROR((AE_INFO,
-                                    "Field [%4.4s] access width (%d bytes) too large for region [%4.4s] (length %X)",
+                                    "Field [%4.4s] access width (%u bytes) too large for region [%4.4s] (length %u)",
                                     acpi_ut_get_node_name(obj_desc->
                                                           common_field.node),
                                     obj_desc->common_field.access_byte_width,
@@ -189,7 +189,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
                  * exceeds region length, indicate an error
                  */
                 ACPI_ERROR((AE_INFO,
-                            "Field [%4.4s] Base+Offset+Width %X+%X+%X is beyond end of region [%4.4s] (length %X)",
+                            "Field [%4.4s] Base+Offset+Width %u+%u+%u is beyond end of region [%4.4s] (length %u)",
                             acpi_ut_get_node_name(obj_desc->common_field.node),
                             obj_desc->common_field.base_byte_offset,
                             field_datum_byte_offset,
@@ -281,13 +281,13 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
         if (ACPI_FAILURE(status)) {
                 if (status == AE_NOT_IMPLEMENTED) {
                         ACPI_ERROR((AE_INFO,
-                                    "Region %s(%X) not implemented",
+                                    "Region %s(0x%X) not implemented",
                                     acpi_ut_get_region_name(rgn_desc->region.
                                                             space_id),
                                     rgn_desc->region.space_id));
                 } else if (status == AE_NOT_EXIST) {
                         ACPI_ERROR((AE_INFO,
-                                    "Region %s(%X) has no handler",
+                                    "Region %s(0x%X) has no handler",
                                     acpi_ut_get_region_name(rgn_desc->region.
                                                             space_id),
                                     rgn_desc->region.space_id));
@@ -525,7 +525,7 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Wrong object type in field I/O %X",
+                ACPI_ERROR((AE_INFO, "Wrong object type in field I/O %u",
                             obj_desc->common.type));
                 status = AE_AML_INTERNAL;
                 break;
@@ -630,7 +630,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
                 default:
 
                         ACPI_ERROR((AE_INFO,
-                                    "Unknown UpdateRule value: %X",
+                                    "Unknown UpdateRule value: 0x%X",
                                     (obj_desc->common_field.
                                      field_flags &
                                      AML_FIELD_UPDATE_RULE_MASK)));
@@ -689,7 +689,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
         if (buffer_length <
             ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) {
                 ACPI_ERROR((AE_INFO,
-                            "Field size %X (bits) is too large for buffer (%X)",
+                            "Field size %u (bits) is too large for buffer (%u)",
                             obj_desc->common_field.bit_length, buffer_length));
 
                 return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c
index c5bb1eeed2df..95db4be0877b 100644
--- a/drivers/acpi/acpica/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -99,7 +99,7 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
 
                 default:
 
-                        ACPI_ERROR((AE_INFO, "Unknown Reference Class %2.2X",
+                        ACPI_ERROR((AE_INFO, "Unknown Reference Class 0x%2.2X",
                                     obj_desc->reference.class));
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
@@ -115,7 +115,7 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Invalid descriptor type %X",
+                ACPI_ERROR((AE_INFO, "Invalid descriptor type 0x%X",
                             ACPI_GET_DESCRIPTOR_TYPE(obj_desc)));
                 return_ACPI_STATUS(AE_TYPE);
         }
@@ -276,7 +276,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
                 break;
 
         default:
-                ACPI_ERROR((AE_INFO, "Invalid object type: %X",
+                ACPI_ERROR((AE_INFO, "Invalid object type: 0x%X",
                             operand0->common.type));
                 status = AE_AML_INTERNAL;
         }
@@ -378,7 +378,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                 /* Invalid object type, should not happen here */
 
-                ACPI_ERROR((AE_INFO, "Invalid object type: %X",
+                ACPI_ERROR((AE_INFO, "Invalid object type: 0x%X",
                             operand0->common.type));
                 status = AE_AML_INTERNAL;
                 goto cleanup;
diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c
index 7116bc86494d..f73be97043c0 100644
--- a/drivers/acpi/acpica/exmutex.c
+++ b/drivers/acpi/acpica/exmutex.c
@@ -85,10 +85,10 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
                 (obj_desc->mutex.prev)->mutex.next = obj_desc->mutex.next;
 
                 /*
-                 * Migrate the previous sync level associated with this mutex to the
-                 * previous mutex on the list so that it may be preserved. This handles
-                 * the case where several mutexes have been acquired at the same level,
-                 * but are not released in opposite order.
+                 * Migrate the previous sync level associated with this mutex to
+                 * the previous mutex on the list so that it may be preserved.
+                 * This handles the case where several mutexes have been acquired
+                 * at the same level, but are not released in opposite order.
                  */
                 (obj_desc->mutex.prev)->mutex.original_sync_level =
                     obj_desc->mutex.original_sync_level;
@@ -101,8 +101,8 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
  *
  * FUNCTION:    acpi_ex_link_mutex
  *
- * PARAMETERS:  obj_desc        - The mutex to be linked
- *              Thread          - Current executing thread object
+ * PARAMETERS:  obj_desc            - The mutex to be linked
+ *              Thread              - Current executing thread object
  *
  * RETURN:      None
  *
@@ -138,9 +138,9 @@ acpi_ex_link_mutex(union acpi_operand_object *obj_desc,
  *
  * FUNCTION:    acpi_ex_acquire_mutex_object
  *
- * PARAMETERS:  time_desc           - Timeout in milliseconds
+ * PARAMETERS:  Timeout             - Timeout in milliseconds
  *              obj_desc            - Mutex object
- *              Thread              - Current thread state
+ *              thread_id           - Current thread state
  *
  * RETURN:      Status
  *
@@ -234,7 +234,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        /* Must have a valid thread ID */
+        /* Must have a valid thread state struct */
 
         if (!walk_state->thread) {
                 ACPI_ERROR((AE_INFO,
@@ -249,7 +249,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
          */
         if (walk_state->thread->current_sync_level > obj_desc->mutex.sync_level) {
                 ACPI_ERROR((AE_INFO,
-                            "Cannot acquire Mutex [%4.4s], current SyncLevel is too large (%d)",
+                            "Cannot acquire Mutex [%4.4s], current SyncLevel is too large (%u)",
                             acpi_ut_get_node_name(obj_desc->mutex.node),
                             walk_state->thread->current_sync_level));
                 return_ACPI_STATUS(AE_AML_MUTEX_ORDER);
@@ -359,6 +359,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
 {
         acpi_status status = AE_OK;
         u8 previous_sync_level;
+        struct acpi_thread_state *owner_thread;
 
         ACPI_FUNCTION_TRACE(ex_release_mutex);
 
@@ -366,9 +367,11 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
+        owner_thread = obj_desc->mutex.owner_thread;
+
         /* The mutex must have been previously acquired in order to release it */
 
-        if (!obj_desc->mutex.owner_thread) {
+        if (!owner_thread) {
                 ACPI_ERROR((AE_INFO,
                             "Cannot release Mutex [%4.4s], not acquired",
                             acpi_ut_get_node_name(obj_desc->mutex.node)));
@@ -387,16 +390,13 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
          * The Mutex is owned, but this thread must be the owner.
          * Special case for Global Lock, any thread can release
          */
-        if ((obj_desc->mutex.owner_thread->thread_id !=
-             walk_state->thread->thread_id)
-            && (obj_desc != acpi_gbl_global_lock_mutex)) {
+        if ((owner_thread->thread_id != walk_state->thread->thread_id) &&
+            (obj_desc != acpi_gbl_global_lock_mutex)) {
                 ACPI_ERROR((AE_INFO,
                             "Thread %p cannot release Mutex [%4.4s] acquired by thread %p",
                             ACPI_CAST_PTR(void, walk_state->thread->thread_id),
                             acpi_ut_get_node_name(obj_desc->mutex.node),
-                            ACPI_CAST_PTR(void,
-                                          obj_desc->mutex.owner_thread->
-                                          thread_id)));
+                            ACPI_CAST_PTR(void, owner_thread->thread_id)));
                 return_ACPI_STATUS(AE_AML_NOT_OWNER);
         }
 
@@ -407,10 +407,9 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
          * different level can only mean that the mutex ordering rule is being
          * violated. This behavior is clarified in ACPI 4.0 specification.
          */
-        if (obj_desc->mutex.sync_level !=
-            walk_state->thread->current_sync_level) {
+        if (obj_desc->mutex.sync_level != owner_thread->current_sync_level) {
                 ACPI_ERROR((AE_INFO,
-                            "Cannot release Mutex [%4.4s], SyncLevel mismatch: mutex %d current %d",
+                            "Cannot release Mutex [%4.4s], SyncLevel mismatch: mutex %u current %u",
                             acpi_ut_get_node_name(obj_desc->mutex.node),
                             obj_desc->mutex.sync_level,
                             walk_state->thread->current_sync_level));
@@ -423,7 +422,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
          * acquired, but are not released in reverse order.
          */
         previous_sync_level =
-            walk_state->thread->acquired_mutex_list->mutex.original_sync_level;
+            owner_thread->acquired_mutex_list->mutex.original_sync_level;
 
         status = acpi_ex_release_mutex_object(obj_desc);
         if (ACPI_FAILURE(status)) {
@@ -434,8 +433,9 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
 
                 /* Restore the previous sync_level */
 
-                walk_state->thread->current_sync_level = previous_sync_level;
+                owner_thread->current_sync_level = previous_sync_level;
         }
+
         return_ACPI_STATUS(status);
 }
 
@@ -443,7 +443,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
  *
  * FUNCTION:    acpi_ex_release_all_mutexes
  *
- * PARAMETERS:  Thread          - Current executing thread object
+ * PARAMETERS:  Thread              - Current executing thread object
  *
  * RETURN:      Status
  *
diff --git a/drivers/acpi/acpica/exnames.c b/drivers/acpi/acpica/exnames.c
index 679f308c5a89..d11e539ef763 100644
--- a/drivers/acpi/acpica/exnames.c
+++ b/drivers/acpi/acpica/exnames.c
@@ -102,7 +102,7 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
         name_string = ACPI_ALLOCATE(size_needed);
         if (!name_string) {
                 ACPI_ERROR((AE_INFO,
-                            "Could not allocate size %d", size_needed));
+                            "Could not allocate size %u", size_needed));
                 return_PTR(NULL);
         }
 
@@ -216,7 +216,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
                  */
                 status = AE_AML_BAD_NAME;
                 ACPI_ERROR((AE_INFO,
-                            "Bad character %02x in name, at %p",
+                            "Bad character 0x%02x in name, at %p",
                             *aml_address, aml_address));
         }
 
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index 99adbab5acbf..84e4d185aa25 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -110,7 +110,7 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)
 
         default:                /*  Unknown opcode  */
 
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X",
                             walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 break;
@@ -173,7 +173,7 @@ acpi_status acpi_ex_opcode_1A_0T_0R(struct acpi_walk_state *walk_state)
 
         case AML_SLEEP_OP:      /*  Sleep (msec_time) */
 
-                status = acpi_ex_system_do_suspend(operand[0]->integer.value);
+                status = acpi_ex_system_do_sleep(operand[0]->integer.value);
                 break;
 
         case AML_STALL_OP:      /*  Stall (usec_time) */
@@ -189,7 +189,7 @@ acpi_status acpi_ex_opcode_1A_0T_0R(struct acpi_walk_state *walk_state)
 
         default:                /*  Unknown opcode  */
 
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X",
                             walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 break;
@@ -229,7 +229,7 @@ acpi_status acpi_ex_opcode_1A_1T_0R(struct acpi_walk_state *walk_state)
 
         default:                /* Unknown opcode */
 
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X",
                             walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
@@ -399,7 +399,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
 
                         if (digit > 0) {
                                 ACPI_ERROR((AE_INFO,
-                                            "Integer too large to convert to BCD: %8.8X%8.8X",
+                                            "Integer too large to convert to BCD: 0x%8.8X%8.8X",
                                             ACPI_FORMAT_UINT64(operand[0]->
                                                                integer.value)));
                                 status = AE_AML_NUMERIC_OVERFLOW;
@@ -540,7 +540,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
 
         default:                /* Unknown opcode */
 
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X",
                             walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
@@ -979,7 +979,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                 default:
 
                                         ACPI_ERROR((AE_INFO,
-                                                    "Unknown Index TargetType %X in reference object %p",
+                                                    "Unknown Index TargetType 0x%X in reference object %p",
                                                     operand[0]->reference.
                                                     target_type, operand[0]));
                                         status = AE_AML_OPERAND_TYPE;
@@ -1007,7 +1007,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
                         default:
                                 ACPI_ERROR((AE_INFO,
-                                            "Unknown class in reference(%p) - %2.2X",
+                                            "Unknown class in reference(%p) - 0x%2.2X",
                                             operand[0],
                                             operand[0]->reference.class));
 
@@ -1019,7 +1019,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X",
                             walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index 22841bbbe63c..10e104cf0fb9 100644
--- a/drivers/acpi/acpica/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -119,33 +119,6 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
                         status = AE_AML_OPERAND_TYPE;
                         break;
                 }
-#ifdef ACPI_GPE_NOTIFY_CHECK
-                /*
-                 * GPE method wake/notify check.  Here, we want to ensure that we
-                 * don't receive any "DeviceWake" Notifies from a GPE _Lxx or _Exx
-                 * GPE method during system runtime.  If we do, the GPE is marked
-                 * as "wake-only" and disabled.
-                 *
-                 * 1) Is the Notify() value == device_wake?
-                 * 2) Is this a GPE deferred method?  (An _Lxx or _Exx method)
-                 * 3) Did the original GPE happen at system runtime?
-                 *    (versus during wake)
-                 *
-                 * If all three cases are true, this is a wake-only GPE that should
-                 * be disabled at runtime.
-                 */
-                if (value == 2) {       /* device_wake */
-                        status =
-                            acpi_ev_check_for_wake_only_gpe(walk_state->
-                                                            gpe_event_info);
-                        if (ACPI_FAILURE(status)) {
-
-                                /* AE_WAKE_ONLY_GPE only error, means ignore this notify */
-
-                                return_ACPI_STATUS(AE_OK)
-                        }
-                }
-#endif
 
                 /*
                  * Dispatch the notify to the appropriate handler
@@ -159,7 +132,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X",
                             walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
         }
@@ -224,7 +197,7 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X",
                             walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
@@ -441,7 +414,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
 
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Index (%X%8.8X) is beyond end of object",
+                                        "Index (0x%8.8X%8.8X) is beyond end of object",
                                         ACPI_FORMAT_UINT64(index)));
                         goto cleanup;
                 }
@@ -464,7 +437,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X",
                             walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 break;
@@ -572,7 +545,7 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X",
                             walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index 8bb1012ef44e..7a08d23befcd 100644
--- a/drivers/acpi/acpica/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -119,7 +119,7 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X",
                             walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
@@ -244,7 +244,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X",
                             walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
diff --git a/drivers/acpi/acpica/exoparg6.c b/drivers/acpi/acpica/exoparg6.c
index f256b6a25f2e..4b50730cf9a0 100644
--- a/drivers/acpi/acpica/exoparg6.c
+++ b/drivers/acpi/acpica/exoparg6.c
@@ -245,7 +245,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
                 index = operand[5]->integer.value;
                 if (index >= operand[0]->package.count) {
                         ACPI_ERROR((AE_INFO,
-                                    "Index (%X%8.8X) beyond package end (%X)",
+                                    "Index (0x%8.8X%8.8X) beyond package end (0x%X)",
                                     ACPI_FORMAT_UINT64(index),
                                     operand[0]->package.count));
                         status = AE_AML_PACKAGE_LIMIT;
@@ -314,7 +314,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X",
                             walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index 2fbfe51fb141..25059dace0ad 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -275,7 +275,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
         default:
                 /* Invalid field access type */
 
-                ACPI_ERROR((AE_INFO, "Unknown field access type %X", access));
+                ACPI_ERROR((AE_INFO, "Unknown field access type 0x%X", access));
                 return_UINT32(0);
         }
 
@@ -430,7 +430,7 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
                 type = acpi_ns_get_type(info->region_node);
                 if (type != ACPI_TYPE_REGION) {
                         ACPI_ERROR((AE_INFO,
-                                    "Needed Region, found type %X (%s)",
+                                    "Needed Region, found type 0x%X (%s)",
                                     type, acpi_ut_get_type_name(type)));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 486b2e5661b6..531000fc77d2 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -105,7 +105,7 @@ acpi_ex_system_memory_space_handler(u32 function,
                 break;
 
         default:
-                ACPI_ERROR((AE_INFO, "Invalid SystemMemory width %d",
+                ACPI_ERROR((AE_INFO, "Invalid SystemMemory width %u",
                             bit_width));
                 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
         }
@@ -173,7 +173,7 @@ acpi_ex_system_memory_space_handler(u32 function,
                 mem_info->mapped_logical_address = acpi_os_map_memory((acpi_physical_address) address, map_length);
                 if (!mem_info->mapped_logical_address) {
                         ACPI_ERROR((AE_INFO,
-                                    "Could not map memory at %8.8X%8.8X, size %X",
+                                    "Could not map memory at 0x%8.8X%8.8X, size %u",
                                     ACPI_FORMAT_NATIVE_UINT(address),
                                     (u32) map_length));
                         mem_info->mapped_length = 0;
@@ -491,8 +491,10 @@ acpi_ex_data_table_space_handler(u32 function,
 {
         ACPI_FUNCTION_TRACE(ex_data_table_space_handler);
 
-        /* Perform the memory read or write */
-
+        /*
+         * Perform the memory read or write. The bit_width was already
+         * validated.
+         */
         switch (function) {
         case ACPI_READ:
 
@@ -502,9 +504,14 @@ acpi_ex_data_table_space_handler(u32 function,
                 break;
 
         case ACPI_WRITE:
+
+                ACPI_MEMCPY(ACPI_PHYSADDR_TO_PTR(address),
+                            ACPI_CAST_PTR(char, value), ACPI_DIV_8(bit_width));
+                break;
+
         default:
 
-                return_ACPI_STATUS(AE_SUPPORT);
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         return_ACPI_STATUS(AE_OK);
diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c
index fdc1b27999ef..1fa4289a687e 100644
--- a/drivers/acpi/acpica/exresnte.c
+++ b/drivers/acpi/acpica/exresnte.c
@@ -252,7 +252,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
                         /* No named references are allowed here */
 
                         ACPI_ERROR((AE_INFO,
-                                    "Unsupported Reference type %X",
+                                    "Unsupported Reference type 0x%X",
                                     source_desc->reference.class));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
@@ -264,7 +264,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
                 /* Default case is for unknown types */
 
                 ACPI_ERROR((AE_INFO,
-                            "Node %p - Unknown object type %X",
+                            "Node %p - Unknown object type 0x%X",
                             node, entry_type));
 
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index fdd6a7079b97..7ca35ea8acea 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -231,7 +231,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                                 /* Invalid reference object */
 
                                 ACPI_ERROR((AE_INFO,
-                                            "Unknown TargetType %X in Index/Reference object %p",
+                                            "Unknown TargetType 0x%X in Index/Reference object %p",
                                             stack_desc->reference.target_type,
                                             stack_desc));
                                 status = AE_AML_INTERNAL;
@@ -273,8 +273,8 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                 default:
 
                         ACPI_ERROR((AE_INFO,
-                                    "Unknown Reference type %X in %p", ref_type,
-                                    stack_desc));
+                                    "Unknown Reference type 0x%X in %p",
+                                    ref_type, stack_desc));
                         status = AE_AML_INTERNAL;
                         break;
                 }
@@ -403,7 +403,8 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
 
                         if (ACPI_GET_DESCRIPTOR_TYPE(node) !=
                             ACPI_DESC_TYPE_NAMED) {
-                                ACPI_ERROR((AE_INFO, "Not a NS node %p [%s]",
+                                ACPI_ERROR((AE_INFO,
+                                            "Not a namespace node %p [%s]",
                                             node,
                                             acpi_ut_get_descriptor_name(node)));
                                 return_ACPI_STATUS(AE_AML_INTERNAL);
@@ -507,7 +508,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
                 default:
 
                         ACPI_ERROR((AE_INFO,
-                                    "Unknown Reference Class %2.2X",
+                                    "Unknown Reference Class 0x%2.2X",
                                     obj_desc->reference.class));
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index c5ecd615f145..8c97cfd6a0fd 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -153,7 +153,7 @@ acpi_ex_resolve_operands(u16 opcode,
 
         arg_types = op_info->runtime_args;
         if (arg_types == ARGI_INVALID_OPCODE) {
-                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X", opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode 0x%X", opcode));
 
                 return_ACPI_STATUS(AE_AML_INTERNAL);
         }
@@ -218,7 +218,7 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         if (!acpi_ut_valid_object_type(object_type)) {
                                 ACPI_ERROR((AE_INFO,
-                                            "Bad operand object type [%X]",
+                                            "Bad operand object type [0x%X]",
                                             object_type));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
@@ -253,7 +253,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                 default:
 
                                         ACPI_ERROR((AE_INFO,
-                                                    "Unknown Reference Class %2.2X in %p",
+                                                    "Unknown Reference Class 0x%2.2X in %p",
                                                     obj_desc->reference.class,
                                                     obj_desc));
 
@@ -665,7 +665,7 @@ acpi_ex_resolve_operands(u16 opcode,
                         /* Unknown type */
 
                         ACPI_ERROR((AE_INFO,
-                                    "Internal - Unknown ARGI (required operand) type %X",
+                                    "Internal - Unknown ARGI (required operand) type 0x%X",
                                     this_arg_type));
 
                         return_ACPI_STATUS(AE_BAD_PARAMETER);
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index 702b9ecfd44b..1624436ba4c5 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exstore - AML Interpreter object store support
@@ -53,10 +52,6 @@
 ACPI_MODULE_NAME("exstore")
 
 /* Local prototypes */
-static void
-acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
-                        u32 level, u32 index);
-
 static acpi_status
 acpi_ex_store_object_to_index(union acpi_operand_object *val_desc,
                               union acpi_operand_object *dest_desc,
@@ -64,215 +59,6 @@ acpi_ex_store_object_to_index(union acpi_operand_object *val_desc,
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ex_do_debug_object
- *
- * PARAMETERS:  source_desc         - Value to be stored
- *              Level               - Indentation level (used for packages)
- *              Index               - Current package element, zero if not pkg
- *
- * RETURN:      None
- *
- * DESCRIPTION: Handles stores to the Debug Object.
- *
- ******************************************************************************/
-
-static void
-acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
-                        u32 level, u32 index)
-{
-        u32 i;
-
-        ACPI_FUNCTION_TRACE_PTR(ex_do_debug_object, source_desc);
-
-        /* Print line header as long as we are not in the middle of an object display */
-
-        if (!((level > 0) && index == 0)) {
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[ACPI Debug] %*s",
-                                      level, " "));
-        }
-
-        /* Display index for package output only */
-
-        if (index > 0) {
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT,
-                                      "(%.2u) ", index - 1));
-        }
-
-        if (!source_desc) {
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[Null Object]\n"));
-                return_VOID;
-        }
-
-        if (ACPI_GET_DESCRIPTOR_TYPE(source_desc) == ACPI_DESC_TYPE_OPERAND) {
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "%s ",
-                                      acpi_ut_get_object_type_name
-                                      (source_desc)));
-
-                if (!acpi_ut_valid_internal_object(source_desc)) {
-                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT,
-                                              "%p, Invalid Internal Object!\n",
-                                              source_desc));
-                        return_VOID;
-                }
-        } else if (ACPI_GET_DESCRIPTOR_TYPE(source_desc) ==
-                   ACPI_DESC_TYPE_NAMED) {
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "%s: %p\n",
-                                      acpi_ut_get_type_name(((struct
-                                                              acpi_namespace_node
-                                                              *)source_desc)->
-                                                            type),
-                                      source_desc));
-                return_VOID;
-        } else {
-                return_VOID;
-        }
-
-        /* source_desc is of type ACPI_DESC_TYPE_OPERAND */
-
-        switch (source_desc->common.type) {
-        case ACPI_TYPE_INTEGER:
-
-                /* Output correct integer width */
-
-                if (acpi_gbl_integer_byte_width == 4) {
-                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "0x%8.8X\n",
-                                              (u32) source_desc->integer.
-                                              value));
-                } else {
-                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT,
-                                              "0x%8.8X%8.8X\n",
-                                              ACPI_FORMAT_UINT64(source_desc->
-                                                                 integer.
-                                                                 value)));
-                }
-                break;
-
-        case ACPI_TYPE_BUFFER:
-
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[0x%.2X]\n",
-                                      (u32) source_desc->buffer.length));
-                ACPI_DUMP_BUFFER(source_desc->buffer.pointer,
-                                 (source_desc->buffer.length <
-                                  256) ? source_desc->buffer.length : 256);
-                break;
-
-        case ACPI_TYPE_STRING:
-
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[0x%.2X] \"%s\"\n",
-                                      source_desc->string.length,
-                                      source_desc->string.pointer));
-                break;
-
-        case ACPI_TYPE_PACKAGE:
-
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT,
-                                      "[Contains 0x%.2X Elements]\n",
-                                      source_desc->package.count));
-
-                /* Output the entire contents of the package */
-
-                for (i = 0; i < source_desc->package.count; i++) {
-                        acpi_ex_do_debug_object(source_desc->package.
-                                                elements[i], level + 4, i + 1);
-                }
-                break;
-
-        case ACPI_TYPE_LOCAL_REFERENCE:
-
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[%s] ",
-                                      acpi_ut_get_reference_name(source_desc)));
-
-                /* Decode the reference */
-
-                switch (source_desc->reference.class) {
-                case ACPI_REFCLASS_INDEX:
-
-                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "0x%X\n",
-                                              source_desc->reference.value));
-                        break;
-
-                case ACPI_REFCLASS_TABLE:
-
-                        /* Case for ddb_handle */
-
-                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT,
-                                              "Table Index 0x%X\n",
-                                              source_desc->reference.value));
-                        return;
-
-                default:
-                        break;
-                }
-
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "  "));
-
-                /* Check for valid node first, then valid object */
-
-                if (source_desc->reference.node) {
-                        if (ACPI_GET_DESCRIPTOR_TYPE
-                            (source_desc->reference.node) !=
-                            ACPI_DESC_TYPE_NAMED) {
-                                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT,
-                                                      " %p - Not a valid namespace node\n",
-                                                      source_desc->reference.
-                                                      node));
-                        } else {
-                                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT,
-                                                      "Node %p [%4.4s] ",
-                                                      source_desc->reference.
-                                                      node,
-                                                      (source_desc->reference.
-                                                       node)->name.ascii));
-
-                                switch ((source_desc->reference.node)->type) {
-
-                                        /* These types have no attached object */
-
-                                case ACPI_TYPE_DEVICE:
-                                        acpi_os_printf("Device\n");
-                                        break;
-
-                                case ACPI_TYPE_THERMAL:
-                                        acpi_os_printf("Thermal Zone\n");
-                                        break;
-
-                                default:
-                                        acpi_ex_do_debug_object((source_desc->
-                                                                 reference.
-                                                                 node)->object,
-                                                                level + 4, 0);
-                                        break;
-                                }
-                        }
-                } else if (source_desc->reference.object) {
-                        if (ACPI_GET_DESCRIPTOR_TYPE
-                            (source_desc->reference.object) ==
-                            ACPI_DESC_TYPE_NAMED) {
-                                acpi_ex_do_debug_object(((struct
-                                                          acpi_namespace_node *)
-                                                         source_desc->reference.
-                                                         object)->object,
-                                                        level + 4, 0);
-                        } else {
-                                acpi_ex_do_debug_object(source_desc->reference.
-                                                        object, level + 4, 0);
-                        }
-                }
-                break;
-
-        default:
-
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "%p\n",
-                                      source_desc));
-                break;
-        }
-
-        ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC, "\n"));
-        return_VOID;
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ex_store
  *
  * PARAMETERS:  *source_desc        - Value to be stored
@@ -402,12 +188,12 @@ acpi_ex_store(union acpi_operand_object *source_desc,
                                   source_desc,
                                   acpi_ut_get_object_type_name(source_desc)));
 
-                acpi_ex_do_debug_object(source_desc, 0, 0);
+                ACPI_DEBUG_OBJECT(source_desc, 0, 0);
                 break;
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unknown Reference Class %2.2X",
+                ACPI_ERROR((AE_INFO, "Unknown Reference Class 0x%2.2X",
                             ref_desc->reference.class));
                 ACPI_DUMP_ENTRY(ref_desc, ACPI_LV_INFO);
 
diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c
index e11b6cb42a57..6d32e09327f1 100644
--- a/drivers/acpi/acpica/exsystem.c
+++ b/drivers/acpi/acpica/exsystem.c
@@ -170,7 +170,7 @@ acpi_status acpi_ex_system_do_stall(u32 how_long)
                  * (ACPI specifies 100 usec as max, but this gives some slack in
                  * order to support existing BIOSs)
                  */
-                ACPI_ERROR((AE_INFO, "Time parameter is too large (%d)",
+                ACPI_ERROR((AE_INFO, "Time parameter is too large (%u)",
                             how_long));
                 status = AE_AML_OPERAND_VALUE;
         } else {
@@ -182,18 +182,18 @@ acpi_status acpi_ex_system_do_stall(u32 how_long)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ex_system_do_suspend
+ * FUNCTION:    acpi_ex_system_do_sleep
  *
- * PARAMETERS:  how_long        - The amount of time to suspend,
+ * PARAMETERS:  how_long        - The amount of time to sleep,
  *                                in milliseconds
  *
  * RETURN:      None
  *
- * DESCRIPTION: Suspend running thread for specified amount of time.
+ * DESCRIPTION: Sleep the running thread for specified amount of time.
  *
  ******************************************************************************/
 
-acpi_status acpi_ex_system_do_suspend(u64 how_long)
+acpi_status acpi_ex_system_do_sleep(u64 how_long)
 {
         ACPI_FUNCTION_ENTRY();
 
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index 679a112a7d26..b44274a0b62c 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -63,7 +63,6 @@ acpi_status acpi_hw_set_mode(u32 mode)
 {
 
         acpi_status status;
-        u32 retry;
 
         ACPI_FUNCTION_TRACE(hw_set_mode);
 
@@ -125,24 +124,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
                 return_ACPI_STATUS(status);
         }
 
-        /*
-         * Some hardware takes a LONG time to switch modes. Give them 3 sec to
-         * do so, but allow faster systems to proceed more quickly.
-         */
-        retry = 3000;
-        while (retry) {
-                if (acpi_hw_get_mode() == mode) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                          "Mode %X successfully enabled\n",
-                                          mode));
-                        return_ACPI_STATUS(AE_OK);
-                }
-                acpi_os_stall(1000);
-                retry--;
-        }
-
-        ACPI_ERROR((AE_INFO, "Hardware did not change modes"));
-        return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
+        return_ACPI_STATUS(AE_OK);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index ec7fc227b33f..5d1273b660ae 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -299,7 +299,7 @@ struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)
         ACPI_FUNCTION_ENTRY();
 
         if (register_id > ACPI_BITREG_MAX) {
-                ACPI_ERROR((AE_INFO, "Invalid BitRegister ID: %X",
+                ACPI_ERROR((AE_INFO, "Invalid BitRegister ID: 0x%X",
                             register_id));
                 return (NULL);
         }
@@ -413,7 +413,7 @@ acpi_hw_register_read(u32 register_id, u32 * return_value)
                 break;
 
         default:
-                ACPI_ERROR((AE_INFO, "Unknown Register ID: %X", register_id));
+                ACPI_ERROR((AE_INFO, "Unknown Register ID: 0x%X", register_id));
                 status = AE_BAD_PARAMETER;
                 break;
         }
@@ -549,7 +549,7 @@ acpi_status acpi_hw_register_write(u32 register_id, u32 value)
                 break;
 
         default:
-                ACPI_ERROR((AE_INFO, "Unknown Register ID: %X", register_id));
+                ACPI_ERROR((AE_INFO, "Unknown Register ID: 0x%X", register_id));
                 status = AE_BAD_PARAMETER;
                 break;
         }
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index 5e6d4dbb8024..36eb803dd9d0 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -245,7 +245,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
 
         if ((acpi_gbl_sleep_type_a > ACPI_SLEEP_TYPE_MAX) ||
             (acpi_gbl_sleep_type_b > ACPI_SLEEP_TYPE_MAX)) {
-                ACPI_ERROR((AE_INFO, "Sleep values out of range: A=%X B=%X",
+                ACPI_ERROR((AE_INFO, "Sleep values out of range: A=0x%X B=0x%X",
                             acpi_gbl_sleep_type_a, acpi_gbl_sleep_type_b));
                 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
         }
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c
index e26c17d4b716..c10d587c1641 100644
--- a/drivers/acpi/acpica/hwvalid.c
+++ b/drivers/acpi/acpica/hwvalid.c
@@ -150,7 +150,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
 
         if (last_address > ACPI_UINT16_MAX) {
                 ACPI_ERROR((AE_INFO,
-                            "Illegal I/O port address/length above 64K: 0x%p/%X",
+                            "Illegal I/O port address/length above 64K: %p/0x%X",
                             ACPI_CAST_PTR(void, address), byte_width));
                 return_ACPI_STATUS(AE_LIMIT);
         }
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index aa2b80132d0a..3a2814676ac3 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -222,7 +222,7 @@ acpi_status acpi_ns_root_initialize(void)
                         default:
 
                                 ACPI_ERROR((AE_INFO,
-                                            "Unsupported initial type value %X",
+                                            "Unsupported initial type value 0x%X",
                                             init_val->type));
                                 acpi_ut_remove_reference(obj_desc);
                                 obj_desc = NULL;
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index 0689d36638d9..2110cc2360f0 100644
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -205,8 +205,8 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                 /* Check the node type and name */
 
                 if (type > ACPI_TYPE_LOCAL_MAX) {
-                        ACPI_WARNING((AE_INFO, "Invalid ACPI Object Type %08X",
-                                      type));
+                        ACPI_WARNING((AE_INFO,
+                                      "Invalid ACPI Object Type 0x%08X", type));
                 }
 
                 if (!acpi_ut_valid_acpi_name(this_node->name.integer)) {
diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c
index 959372451635..7dea0031605c 100644
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -107,7 +107,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
 
         if (index != 0) {
                 ACPI_ERROR((AE_INFO,
-                            "Could not construct external pathname; index=%X, size=%X, Path=%s",
+                            "Could not construct external pathname; index=%u, size=%u, Path=%s",
                             (u32) index, (u32) size, &name_buffer[size]));
 
                 return (AE_BAD_PARAMETER);
diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index 08f8b3f5ccaa..a8e42b5e9463 100644
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -311,7 +311,7 @@ acpi_ns_search_and_enter(u32 target_name,
 
         if (!node || !target_name || !return_node) {
                 ACPI_ERROR((AE_INFO,
-                            "Null parameter: Node %p Name %X ReturnNode %p",
+                            "Null parameter: Node %p Name 0x%X ReturnNode %p",
                             node, target_name, return_node));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index 24d05a87a2a3..bab559712da1 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -276,7 +276,7 @@ u32 acpi_ns_local(acpi_object_type type)
 
                 /* Type code out of range  */
 
-                ACPI_WARNING((AE_INFO, "Invalid Object Type %X", type));
+                ACPI_WARNING((AE_INFO, "Invalid Object Type 0x%X", type));
                 return_UINT32(ACPI_NS_NORMAL);
         }
 
@@ -764,7 +764,7 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
 
                 /* type code out of range  */
 
-                ACPI_WARNING((AE_INFO, "Invalid Object Type %X", type));
+                ACPI_WARNING((AE_INFO, "Invalid Object Type 0x%X", type));
                 return_UINT32(ACPI_NS_NORMAL);
         }
 
diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index 00493e108a01..7df1a4c95274 100644
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -460,7 +460,7 @@ acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Invalid ArgType %X", arg_type));
+                ACPI_ERROR((AE_INFO, "Invalid ArgType 0x%X", arg_type));
                 return_VOID;
         }
 
@@ -742,7 +742,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Invalid ArgType: %X", arg_type));
+                ACPI_ERROR((AE_INFO, "Invalid ArgType: 0x%X", arg_type));
                 status = AE_AML_OPERAND_TYPE;
                 break;
         }
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 59aabaeab1d3..2f2e7760938c 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -136,7 +136,7 @@ static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state)
                 /* The opcode is unrecognized. Just skip unknown opcodes */
 
                 ACPI_ERROR((AE_INFO,
-                            "Found unknown opcode %X at AML address %p offset %X, ignoring",
+                            "Found unknown opcode 0x%X at AML address %p offset 0x%X, ignoring",
                             walk_state->opcode, walk_state->parser_state.aml,
                             walk_state->aml_offset));
 
@@ -1021,7 +1021,6 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                         if (status == AE_AML_NO_RETURN_VALUE) {
                                                 ACPI_EXCEPTION((AE_INFO, status,
                                                                 "Invoked method did not return a value"));
-
                                         }
 
                                         ACPI_EXCEPTION((AE_INFO, status,
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index 6064dd4e94c2..c42f067cff9d 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -46,6 +46,7 @@
 #include "acparser.h"
 #include "acdispat.h"
 #include "acinterp.h"
+#include "actables.h"
 #include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
@@ -220,6 +221,10 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
 
         ACPI_FUNCTION_TRACE(ps_execute_method);
 
+        /* Quick validation of DSDT header */
+
+        acpi_tb_check_dsdt_header();
+
         /* Validate the Info and method Node */
 
         if (!info || !info->resolved_node) {
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index f2ee3b548609..c80a2eea3a01 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -212,7 +212,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
 
                 if ((*top_object_list)->common.type != ACPI_TYPE_PACKAGE) {
                         ACPI_ERROR((AE_INFO,
-                                    "(PRT[%X]) Need sub-package, found %s",
+                                    "(PRT[%u]) Need sub-package, found %s",
                                     index,
                                     acpi_ut_get_object_type_name
                                     (*top_object_list)));
@@ -223,7 +223,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
 
                 if ((*top_object_list)->package.count != 4) {
                         ACPI_ERROR((AE_INFO,
-                                    "(PRT[%X]) Need package of length 4, found length %d",
+                                    "(PRT[%u]) Need package of length 4, found length %u",
                                     index, (*top_object_list)->package.count));
                         return_ACPI_STATUS(AE_AML_PACKAGE_LIMIT);
                 }
@@ -240,7 +240,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 obj_desc = sub_object_list[0];
                 if (obj_desc->common.type != ACPI_TYPE_INTEGER) {
                         ACPI_ERROR((AE_INFO,
-                                    "(PRT[%X].Address) Need Integer, found %s",
+                                    "(PRT[%u].Address) Need Integer, found %s",
                                     index,
                                     acpi_ut_get_object_type_name(obj_desc)));
                         return_ACPI_STATUS(AE_BAD_DATA);
@@ -253,7 +253,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 obj_desc = sub_object_list[1];
                 if (obj_desc->common.type != ACPI_TYPE_INTEGER) {
                         ACPI_ERROR((AE_INFO,
-                                    "(PRT[%X].Pin) Need Integer, found %s",
+                                    "(PRT[%u].Pin) Need Integer, found %s",
                                     index,
                                     acpi_ut_get_object_type_name(obj_desc)));
                         return_ACPI_STATUS(AE_BAD_DATA);
@@ -289,7 +289,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                                 if (obj_desc->reference.class !=
                                     ACPI_REFCLASS_NAME) {
                                         ACPI_ERROR((AE_INFO,
-                                                    "(PRT[%X].Source) Need name, found Reference Class %X",
+                                                    "(PRT[%u].Source) Need name, found Reference Class 0x%X",
                                                     index,
                                                     obj_desc->reference.class));
                                         return_ACPI_STATUS(AE_BAD_DATA);
@@ -340,7 +340,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                         default:
 
                                 ACPI_ERROR((AE_INFO,
-                                            "(PRT[%X].Source) Need Ref/String/Integer, found %s",
+                                            "(PRT[%u].Source) Need Ref/String/Integer, found %s",
                                             index,
                                             acpi_ut_get_object_type_name
                                             (obj_desc)));
@@ -358,7 +358,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 obj_desc = sub_object_list[3];
                 if (obj_desc->common.type != ACPI_TYPE_INTEGER) {
                         ACPI_ERROR((AE_INFO,
-                                    "(PRT[%X].SourceIndex) Need Integer, found %s",
+                                    "(PRT[%u].SourceIndex) Need Integer, found %s",
                                     index,
                                     acpi_ut_get_object_type_name(obj_desc)));
                         return_ACPI_STATUS(AE_BAD_DATA);
diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c
index fd057c72d252..7335f22aac20 100644
--- a/drivers/acpi/acpica/rslist.c
+++ b/drivers/acpi/acpica/rslist.c
@@ -94,7 +94,7 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
                                             [resource_index]);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status,
-                                "Could not convert AML resource (Type %X)",
+                                "Could not convert AML resource (Type 0x%X)",
                                 *aml));
                 return_ACPI_STATUS(status);
         }
@@ -147,7 +147,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
 
                 if (resource->type > ACPI_RESOURCE_TYPE_MAX) {
                         ACPI_ERROR((AE_INFO,
-                                    "Invalid descriptor type (%X) in resource list",
+                                    "Invalid descriptor type (0x%X) in resource list",
                                     resource->type));
                         return_ACPI_STATUS(AE_BAD_DATA);
                 }
@@ -161,7 +161,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
                                                          [resource->type]);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Could not convert resource (type %X) to AML",
+                                        "Could not convert resource (type 0x%X) to AML",
                                         resource->type));
                         return_ACPI_STATUS(status);
                 }
diff --git a/drivers/acpi/acpica/rsmisc.c b/drivers/acpi/acpica/rsmisc.c
index 07de352fa443..f8cd9e87d987 100644
--- a/drivers/acpi/acpica/rsmisc.c
+++ b/drivers/acpi/acpica/rsmisc.c
@@ -88,7 +88,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                 /* Each internal resource struct is expected to be 32-bit aligned */
 
                 ACPI_WARNING((AE_INFO,
-                              "Misaligned resource pointer (get): %p Type %2.2X Len %X",
+                              "Misaligned resource pointer (get): %p Type 0x%2.2X Length %u",
                               resource, resource->type, resource->length));
         }
 
@@ -541,7 +541,7 @@ if (((aml->irq.flags & 0x09) == 0x00) || ((aml->irq.flags & 0x09) == 0x09)) {
          * "IRQ Format"), so 0x00 and 0x09 are illegal.
          */
         ACPI_ERROR((AE_INFO,
-                    "Invalid interrupt polarity/trigger in resource list, %X",
+                    "Invalid interrupt polarity/trigger in resource list, 0x%X",
                     aml->irq.flags));
         return_ACPI_STATUS(AE_BAD_DATA);
 }
diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index f43fbe0fc3fc..1728cb9bf600 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -283,7 +283,7 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
         if (length > sizeof(struct acpi_table_fadt)) {
                 ACPI_WARNING((AE_INFO,
                               "FADT (revision %u) is longer than ACPI 2.0 version, "
-                              "truncating length 0x%X to 0x%X",
+                              "truncating length %u to %u",
                               table->revision, length,
                               (u32)sizeof(struct acpi_table_fadt)));
         }
@@ -422,7 +422,7 @@ static void acpi_tb_convert_fadt(void)
                 if (address64->address && address32 &&
                     (address64->address != (u64) address32)) {
                         ACPI_ERROR((AE_INFO,
-                                    "32/64X address mismatch in %s: %8.8X/%8.8X%8.8X, using 32",
+                                    "32/64X address mismatch in %s: 0x%8.8X/0x%8.8X%8.8X, using 32",
                                     fadt_info_table[i].name, address32,
                                     ACPI_FORMAT_UINT64(address64->address)));
                 }
@@ -481,7 +481,7 @@ static void acpi_tb_validate_fadt(void)
             (acpi_gbl_FADT.Xfacs != (u64) acpi_gbl_FADT.facs)) {
                 ACPI_WARNING((AE_INFO,
                               "32/64X FACS address mismatch in FADT - "
-                              "%8.8X/%8.8X%8.8X, using 32",
+                              "0x%8.8X/0x%8.8X%8.8X, using 32",
                               acpi_gbl_FADT.facs,
                               ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xfacs)));
 
@@ -492,7 +492,7 @@ static void acpi_tb_validate_fadt(void)
             (acpi_gbl_FADT.Xdsdt != (u64) acpi_gbl_FADT.dsdt)) {
                 ACPI_WARNING((AE_INFO,
                               "32/64X DSDT address mismatch in FADT - "
-                              "%8.8X/%8.8X%8.8X, using 32",
+                              "0x%8.8X/0x%8.8X%8.8X, using 32",
                               acpi_gbl_FADT.dsdt,
                               ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xdsdt)));
 
@@ -521,7 +521,7 @@ static void acpi_tb_validate_fadt(void)
                 if (address64->address &&
                     (address64->bit_width != ACPI_MUL_8(length))) {
                         ACPI_WARNING((AE_INFO,
-                                      "32/64X length mismatch in %s: %d/%d",
+                                      "32/64X length mismatch in %s: %u/%u",
                                       name, ACPI_MUL_8(length),
                                       address64->bit_width));
                 }
@@ -534,7 +534,7 @@ static void acpi_tb_validate_fadt(void)
                         if (!address64->address || !length) {
                                 ACPI_ERROR((AE_INFO,
                                             "Required field %s has zero address and/or length:"
-                                            " %8.8X%8.8X/%X",
+                                            " 0x%8.8X%8.8X/0x%X",
                                             name,
                                             ACPI_FORMAT_UINT64(address64->
                                                                address),
@@ -550,7 +550,7 @@ static void acpi_tb_validate_fadt(void)
                             (!address64->address && length)) {
                                 ACPI_WARNING((AE_INFO,
                                               "Optional field %s has zero address or length: "
-                                              "%8.8X%8.8X/%X",
+                                              "0x%8.8X%8.8X/0x%X",
                                               name,
                                               ACPI_FORMAT_UINT64(address64->
                                                                  address),
@@ -600,7 +600,7 @@ static void acpi_tb_setup_fadt_registers(void)
                             (fadt_info_table[i].default_length !=
                              target64->bit_width)) {
                                 ACPI_WARNING((AE_INFO,
-                                              "Invalid length for %s: %d, using default %d",
+                                              "Invalid length for %s: %u, using default %u",
                                               fadt_info_table[i].name,
                                               target64->bit_width,
                                               fadt_info_table[i].
diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c
index e252180ce61c..989d5c867864 100644
--- a/drivers/acpi/acpica/tbfind.c
+++ b/drivers/acpi/acpica/tbfind.c
@@ -83,7 +83,7 @@ acpi_tb_find_table(char *signature,
 
         /* Search for the table */
 
-        for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
+        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
                 if (ACPI_MEMCMP(&(acpi_gbl_root_table_list.tables[i].signature),
                                 header.signature, ACPI_NAME_SIZE)) {
 
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 7ec02b0f69e0..83d7af8d0905 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -137,7 +137,7 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
 
         /* Check if table is already registered */
 
-        for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
+        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
                 if (!acpi_gbl_root_table_list.tables[i].pointer) {
                         status =
                             acpi_tb_verify_table(&acpi_gbl_root_table_list.
@@ -273,7 +273,7 @@ acpi_status acpi_tb_resize_root_table_list(void)
         /* Increase the Table Array size */
 
         tables = ACPI_ALLOCATE_ZEROED(((acpi_size) acpi_gbl_root_table_list.
-                                       size +
+                                       max_table_count +
                                        ACPI_ROOT_TABLE_SIZE_INCREMENT) *
                                       sizeof(struct acpi_table_desc));
         if (!tables) {
@@ -286,8 +286,8 @@ acpi_status acpi_tb_resize_root_table_list(void)
 
         if (acpi_gbl_root_table_list.tables) {
                 ACPI_MEMCPY(tables, acpi_gbl_root_table_list.tables,
-                            (acpi_size) acpi_gbl_root_table_list.size *
-                            sizeof(struct acpi_table_desc));
+                            (acpi_size) acpi_gbl_root_table_list.
+                            max_table_count * sizeof(struct acpi_table_desc));
 
                 if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
                         ACPI_FREE(acpi_gbl_root_table_list.tables);
@@ -295,8 +295,9 @@ acpi_status acpi_tb_resize_root_table_list(void)
         }
 
         acpi_gbl_root_table_list.tables = tables;
-        acpi_gbl_root_table_list.size += ACPI_ROOT_TABLE_SIZE_INCREMENT;
-        acpi_gbl_root_table_list.flags |= (u8) ACPI_ROOT_ORIGIN_ALLOCATED;
+        acpi_gbl_root_table_list.max_table_count +=
+            ACPI_ROOT_TABLE_SIZE_INCREMENT;
+        acpi_gbl_root_table_list.flags |= (u8)ACPI_ROOT_ORIGIN_ALLOCATED;
 
         return_ACPI_STATUS(AE_OK);
 }
@@ -321,38 +322,36 @@ acpi_tb_store_table(acpi_physical_address address,
                     struct acpi_table_header *table,
                     u32 length, u8 flags, u32 *table_index)
 {
-        acpi_status status = AE_OK;
+        acpi_status status;
+        struct acpi_table_desc *new_table;
 
         /* Ensure that there is room for the table in the Root Table List */
 
-        if (acpi_gbl_root_table_list.count >= acpi_gbl_root_table_list.size) {
+        if (acpi_gbl_root_table_list.current_table_count >=
+            acpi_gbl_root_table_list.max_table_count) {
                 status = acpi_tb_resize_root_table_list();
                 if (ACPI_FAILURE(status)) {
                         return (status);
                 }
         }
 
+        new_table =
+            &acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.
+                                             current_table_count];
+
         /* Initialize added table */
 
-        acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].
-            address = address;
-        acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].
-            pointer = table;
-        acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].length =
-            length;
-        acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].
-            owner_id = 0;
-        acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].flags =
-            flags;
-
-        ACPI_MOVE_32_TO_32(&
-                           (acpi_gbl_root_table_list.
-                            tables[acpi_gbl_root_table_list.count].signature),
-                           table->signature);
-
-        *table_index = acpi_gbl_root_table_list.count;
-        acpi_gbl_root_table_list.count++;
-        return (status);
+        new_table->address = address;
+        new_table->pointer = table;
+        new_table->length = length;
+        new_table->owner_id = 0;
+        new_table->flags = flags;
+
+        ACPI_MOVE_32_TO_32(&new_table->signature, table->signature);
+
+        *table_index = acpi_gbl_root_table_list.current_table_count;
+        acpi_gbl_root_table_list.current_table_count++;
+        return (AE_OK);
 }
 
 /*******************************************************************************
@@ -408,7 +407,7 @@ void acpi_tb_terminate(void)
 
         /* Delete the individual tables */
 
-        for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
+        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; i++) {
                 acpi_tb_delete_table(&acpi_gbl_root_table_list.tables[i]);
         }
 
@@ -422,7 +421,7 @@ void acpi_tb_terminate(void)
 
         acpi_gbl_root_table_list.tables = NULL;
         acpi_gbl_root_table_list.flags = 0;
-        acpi_gbl_root_table_list.count = 0;
+        acpi_gbl_root_table_list.current_table_count = 0;
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "ACPI Tables freed\n"));
         (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
@@ -452,7 +451,7 @@ acpi_status acpi_tb_delete_namespace_by_owner(u32 table_index)
                 return_ACPI_STATUS(status);
         }
 
-        if (table_index >= acpi_gbl_root_table_list.count) {
+        if (table_index >= acpi_gbl_root_table_list.current_table_count) {
 
                 /* The table index does not exist */
 
@@ -505,7 +504,7 @@ acpi_status acpi_tb_allocate_owner_id(u32 table_index)
         ACPI_FUNCTION_TRACE(tb_allocate_owner_id);
 
         (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if (table_index < acpi_gbl_root_table_list.count) {
+        if (table_index < acpi_gbl_root_table_list.current_table_count) {
                 status = acpi_ut_allocate_owner_id
                     (&(acpi_gbl_root_table_list.tables[table_index].owner_id));
         }
@@ -533,7 +532,7 @@ acpi_status acpi_tb_release_owner_id(u32 table_index)
         ACPI_FUNCTION_TRACE(tb_release_owner_id);
 
         (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if (table_index < acpi_gbl_root_table_list.count) {
+        if (table_index < acpi_gbl_root_table_list.current_table_count) {
                 acpi_ut_release_owner_id(&
                                          (acpi_gbl_root_table_list.
                                           tables[table_index].owner_id));
@@ -564,7 +563,7 @@ acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id *owner_id)
         ACPI_FUNCTION_TRACE(tb_get_owner_id);
 
         (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if (table_index < acpi_gbl_root_table_list.count) {
+        if (table_index < acpi_gbl_root_table_list.current_table_count) {
                 *owner_id =
                     acpi_gbl_root_table_list.tables[table_index].owner_id;
                 status = AE_OK;
@@ -589,7 +588,7 @@ u8 acpi_tb_is_table_loaded(u32 table_index)
         u8 is_loaded = FALSE;
 
         (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if (table_index < acpi_gbl_root_table_list.count) {
+        if (table_index < acpi_gbl_root_table_list.current_table_count) {
                 is_loaded = (u8)
                     (acpi_gbl_root_table_list.tables[table_index].flags &
                      ACPI_TABLE_IS_LOADED);
@@ -616,7 +615,7 @@ void acpi_tb_set_table_loaded_flag(u32 table_index, u8 is_loaded)
 {
 
         (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if (table_index < acpi_gbl_root_table_list.count) {
+        if (table_index < acpi_gbl_root_table_list.current_table_count) {
                 if (is_loaded) {
                         acpi_gbl_root_table_list.tables[table_index].flags |=
                             ACPI_TABLE_IS_LOADED;
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 02723a9fb10c..34f9c2bc5e1f 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -158,7 +158,7 @@ acpi_status acpi_tb_initialize_facs(void)
 u8 acpi_tb_tables_loaded(void)
 {
 
-        if (acpi_gbl_root_table_list.count >= 3) {
+        if (acpi_gbl_root_table_list.current_table_count >= 3) {
                 return (TRUE);
         }
 
@@ -309,7 +309,7 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
 
         if (checksum) {
                 ACPI_WARNING((AE_INFO,
-                              "Incorrect checksum in table [%4.4s] - %2.2X, should be %2.2X",
+                              "Incorrect checksum in table [%4.4s] - 0x%2.2X, should be 0x%2.2X",
                               table->signature, table->checksum,
                               (u8) (table->checksum - checksum)));
 
@@ -349,6 +349,84 @@ u8 acpi_tb_checksum(u8 *buffer, u32 length)
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_tb_check_dsdt_header
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Quick compare to check validity of the DSDT. This will detect
+ *              if the DSDT has been replaced from outside the OS and/or if
+ *              the DSDT header has been corrupted.
+ *
+ ******************************************************************************/
+
+void acpi_tb_check_dsdt_header(void)
+{
+
+        /* Compare original length and checksum to current values */
+
+        if (acpi_gbl_original_dsdt_header.length != acpi_gbl_DSDT->length ||
+            acpi_gbl_original_dsdt_header.checksum != acpi_gbl_DSDT->checksum) {
+                ACPI_ERROR((AE_INFO,
+                            "The DSDT has been corrupted or replaced - old, new headers below"));
+                acpi_tb_print_table_header(0, &acpi_gbl_original_dsdt_header);
+                acpi_tb_print_table_header(0, acpi_gbl_DSDT);
+
+                ACPI_ERROR((AE_INFO,
+                            "Please send DMI info to linux-acpi@vger.kernel.org\n"
+                            "If system does not work as expected, please boot with acpi=copy_dsdt"));
+
+                /* Disable further error messages */
+
+                acpi_gbl_original_dsdt_header.length = acpi_gbl_DSDT->length;
+                acpi_gbl_original_dsdt_header.checksum =
+                    acpi_gbl_DSDT->checksum;
+        }
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_copy_dsdt
+ *
+ * PARAMETERS:  table_desc          - Installed table to copy
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Implements a subsystem option to copy the DSDT to local memory.
+ *              Some very bad BIOSs are known to either corrupt the DSDT or
+ *              install a new, bad DSDT. This copy works around the problem.
+ *
+ ******************************************************************************/
+
+struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index)
+{
+        struct acpi_table_header *new_table;
+        struct acpi_table_desc *table_desc;
+
+        table_desc = &acpi_gbl_root_table_list.tables[table_index];
+
+        new_table = ACPI_ALLOCATE(table_desc->length);
+        if (!new_table) {
+                ACPI_ERROR((AE_INFO, "Could not copy DSDT of length 0x%X",
+                            table_desc->length));
+                return (NULL);
+        }
+
+        ACPI_MEMCPY(new_table, table_desc->pointer, table_desc->length);
+        acpi_tb_delete_table(table_desc);
+        table_desc->pointer = new_table;
+        table_desc->flags = ACPI_TABLE_ORIGIN_ALLOCATED;
+
+        ACPI_INFO((AE_INFO,
+                   "Forced DSDT copy: length 0x%05X copied locally, original unmapped",
+                   new_table->length));
+
+        return (new_table);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_tb_install_table
  *
  * PARAMETERS:  Address                 - Physical address of DSDT or FACS
@@ -496,7 +574,7 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
                         /* Will truncate 64-bit address to 32 bits, issue warning */
 
                         ACPI_WARNING((AE_INFO,
-                                      "64-bit Physical Address in XSDT is too large (%8.8X%8.8X),"
+                                      "64-bit Physical Address in XSDT is too large (0x%8.8X%8.8X),"
                                       " truncating",
                                       ACPI_FORMAT_UINT64(address64)));
                 }
@@ -629,14 +707,14 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
          */
         table_entry =
             ACPI_CAST_PTR(u8, table) + sizeof(struct acpi_table_header);
-        acpi_gbl_root_table_list.count = 2;
+        acpi_gbl_root_table_list.current_table_count = 2;
 
         /*
          * Initialize the root table array from the RSDT/XSDT
          */
         for (i = 0; i < table_count; i++) {
-                if (acpi_gbl_root_table_list.count >=
-                    acpi_gbl_root_table_list.size) {
+                if (acpi_gbl_root_table_list.current_table_count >=
+                    acpi_gbl_root_table_list.max_table_count) {
 
                         /* There is no more room in the root table array, attempt resize */
 
@@ -646,19 +724,20 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
                                               "Truncating %u table entries!",
                                               (unsigned) (table_count -
                                                (acpi_gbl_root_table_list.
-                                               count - 2))));
+                                                          current_table_count -
+                                                          2))));
                                 break;
                         }
                 }
 
                 /* Get the table physical address (32-bit for RSDT, 64-bit for XSDT) */
 
-                acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].
-                    address =
+                acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.
+                                                current_table_count].address =
                     acpi_tb_get_root_table_entry(table_entry, table_entry_size);
 
                 table_entry += table_entry_size;
-                acpi_gbl_root_table_list.count++;
+                acpi_gbl_root_table_list.current_table_count++;
         }
 
         /*
@@ -671,7 +750,7 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
          * Complete the initialization of the root table array by examining
          * the header of each table
          */
-        for (i = 2; i < acpi_gbl_root_table_list.count; i++) {
+        for (i = 2; i < acpi_gbl_root_table_list.current_table_count; i++) {
                 acpi_tb_install_table(acpi_gbl_root_table_list.tables[i].
                                       address, NULL, i);
 
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index 5217a6159a31..4a8b9e6ea57a 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -72,7 +72,7 @@ static int no_auto_ssdt;
 acpi_status acpi_allocate_root_table(u32 initial_table_count)
 {
 
-        acpi_gbl_root_table_list.size = initial_table_count;
+        acpi_gbl_root_table_list.max_table_count = initial_table_count;
         acpi_gbl_root_table_list.flags = ACPI_ROOT_ALLOW_RESIZE;
 
         return (acpi_tb_resize_root_table_list());
@@ -130,7 +130,7 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
                             sizeof(struct acpi_table_desc));
 
                 acpi_gbl_root_table_list.tables = initial_table_array;
-                acpi_gbl_root_table_list.size = initial_table_count;
+                acpi_gbl_root_table_list.max_table_count = initial_table_count;
                 acpi_gbl_root_table_list.flags = ACPI_ROOT_ORIGIN_UNKNOWN;
                 if (allow_resize) {
                         acpi_gbl_root_table_list.flags |=
@@ -172,6 +172,7 @@ acpi_status acpi_reallocate_root_table(void)
 {
         struct acpi_table_desc *tables;
         acpi_size new_size;
+        acpi_size current_size;
 
         ACPI_FUNCTION_TRACE(acpi_reallocate_root_table);
 
@@ -183,10 +184,17 @@ acpi_status acpi_reallocate_root_table(void)
                 return_ACPI_STATUS(AE_SUPPORT);
         }
 
-        new_size = ((acpi_size) acpi_gbl_root_table_list.count +
-                    ACPI_ROOT_TABLE_SIZE_INCREMENT) *
+        /*
+         * Get the current size of the root table and add the default
+         * increment to create the new table size.
+         */
+        current_size = (acpi_size)
+            acpi_gbl_root_table_list.current_table_count *
             sizeof(struct acpi_table_desc);
 
+        new_size = current_size +
+            (ACPI_ROOT_TABLE_SIZE_INCREMENT * sizeof(struct acpi_table_desc));
+
         /* Create new array and copy the old array */
 
         tables = ACPI_ALLOCATE_ZEROED(new_size);
@@ -194,10 +202,17 @@ acpi_status acpi_reallocate_root_table(void)
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
-        ACPI_MEMCPY(tables, acpi_gbl_root_table_list.tables, new_size);
+        ACPI_MEMCPY(tables, acpi_gbl_root_table_list.tables, current_size);
 
-        acpi_gbl_root_table_list.size = acpi_gbl_root_table_list.count;
+        /*
+         * Update the root table descriptor. The new size will be the current
+         * number of tables plus the increment, independent of the reserved
+         * size of the original table list.
+         */
         acpi_gbl_root_table_list.tables = tables;
+        acpi_gbl_root_table_list.max_table_count =
+            acpi_gbl_root_table_list.current_table_count +
+            ACPI_ROOT_TABLE_SIZE_INCREMENT;
         acpi_gbl_root_table_list.flags =
             ACPI_ROOT_ORIGIN_ALLOCATED | ACPI_ROOT_ALLOW_RESIZE;
 
@@ -278,7 +293,8 @@ acpi_get_table_header(char *signature,
 
         /* Walk the root table list */
 
-        for (i = 0, j = 0; i < acpi_gbl_root_table_list.count; i++) {
+        for (i = 0, j = 0; i < acpi_gbl_root_table_list.current_table_count;
+             i++) {
                 if (!ACPI_COMPARE_NAME
                     (&(acpi_gbl_root_table_list.tables[i].signature),
                      signature)) {
@@ -341,7 +357,7 @@ acpi_status acpi_unload_table_id(acpi_owner_id id)
         ACPI_FUNCTION_TRACE(acpi_unload_table_id);
 
         /* Find table in the global table list */
-        for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
+        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
                 if (id != acpi_gbl_root_table_list.tables[i].owner_id) {
                         continue;
                 }
@@ -391,7 +407,8 @@ acpi_get_table_with_size(char *signature,
 
         /* Walk the root table list */
 
-        for (i = 0, j = 0; i < acpi_gbl_root_table_list.count; i++) {
+        for (i = 0, j = 0; i < acpi_gbl_root_table_list.current_table_count;
+             i++) {
                 if (!ACPI_COMPARE_NAME
                     (&(acpi_gbl_root_table_list.tables[i].signature),
                      signature)) {
@@ -459,7 +476,7 @@ acpi_get_table_by_index(u32 table_index, struct acpi_table_header **table)
 
         /* Validate index */
 
-        if (table_index >= acpi_gbl_root_table_list.count) {
+        if (table_index >= acpi_gbl_root_table_list.current_table_count) {
                 (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
@@ -500,16 +517,17 @@ static acpi_status acpi_tb_load_namespace(void)
 {
         acpi_status status;
         u32 i;
+        struct acpi_table_header *new_dsdt;
 
         ACPI_FUNCTION_TRACE(tb_load_namespace);
 
         (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
 
         /*
-         * Load the namespace. The DSDT is required, but any SSDT and PSDT tables
-         * are optional.
+         * Load the namespace. The DSDT is required, but any SSDT and
+         * PSDT tables are optional. Verify the DSDT.
          */
-        if (!acpi_gbl_root_table_list.count ||
+        if (!acpi_gbl_root_table_list.current_table_count ||
             !ACPI_COMPARE_NAME(&
                                (acpi_gbl_root_table_list.
                                 tables[ACPI_TABLE_INDEX_DSDT].signature),
@@ -522,17 +540,35 @@ static acpi_status acpi_tb_load_namespace(void)
                 goto unlock_and_exit;
         }
 
-        /* A valid DSDT is required */
-
-        status =
-            acpi_tb_verify_table(&acpi_gbl_root_table_list.
-                                 tables[ACPI_TABLE_INDEX_DSDT]);
-        if (ACPI_FAILURE(status)) {
+        /*
+         * Save the DSDT pointer for simple access. This is the mapped memory
+         * address. We must take care here because the address of the .Tables
+         * array can change dynamically as tables are loaded at run-time. Note:
+         * .Pointer field is not validated until after call to acpi_tb_verify_table.
+         */
+        acpi_gbl_DSDT =
+            acpi_gbl_root_table_list.tables[ACPI_TABLE_INDEX_DSDT].pointer;
 
-                status = AE_NO_ACPI_TABLES;
-                goto unlock_and_exit;
+        /*
+         * Optionally copy the entire DSDT to local memory (instead of simply
+         * mapping it.) There are some BIOSs that corrupt or replace the original
+         * DSDT, creating the need for this option. Default is FALSE, do not copy
+         * the DSDT.
+         */
+        if (acpi_gbl_copy_dsdt_locally) {
+                new_dsdt = acpi_tb_copy_dsdt(ACPI_TABLE_INDEX_DSDT);
+                if (new_dsdt) {
+                        acpi_gbl_DSDT = new_dsdt;
+                }
         }
 
+        /*
+         * Save the original DSDT header for detection of table corruption
+         * and/or replacement of the DSDT from outside the OS.
+         */
+        ACPI_MEMCPY(&acpi_gbl_original_dsdt_header, acpi_gbl_DSDT,
+                    sizeof(struct acpi_table_header));
+
         (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
 
         /* Load and parse tables */
@@ -545,7 +581,7 @@ static acpi_status acpi_tb_load_namespace(void)
         /* Load any SSDT or PSDT tables. Note: Loop leaves tables locked */
 
         (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
+        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
                 if ((!ACPI_COMPARE_NAME
                      (&(acpi_gbl_root_table_list.tables[i].signature),
                       ACPI_SIG_SSDT)
diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index dda6e8c497d3..fd2c07d1d3ac 100644
--- a/drivers/acpi/acpica/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -134,7 +134,7 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address)
                                        ACPI_EBDA_PTR_LENGTH);
         if (!table_ptr) {
                 ACPI_ERROR((AE_INFO,
-                            "Could not map memory at %8.8X for length %X",
+                            "Could not map memory at 0x%8.8X for length %u",
                             ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH));
 
                 return_ACPI_STATUS(AE_NO_MEMORY);
@@ -159,7 +159,7 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address)
                                                ACPI_EBDA_WINDOW_SIZE);
                 if (!table_ptr) {
                         ACPI_ERROR((AE_INFO,
-                                    "Could not map memory at %8.8X for length %X",
+                                    "Could not map memory at 0x%8.8X for length %u",
                                     physical_address, ACPI_EBDA_WINDOW_SIZE));
 
                         return_ACPI_STATUS(AE_NO_MEMORY);
@@ -191,7 +191,7 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address)
 
         if (!table_ptr) {
                 ACPI_ERROR((AE_INFO,
-                            "Could not map memory at %8.8X for length %X",
+                            "Could not map memory at 0x%8.8X for length %u",
                             ACPI_HI_RSDP_WINDOW_BASE,
                             ACPI_HI_RSDP_WINDOW_SIZE));
 
diff --git a/drivers/acpi/acpica/utalloc.c b/drivers/acpi/acpica/utalloc.c
index 3d706b8fd449..8f0896281567 100644
--- a/drivers/acpi/acpica/utalloc.c
+++ b/drivers/acpi/acpica/utalloc.c
@@ -340,7 +340,7 @@ void *acpi_ut_allocate(acpi_size size,
                 /* Report allocation error */
 
                 ACPI_WARNING((module, line,
-                              "Could not allocate size %X", (u32) size));
+                              "Could not allocate size %u", (u32) size));
 
                 return_PTR(NULL);
         }
diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index 97ec3621e71d..6fef83f04bcd 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -677,16 +677,24 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
         u16 reference_count;
         union acpi_operand_object *next_object;
         acpi_status status;
+        acpi_size copy_size;
 
         /* Save fields from destination that we don't want to overwrite */
 
         reference_count = dest_desc->common.reference_count;
         next_object = dest_desc->common.next_object;
 
-        /* Copy the entire source object over the destination object */
+        /*
+         * Copy the entire source object over the destination object.
+         * Note: Source can be either an operand object or namespace node.
+         */
+        copy_size = sizeof(union acpi_operand_object);
+        if (ACPI_GET_DESCRIPTOR_TYPE(source_desc) == ACPI_DESC_TYPE_NAMED) {
+                copy_size = sizeof(struct acpi_namespace_node);
+        }
 
-        ACPI_MEMCPY((char *)dest_desc, (char *)source_desc,
-                    sizeof(union acpi_operand_object));
+        ACPI_MEMCPY(ACPI_CAST_PTR(char, dest_desc),
+                    ACPI_CAST_PTR(char, source_desc), copy_size);
 
         /* Restore the saved fields */
 
diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index 16b51c69606a..ed794cd033ea 100644
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -434,7 +434,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unknown action (%X)", action));
+                ACPI_ERROR((AE_INFO, "Unknown action (0x%X)", action));
                 break;
         }
 
@@ -444,8 +444,8 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
          */
         if (count > ACPI_MAX_REFERENCE_COUNT) {
                 ACPI_WARNING((AE_INFO,
-                              "Large Reference Count (%X) in object %p", count,
-                              object));
+                              "Large Reference Count (0x%X) in object %p",
+                              count, object));
         }
 }
 
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index 7f5e734ce7f7..6dfdeb653490 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -307,7 +307,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
                                   prefix_node, path, AE_TYPE);
 
                 ACPI_ERROR((AE_INFO,
-                            "Type returned from %s was incorrect: %s, expected Btypes: %X",
+                            "Type returned from %s was incorrect: %s, expected Btypes: 0x%X",
                             path,
                             acpi_ut_get_object_type_name(info->return_object),
                             expected_return_btypes));
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index eda3e656c4af..66116750a0f9 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -785,6 +785,7 @@ acpi_status acpi_ut_init_globals(void)
 
         /* Miscellaneous variables */
 
+        acpi_gbl_DSDT = NULL;
         acpi_gbl_cm_single_step = FALSE;
         acpi_gbl_db_terminate_threads = FALSE;
         acpi_gbl_shutdown = FALSE;
diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c
index 32982e2ac384..e8d0724ee403 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -205,7 +205,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
         /* Guard against multiple allocations of ID to the same location */
 
         if (*owner_id) {
-                ACPI_ERROR((AE_INFO, "Owner ID [%2.2X] already exists",
+                ACPI_ERROR((AE_INFO, "Owner ID [0x%2.2X] already exists",
                             *owner_id));
                 return_ACPI_STATUS(AE_ALREADY_EXISTS);
         }
@@ -315,7 +315,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
         /* Zero is not a valid owner_iD */
 
         if (owner_id == 0) {
-                ACPI_ERROR((AE_INFO, "Invalid OwnerId: %2.2X", owner_id));
+                ACPI_ERROR((AE_INFO, "Invalid OwnerId: 0x%2.2X", owner_id));
                 return_VOID;
         }
 
@@ -341,7 +341,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
                 acpi_gbl_owner_id_mask[index] ^= bit;
         } else {
                 ACPI_ERROR((AE_INFO,
-                            "Release of non-allocated OwnerId: %2.2X",
+                            "Release of non-allocated OwnerId: 0x%2.2X",
                             owner_id + 1));
         }
 
diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
index 55d014ed6d55..058b3df48271 100644
--- a/drivers/acpi/acpica/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -258,7 +258,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
                 acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id;
         } else {
                 ACPI_EXCEPTION((AE_INFO, status,
-                                "Thread %p could not acquire Mutex [%X]",
+                                "Thread %p could not acquire Mutex [0x%X]",
                                 ACPI_CAST_PTR(void, this_thread_id), mutex_id));
         }
 
@@ -297,7 +297,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
          */
         if (acpi_gbl_mutex_info[mutex_id].thread_id == ACPI_MUTEX_NOT_ACQUIRED) {
                 ACPI_ERROR((AE_INFO,
-                            "Mutex [%X] is not acquired, cannot release",
+                            "Mutex [0x%X] is not acquired, cannot release",
                             mutex_id));
 
                 return (AE_NOT_ACQUIRED);
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index 3356f0cb0745..fd1fa2749ea5 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -251,7 +251,7 @@ union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size)
 
                 buffer = ACPI_ALLOCATE_ZEROED(buffer_size);
                 if (!buffer) {
-                        ACPI_ERROR((AE_INFO, "Could not allocate size %X",
+                        ACPI_ERROR((AE_INFO, "Could not allocate size %u",
                                     (u32) buffer_size));
                         acpi_ut_remove_reference(buffer_desc);
                         return_PTR(NULL);
@@ -303,7 +303,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
          */
         string = ACPI_ALLOCATE_ZEROED(string_size + 1);
         if (!string) {
-                ACPI_ERROR((AE_INFO, "Could not allocate size %X",
+                ACPI_ERROR((AE_INFO, "Could not allocate size %u",
                             (u32) string_size));
                 acpi_ut_remove_reference(string_desc);
                 return_PTR(NULL);
@@ -533,7 +533,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
                          */
                         ACPI_ERROR((AE_INFO,
                                     "Cannot convert to external object - "
-                                    "unsupported Reference Class [%s] %X in object %p",
+                                    "unsupported Reference Class [%s] 0x%X in object %p",
                                     acpi_ut_get_reference_name(internal_object),
                                     internal_object->reference.class,
                                     internal_object));
@@ -545,7 +545,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
         default:
 
                 ACPI_ERROR((AE_INFO, "Cannot convert to external object - "
-                            "unsupported type [%s] %X in object %p",
+                            "unsupported type [%s] 0x%X in object %p",
                             acpi_ut_get_object_type_name(internal_object),
                             internal_object->common.type, internal_object));
                 status = AE_TYPE;
diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig
new file mode 100644
index 000000000000..f8c668f27b5a
--- /dev/null
+++ b/drivers/acpi/apei/Kconfig
@@ -0,0 +1,30 @@
+config ACPI_APEI
+        bool "ACPI Platform Error Interface (APEI)"
+        depends on X86
+        help
+          APEI allows to report errors (for example from the chipset)
+          to the operating system. This improves NMI handling
+          especially. In addition it supports error serialization and
+          error injection.
+
+config ACPI_APEI_GHES
+        tristate "APEI Generic Hardware Error Source"
+        depends on ACPI_APEI && X86
+        select ACPI_HED
+        help
+          Generic Hardware Error Source provides a way to report
+          platform hardware errors (such as that from chipset). It
+          works in so called "Firmware First" mode, that is, hardware
+          errors are reported to firmware firstly, then reported to
+          Linux by firmware. This way, some non-standard hardware
+          error registers or non-standard hardware link can be checked
+          by firmware to produce more valuable hardware error
+          information for Linux.
+
+config ACPI_APEI_EINJ
+        tristate "APEI Error INJection (EINJ)"
+        depends on ACPI_APEI && DEBUG_FS
+        help
+          EINJ provides a hardware error injection mechanism, it is
+          mainly used for debugging and testing the other parts of
+          APEI and some other RAS features.
diff --git a/drivers/acpi/apei/Makefile b/drivers/acpi/apei/Makefile
new file mode 100644
index 000000000000..b13b03a17789
--- /dev/null
+++ b/drivers/acpi/apei/Makefile
@@ -0,0 +1,5 @@
+obj-$(CONFIG_ACPI_APEI)         += apei.o
+obj-$(CONFIG_ACPI_APEI_GHES)    += ghes.o
+obj-$(CONFIG_ACPI_APEI_EINJ)    += einj.o
+
+apei-y := apei-base.o hest.o cper.o erst.o
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
new file mode 100644
index 000000000000..db3946e9c66b
--- /dev/null
+++ b/drivers/acpi/apei/apei-base.c
@@ -0,0 +1,593 @@
+/*
+ * apei-base.c - ACPI Platform Error Interface (APEI) supporting
+ * infrastructure
+ *
+ * APEI allows to report errors (for example from the chipset) to the
+ * the operating system. This improves NMI handling especially. In
+ * addition it supports error serialization and error injection.
+ *
+ * For more information about APEI, please refer to ACPI Specification
+ * version 4.0, chapter 17.
+ *
+ * This file has Common functions used by more than one APEI table,
+ * including framework of interpreter for ERST and EINJ; resource
+ * management for APEI registers.
+ *
+ * Copyright (C) 2009, Intel Corp.
+ *      Author: Huang Ying <ying.huang@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/acpi.h>
+#include <linux/io.h>
+#include <linux/kref.h>
+#include <linux/rculist.h>
+#include <linux/interrupt.h>
+#include <linux/debugfs.h>
+#include <acpi/atomicio.h>
+
+#include "apei-internal.h"
+
+#define APEI_PFX "APEI: "
+
+/*
+ * APEI ERST (Error Record Serialization Table) and EINJ (Error
+ * INJection) interpreter framework.
+ */
+
+#define APEI_EXEC_PRESERVE_REGISTER     0x1
+
+void apei_exec_ctx_init(struct apei_exec_context *ctx,
+                        struct apei_exec_ins_type *ins_table,
+                        u32 instructions,
+                        struct acpi_whea_header *action_table,
+                        u32 entries)
+{
+        ctx->ins_table = ins_table;
+        ctx->instructions = instructions;
+        ctx->action_table = action_table;
+        ctx->entries = entries;
+}
+EXPORT_SYMBOL_GPL(apei_exec_ctx_init);
+
+int __apei_exec_read_register(struct acpi_whea_header *entry, u64 *val)
+{
+        int rc;
+
+        rc = acpi_atomic_read(val, &entry->register_region);
+        if (rc)
+                return rc;
+        *val >>= entry->register_region.bit_offset;
+        *val &= entry->mask;
+
+        return 0;
+}
+
+int apei_exec_read_register(struct apei_exec_context *ctx,
+                            struct acpi_whea_header *entry)
+{
+        int rc;
+        u64 val = 0;
+
+        rc = __apei_exec_read_register(entry, &val);
+        if (rc)
+                return rc;
+        ctx->value = val;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(apei_exec_read_register);
+
+int apei_exec_read_register_value(struct apei_exec_context *ctx,
+                                  struct acpi_whea_header *entry)
+{
+        int rc;
+
+        rc = apei_exec_read_register(ctx, entry);
+        if (rc)
+                return rc;
+        ctx->value = (ctx->value == entry->value);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(apei_exec_read_register_value);
+
+int __apei_exec_write_register(struct acpi_whea_header *entry, u64 val)
+{
+        int rc;
+
+        val &= entry->mask;
+        val <<= entry->register_region.bit_offset;
+        if (entry->flags & APEI_EXEC_PRESERVE_REGISTER) {
+                u64 valr = 0;
+                rc = acpi_atomic_read(&valr, &entry->register_region);
+                if (rc)
+                        return rc;
+                valr &= ~(entry->mask << entry->register_region.bit_offset);
+                val |= valr;
+        }
+        rc = acpi_atomic_write(val, &entry->register_region);
+
+        return rc;
+}
+
+int apei_exec_write_register(struct apei_exec_context *ctx,
+                             struct acpi_whea_header *entry)
+{
+        return __apei_exec_write_register(entry, ctx->value);
+}
+EXPORT_SYMBOL_GPL(apei_exec_write_register);
+
+int apei_exec_write_register_value(struct apei_exec_context *ctx,
+                                   struct acpi_whea_header *entry)
+{
+        int rc;
+
+        ctx->value = entry->value;
+        rc = apei_exec_write_register(ctx, entry);
+
+        return rc;
+}
+EXPORT_SYMBOL_GPL(apei_exec_write_register_value);
+
+int apei_exec_noop(struct apei_exec_context *ctx,
+                   struct acpi_whea_header *entry)
+{
+        return 0;
+}
+EXPORT_SYMBOL_GPL(apei_exec_noop);
+
+/*
+ * Interpret the specified action. Go through whole action table,
+ * execute all instructions belong to the action.
+ */
+int apei_exec_run(struct apei_exec_context *ctx, u8 action)
+{
+        int rc;
+        u32 i, ip;
+        struct acpi_whea_header *entry;
+        apei_exec_ins_func_t run;
+
+        ctx->ip = 0;
+
+        /*
+         * "ip" is the instruction pointer of current instruction,
+         * "ctx->ip" specifies the next instruction to executed,
+         * instruction "run" function may change the "ctx->ip" to
+         * implement "goto" semantics.
+         */
+rewind:
+        ip = 0;
+        for (i = 0; i < ctx->entries; i++) {
+                entry = &ctx->action_table[i];
+                if (entry->action != action)
+                        continue;
+                if (ip == ctx->ip) {
+                        if (entry->instruction >= ctx->instructions ||
+                            !ctx->ins_table[entry->instruction].run) {
+                                pr_warning(FW_WARN APEI_PFX
+                        "Invalid action table, unknown instruction type: %d\n",
+                                           entry->instruction);
+                                return -EINVAL;
+                        }
+                        run = ctx->ins_table[entry->instruction].run;
+                        rc = run(ctx, entry);
+                        if (rc < 0)
+                                return rc;
+                        else if (rc != APEI_EXEC_SET_IP)
+                                ctx->ip++;
+                }
+                ip++;
+                if (ctx->ip < ip)
+                        goto rewind;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(apei_exec_run);
+
+typedef int (*apei_exec_entry_func_t)(struct apei_exec_context *ctx,
+                                      struct acpi_whea_header *entry,
+                                      void *data);
+
+static int apei_exec_for_each_entry(struct apei_exec_context *ctx,
+                                    apei_exec_entry_func_t func,
+                                    void *data,
+                                    int *end)
+{
+        u8 ins;
+        int i, rc;
+        struct acpi_whea_header *entry;
+        struct apei_exec_ins_type *ins_table = ctx->ins_table;
+
+        for (i = 0; i < ctx->entries; i++) {
+                entry = ctx->action_table + i;
+                ins = entry->instruction;
+                if (end)
+                        *end = i;
+                if (ins >= ctx->instructions || !ins_table[ins].run) {
+                        pr_warning(FW_WARN APEI_PFX
+                        "Invalid action table, unknown instruction type: %d\n",
+                                   ins);
+                        return -EINVAL;
+                }
+                rc = func(ctx, entry, data);
+                if (rc)
+                        return rc;
+        }
+
+        return 0;
+}
+
+static int pre_map_gar_callback(struct apei_exec_context *ctx,
+                                struct acpi_whea_header *entry,
+                                void *data)
+{
+        u8 ins = entry->instruction;
+
+        if (ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER)
+                return acpi_pre_map_gar(&entry->register_region);
+
+        return 0;
+}
+
+/*
+ * Pre-map all GARs in action table to make it possible to access them
+ * in NMI handler.
+ */
+int apei_exec_pre_map_gars(struct apei_exec_context *ctx)
+{
+        int rc, end;
+
+        rc = apei_exec_for_each_entry(ctx, pre_map_gar_callback,
+                                      NULL, &end);
+        if (rc) {
+                struct apei_exec_context ctx_unmap;
+                memcpy(&ctx_unmap, ctx, sizeof(*ctx));
+                ctx_unmap.entries = end;
+                apei_exec_post_unmap_gars(&ctx_unmap);
+        }
+
+        return rc;
+}
+EXPORT_SYMBOL_GPL(apei_exec_pre_map_gars);
+
+static int post_unmap_gar_callback(struct apei_exec_context *ctx,
+                                   struct acpi_whea_header *entry,
+                                   void *data)
+{
+        u8 ins = entry->instruction;
+
+        if (ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER)
+                acpi_post_unmap_gar(&entry->register_region);
+
+        return 0;
+}
+
+/* Post-unmap all GAR in action table. */
+int apei_exec_post_unmap_gars(struct apei_exec_context *ctx)
+{
+        return apei_exec_for_each_entry(ctx, post_unmap_gar_callback,
+                                        NULL, NULL);
+}
+EXPORT_SYMBOL_GPL(apei_exec_post_unmap_gars);
+
+/*
+ * Resource management for GARs in APEI
+ */
+struct apei_res {
+        struct list_head list;
+        unsigned long start;
+        unsigned long end;
+};
+
+/* Collect all resources requested, to avoid conflict */
+struct apei_resources apei_resources_all = {
+        .iomem = LIST_HEAD_INIT(apei_resources_all.iomem),
+        .ioport = LIST_HEAD_INIT(apei_resources_all.ioport),
+};
+
+static int apei_res_add(struct list_head *res_list,
+                        unsigned long start, unsigned long size)
+{
+        struct apei_res *res, *resn, *res_ins = NULL;
+        unsigned long end = start + size;
+
+        if (end <= start)
+                return 0;
+repeat:
+        list_for_each_entry_safe(res, resn, res_list, list) {
+                if (res->start > end || res->end < start)
+                        continue;
+                else if (end <= res->end && start >= res->start) {
+                        kfree(res_ins);
+                        return 0;
+                }
+                list_del(&res->list);
+                res->start = start = min(res->start, start);
+                res->end = end = max(res->end, end);
+                kfree(res_ins);
+                res_ins = res;
+                goto repeat;
+        }
+
+        if (res_ins)
+                list_add(&res_ins->list, res_list);
+        else {
+                res_ins = kmalloc(sizeof(*res), GFP_KERNEL);
+                if (!res_ins)
+                        return -ENOMEM;
+                res_ins->start = start;
+                res_ins->end = end;
+                list_add(&res_ins->list, res_list);
+        }
+
+        return 0;
+}
+
+static int apei_res_sub(struct list_head *res_list1,
+                        struct list_head *res_list2)
+{
+        struct apei_res *res1, *resn1, *res2, *res;
+        res1 = list_entry(res_list1->next, struct apei_res, list);
+        resn1 = list_entry(res1->list.next, struct apei_res, list);
+        while (&res1->list != res_list1) {
+                list_for_each_entry(res2, res_list2, list) {
+                        if (res1->start >= res2->end ||
+                            res1->end <= res2->start)
+                                continue;
+                        else if (res1->end <= res2->end &&
+                                 res1->start >= res2->start) {
+                                list_del(&res1->list);
+                                kfree(res1);
+                                break;
+                        } else if (res1->end > res2->end &&
+                                   res1->start < res2->start) {
+                                res = kmalloc(sizeof(*res), GFP_KERNEL);
+                                if (!res)
+                                        return -ENOMEM;
+                                res->start = res2->end;
+                                res->end = res1->end;
+                                res1->end = res2->start;
+                                list_add(&res->list, &res1->list);
+                                resn1 = res;
+                        } else {
+                                if (res1->start < res2->start)
+                                        res1->end = res2->start;
+                                else
+                                        res1->start = res2->end;
+                        }
+                }
+                res1 = resn1;
+                resn1 = list_entry(resn1->list.next, struct apei_res, list);
+        }
+
+        return 0;
+}
+
+static void apei_res_clean(struct list_head *res_list)
+{
+        struct apei_res *res, *resn;
+
+        list_for_each_entry_safe(res, resn, res_list, list) {
+                list_del(&res->list);
+                kfree(res);
+        }
+}
+
+void apei_resources_fini(struct apei_resources *resources)
+{
+        apei_res_clean(&resources->iomem);
+        apei_res_clean(&resources->ioport);
+}
+EXPORT_SYMBOL_GPL(apei_resources_fini);
+
+static int apei_resources_merge(struct apei_resources *resources1,
+                                struct apei_resources *resources2)
+{
+        int rc;
+        struct apei_res *res;
+
+        list_for_each_entry(res, &resources2->iomem, list) {
+                rc = apei_res_add(&resources1->iomem, res->start,
+                                  res->end - res->start);
+                if (rc)
+                        return rc;
+        }
+        list_for_each_entry(res, &resources2->ioport, list) {
+                rc = apei_res_add(&resources1->ioport, res->start,
+                                  res->end - res->start);
+                if (rc)
+                        return rc;
+        }
+
+        return 0;
+}
+
+/*
+ * EINJ has two groups of GARs (EINJ table entry and trigger table
+ * entry), so common resources are subtracted from the trigger table
+ * resources before the second requesting.
+ */
+int apei_resources_sub(struct apei_resources *resources1,
+                       struct apei_resources *resources2)
+{
+        int rc;
+
+        rc = apei_res_sub(&resources1->iomem, &resources2->iomem);
+        if (rc)
+                return rc;
+        return apei_res_sub(&resources1->ioport, &resources2->ioport);
+}
+EXPORT_SYMBOL_GPL(apei_resources_sub);
+
+/*
+ * IO memory/port rersource management mechanism is used to check
+ * whether memory/port area used by GARs conflicts with normal memory
+ * or IO memory/port of devices.
+ */
+int apei_resources_request(struct apei_resources *resources,
+                           const char *desc)
+{
+        struct apei_res *res, *res_bak;
+        struct resource *r;
+
+        apei_resources_sub(resources, &apei_resources_all);
+
+        list_for_each_entry(res, &resources->iomem, list) {
+                r = request_mem_region(res->start, res->end - res->start,
+                                       desc);
+                if (!r) {
+                        pr_err(APEI_PFX
+                "Can not request iomem region <%016llx-%016llx> for GARs.\n",
+                               (unsigned long long)res->start,
+                               (unsigned long long)res->end);
+                        res_bak = res;
+                        goto err_unmap_iomem;
+                }
+        }
+
+        list_for_each_entry(res, &resources->ioport, list) {
+                r = request_region(res->start, res->end - res->start, desc);
+                if (!r) {
+                        pr_err(APEI_PFX
+                "Can not request ioport region <%016llx-%016llx> for GARs.\n",
+                               (unsigned long long)res->start,
+                               (unsigned long long)res->end);
+                        res_bak = res;
+                        goto err_unmap_ioport;
+                }
+        }
+
+        apei_resources_merge(&apei_resources_all, resources);
+
+        return 0;
+err_unmap_ioport:
+        list_for_each_entry(res, &resources->ioport, list) {
+                if (res == res_bak)
+                        break;
+                release_mem_region(res->start, res->end - res->start);
+        }
+        res_bak = NULL;
+err_unmap_iomem:
+        list_for_each_entry(res, &resources->iomem, list) {
+                if (res == res_bak)
+                        break;
+                release_region(res->start, res->end - res->start);
+        }
+        return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(apei_resources_request);
+
+void apei_resources_release(struct apei_resources *resources)
+{
+        struct apei_res *res;
+
+        list_for_each_entry(res, &resources->iomem, list)
+                release_mem_region(res->start, res->end - res->start);
+        list_for_each_entry(res, &resources->ioport, list)
+                release_region(res->start, res->end - res->start);
+
+        apei_resources_sub(&apei_resources_all, resources);
+}
+EXPORT_SYMBOL_GPL(apei_resources_release);
+
+static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr)
+{
+        u32 width, space_id;
+
+        width = reg->bit_width;
+        space_id = reg->space_id;
+        /* Handle possible alignment issues */
+        memcpy(paddr, &reg->address, sizeof(*paddr));
+        if (!*paddr) {
+                pr_warning(FW_BUG APEI_PFX
+                           "Invalid physical address in GAR [0x%llx/%u/%u]\n",
+                           *paddr, width, space_id);
+                return -EINVAL;
+        }
+
+        if ((width != 8) && (width != 16) && (width != 32) && (width != 64)) {
+                pr_warning(FW_BUG APEI_PFX
+                           "Invalid bit width in GAR [0x%llx/%u/%u]\n",
+                           *paddr, width, space_id);
+                return -EINVAL;
+        }
+
+        if (space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY &&
+            space_id != ACPI_ADR_SPACE_SYSTEM_IO) {
+                pr_warning(FW_BUG APEI_PFX
+                           "Invalid address space type in GAR [0x%llx/%u/%u]\n",
+                           *paddr, width, space_id);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int collect_res_callback(struct apei_exec_context *ctx,
+                                struct acpi_whea_header *entry,
+                                void *data)
+{
+        struct apei_resources *resources = data;
+        struct acpi_generic_address *reg = &entry->register_region;
+        u8 ins = entry->instruction;
+        u64 paddr;
+        int rc;
+
+        if (!(ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER))
+                return 0;
+
+        rc = apei_check_gar(reg, &paddr);
+        if (rc)
+                return rc;
+
+        switch (reg->space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+                return apei_res_add(&resources->iomem, paddr,
+                                    reg->bit_width / 8);
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+                return apei_res_add(&resources->ioport, paddr,
+                                    reg->bit_width / 8);
+        default:
+                return -EINVAL;
+        }
+}
+
+/*
+ * Same register may be used by multiple instructions in GARs, so
+ * resources are collected before requesting.
+ */
+int apei_exec_collect_resources(struct apei_exec_context *ctx,
+                                struct apei_resources *resources)
+{
+        return apei_exec_for_each_entry(ctx, collect_res_callback,
+                                        resources, NULL);
+}
+EXPORT_SYMBOL_GPL(apei_exec_collect_resources);
+
+struct dentry *apei_get_debugfs_dir(void)
+{
+        static struct dentry *dapei;
+
+        if (!dapei)
+                dapei = debugfs_create_dir("apei", NULL);
+
+        return dapei;
+}
+EXPORT_SYMBOL_GPL(apei_get_debugfs_dir);
diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
new file mode 100644
index 000000000000..18df1e940276
--- /dev/null
+++ b/drivers/acpi/apei/apei-internal.h
@@ -0,0 +1,114 @@
+/*
+ * apei-internal.h - ACPI Platform Error Interface internal
+ * definations.
+ */
+
+#ifndef APEI_INTERNAL_H
+#define APEI_INTERNAL_H
+
+#include <linux/cper.h>
+
+struct apei_exec_context;
+
+typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
+                                    struct acpi_whea_header *entry);
+
+#define APEI_EXEC_INS_ACCESS_REGISTER   0x0001
+
+struct apei_exec_ins_type {
+        u32 flags;
+        apei_exec_ins_func_t run;
+};
+
+struct apei_exec_context {
+        u32 ip;
+        u64 value;
+        u64 var1;
+        u64 var2;
+        u64 src_base;
+        u64 dst_base;
+        struct apei_exec_ins_type *ins_table;
+        u32 instructions;
+        struct acpi_whea_header *action_table;
+        u32 entries;
+};
+
+void apei_exec_ctx_init(struct apei_exec_context *ctx,
+                        struct apei_exec_ins_type *ins_table,
+                        u32 instructions,
+                        struct acpi_whea_header *action_table,
+                        u32 entries);
+
+static inline void apei_exec_ctx_set_input(struct apei_exec_context *ctx,
+                                           u64 input)
+{
+        ctx->value = input;
+}
+
+static inline u64 apei_exec_ctx_get_output(struct apei_exec_context *ctx)
+{
+        return ctx->value;
+}
+
+int apei_exec_run(struct apei_exec_context *ctx, u8 action);
+
+/* Common instruction implementation */
+
+/* IP has been set in instruction function */
+#define APEI_EXEC_SET_IP        1
+
+int __apei_exec_read_register(struct acpi_whea_header *entry, u64 *val);
+int __apei_exec_write_register(struct acpi_whea_header *entry, u64 val);
+int apei_exec_read_register(struct apei_exec_context *ctx,
+                            struct acpi_whea_header *entry);
+int apei_exec_read_register_value(struct apei_exec_context *ctx,
+                                  struct acpi_whea_header *entry);
+int apei_exec_write_register(struct apei_exec_context *ctx,
+                             struct acpi_whea_header *entry);
+int apei_exec_write_register_value(struct apei_exec_context *ctx,
+                                   struct acpi_whea_header *entry);
+int apei_exec_noop(struct apei_exec_context *ctx,
+                   struct acpi_whea_header *entry);
+int apei_exec_pre_map_gars(struct apei_exec_context *ctx);
+int apei_exec_post_unmap_gars(struct apei_exec_context *ctx);
+
+struct apei_resources {
+        struct list_head iomem;
+        struct list_head ioport;
+};
+
+static inline void apei_resources_init(struct apei_resources *resources)
+{
+        INIT_LIST_HEAD(&resources->iomem);
+        INIT_LIST_HEAD(&resources->ioport);
+}
+
+void apei_resources_fini(struct apei_resources *resources);
+int apei_resources_sub(struct apei_resources *resources1,
+                       struct apei_resources *resources2);
+int apei_resources_request(struct apei_resources *resources,
+                           const char *desc);
+void apei_resources_release(struct apei_resources *resources);
+int apei_exec_collect_resources(struct apei_exec_context *ctx,
+                                struct apei_resources *resources);
+
+struct dentry;
+struct dentry *apei_get_debugfs_dir(void);
+
+#define apei_estatus_for_each_section(estatus, section)                 \
+        for (section = (struct acpi_hest_generic_data *)(estatus + 1);  \
+             (void *)section - (void *)estatus < estatus->data_length;  \
+             section = (void *)(section+1) + section->error_data_length)
+
+static inline u32 apei_estatus_len(struct acpi_hest_generic_status *estatus)
+{
+        if (estatus->raw_data_length)
+                return estatus->raw_data_offset + \
+                        estatus->raw_data_length;
+        else
+                return sizeof(*estatus) + estatus->data_length;
+}
+
+int apei_estatus_check_header(const struct acpi_hest_generic_status *estatus);
+int apei_estatus_check(const struct acpi_hest_generic_status *estatus);
+#endif
diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
new file mode 100644
index 000000000000..f4cf2fc4c8c1
--- /dev/null
+++ b/drivers/acpi/apei/cper.c
@@ -0,0 +1,84 @@
+/*
+ * UEFI Common Platform Error Record (CPER) support
+ *
+ * Copyright (C) 2010, Intel Corp.
+ *      Author: Huang Ying <ying.huang@intel.com>
+ *
+ * CPER is the format used to describe platform hardware error by
+ * various APEI tables, such as ERST, BERT and HEST etc.
+ *
+ * For more information about CPER, please refer to Appendix N of UEFI
+ * Specification version 2.3.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/time.h>
+#include <linux/cper.h>
+#include <linux/acpi.h>
+
+/*
+ * CPER record ID need to be unique even after reboot, because record
+ * ID is used as index for ERST storage, while CPER records from
+ * multiple boot may co-exist in ERST.
+ */
+u64 cper_next_record_id(void)
+{
+        static atomic64_t seq;
+
+        if (!atomic64_read(&seq))
+                atomic64_set(&seq, ((u64)get_seconds()) << 32);
+
+        return atomic64_inc_return(&seq);
+}
+EXPORT_SYMBOL_GPL(cper_next_record_id);
+
+int apei_estatus_check_header(const struct acpi_hest_generic_status *estatus)
+{
+        if (estatus->data_length &&
+            estatus->data_length < sizeof(struct acpi_hest_generic_data))
+                return -EINVAL;
+        if (estatus->raw_data_length &&
+            estatus->raw_data_offset < sizeof(*estatus) + estatus->data_length)
+                return -EINVAL;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(apei_estatus_check_header);
+
+int apei_estatus_check(const struct acpi_hest_generic_status *estatus)
+{
+        struct acpi_hest_generic_data *gdata;
+        unsigned int data_len, gedata_len;
+        int rc;
+
+        rc = apei_estatus_check_header(estatus);
+        if (rc)
+                return rc;
+        data_len = estatus->data_length;
+        gdata = (struct acpi_hest_generic_data *)(estatus + 1);
+        while (data_len > sizeof(*gdata)) {
+                gedata_len = gdata->error_data_length;
+                if (gedata_len > data_len - sizeof(*gdata))
+                        return -EINVAL;
+                data_len -= gedata_len + sizeof(*gdata);
+        }
+        if (data_len)
+                return -EINVAL;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(apei_estatus_check);
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
new file mode 100644
index 000000000000..465c885938ee
--- /dev/null
+++ b/drivers/acpi/apei/einj.c
@@ -0,0 +1,548 @@
+/*
+ * APEI Error INJection support
+ *
+ * EINJ provides a hardware error injection mechanism, this is useful
+ * for debugging and testing of other APEI and RAS features.
+ *
+ * For more information about EINJ, please refer to ACPI Specification
+ * version 4.0, section 17.5.
+ *
+ * Copyright 2009-2010 Intel Corp.
+ *   Author: Huang Ying <ying.huang@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
+#include <linux/nmi.h>
+#include <linux/delay.h>
+#include <acpi/acpi.h>
+
+#include "apei-internal.h"
+
+#define EINJ_PFX "EINJ: "
+
+#define SPIN_UNIT               100                     /* 100ns */
+/* Firmware should respond within 1 miliseconds */
+#define FIRMWARE_TIMEOUT        (1 * NSEC_PER_MSEC)
+
+/*
+ * Some BIOSes allow parameters to the SET_ERROR_TYPE entries in the
+ * EINJ table through an unpublished extension. Use with caution as
+ * most will ignore the parameter and make their own choice of address
+ * for error injection.
+ */
+struct einj_parameter {
+        u64 type;
+        u64 reserved1;
+        u64 reserved2;
+        u64 param1;
+        u64 param2;
+};
+
+#define EINJ_OP_BUSY                    0x1
+#define EINJ_STATUS_SUCCESS             0x0
+#define EINJ_STATUS_FAIL                0x1
+#define EINJ_STATUS_INVAL               0x2
+
+#define EINJ_TAB_ENTRY(tab)                                             \
+        ((struct acpi_whea_header *)((char *)(tab) +                    \
+                                    sizeof(struct acpi_table_einj)))
+
+static struct acpi_table_einj *einj_tab;
+
+static struct apei_resources einj_resources;
+
+static struct apei_exec_ins_type einj_ins_type[] = {
+        [ACPI_EINJ_READ_REGISTER] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run   = apei_exec_read_register,
+        },
+        [ACPI_EINJ_READ_REGISTER_VALUE] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run   = apei_exec_read_register_value,
+        },
+        [ACPI_EINJ_WRITE_REGISTER] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run   = apei_exec_write_register,
+        },
+        [ACPI_EINJ_WRITE_REGISTER_VALUE] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run   = apei_exec_write_register_value,
+        },
+        [ACPI_EINJ_NOOP] = {
+                .flags = 0,
+                .run   = apei_exec_noop,
+        },
+};
+
+/*
+ * Prevent EINJ interpreter to run simultaneously, because the
+ * corresponding firmware implementation may not work properly when
+ * invoked simultaneously.
+ */
+static DEFINE_MUTEX(einj_mutex);
+
+static struct einj_parameter *einj_param;
+
+static void einj_exec_ctx_init(struct apei_exec_context *ctx)
+{
+        apei_exec_ctx_init(ctx, einj_ins_type, ARRAY_SIZE(einj_ins_type),
+                           EINJ_TAB_ENTRY(einj_tab), einj_tab->entries);
+}
+
+static int __einj_get_available_error_type(u32 *type)
+{
+        struct apei_exec_context ctx;
+        int rc;
+
+        einj_exec_ctx_init(&ctx);
+        rc = apei_exec_run(&ctx, ACPI_EINJ_GET_ERROR_TYPE);
+        if (rc)
+                return rc;
+        *type = apei_exec_ctx_get_output(&ctx);
+
+        return 0;
+}
+
+/* Get error injection capabilities of the platform */
+static int einj_get_available_error_type(u32 *type)
+{
+        int rc;
+
+        mutex_lock(&einj_mutex);
+        rc = __einj_get_available_error_type(type);
+        mutex_unlock(&einj_mutex);
+
+        return rc;
+}
+
+static int einj_timedout(u64 *t)
+{
+        if ((s64)*t < SPIN_UNIT) {
+                pr_warning(FW_WARN EINJ_PFX
+                           "Firmware does not respond in time\n");
+                return 1;
+        }
+        *t -= SPIN_UNIT;
+        ndelay(SPIN_UNIT);
+        touch_nmi_watchdog();
+        return 0;
+}
+
+static u64 einj_get_parameter_address(void)
+{
+        int i;
+        u64 paddr = 0;
+        struct acpi_whea_header *entry;
+
+        entry = EINJ_TAB_ENTRY(einj_tab);
+        for (i = 0; i < einj_tab->entries; i++) {
+                if (entry->action == ACPI_EINJ_SET_ERROR_TYPE &&
+                    entry->instruction == ACPI_EINJ_WRITE_REGISTER &&
+                    entry->register_region.space_id ==
+                    ACPI_ADR_SPACE_SYSTEM_MEMORY)
+                        memcpy(&paddr, &entry->register_region.address,
+                               sizeof(paddr));
+                entry++;
+        }
+
+        return paddr;
+}
+
+/* do sanity check to trigger table */
+static int einj_check_trigger_header(struct acpi_einj_trigger *trigger_tab)
+{
+        if (trigger_tab->header_size != sizeof(struct acpi_einj_trigger))
+                return -EINVAL;
+        if (trigger_tab->table_size > PAGE_SIZE ||
+            trigger_tab->table_size <= trigger_tab->header_size)
+                return -EINVAL;
+        if (trigger_tab->entry_count !=
+            (trigger_tab->table_size - trigger_tab->header_size) /
+            sizeof(struct acpi_einj_entry))
+                return -EINVAL;
+
+        return 0;
+}
+
+/* Execute instructions in trigger error action table */
+static int __einj_error_trigger(u64 trigger_paddr)
+{
+        struct acpi_einj_trigger *trigger_tab = NULL;
+        struct apei_exec_context trigger_ctx;
+        struct apei_resources trigger_resources;
+        struct acpi_whea_header *trigger_entry;
+        struct resource *r;
+        u32 table_size;
+        int rc = -EIO;
+
+        r = request_mem_region(trigger_paddr, sizeof(*trigger_tab),
+                               "APEI EINJ Trigger Table");
+        if (!r) {
+                pr_err(EINJ_PFX
+        "Can not request iomem region <%016llx-%016llx> for Trigger table.\n",
+                       (unsigned long long)trigger_paddr,
+                       (unsigned long long)trigger_paddr+sizeof(*trigger_tab));
+                goto out;
+        }
+        trigger_tab = ioremap_cache(trigger_paddr, sizeof(*trigger_tab));
+        if (!trigger_tab) {
+                pr_err(EINJ_PFX "Failed to map trigger table!\n");
+                goto out_rel_header;
+        }
+        rc = einj_check_trigger_header(trigger_tab);
+        if (rc) {
+                pr_warning(FW_BUG EINJ_PFX
+                           "The trigger error action table is invalid\n");
+                goto out_rel_header;
+        }
+        rc = -EIO;
+        table_size = trigger_tab->table_size;
+        r = request_mem_region(trigger_paddr + sizeof(*trigger_tab),
+                               table_size - sizeof(*trigger_tab),
+                               "APEI EINJ Trigger Table");
+        if (!r) {
+                pr_err(EINJ_PFX
+"Can not request iomem region <%016llx-%016llx> for Trigger Table Entry.\n",
+                       (unsigned long long)trigger_paddr+sizeof(*trigger_tab),
+                       (unsigned long long)trigger_paddr + table_size);
+                goto out_rel_header;
+        }
+        iounmap(trigger_tab);
+        trigger_tab = ioremap_cache(trigger_paddr, table_size);
+        if (!trigger_tab) {
+                pr_err(EINJ_PFX "Failed to map trigger table!\n");
+                goto out_rel_entry;
+        }
+        trigger_entry = (struct acpi_whea_header *)
+                ((char *)trigger_tab + sizeof(struct acpi_einj_trigger));
+        apei_resources_init(&trigger_resources);
+        apei_exec_ctx_init(&trigger_ctx, einj_ins_type,
+                           ARRAY_SIZE(einj_ins_type),
+                           trigger_entry, trigger_tab->entry_count);
+        rc = apei_exec_collect_resources(&trigger_ctx, &trigger_resources);
+        if (rc)
+                goto out_fini;
+        rc = apei_resources_sub(&trigger_resources, &einj_resources);
+        if (rc)
+                goto out_fini;
+        rc = apei_resources_request(&trigger_resources, "APEI EINJ Trigger");
+        if (rc)
+                goto out_fini;
+        rc = apei_exec_pre_map_gars(&trigger_ctx);
+        if (rc)
+                goto out_release;
+
+        rc = apei_exec_run(&trigger_ctx, ACPI_EINJ_TRIGGER_ERROR);
+
+        apei_exec_post_unmap_gars(&trigger_ctx);
+out_release:
+        apei_resources_release(&trigger_resources);
+out_fini:
+        apei_resources_fini(&trigger_resources);
+out_rel_entry:
+        release_mem_region(trigger_paddr + sizeof(*trigger_tab),
+                           table_size - sizeof(*trigger_tab));
+out_rel_header:
+        release_mem_region(trigger_paddr, sizeof(*trigger_tab));
+out:
+        if (trigger_tab)
+                iounmap(trigger_tab);
+
+        return rc;
+}
+
+static int __einj_error_inject(u32 type, u64 param1, u64 param2)
+{
+        struct apei_exec_context ctx;
+        u64 val, trigger_paddr, timeout = FIRMWARE_TIMEOUT;
+        int rc;
+
+        einj_exec_ctx_init(&ctx);
+
+        rc = apei_exec_run(&ctx, ACPI_EINJ_BEGIN_OPERATION);
+        if (rc)
+                return rc;
+        apei_exec_ctx_set_input(&ctx, type);
+        rc = apei_exec_run(&ctx, ACPI_EINJ_SET_ERROR_TYPE);
+        if (rc)
+                return rc;
+        if (einj_param) {
+                writeq(param1, &einj_param->param1);
+                writeq(param2, &einj_param->param2);
+        }
+        rc = apei_exec_run(&ctx, ACPI_EINJ_EXECUTE_OPERATION);
+        if (rc)
+                return rc;
+        for (;;) {
+                rc = apei_exec_run(&ctx, ACPI_EINJ_CHECK_BUSY_STATUS);
+                if (rc)
+                        return rc;
+                val = apei_exec_ctx_get_output(&ctx);
+                if (!(val & EINJ_OP_BUSY))
+                        break;
+                if (einj_timedout(&timeout))
+                        return -EIO;
+        }
+        rc = apei_exec_run(&ctx, ACPI_EINJ_GET_COMMAND_STATUS);
+        if (rc)
+                return rc;
+        val = apei_exec_ctx_get_output(&ctx);
+        if (val != EINJ_STATUS_SUCCESS)
+                return -EBUSY;
+
+        rc = apei_exec_run(&ctx, ACPI_EINJ_GET_TRIGGER_TABLE);
+        if (rc)
+                return rc;
+        trigger_paddr = apei_exec_ctx_get_output(&ctx);
+        rc = __einj_error_trigger(trigger_paddr);
+        if (rc)
+                return rc;
+        rc = apei_exec_run(&ctx, ACPI_EINJ_END_OPERATION);
+
+        return rc;
+}
+
+/* Inject the specified hardware error */
+static int einj_error_inject(u32 type, u64 param1, u64 param2)
+{
+        int rc;
+
+        mutex_lock(&einj_mutex);
+        rc = __einj_error_inject(type, param1, param2);
+        mutex_unlock(&einj_mutex);
+
+        return rc;
+}
+
+static u32 error_type;
+static u64 error_param1;
+static u64 error_param2;
+static struct dentry *einj_debug_dir;
+
+static int available_error_type_show(struct seq_file *m, void *v)
+{
+        int rc;
+        u32 available_error_type = 0;
+
+        rc = einj_get_available_error_type(&available_error_type);
+        if (rc)
+                return rc;
+        if (available_error_type & 0x0001)
+                seq_printf(m, "0x00000001\tProcessor Correctable\n");
+        if (available_error_type & 0x0002)
+                seq_printf(m, "0x00000002\tProcessor Uncorrectable non-fatal\n");
+        if (available_error_type & 0x0004)
+                seq_printf(m, "0x00000004\tProcessor Uncorrectable fatal\n");
+        if (available_error_type & 0x0008)
+                seq_printf(m, "0x00000008\tMemory Correctable\n");
+        if (available_error_type & 0x0010)
+                seq_printf(m, "0x00000010\tMemory Uncorrectable non-fatal\n");
+        if (available_error_type & 0x0020)
+                seq_printf(m, "0x00000020\tMemory Uncorrectable fatal\n");
+        if (available_error_type & 0x0040)
+                seq_printf(m, "0x00000040\tPCI Express Correctable\n");
+        if (available_error_type & 0x0080)
+                seq_printf(m, "0x00000080\tPCI Express Uncorrectable non-fatal\n");
+        if (available_error_type & 0x0100)
+                seq_printf(m, "0x00000100\tPCI Express Uncorrectable fatal\n");
+        if (available_error_type & 0x0200)
+                seq_printf(m, "0x00000200\tPlatform Correctable\n");
+        if (available_error_type & 0x0400)
+                seq_printf(m, "0x00000400\tPlatform Uncorrectable non-fatal\n");
+        if (available_error_type & 0x0800)
+                seq_printf(m, "0x00000800\tPlatform Uncorrectable fatal\n");
+
+        return 0;
+}
+
+static int available_error_type_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, available_error_type_show, NULL);
+}
+
+static const struct file_operations available_error_type_fops = {
+        .open           = available_error_type_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int error_type_get(void *data, u64 *val)
+{
+        *val = error_type;
+
+        return 0;
+}
+
+static int error_type_set(void *data, u64 val)
+{
+        int rc;
+        u32 available_error_type = 0;
+
+        /* Only one error type can be specified */
+        if (val & (val - 1))
+                return -EINVAL;
+        rc = einj_get_available_error_type(&available_error_type);
+        if (rc)
+                return rc;
+        if (!(val & available_error_type))
+                return -EINVAL;
+        error_type = val;
+
+        return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(error_type_fops, error_type_get,
+                        error_type_set, "0x%llx\n");
+
+static int error_inject_set(void *data, u64 val)
+{
+        if (!error_type)
+                return -EINVAL;
+
+        return einj_error_inject(error_type, error_param1, error_param2);
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(error_inject_fops, NULL,
+                        error_inject_set, "%llu\n");
+
+static int einj_check_table(struct acpi_table_einj *einj_tab)
+{
+        if (einj_tab->header_length != sizeof(struct acpi_table_einj))
+                return -EINVAL;
+        if (einj_tab->header.length < sizeof(struct acpi_table_einj))
+                return -EINVAL;
+        if (einj_tab->entries !=
+            (einj_tab->header.length - sizeof(struct acpi_table_einj)) /
+            sizeof(struct acpi_einj_entry))
+                return -EINVAL;
+
+        return 0;
+}
+
+static int __init einj_init(void)
+{
+        int rc;
+        u64 param_paddr;
+        acpi_status status;
+        struct dentry *fentry;
+        struct apei_exec_context ctx;
+
+        if (acpi_disabled)
+                return -ENODEV;
+
+        status = acpi_get_table(ACPI_SIG_EINJ, 0,
+                                (struct acpi_table_header **)&einj_tab);
+        if (status == AE_NOT_FOUND) {
+                pr_info(EINJ_PFX "Table is not found!\n");
+                return -ENODEV;
+        } else if (ACPI_FAILURE(status)) {
+                const char *msg = acpi_format_exception(status);
+                pr_err(EINJ_PFX "Failed to get table, %s\n", msg);
+                return -EINVAL;
+        }
+
+        rc = einj_check_table(einj_tab);
+        if (rc) {
+                pr_warning(FW_BUG EINJ_PFX "EINJ table is invalid\n");
+                return -EINVAL;
+        }
+
+        rc = -ENOMEM;
+        einj_debug_dir = debugfs_create_dir("einj", apei_get_debugfs_dir());
+        if (!einj_debug_dir)
+                goto err_cleanup;
+        fentry = debugfs_create_file("available_error_type", S_IRUSR,
+                                     einj_debug_dir, NULL,
+                                     &available_error_type_fops);
+        if (!fentry)
+                goto err_cleanup;
+        fentry = debugfs_create_file("error_type", S_IRUSR | S_IWUSR,
+                                     einj_debug_dir, NULL, &error_type_fops);
+        if (!fentry)
+                goto err_cleanup;
+        fentry = debugfs_create_x64("param1", S_IRUSR | S_IWUSR,
+                                    einj_debug_dir, &error_param1);
+        if (!fentry)
+                goto err_cleanup;
+        fentry = debugfs_create_x64("param2", S_IRUSR | S_IWUSR,
+                                    einj_debug_dir, &error_param2);
+        if (!fentry)
+                goto err_cleanup;
+        fentry = debugfs_create_file("error_inject", S_IWUSR,
+                                     einj_debug_dir, NULL, &error_inject_fops);
+        if (!fentry)
+                goto err_cleanup;
+
+        apei_resources_init(&einj_resources);
+        einj_exec_ctx_init(&ctx);
+        rc = apei_exec_collect_resources(&ctx, &einj_resources);
+        if (rc)
+                goto err_fini;
+        rc = apei_resources_request(&einj_resources, "APEI EINJ");
+        if (rc)
+                goto err_fini;
+        rc = apei_exec_pre_map_gars(&ctx);
+        if (rc)
+                goto err_release;
+        param_paddr = einj_get_parameter_address();
+        if (param_paddr) {
+                einj_param = ioremap(param_paddr, sizeof(*einj_param));
+                rc = -ENOMEM;
+                if (!einj_param)
+                        goto err_unmap;
+        }
+
+        pr_info(EINJ_PFX "Error INJection is initialized.\n");
+
+        return 0;
+
+err_unmap:
+        apei_exec_post_unmap_gars(&ctx);
+err_release:
+        apei_resources_release(&einj_resources);
+err_fini:
+        apei_resources_fini(&einj_resources);
+err_cleanup:
+        debugfs_remove_recursive(einj_debug_dir);
+
+        return rc;
+}
+
+static void __exit einj_exit(void)
+{
+        struct apei_exec_context ctx;
+
+        if (einj_param)
+                iounmap(einj_param);
+        einj_exec_ctx_init(&ctx);
+        apei_exec_post_unmap_gars(&ctx);
+        apei_resources_release(&einj_resources);
+        apei_resources_fini(&einj_resources);
+        debugfs_remove_recursive(einj_debug_dir);
+}
+
+module_init(einj_init);
+module_exit(einj_exit);
+
+MODULE_AUTHOR("Huang Ying");
+MODULE_DESCRIPTION("APEI Error INJection support");
+MODULE_LICENSE("GPL");
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
new file mode 100644
index 000000000000..2ebc39115507
--- /dev/null
+++ b/drivers/acpi/apei/erst.c
@@ -0,0 +1,855 @@
+/*
+ * APEI Error Record Serialization Table support
+ *
+ * ERST is a way provided by APEI to save and retrieve hardware error
+ * infomation to and from a persistent store.
+ *
+ * For more information about ERST, please refer to ACPI Specification
+ * version 4.0, section 17.4.
+ *
+ * Copyright 2010 Intel Corp.
+ *   Author: Huang Ying <ying.huang@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/acpi.h>
+#include <linux/uaccess.h>
+#include <linux/cper.h>
+#include <linux/nmi.h>
+#include <acpi/apei.h>
+
+#include "apei-internal.h"
+
+#define ERST_PFX "ERST: "
+
+/* ERST command status */
+#define ERST_STATUS_SUCCESS                     0x0
+#define ERST_STATUS_NOT_ENOUGH_SPACE            0x1
+#define ERST_STATUS_HARDWARE_NOT_AVAILABLE      0x2
+#define ERST_STATUS_FAILED                      0x3
+#define ERST_STATUS_RECORD_STORE_EMPTY          0x4
+#define ERST_STATUS_RECORD_NOT_FOUND            0x5
+
+#define ERST_TAB_ENTRY(tab)                                             \
+        ((struct acpi_whea_header *)((char *)(tab) +                    \
+                                     sizeof(struct acpi_table_erst)))
+
+#define SPIN_UNIT               100                     /* 100ns */
+/* Firmware should respond within 1 miliseconds */
+#define FIRMWARE_TIMEOUT        (1 * NSEC_PER_MSEC)
+#define FIRMWARE_MAX_STALL      50                      /* 50us */
+
+int erst_disable;
+EXPORT_SYMBOL_GPL(erst_disable);
+
+static struct acpi_table_erst *erst_tab;
+
+/* ERST Error Log Address Range atrributes */
+#define ERST_RANGE_RESERVED     0x0001
+#define ERST_RANGE_NVRAM        0x0002
+#define ERST_RANGE_SLOW         0x0004
+
+/*
+ * ERST Error Log Address Range, used as buffer for reading/writing
+ * error records.
+ */
+static struct erst_erange {
+        u64 base;
+        u64 size;
+        void __iomem *vaddr;
+        u32 attr;
+} erst_erange;
+
+/*
+ * Prevent ERST interpreter to run simultaneously, because the
+ * corresponding firmware implementation may not work properly when
+ * invoked simultaneously.
+ *
+ * It is used to provide exclusive accessing for ERST Error Log
+ * Address Range too.
+ */
+static DEFINE_SPINLOCK(erst_lock);
+
+static inline int erst_errno(int command_status)
+{
+        switch (command_status) {
+        case ERST_STATUS_SUCCESS:
+                return 0;
+        case ERST_STATUS_HARDWARE_NOT_AVAILABLE:
+                return -ENODEV;
+        case ERST_STATUS_NOT_ENOUGH_SPACE:
+                return -ENOSPC;
+        case ERST_STATUS_RECORD_STORE_EMPTY:
+        case ERST_STATUS_RECORD_NOT_FOUND:
+                return -ENOENT;
+        default:
+                return -EINVAL;
+        }
+}
+
+static int erst_timedout(u64 *t, u64 spin_unit)
+{
+        if ((s64)*t < spin_unit) {
+                pr_warning(FW_WARN ERST_PFX
+                           "Firmware does not respond in time\n");
+                return 1;
+        }
+        *t -= spin_unit;
+        ndelay(spin_unit);
+        touch_nmi_watchdog();
+        return 0;
+}
+
+static int erst_exec_load_var1(struct apei_exec_context *ctx,
+                               struct acpi_whea_header *entry)
+{
+        return __apei_exec_read_register(entry, &ctx->var1);
+}
+
+static int erst_exec_load_var2(struct apei_exec_context *ctx,
+                               struct acpi_whea_header *entry)
+{
+        return __apei_exec_read_register(entry, &ctx->var2);
+}
+
+static int erst_exec_store_var1(struct apei_exec_context *ctx,
+                                struct acpi_whea_header *entry)
+{
+        return __apei_exec_write_register(entry, ctx->var1);
+}
+
+static int erst_exec_add(struct apei_exec_context *ctx,
+                         struct acpi_whea_header *entry)
+{
+        ctx->var1 += ctx->var2;
+        return 0;
+}
+
+static int erst_exec_subtract(struct apei_exec_context *ctx,
+                              struct acpi_whea_header *entry)
+{
+        ctx->var1 -= ctx->var2;
+        return 0;
+}
+
+static int erst_exec_add_value(struct apei_exec_context *ctx,
+                               struct acpi_whea_header *entry)
+{
+        int rc;
+        u64 val;
+
+        rc = __apei_exec_read_register(entry, &val);
+        if (rc)
+                return rc;
+        val += ctx->value;
+        rc = __apei_exec_write_register(entry, val);
+        return rc;
+}
+
+static int erst_exec_subtract_value(struct apei_exec_context *ctx,
+                                    struct acpi_whea_header *entry)
+{
+        int rc;
+        u64 val;
+
+        rc = __apei_exec_read_register(entry, &val);
+        if (rc)
+                return rc;
+        val -= ctx->value;
+        rc = __apei_exec_write_register(entry, val);
+        return rc;
+}
+
+static int erst_exec_stall(struct apei_exec_context *ctx,
+                           struct acpi_whea_header *entry)
+{
+        u64 stall_time;
+
+        if (ctx->value > FIRMWARE_MAX_STALL) {
+                if (!in_nmi())
+                        pr_warning(FW_WARN ERST_PFX
+                        "Too long stall time for stall instruction: %llx.\n",
+                                   ctx->value);
+                stall_time = FIRMWARE_MAX_STALL;
+        } else
+                stall_time = ctx->value;
+        udelay(stall_time);
+        return 0;
+}
+
+static int erst_exec_stall_while_true(struct apei_exec_context *ctx,
+                                      struct acpi_whea_header *entry)
+{
+        int rc;
+        u64 val;
+        u64 timeout = FIRMWARE_TIMEOUT;
+        u64 stall_time;
+
+        if (ctx->var1 > FIRMWARE_MAX_STALL) {
+                if (!in_nmi())
+                        pr_warning(FW_WARN ERST_PFX
+                "Too long stall time for stall while true instruction: %llx.\n",
+                                   ctx->var1);
+                stall_time = FIRMWARE_MAX_STALL;
+        } else
+                stall_time = ctx->var1;
+
+        for (;;) {
+                rc = __apei_exec_read_register(entry, &val);
+                if (rc)
+                        return rc;
+                if (val != ctx->value)
+                        break;
+                if (erst_timedout(&timeout, stall_time * NSEC_PER_USEC))
+                        return -EIO;
+        }
+        return 0;
+}
+
+static int erst_exec_skip_next_instruction_if_true(
+        struct apei_exec_context *ctx,
+        struct acpi_whea_header *entry)
+{
+        int rc;
+        u64 val;
+
+        rc = __apei_exec_read_register(entry, &val);
+        if (rc)
+                return rc;
+        if (val == ctx->value) {
+                ctx->ip += 2;
+                return APEI_EXEC_SET_IP;
+        }
+
+        return 0;
+}
+
+static int erst_exec_goto(struct apei_exec_context *ctx,
+                          struct acpi_whea_header *entry)
+{
+        ctx->ip = ctx->value;
+        return APEI_EXEC_SET_IP;
+}
+
+static int erst_exec_set_src_address_base(struct apei_exec_context *ctx,
+                                          struct acpi_whea_header *entry)
+{
+        return __apei_exec_read_register(entry, &ctx->src_base);
+}
+
+static int erst_exec_set_dst_address_base(struct apei_exec_context *ctx,
+                                          struct acpi_whea_header *entry)
+{
+        return __apei_exec_read_register(entry, &ctx->dst_base);
+}
+
+static int erst_exec_move_data(struct apei_exec_context *ctx,
+                               struct acpi_whea_header *entry)
+{
+        int rc;
+        u64 offset;
+
+        rc = __apei_exec_read_register(entry, &offset);
+        if (rc)
+                return rc;
+        memmove((void *)ctx->dst_base + offset,
+                (void *)ctx->src_base + offset,
+                ctx->var2);
+
+        return 0;
+}
+
+static struct apei_exec_ins_type erst_ins_type[] = {
+        [ACPI_ERST_READ_REGISTER] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = apei_exec_read_register,
+        },
+        [ACPI_ERST_READ_REGISTER_VALUE] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = apei_exec_read_register_value,
+        },
+        [ACPI_ERST_WRITE_REGISTER] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = apei_exec_write_register,
+        },
+        [ACPI_ERST_WRITE_REGISTER_VALUE] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = apei_exec_write_register_value,
+        },
+        [ACPI_ERST_NOOP] = {
+                .flags = 0,
+                .run = apei_exec_noop,
+        },
+        [ACPI_ERST_LOAD_VAR1] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = erst_exec_load_var1,
+        },
+        [ACPI_ERST_LOAD_VAR2] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = erst_exec_load_var2,
+        },
+        [ACPI_ERST_STORE_VAR1] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = erst_exec_store_var1,
+        },
+        [ACPI_ERST_ADD] = {
+                .flags = 0,
+                .run = erst_exec_add,
+        },
+        [ACPI_ERST_SUBTRACT] = {
+                .flags = 0,
+                .run = erst_exec_subtract,
+        },
+        [ACPI_ERST_ADD_VALUE] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = erst_exec_add_value,
+        },
+        [ACPI_ERST_SUBTRACT_VALUE] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = erst_exec_subtract_value,
+        },
+        [ACPI_ERST_STALL] = {
+                .flags = 0,
+                .run = erst_exec_stall,
+        },
+        [ACPI_ERST_STALL_WHILE_TRUE] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = erst_exec_stall_while_true,
+        },
+        [ACPI_ERST_SKIP_NEXT_IF_TRUE] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = erst_exec_skip_next_instruction_if_true,
+        },
+        [ACPI_ERST_GOTO] = {
+                .flags = 0,
+                .run = erst_exec_goto,
+        },
+        [ACPI_ERST_SET_SRC_ADDRESS_BASE] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = erst_exec_set_src_address_base,
+        },
+        [ACPI_ERST_SET_DST_ADDRESS_BASE] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = erst_exec_set_dst_address_base,
+        },
+        [ACPI_ERST_MOVE_DATA] = {
+                .flags = APEI_EXEC_INS_ACCESS_REGISTER,
+                .run = erst_exec_move_data,
+        },
+};
+
+static inline void erst_exec_ctx_init(struct apei_exec_context *ctx)
+{
+        apei_exec_ctx_init(ctx, erst_ins_type, ARRAY_SIZE(erst_ins_type),
+                           ERST_TAB_ENTRY(erst_tab), erst_tab->entries);
+}
+
+static int erst_get_erange(struct erst_erange *range)
+{
+        struct apei_exec_context ctx;
+        int rc;
+
+        erst_exec_ctx_init(&ctx);
+        rc = apei_exec_run(&ctx, ACPI_ERST_GET_ERROR_RANGE);
+        if (rc)
+                return rc;
+        range->base = apei_exec_ctx_get_output(&ctx);
+        rc = apei_exec_run(&ctx, ACPI_ERST_GET_ERROR_LENGTH);
+        if (rc)
+                return rc;
+        range->size = apei_exec_ctx_get_output(&ctx);
+        rc = apei_exec_run(&ctx, ACPI_ERST_GET_ERROR_ATTRIBUTES);
+        if (rc)
+                return rc;
+        range->attr = apei_exec_ctx_get_output(&ctx);
+
+        return 0;
+}
+
+static ssize_t __erst_get_record_count(void)
+{
+        struct apei_exec_context ctx;
+        int rc;
+
+        erst_exec_ctx_init(&ctx);
+        rc = apei_exec_run(&ctx, ACPI_ERST_GET_RECORD_COUNT);
+        if (rc)
+                return rc;
+        return apei_exec_ctx_get_output(&ctx);
+}
+
+ssize_t erst_get_record_count(void)
+{
+        ssize_t count;
+        unsigned long flags;
+
+        if (erst_disable)
+                return -ENODEV;
+
+        spin_lock_irqsave(&erst_lock, flags);
+        count = __erst_get_record_count();
+        spin_unlock_irqrestore(&erst_lock, flags);
+
+        return count;
+}
+EXPORT_SYMBOL_GPL(erst_get_record_count);
+
+static int __erst_get_next_record_id(u64 *record_id)
+{
+        struct apei_exec_context ctx;
+        int rc;
+
+        erst_exec_ctx_init(&ctx);
+        rc = apei_exec_run(&ctx, ACPI_ERST_GET_RECORD_ID);
+        if (rc)
+                return rc;
+        *record_id = apei_exec_ctx_get_output(&ctx);
+
+        return 0;
+}
+
+/*
+ * Get the record ID of an existing error record on the persistent
+ * storage. If there is no error record on the persistent storage, the
+ * returned record_id is APEI_ERST_INVALID_RECORD_ID.
+ */
+int erst_get_next_record_id(u64 *record_id)
+{
+        int rc;
+        unsigned long flags;
+
+        if (erst_disable)
+                return -ENODEV;
+
+        spin_lock_irqsave(&erst_lock, flags);
+        rc = __erst_get_next_record_id(record_id);
+        spin_unlock_irqrestore(&erst_lock, flags);
+
+        return rc;
+}
+EXPORT_SYMBOL_GPL(erst_get_next_record_id);
+
+static int __erst_write_to_storage(u64 offset)
+{
+        struct apei_exec_context ctx;
+        u64 timeout = FIRMWARE_TIMEOUT;
+        u64 val;
+        int rc;
+
+        erst_exec_ctx_init(&ctx);
+        rc = apei_exec_run(&ctx, ACPI_ERST_BEGIN_WRITE);
+        if (rc)
+                return rc;
+        apei_exec_ctx_set_input(&ctx, offset);
+        rc = apei_exec_run(&ctx, ACPI_ERST_SET_RECORD_OFFSET);
+        if (rc)
+                return rc;
+        rc = apei_exec_run(&ctx, ACPI_ERST_EXECUTE_OPERATION);
+        if (rc)
+                return rc;
+        for (;;) {
+                rc = apei_exec_run(&ctx, ACPI_ERST_CHECK_BUSY_STATUS);
+                if (rc)
+                        return rc;
+                val = apei_exec_ctx_get_output(&ctx);
+                if (!val)
+                        break;
+                if (erst_timedout(&timeout, SPIN_UNIT))
+                        return -EIO;
+        }
+        rc = apei_exec_run(&ctx, ACPI_ERST_GET_COMMAND_STATUS);
+        if (rc)
+                return rc;
+        val = apei_exec_ctx_get_output(&ctx);
+        rc = apei_exec_run(&ctx, ACPI_ERST_END);
+        if (rc)
+                return rc;
+
+        return erst_errno(val);
+}
+
+static int __erst_read_from_storage(u64 record_id, u64 offset)
+{
+        struct apei_exec_context ctx;
+        u64 timeout = FIRMWARE_TIMEOUT;
+        u64 val;
+        int rc;
+
+        erst_exec_ctx_init(&ctx);
+        rc = apei_exec_run(&ctx, ACPI_ERST_BEGIN_READ);
+        if (rc)
+                return rc;
+        apei_exec_ctx_set_input(&ctx, offset);
+        rc = apei_exec_run(&ctx, ACPI_ERST_SET_RECORD_OFFSET);
+        if (rc)
+                return rc;
+        apei_exec_ctx_set_input(&ctx, record_id);
+        rc = apei_exec_run(&ctx, ACPI_ERST_SET_RECORD_ID);
+        if (rc)
+                return rc;
+        rc = apei_exec_run(&ctx, ACPI_ERST_EXECUTE_OPERATION);
+        if (rc)
+                return rc;
+        for (;;) {
+                rc = apei_exec_run(&ctx, ACPI_ERST_CHECK_BUSY_STATUS);
+                if (rc)
+                        return rc;
+                val = apei_exec_ctx_get_output(&ctx);
+                if (!val)
+                        break;
+                if (erst_timedout(&timeout, SPIN_UNIT))
+                        return -EIO;
+        };
+        rc = apei_exec_run(&ctx, ACPI_ERST_GET_COMMAND_STATUS);
+        if (rc)
+                return rc;
+        val = apei_exec_ctx_get_output(&ctx);
+        rc = apei_exec_run(&ctx, ACPI_ERST_END);
+        if (rc)
+                return rc;
+
+        return erst_errno(val);
+}
+
+static int __erst_clear_from_storage(u64 record_id)
+{
+        struct apei_exec_context ctx;
+        u64 timeout = FIRMWARE_TIMEOUT;
+        u64 val;
+        int rc;
+
+        erst_exec_ctx_init(&ctx);
+        rc = apei_exec_run(&ctx, ACPI_ERST_BEGIN_CLEAR);
+        if (rc)
+                return rc;
+        apei_exec_ctx_set_input(&ctx, record_id);
+        rc = apei_exec_run(&ctx, ACPI_ERST_SET_RECORD_ID);
+        if (rc)
+                return rc;
+        rc = apei_exec_run(&ctx, ACPI_ERST_EXECUTE_OPERATION);
+        if (rc)
+                return rc;
+        for (;;) {
+                rc = apei_exec_run(&ctx, ACPI_ERST_CHECK_BUSY_STATUS);
+                if (rc)
+                        return rc;
+                val = apei_exec_ctx_get_output(&ctx);
+                if (!val)
+                        break;
+                if (erst_timedout(&timeout, SPIN_UNIT))
+                        return -EIO;
+        }
+        rc = apei_exec_run(&ctx, ACPI_ERST_GET_COMMAND_STATUS);
+        if (rc)
+                return rc;
+        val = apei_exec_ctx_get_output(&ctx);
+        rc = apei_exec_run(&ctx, ACPI_ERST_END);
+        if (rc)
+                return rc;
+
+        return erst_errno(val);
+}
+
+/* NVRAM ERST Error Log Address Range is not supported yet */
+static void pr_unimpl_nvram(void)
+{
+        if (printk_ratelimit())
+                pr_warning(ERST_PFX
+                "NVRAM ERST Log Address Range is not implemented yet\n");
+}
+
+static int __erst_write_to_nvram(const struct cper_record_header *record)
+{
+        /* do not print message, because printk is not safe for NMI */
+        return -ENOSYS;
+}
+
+static int __erst_read_to_erange_from_nvram(u64 record_id, u64 *offset)
+{
+        pr_unimpl_nvram();
+        return -ENOSYS;
+}
+
+static int __erst_clear_from_nvram(u64 record_id)
+{
+        pr_unimpl_nvram();
+        return -ENOSYS;
+}
+
+int erst_write(const struct cper_record_header *record)
+{
+        int rc;
+        unsigned long flags;
+        struct cper_record_header *rcd_erange;
+
+        if (erst_disable)
+                return -ENODEV;
+
+        if (memcmp(record->signature, CPER_SIG_RECORD, CPER_SIG_SIZE))
+                return -EINVAL;
+
+        if (erst_erange.attr & ERST_RANGE_NVRAM) {
+                if (!spin_trylock_irqsave(&erst_lock, flags))
+                        return -EBUSY;
+                rc = __erst_write_to_nvram(record);
+                spin_unlock_irqrestore(&erst_lock, flags);
+                return rc;
+        }
+
+        if (record->record_length > erst_erange.size)
+                return -EINVAL;
+
+        if (!spin_trylock_irqsave(&erst_lock, flags))
+                return -EBUSY;
+        memcpy(erst_erange.vaddr, record, record->record_length);
+        rcd_erange = erst_erange.vaddr;
+        /* signature for serialization system */
+        memcpy(&rcd_erange->persistence_information, "ER", 2);
+
+        rc = __erst_write_to_storage(0);
+        spin_unlock_irqrestore(&erst_lock, flags);
+
+        return rc;
+}
+EXPORT_SYMBOL_GPL(erst_write);
+
+static int __erst_read_to_erange(u64 record_id, u64 *offset)
+{
+        int rc;
+
+        if (erst_erange.attr & ERST_RANGE_NVRAM)
+                return __erst_read_to_erange_from_nvram(
+                        record_id, offset);
+
+        rc = __erst_read_from_storage(record_id, 0);
+        if (rc)
+                return rc;
+        *offset = 0;
+
+        return 0;
+}
+
+static ssize_t __erst_read(u64 record_id, struct cper_record_header *record,
+                           size_t buflen)
+{
+        int rc;
+        u64 offset, len = 0;
+        struct cper_record_header *rcd_tmp;
+
+        rc = __erst_read_to_erange(record_id, &offset);
+        if (rc)
+                return rc;
+        rcd_tmp = erst_erange.vaddr + offset;
+        len = rcd_tmp->record_length;
+        if (len <= buflen)
+                memcpy(record, rcd_tmp, len);
+
+        return len;
+}
+
+/*
+ * If return value > buflen, the buffer size is not big enough,
+ * else if return value < 0, something goes wrong,
+ * else everything is OK, and return value is record length
+ */
+ssize_t erst_read(u64 record_id, struct cper_record_header *record,
+                  size_t buflen)
+{
+        ssize_t len;
+        unsigned long flags;
+
+        if (erst_disable)
+                return -ENODEV;
+
+        spin_lock_irqsave(&erst_lock, flags);
+        len = __erst_read(record_id, record, buflen);
+        spin_unlock_irqrestore(&erst_lock, flags);
+        return len;
+}
+EXPORT_SYMBOL_GPL(erst_read);
+
+/*
+ * If return value > buflen, the buffer size is not big enough,
+ * else if return value = 0, there is no more record to read,
+ * else if return value < 0, something goes wrong,
+ * else everything is OK, and return value is record length
+ */
+ssize_t erst_read_next(struct cper_record_header *record, size_t buflen)
+{
+        int rc;
+        ssize_t len;
+        unsigned long flags;
+        u64 record_id;
+
+        if (erst_disable)
+                return -ENODEV;
+
+        spin_lock_irqsave(&erst_lock, flags);
+        rc = __erst_get_next_record_id(&record_id);
+        if (rc) {
+                spin_unlock_irqrestore(&erst_lock, flags);
+                return rc;
+        }
+        /* no more record */
+        if (record_id == APEI_ERST_INVALID_RECORD_ID) {
+                spin_unlock_irqrestore(&erst_lock, flags);
+                return 0;
+        }
+
+        len = __erst_read(record_id, record, buflen);
+        spin_unlock_irqrestore(&erst_lock, flags);
+
+        return len;
+}
+EXPORT_SYMBOL_GPL(erst_read_next);
+
+int erst_clear(u64 record_id)
+{
+        int rc;
+        unsigned long flags;
+
+        if (erst_disable)
+                return -ENODEV;
+
+        spin_lock_irqsave(&erst_lock, flags);
+        if (erst_erange.attr & ERST_RANGE_NVRAM)
+                rc = __erst_clear_from_nvram(record_id);
+        else
+                rc = __erst_clear_from_storage(record_id);
+        spin_unlock_irqrestore(&erst_lock, flags);
+
+        return rc;
+}
+EXPORT_SYMBOL_GPL(erst_clear);
+
+static int __init setup_erst_disable(char *str)
+{
+        erst_disable = 1;
+        return 0;
+}
+
+__setup("erst_disable", setup_erst_disable);
+
+static int erst_check_table(struct acpi_table_erst *erst_tab)
+{
+        if (erst_tab->header_length != sizeof(struct acpi_table_erst))
+                return -EINVAL;
+        if (erst_tab->header.length < sizeof(struct acpi_table_erst))
+                return -EINVAL;
+        if (erst_tab->entries !=
+            (erst_tab->header.length - sizeof(struct acpi_table_erst)) /
+            sizeof(struct acpi_erst_entry))
+                return -EINVAL;
+
+        return 0;
+}
+
+static int __init erst_init(void)
+{
+        int rc = 0;
+        acpi_status status;
+        struct apei_exec_context ctx;
+        struct apei_resources erst_resources;
+        struct resource *r;
+
+        if (acpi_disabled)
+                goto err;
+
+        if (erst_disable) {
+                pr_info(ERST_PFX
+        "Error Record Serialization Table (ERST) support is disabled.\n");
+                goto err;
+        }
+
+        status = acpi_get_table(ACPI_SIG_ERST, 0,
+                                (struct acpi_table_header **)&erst_tab);
+        if (status == AE_NOT_FOUND) {
+                pr_err(ERST_PFX "Table is not found!\n");
+                goto err;
+        } else if (ACPI_FAILURE(status)) {
+                const char *msg = acpi_format_exception(status);
+                pr_err(ERST_PFX "Failed to get table, %s\n", msg);
+                rc = -EINVAL;
+                goto err;
+        }
+
+        rc = erst_check_table(erst_tab);
+        if (rc) {
+                pr_err(FW_BUG ERST_PFX "ERST table is invalid\n");
+                goto err;
+        }
+
+        apei_resources_init(&erst_resources);
+        erst_exec_ctx_init(&ctx);
+        rc = apei_exec_collect_resources(&ctx, &erst_resources);
+        if (rc)
+                goto err_fini;
+        rc = apei_resources_request(&erst_resources, "APEI ERST");
+        if (rc)
+                goto err_fini;
+        rc = apei_exec_pre_map_gars(&ctx);
+        if (rc)
+                goto err_release;
+        rc = erst_get_erange(&erst_erange);
+        if (rc) {
+                if (rc == -ENODEV)
+                        pr_info(ERST_PFX
+        "The corresponding hardware device or firmware implementation "
+        "is not available.\n");
+                else
+                        pr_err(ERST_PFX
+                               "Failed to get Error Log Address Range.\n");
+                goto err_unmap_reg;
+        }
+
+        r = request_mem_region(erst_erange.base, erst_erange.size, "APEI ERST");
+        if (!r) {
+                pr_err(ERST_PFX
+                "Can not request iomem region <0x%16llx-0x%16llx> for ERST.\n",
+                (unsigned long long)erst_erange.base,
+                (unsigned long long)erst_erange.base + erst_erange.size);
+                rc = -EIO;
+                goto err_unmap_reg;
+        }
+        rc = -ENOMEM;
+        erst_erange.vaddr = ioremap_cache(erst_erange.base,
+                                          erst_erange.size);
+        if (!erst_erange.vaddr)
+                goto err_release_erange;
+
+        pr_info(ERST_PFX
+        "Error Record Serialization Table (ERST) support is initialized.\n");
+
+        return 0;
+
+err_release_erange:
+        release_mem_region(erst_erange.base, erst_erange.size);
+err_unmap_reg:
+        apei_exec_post_unmap_gars(&ctx);
+err_release:
+        apei_resources_release(&erst_resources);
+err_fini:
+        apei_resources_fini(&erst_resources);
+err:
+        erst_disable = 1;
+        return rc;
+}
+
+device_initcall(erst_init);
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
new file mode 100644
index 000000000000..fd0cc016a099
--- /dev/null
+++ b/drivers/acpi/apei/ghes.c
@@ -0,0 +1,427 @@
+/*
+ * APEI Generic Hardware Error Source support
+ *
+ * Generic Hardware Error Source provides a way to report platform
+ * hardware errors (such as that from chipset). It works in so called
+ * "Firmware First" mode, that is, hardware errors are reported to
+ * firmware firstly, then reported to Linux by firmware. This way,
+ * some non-standard hardware error registers or non-standard hardware
+ * link can be checked by firmware to produce more hardware error
+ * information for Linux.
+ *
+ * For more information about Generic Hardware Error Source, please
+ * refer to ACPI Specification version 4.0, section 17.3.2.6
+ *
+ * Now, only SCI notification type and memory errors are
+ * supported. More notification type and hardware error type will be
+ * added later.
+ *
+ * Copyright 2010 Intel Corp.
+ *   Author: Huang Ying <ying.huang@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/acpi.h>
+#include <linux/io.h>
+#include <linux/interrupt.h>
+#include <linux/cper.h>
+#include <linux/kdebug.h>
+#include <acpi/apei.h>
+#include <acpi/atomicio.h>
+#include <acpi/hed.h>
+#include <asm/mce.h>
+
+#include "apei-internal.h"
+
+#define GHES_PFX        "GHES: "
+
+#define GHES_ESTATUS_MAX_SIZE           65536
+
+/*
+ * One struct ghes is created for each generic hardware error
+ * source.
+ *
+ * It provides the context for APEI hardware error timer/IRQ/SCI/NMI
+ * handler. Handler for one generic hardware error source is only
+ * triggered after the previous one is done. So handler can uses
+ * struct ghes without locking.
+ *
+ * estatus: memory buffer for error status block, allocated during
+ * HEST parsing.
+ */
+#define GHES_TO_CLEAR           0x0001
+
+struct ghes {
+        struct acpi_hest_generic *generic;
+        struct acpi_hest_generic_status *estatus;
+        struct list_head list;
+        u64 buffer_paddr;
+        unsigned long flags;
+};
+
+/*
+ * Error source lists, one list for each notification method. The
+ * members in lists are struct ghes.
+ *
+ * The list members are only added in HEST parsing and deleted during
+ * module_exit, that is, single-threaded. So no lock is needed for
+ * that.
+ *
+ * But the mutual exclusion is needed between members adding/deleting
+ * and timer/IRQ/SCI/NMI handler, which may traverse the list. RCU is
+ * used for that.
+ */
+static LIST_HEAD(ghes_sci);
+
+static struct ghes *ghes_new(struct acpi_hest_generic *generic)
+{
+        struct ghes *ghes;
+        unsigned int error_block_length;
+        int rc;
+
+        ghes = kzalloc(sizeof(*ghes), GFP_KERNEL);
+        if (!ghes)
+                return ERR_PTR(-ENOMEM);
+        ghes->generic = generic;
+        INIT_LIST_HEAD(&ghes->list);
+        rc = acpi_pre_map_gar(&generic->error_status_address);
+        if (rc)
+                goto err_free;
+        error_block_length = generic->error_block_length;
+        if (error_block_length > GHES_ESTATUS_MAX_SIZE) {
+                pr_warning(FW_WARN GHES_PFX
+                           "Error status block length is too long: %u for "
+                           "generic hardware error source: %d.\n",
+                           error_block_length, generic->header.source_id);
+                error_block_length = GHES_ESTATUS_MAX_SIZE;
+        }
+        ghes->estatus = kmalloc(error_block_length, GFP_KERNEL);
+        if (!ghes->estatus) {
+                rc = -ENOMEM;
+                goto err_unmap;
+        }
+
+        return ghes;
+
+err_unmap:
+        acpi_post_unmap_gar(&generic->error_status_address);
+err_free:
+        kfree(ghes);
+        return ERR_PTR(rc);
+}
+
+static void ghes_fini(struct ghes *ghes)
+{
+        kfree(ghes->estatus);
+        acpi_post_unmap_gar(&ghes->generic->error_status_address);
+}
+
+enum {
+        GHES_SER_NO = 0x0,
+        GHES_SER_CORRECTED = 0x1,
+        GHES_SER_RECOVERABLE = 0x2,
+        GHES_SER_PANIC = 0x3,
+};
+
+static inline int ghes_severity(int severity)
+{
+        switch (severity) {
+        case CPER_SER_INFORMATIONAL:
+                return GHES_SER_NO;
+        case CPER_SER_CORRECTED:
+                return GHES_SER_CORRECTED;
+        case CPER_SER_RECOVERABLE:
+                return GHES_SER_RECOVERABLE;
+        case CPER_SER_FATAL:
+                return GHES_SER_PANIC;
+        default:
+                /* Unkown, go panic */
+                return GHES_SER_PANIC;
+        }
+}
+
+/* SCI handler run in work queue, so ioremap can be used here */
+static int ghes_copy_tofrom_phys(void *buffer, u64 paddr, u32 len,
+                                 int from_phys)
+{
+        void *vaddr;
+
+        vaddr = ioremap_cache(paddr, len);
+        if (!vaddr)
+                return -ENOMEM;
+        if (from_phys)
+                memcpy(buffer, vaddr, len);
+        else
+                memcpy(vaddr, buffer, len);
+        iounmap(vaddr);
+
+        return 0;
+}
+
+static int ghes_read_estatus(struct ghes *ghes, int silent)
+{
+        struct acpi_hest_generic *g = ghes->generic;
+        u64 buf_paddr;
+        u32 len;
+        int rc;
+
+        rc = acpi_atomic_read(&buf_paddr, &g->error_status_address);
+        if (rc) {
+                if (!silent && printk_ratelimit())
+                        pr_warning(FW_WARN GHES_PFX
+"Failed to read error status block address for hardware error source: %d.\n",
+                                   g->header.source_id);
+                return -EIO;
+        }
+        if (!buf_paddr)
+                return -ENOENT;
+
+        rc = ghes_copy_tofrom_phys(ghes->estatus, buf_paddr,
+                                   sizeof(*ghes->estatus), 1);
+        if (rc)
+                return rc;
+        if (!ghes->estatus->block_status)
+                return -ENOENT;
+
+        ghes->buffer_paddr = buf_paddr;
+        ghes->flags |= GHES_TO_CLEAR;
+
+        rc = -EIO;
+        len = apei_estatus_len(ghes->estatus);
+        if (len < sizeof(*ghes->estatus))
+                goto err_read_block;
+        if (len > ghes->generic->error_block_length)
+                goto err_read_block;
+        if (apei_estatus_check_header(ghes->estatus))
+                goto err_read_block;
+        rc = ghes_copy_tofrom_phys(ghes->estatus + 1,
+                                   buf_paddr + sizeof(*ghes->estatus),
+                                   len - sizeof(*ghes->estatus), 1);
+        if (rc)
+                return rc;
+        if (apei_estatus_check(ghes->estatus))
+                goto err_read_block;
+        rc = 0;
+
+err_read_block:
+        if (rc && !silent)
+                pr_warning(FW_WARN GHES_PFX
+                           "Failed to read error status block!\n");
+        return rc;
+}
+
+static void ghes_clear_estatus(struct ghes *ghes)
+{
+        ghes->estatus->block_status = 0;
+        if (!(ghes->flags & GHES_TO_CLEAR))
+                return;
+        ghes_copy_tofrom_phys(ghes->estatus, ghes->buffer_paddr,
+                              sizeof(ghes->estatus->block_status), 0);
+        ghes->flags &= ~GHES_TO_CLEAR;
+}
+
+static void ghes_do_proc(struct ghes *ghes)
+{
+        int ser, processed = 0;
+        struct acpi_hest_generic_data *gdata;
+
+        ser = ghes_severity(ghes->estatus->error_severity);
+        apei_estatus_for_each_section(ghes->estatus, gdata) {
+#ifdef CONFIG_X86_MCE
+                if (!uuid_le_cmp(*(uuid_le *)gdata->section_type,
+                                 CPER_SEC_PLATFORM_MEM)) {
+                        apei_mce_report_mem_error(
+                                ser == GHES_SER_CORRECTED,
+                                (struct cper_sec_mem_err *)(gdata+1));
+                        processed = 1;
+                }
+#endif
+        }
+
+        if (!processed && printk_ratelimit())
+                pr_warning(GHES_PFX
+                "Unknown error record from generic hardware error source: %d\n",
+                           ghes->generic->header.source_id);
+}
+
+static int ghes_proc(struct ghes *ghes)
+{
+        int rc;
+
+        rc = ghes_read_estatus(ghes, 0);
+        if (rc)
+                goto out;
+        ghes_do_proc(ghes);
+
+out:
+        ghes_clear_estatus(ghes);
+        return 0;
+}
+
+static int ghes_notify_sci(struct notifier_block *this,
+                                  unsigned long event, void *data)
+{
+        struct ghes *ghes;
+        int ret = NOTIFY_DONE;
+
+        rcu_read_lock();
+        list_for_each_entry_rcu(ghes, &ghes_sci, list) {
+                if (!ghes_proc(ghes))
+                        ret = NOTIFY_OK;
+        }
+        rcu_read_unlock();
+
+        return ret;
+}
+
+static struct notifier_block ghes_notifier_sci = {
+        .notifier_call = ghes_notify_sci,
+};
+
+static int hest_ghes_parse(struct acpi_hest_header *hest_hdr, void *data)
+{
+        struct acpi_hest_generic *generic;
+        struct ghes *ghes = NULL;
+        int rc = 0;
+
+        if (hest_hdr->type != ACPI_HEST_TYPE_GENERIC_ERROR)
+                return 0;
+
+        generic = (struct acpi_hest_generic *)hest_hdr;
+        if (!generic->enabled)
+                return 0;
+
+        if (generic->error_block_length <
+            sizeof(struct acpi_hest_generic_status)) {
+                pr_warning(FW_BUG GHES_PFX
+"Invalid error block length: %u for generic hardware error source: %d\n",
+                           generic->error_block_length,
+                           generic->header.source_id);
+                goto err;
+        }
+        if (generic->records_to_preallocate == 0) {
+                pr_warning(FW_BUG GHES_PFX
+"Invalid records to preallocate: %u for generic hardware error source: %d\n",
+                           generic->records_to_preallocate,
+                           generic->header.source_id);
+                goto err;
+        }
+        ghes = ghes_new(generic);
+        if (IS_ERR(ghes)) {
+                rc = PTR_ERR(ghes);
+                ghes = NULL;
+                goto err;
+        }
+        switch (generic->notify.type) {
+        case ACPI_HEST_NOTIFY_POLLED:
+                pr_warning(GHES_PFX
+"Generic hardware error source: %d notified via POLL is not supported!\n",
+                           generic->header.source_id);
+                break;
+        case ACPI_HEST_NOTIFY_EXTERNAL:
+        case ACPI_HEST_NOTIFY_LOCAL:
+                pr_warning(GHES_PFX
+"Generic hardware error source: %d notified via IRQ is not supported!\n",
+                           generic->header.source_id);
+                break;
+        case ACPI_HEST_NOTIFY_SCI:
+                if (list_empty(&ghes_sci))
+                        register_acpi_hed_notifier(&ghes_notifier_sci);
+                list_add_rcu(&ghes->list, &ghes_sci);
+                break;
+        case ACPI_HEST_NOTIFY_NMI:
+                pr_warning(GHES_PFX
+"Generic hardware error source: %d notified via NMI is not supported!\n",
+                           generic->header.source_id);
+                break;
+        default:
+                pr_warning(FW_WARN GHES_PFX
+        "Unknown notification type: %u for generic hardware error source: %d\n",
+                           generic->notify.type, generic->header.source_id);
+                break;
+        }
+
+        return 0;
+err:
+        if (ghes)
+                ghes_fini(ghes);
+        return rc;
+}
+
+static void ghes_cleanup(void)
+{
+        struct ghes *ghes, *nghes;
+
+        if (!list_empty(&ghes_sci))
+                unregister_acpi_hed_notifier(&ghes_notifier_sci);
+
+        synchronize_rcu();
+
+        list_for_each_entry_safe(ghes, nghes, &ghes_sci, list) {
+                list_del(&ghes->list);
+                ghes_fini(ghes);
+                kfree(ghes);
+        }
+}
+
+static int __init ghes_init(void)
+{
+        int rc;
+
+        if (acpi_disabled)
+                return -ENODEV;
+
+        if (hest_disable) {
+                pr_info(GHES_PFX "HEST is not enabled!\n");
+                return -EINVAL;
+        }
+
+        rc = apei_hest_parse(hest_ghes_parse, NULL);
+        if (rc) {
+                pr_err(GHES_PFX
+                "Error during parsing HEST generic hardware error sources.\n");
+                goto err_cleanup;
+        }
+
+        if (list_empty(&ghes_sci)) {
+                pr_info(GHES_PFX
+                        "No functional generic hardware error sources.\n");
+                rc = -ENODEV;
+                goto err_cleanup;
+        }
+
+        pr_info(GHES_PFX
+                "Generic Hardware Error Source support is initialized.\n");
+
+        return 0;
+err_cleanup:
+        ghes_cleanup();
+        return rc;
+}
+
+static void __exit ghes_exit(void)
+{
+        ghes_cleanup();
+}
+
+module_init(ghes_init);
+module_exit(ghes_exit);
+
+MODULE_AUTHOR("Huang Ying");
+MODULE_DESCRIPTION("APEI Generic Hardware Error Source support");
+MODULE_LICENSE("GPL");
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
new file mode 100644
index 000000000000..e7f40d362cb3
--- /dev/null
+++ b/drivers/acpi/apei/hest.c
@@ -0,0 +1,173 @@
+/*
+ * APEI Hardware Error Souce Table support
+ *
+ * HEST describes error sources in detail; communicates operational
+ * parameters (i.e. severity levels, masking bits, and threshold
+ * values) to Linux as necessary. It also allows the BIOS to report
+ * non-standard error sources to Linux (for example, chipset-specific
+ * error registers).
+ *
+ * For more information about HEST, please refer to ACPI Specification
+ * version 4.0, section 17.3.2.
+ *
+ * Copyright 2009 Intel Corp.
+ *   Author: Huang Ying <ying.huang@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/acpi.h>
+#include <linux/kdebug.h>
+#include <linux/highmem.h>
+#include <linux/io.h>
+#include <acpi/apei.h>
+
+#include "apei-internal.h"
+
+#define HEST_PFX "HEST: "
+
+int hest_disable;
+EXPORT_SYMBOL_GPL(hest_disable);
+
+/* HEST table parsing */
+
+static struct acpi_table_hest *hest_tab;
+
+static int hest_void_parse(struct acpi_hest_header *hest_hdr, void *data)
+{
+        return 0;
+}
+
+static int hest_esrc_len_tab[ACPI_HEST_TYPE_RESERVED] = {
+        [ACPI_HEST_TYPE_IA32_CHECK] = -1,       /* need further calculation */
+        [ACPI_HEST_TYPE_IA32_CORRECTED_CHECK] = -1,
+        [ACPI_HEST_TYPE_IA32_NMI] = sizeof(struct acpi_hest_ia_nmi),
+        [ACPI_HEST_TYPE_AER_ROOT_PORT] = sizeof(struct acpi_hest_aer_root),
+        [ACPI_HEST_TYPE_AER_ENDPOINT] = sizeof(struct acpi_hest_aer),
+        [ACPI_HEST_TYPE_AER_BRIDGE] = sizeof(struct acpi_hest_aer_bridge),
+        [ACPI_HEST_TYPE_GENERIC_ERROR] = sizeof(struct acpi_hest_generic),
+};
+
+static int hest_esrc_len(struct acpi_hest_header *hest_hdr)
+{
+        u16 hest_type = hest_hdr->type;
+        int len;
+
+        if (hest_type >= ACPI_HEST_TYPE_RESERVED)
+                return 0;
+
+        len = hest_esrc_len_tab[hest_type];
+
+        if (hest_type == ACPI_HEST_TYPE_IA32_CORRECTED_CHECK) {
+                struct acpi_hest_ia_corrected *cmc;
+                cmc = (struct acpi_hest_ia_corrected *)hest_hdr;
+                len = sizeof(*cmc) + cmc->num_hardware_banks *
+                        sizeof(struct acpi_hest_ia_error_bank);
+        } else if (hest_type == ACPI_HEST_TYPE_IA32_CHECK) {
+                struct acpi_hest_ia_machine_check *mc;
+                mc = (struct acpi_hest_ia_machine_check *)hest_hdr;
+                len = sizeof(*mc) + mc->num_hardware_banks *
+                        sizeof(struct acpi_hest_ia_error_bank);
+        }
+        BUG_ON(len == -1);
+
+        return len;
+};
+
+int apei_hest_parse(apei_hest_func_t func, void *data)
+{
+        struct acpi_hest_header *hest_hdr;
+        int i, rc, len;
+
+        if (hest_disable)
+                return -EINVAL;
+
+        hest_hdr = (struct acpi_hest_header *)(hest_tab + 1);
+        for (i = 0; i < hest_tab->error_source_count; i++) {
+                len = hest_esrc_len(hest_hdr);
+                if (!len) {
+                        pr_warning(FW_WARN HEST_PFX
+                                   "Unknown or unused hardware error source "
+                                   "type: %d for hardware error source: %d.\n",
+                                   hest_hdr->type, hest_hdr->source_id);
+                        return -EINVAL;
+                }
+                if ((void *)hest_hdr + len >
+                    (void *)hest_tab + hest_tab->header.length) {
+                        pr_warning(FW_BUG HEST_PFX
+                "Table contents overflow for hardware error source: %d.\n",
+                                hest_hdr->source_id);
+                        return -EINVAL;
+                }
+
+                rc = func(hest_hdr, data);
+                if (rc)
+                        return rc;
+
+                hest_hdr = (void *)hest_hdr + len;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(apei_hest_parse);
+
+static int __init setup_hest_disable(char *str)
+{
+        hest_disable = 1;
+        return 0;
+}
+
+__setup("hest_disable", setup_hest_disable);
+
+static int __init hest_init(void)
+{
+        acpi_status status;
+        int rc = -ENODEV;
+
+        if (acpi_disabled)
+                goto err;
+
+        if (hest_disable) {
+                pr_info(HEST_PFX "HEST tabling parsing is disabled.\n");
+                goto err;
+        }
+
+        status = acpi_get_table(ACPI_SIG_HEST, 0,
+                                (struct acpi_table_header **)&hest_tab);
+        if (status == AE_NOT_FOUND) {
+                pr_info(HEST_PFX "Table is not found!\n");
+                goto err;
+        } else if (ACPI_FAILURE(status)) {
+                const char *msg = acpi_format_exception(status);
+                pr_err(HEST_PFX "Failed to get table, %s\n", msg);
+                rc = -EINVAL;
+                goto err;
+        }
+
+        rc = apei_hest_parse(hest_void_parse, NULL);
+        if (rc)
+                goto err;
+
+        pr_info(HEST_PFX "HEST table parsing is initialized.\n");
+
+        return 0;
+err:
+        hest_disable = 1;
+        return rc;
+}
+
+subsys_initcall(hest_init);
diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c
new file mode 100644
index 000000000000..814b19249616
--- /dev/null
+++ b/drivers/acpi/atomicio.c
@@ -0,0 +1,360 @@
+/*
+ * atomicio.c - ACPI IO memory pre-mapping/post-unmapping, then
+ * accessing in atomic context.
+ *
+ * This is used for NMI handler to access IO memory area, because
+ * ioremap/iounmap can not be used in NMI handler. The IO memory area
+ * is pre-mapped in process context and accessed in NMI handler.
+ *
+ * Copyright (C) 2009-2010, Intel Corp.
+ *      Author: Huang Ying <ying.huang@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/acpi.h>
+#include <linux/io.h>
+#include <linux/kref.h>
+#include <linux/rculist.h>
+#include <linux/interrupt.h>
+#include <acpi/atomicio.h>
+
+#define ACPI_PFX "ACPI: "
+
+static LIST_HEAD(acpi_iomaps);
+/*
+ * Used for mutual exclusion between writers of acpi_iomaps list, for
+ * synchronization between readers and writer, RCU is used.
+ */
+static DEFINE_SPINLOCK(acpi_iomaps_lock);
+
+struct acpi_iomap {
+        struct list_head list;
+        void __iomem *vaddr;
+        unsigned long size;
+        phys_addr_t paddr;
+        struct kref ref;
+};
+
+/* acpi_iomaps_lock or RCU read lock must be held before calling */
+static struct acpi_iomap *__acpi_find_iomap(phys_addr_t paddr,
+                                            unsigned long size)
+{
+        struct acpi_iomap *map;
+
+        list_for_each_entry_rcu(map, &acpi_iomaps, list) {
+                if (map->paddr + map->size >= paddr + size &&
+                    map->paddr <= paddr)
+                        return map;
+        }
+        return NULL;
+}
+
+/*
+ * Atomic "ioremap" used by NMI handler, if the specified IO memory
+ * area is not pre-mapped, NULL will be returned.
+ *
+ * acpi_iomaps_lock or RCU read lock must be held before calling
+ */
+static void __iomem *__acpi_ioremap_fast(phys_addr_t paddr,
+                                         unsigned long size)
+{
+        struct acpi_iomap *map;
+
+        map = __acpi_find_iomap(paddr, size);
+        if (map)
+                return map->vaddr + (paddr - map->paddr);
+        else
+                return NULL;
+}
+
+/* acpi_iomaps_lock must be held before calling */
+static void __iomem *__acpi_try_ioremap(phys_addr_t paddr,
+                                        unsigned long size)
+{
+        struct acpi_iomap *map;
+
+        map = __acpi_find_iomap(paddr, size);
+        if (map) {
+                kref_get(&map->ref);
+                return map->vaddr + (paddr - map->paddr);
+        } else
+                return NULL;
+}
+
+/*
+ * Used to pre-map the specified IO memory area. First try to find
+ * whether the area is already pre-mapped, if it is, increase the
+ * reference count (in __acpi_try_ioremap) and return; otherwise, do
+ * the real ioremap, and add the mapping into acpi_iomaps list.
+ */
+static void __iomem *acpi_pre_map(phys_addr_t paddr,
+                                  unsigned long size)
+{
+        void __iomem *vaddr;
+        struct acpi_iomap *map;
+        unsigned long pg_sz, flags;
+        phys_addr_t pg_off;
+
+        spin_lock_irqsave(&acpi_iomaps_lock, flags);
+        vaddr = __acpi_try_ioremap(paddr, size);
+        spin_unlock_irqrestore(&acpi_iomaps_lock, flags);
+        if (vaddr)
+                return vaddr;
+
+        pg_off = paddr & PAGE_MASK;
+        pg_sz = ((paddr + size + PAGE_SIZE - 1) & PAGE_MASK) - pg_off;
+        vaddr = ioremap(pg_off, pg_sz);
+        if (!vaddr)
+                return NULL;
+        map = kmalloc(sizeof(*map), GFP_KERNEL);
+        if (!map)
+                goto err_unmap;
+        INIT_LIST_HEAD(&map->list);
+        map->paddr = pg_off;
+        map->size = pg_sz;
+        map->vaddr = vaddr;
+        kref_init(&map->ref);
+
+        spin_lock_irqsave(&acpi_iomaps_lock, flags);
+        vaddr = __acpi_try_ioremap(paddr, size);
+        if (vaddr) {
+                spin_unlock_irqrestore(&acpi_iomaps_lock, flags);
+                iounmap(map->vaddr);
+                kfree(map);
+                return vaddr;
+        }
+        list_add_tail_rcu(&map->list, &acpi_iomaps);
+        spin_unlock_irqrestore(&acpi_iomaps_lock, flags);
+
+        return vaddr + (paddr - pg_off);
+err_unmap:
+        iounmap(vaddr);
+        return NULL;
+}
+
+/* acpi_iomaps_lock must be held before calling */
+static void __acpi_kref_del_iomap(struct kref *ref)
+{
+        struct acpi_iomap *map;
+
+        map = container_of(ref, struct acpi_iomap, ref);
+        list_del_rcu(&map->list);
+}
+
+/*
+ * Used to post-unmap the specified IO memory area. The iounmap is
+ * done only if the reference count goes zero.
+ */
+static void acpi_post_unmap(phys_addr_t paddr, unsigned long size)
+{
+        struct acpi_iomap *map;
+        unsigned long flags;
+        int del;
+
+        spin_lock_irqsave(&acpi_iomaps_lock, flags);
+        map = __acpi_find_iomap(paddr, size);
+        BUG_ON(!map);
+        del = kref_put(&map->ref, __acpi_kref_del_iomap);
+        spin_unlock_irqrestore(&acpi_iomaps_lock, flags);
+
+        if (!del)
+                return;
+
+        synchronize_rcu();
+        iounmap(map->vaddr);
+        kfree(map);
+}
+
+/* In NMI handler, should set silent = 1 */
+static int acpi_check_gar(struct acpi_generic_address *reg,
+                          u64 *paddr, int silent)
+{
+        u32 width, space_id;
+
+        width = reg->bit_width;
+        space_id = reg->space_id;
+        /* Handle possible alignment issues */
+        memcpy(paddr, &reg->address, sizeof(*paddr));
+        if (!*paddr) {
+                if (!silent)
+                        pr_warning(FW_BUG ACPI_PFX
+                        "Invalid physical address in GAR [0x%llx/%u/%u]\n",
+                                   *paddr, width, space_id);
+                return -EINVAL;
+        }
+
+        if ((width != 8) && (width != 16) && (width != 32) && (width != 64)) {
+                if (!silent)
+                        pr_warning(FW_BUG ACPI_PFX
+                                   "Invalid bit width in GAR [0x%llx/%u/%u]\n",
+                                   *paddr, width, space_id);
+                return -EINVAL;
+        }
+
+        if (space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY &&
+            space_id != ACPI_ADR_SPACE_SYSTEM_IO) {
+                if (!silent)
+                        pr_warning(FW_BUG ACPI_PFX
+                        "Invalid address space type in GAR [0x%llx/%u/%u]\n",
+                                   *paddr, width, space_id);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/* Pre-map, working on GAR */
+int acpi_pre_map_gar(struct acpi_generic_address *reg)
+{
+        u64 paddr;
+        void __iomem *vaddr;
+        int rc;
+
+        if (reg->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
+                return 0;
+
+        rc = acpi_check_gar(reg, &paddr, 0);
+        if (rc)
+                return rc;
+
+        vaddr = acpi_pre_map(paddr, reg->bit_width / 8);
+        if (!vaddr)
+                return -EIO;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(acpi_pre_map_gar);
+
+/* Post-unmap, working on GAR */
+int acpi_post_unmap_gar(struct acpi_generic_address *reg)
+{
+        u64 paddr;
+        int rc;
+
+        if (reg->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
+                return 0;
+
+        rc = acpi_check_gar(reg, &paddr, 0);
+        if (rc)
+                return rc;
+
+        acpi_post_unmap(paddr, reg->bit_width / 8);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(acpi_post_unmap_gar);
+
+/*
+ * Can be used in atomic (including NMI) or process context. RCU read
+ * lock can only be released after the IO memory area accessing.
+ */
+static int acpi_atomic_read_mem(u64 paddr, u64 *val, u32 width)
+{
+        void __iomem *addr;
+
+        rcu_read_lock();
+        addr = __acpi_ioremap_fast(paddr, width);
+        switch (width) {
+        case 8:
+                *val = readb(addr);
+                break;
+        case 16:
+                *val = readw(addr);
+                break;
+        case 32:
+                *val = readl(addr);
+                break;
+        case 64:
+                *val = readq(addr);
+                break;
+        default:
+                return -EINVAL;
+        }
+        rcu_read_unlock();
+
+        return 0;
+}
+
+static int acpi_atomic_write_mem(u64 paddr, u64 val, u32 width)
+{
+        void __iomem *addr;
+
+        rcu_read_lock();
+        addr = __acpi_ioremap_fast(paddr, width);
+        switch (width) {
+        case 8:
+                writeb(val, addr);
+                break;
+        case 16:
+                writew(val, addr);
+                break;
+        case 32:
+                writel(val, addr);
+                break;
+        case 64:
+                writeq(val, addr);
+                break;
+        default:
+                return -EINVAL;
+        }
+        rcu_read_unlock();
+
+        return 0;
+}
+
+/* GAR accessing in atomic (including NMI) or process context */
+int acpi_atomic_read(u64 *val, struct acpi_generic_address *reg)
+{
+        u64 paddr;
+        int rc;
+
+        rc = acpi_check_gar(reg, &paddr, 1);
+        if (rc)
+                return rc;
+
+        *val = 0;
+        switch (reg->space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+                return acpi_atomic_read_mem(paddr, val, reg->bit_width);
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+                return acpi_os_read_port(paddr, (u32 *)val, reg->bit_width);
+        default:
+                return -EINVAL;
+        }
+}
+EXPORT_SYMBOL_GPL(acpi_atomic_read);
+
+int acpi_atomic_write(u64 val, struct acpi_generic_address *reg)
+{
+        u64 paddr;
+        int rc;
+
+        rc = acpi_check_gar(reg, &paddr, 1);
+        if (rc)
+                return rc;
+
+        switch (reg->space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+                return acpi_atomic_write_mem(paddr, val, reg->bit_width);
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+                return acpi_os_write_port(paddr, val, reg->bit_width);
+        default:
+                return -EINVAL;
+        }
+}
+EXPORT_SYMBOL_GPL(acpi_atomic_write);
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 743576bf1bd7..c1d23cd71652 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -69,6 +69,44 @@ static struct dmi_system_id __cpuinitdata power_nocheck_dmi_table[] = {
 };
 
 
+#ifdef CONFIG_X86
+static int set_copy_dsdt(const struct dmi_system_id *id)
+{
+        printk(KERN_NOTICE "%s detected - "
+                "force copy of DSDT to local memory\n", id->ident);
+        acpi_gbl_copy_dsdt_locally = 1;
+        return 0;
+}
+
+static struct dmi_system_id dsdt_dmi_table[] __initdata = {
+        /*
+         * Insyde BIOS on some TOSHIBA machines corrupt the DSDT.
+         * https://bugzilla.kernel.org/show_bug.cgi?id=14679
+         */
+        {
+         .callback = set_copy_dsdt,
+         .ident = "TOSHIBA Satellite A505",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A505"),
+                },
+        },
+        {
+         .callback = set_copy_dsdt,
+         .ident = "TOSHIBA Satellite L505D",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L505D"),
+                },
+        },
+        {}
+};
+#else
+static struct dmi_system_id dsdt_dmi_table[] __initdata = {
+        {}
+};
+#endif
+
 /* --------------------------------------------------------------------------
                                 Device Management
    -------------------------------------------------------------------------- */
@@ -363,11 +401,6 @@ static void acpi_print_osc_error(acpi_handle handle,
         printk("\n");
 }
 
-static u8 hex_val(unsigned char c)
-{
-        return isdigit(c) ? c - '0' : toupper(c) - 'A' + 10;
-}
-
 static acpi_status acpi_str_to_uuid(char *str, u8 *uuid)
 {
         int i;
@@ -384,8 +417,8 @@ static acpi_status acpi_str_to_uuid(char *str, u8 *uuid)
                         return AE_BAD_PARAMETER;
         }
         for (i = 0; i < 16; i++) {
-                uuid[i] = hex_val(str[opc_map_to_uuid[i]]) << 4;
-                uuid[i] |= hex_val(str[opc_map_to_uuid[i] + 1]);
+                uuid[i] = hex_to_bin(str[opc_map_to_uuid[i]]) << 4;
+                uuid[i] |= hex_to_bin(str[opc_map_to_uuid[i] + 1]);
         }
         return AE_OK;
 }
@@ -813,6 +846,12 @@ void __init acpi_early_init(void)
 
         acpi_gbl_permanent_mmap = 1;
 
+        /*
+         * If the machine falls into the DMI check table,
+         * DSDT will be copied to memory
+         */
+        dmi_check_system(dsdt_dmi_table);
+
         status = acpi_reallocate_root_table();
         if (ACPI_FAILURE(status)) {
                 printk(KERN_ERR PREFIX
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 3f01f065b533..5f2027d782e8 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1037,10 +1037,9 @@ int __init acpi_ec_ecdt_probe(void)
                 /* Don't trust ECDT, which comes from ASUSTek */
                 if (!EC_FLAGS_VALIDATE_ECDT)
                         goto install;
-                saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
+                saved_ec = kmemdup(boot_ec, sizeof(struct acpi_ec), GFP_KERNEL);
                 if (!saved_ec)
                         return -ENOMEM;
-                memcpy(saved_ec, boot_ec, sizeof(struct acpi_ec));
         /* fall through */
         }
 
diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c
new file mode 100644
index 000000000000..d0c1967f7597
--- /dev/null
+++ b/drivers/acpi/hed.c
@@ -0,0 +1,112 @@
+/*
+ * ACPI Hardware Error Device (PNP0C33) Driver
+ *
+ * Copyright (C) 2010, Intel Corp.
+ *      Author: Huang Ying <ying.huang@intel.com>
+ *
+ * ACPI Hardware Error Device is used to report some hardware errors
+ * notified via SCI, mainly the corrected errors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/acpi.h>
+#include <acpi/acpi_bus.h>
+#include <acpi/acpi_drivers.h>
+#include <acpi/hed.h>
+
+static struct acpi_device_id acpi_hed_ids[] = {
+        {"PNP0C33", 0},
+        {"", 0},
+};
+MODULE_DEVICE_TABLE(acpi, acpi_hed_ids);
+
+static acpi_handle hed_handle;
+
+static BLOCKING_NOTIFIER_HEAD(acpi_hed_notify_list);
+
+int register_acpi_hed_notifier(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_register(&acpi_hed_notify_list, nb);
+}
+EXPORT_SYMBOL_GPL(register_acpi_hed_notifier);
+
+void unregister_acpi_hed_notifier(struct notifier_block *nb)
+{
+        blocking_notifier_chain_unregister(&acpi_hed_notify_list, nb);
+}
+EXPORT_SYMBOL_GPL(unregister_acpi_hed_notifier);
+
+/*
+ * SCI to report hardware error is forwarded to the listeners of HED,
+ * it is used by HEST Generic Hardware Error Source with notify type
+ * SCI.
+ */
+static void acpi_hed_notify(struct acpi_device *device, u32 event)
+{
+        blocking_notifier_call_chain(&acpi_hed_notify_list, 0, NULL);
+}
+
+static int __devinit acpi_hed_add(struct acpi_device *device)
+{
+        /* Only one hardware error device */
+        if (hed_handle)
+                return -EINVAL;
+        hed_handle = device->handle;
+        return 0;
+}
+
+static int __devexit acpi_hed_remove(struct acpi_device *device, int type)
+{
+        hed_handle = NULL;
+        return 0;
+}
+
+static struct acpi_driver acpi_hed_driver = {
+        .name = "hardware_error_device",
+        .class = "hardware_error",
+        .ids = acpi_hed_ids,
+        .ops = {
+                .add = acpi_hed_add,
+                .remove = acpi_hed_remove,
+                .notify = acpi_hed_notify,
+        },
+};
+
+static int __init acpi_hed_init(void)
+{
+        if (acpi_disabled)
+                return -ENODEV;
+
+        if (acpi_bus_register_driver(&acpi_hed_driver) < 0)
+                return -ENODEV;
+
+        return 0;
+}
+
+static void __exit acpi_hed_exit(void)
+{
+        acpi_bus_unregister_driver(&acpi_hed_driver);
+}
+
+module_init(acpi_hed_init);
+module_exit(acpi_hed_exit);
+
+ACPI_MODULE_NAME("hed");
+MODULE_AUTHOR("Huang Ying");
+MODULE_DESCRIPTION("ACPI Hardware Error Device Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/acpi/hest.c b/drivers/acpi/hest.c
deleted file mode 100644
index 1c527a192872..000000000000
--- a/drivers/acpi/hest.c
+++ /dev/null
@@ -1,139 +0,0 @@
-#include <linux/acpi.h>
-#include <linux/pci.h>
-
-#define PREFIX "ACPI: "
-
-static inline unsigned long parse_acpi_hest_ia_machine_check(struct acpi_hest_ia_machine_check *p)
-{
-        return sizeof(*p) +
-                (sizeof(struct acpi_hest_ia_error_bank) * p->num_hardware_banks);
-}
-
-static inline unsigned long parse_acpi_hest_ia_corrected(struct acpi_hest_ia_corrected *p)
-{
-        return sizeof(*p) +
-                (sizeof(struct acpi_hest_ia_error_bank) * p->num_hardware_banks);
-}
-
-static inline unsigned long parse_acpi_hest_ia_nmi(struct acpi_hest_ia_nmi *p)
-{
-        return sizeof(*p);
-}
-
-static inline unsigned long parse_acpi_hest_generic(struct acpi_hest_generic *p)
-{
-        return sizeof(*p);
-}
-
-static inline unsigned int hest_match_pci(struct acpi_hest_aer_common *p, struct pci_dev *pci)
-{
-        return  (0           == pci_domain_nr(pci->bus) &&
-                 p->bus      == pci->bus->number &&
-                 p->device   == PCI_SLOT(pci->devfn) &&
-                 p->function == PCI_FUNC(pci->devfn));
-}
-
-static unsigned long parse_acpi_hest_aer(void *hdr, int type, struct pci_dev *pci, int *firmware_first)
-{
-        struct acpi_hest_aer_common *p = hdr + sizeof(struct acpi_hest_header);
-        unsigned long rc=0;
-        u8 pcie_type = 0;
-        u8 bridge = 0;
-        switch (type) {
-        case ACPI_HEST_TYPE_AER_ROOT_PORT:
-                rc = sizeof(struct acpi_hest_aer_root);
-                pcie_type = PCI_EXP_TYPE_ROOT_PORT;
-                break;
-        case ACPI_HEST_TYPE_AER_ENDPOINT:
-                rc = sizeof(struct acpi_hest_aer);
-                pcie_type = PCI_EXP_TYPE_ENDPOINT;
-                break;
-        case ACPI_HEST_TYPE_AER_BRIDGE:
-                rc = sizeof(struct acpi_hest_aer_bridge);
-                if ((pci->class >> 16) == PCI_BASE_CLASS_BRIDGE)
-                        bridge = 1;
-                break;
-        }
-
-        if (p->flags & ACPI_HEST_GLOBAL) {
-                if ((pci->is_pcie && (pci->pcie_type == pcie_type)) || bridge)
-                        *firmware_first = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);
-        }
-        else
-                if (hest_match_pci(p, pci))
-                        *firmware_first = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);
-        return rc;
-}
-
-static int acpi_hest_firmware_first(struct acpi_table_header *stdheader, struct pci_dev *pci)
-{
-        struct acpi_table_hest *hest = (struct acpi_table_hest *)stdheader;
-        void *p = (void *)hest + sizeof(*hest); /* defined by the ACPI 4.0 spec */
-        struct acpi_hest_header *hdr = p;
-
-        int i;
-        int firmware_first = 0;
-        static unsigned char printed_unused = 0;
-        static unsigned char printed_reserved = 0;
-
-        for (i=0, hdr=p; p < (((void *)hest) + hest->header.length) && i < hest->error_source_count; i++) {
-                switch (hdr->type) {
-                case ACPI_HEST_TYPE_IA32_CHECK:
-                        p += parse_acpi_hest_ia_machine_check(p);
-                        break;
-                case ACPI_HEST_TYPE_IA32_CORRECTED_CHECK:
-                        p += parse_acpi_hest_ia_corrected(p);
-                        break;
-                case ACPI_HEST_TYPE_IA32_NMI:
-                        p += parse_acpi_hest_ia_nmi(p);
-                        break;
-                /* These three should never appear */
-                case ACPI_HEST_TYPE_NOT_USED3:
-                case ACPI_HEST_TYPE_NOT_USED4:
-                case ACPI_HEST_TYPE_NOT_USED5:
-                        if (!printed_unused) {
-                                printk(KERN_DEBUG PREFIX
-                                       "HEST Error Source list contains an obsolete type (%d).\n", hdr->type);
-                                printed_unused = 1;
-                        }
-                        break;
-                case ACPI_HEST_TYPE_AER_ROOT_PORT:
-                case ACPI_HEST_TYPE_AER_ENDPOINT:
-                case ACPI_HEST_TYPE_AER_BRIDGE:
-                        p += parse_acpi_hest_aer(p, hdr->type, pci, &firmware_first);
-                        break;
-                case ACPI_HEST_TYPE_GENERIC_ERROR:
-                        p += parse_acpi_hest_generic(p);
-                        break;
-                /* These should never appear either */
-                case ACPI_HEST_TYPE_RESERVED:
-                default:
-                        if (!printed_reserved) {
-                                printk(KERN_DEBUG PREFIX
-                                       "HEST Error Source list contains a reserved type (%d).\n", hdr->type);
-                                printed_reserved = 1;
-                        }
-                        break;
-                }
-        }
-        return firmware_first;
-}
-
-int acpi_hest_firmware_first_pci(struct pci_dev *pci)
-{
-        acpi_status status = AE_NOT_FOUND;
-        struct acpi_table_header *hest = NULL;
-
-        if (acpi_disabled)
-                return 0;
-
-        status = acpi_get_table(ACPI_SIG_HEST, 1, &hest);
-
-        if (ACPI_SUCCESS(status)) {
-                if (acpi_hest_firmware_first(hest, pci)) {
-                        return 1;
-                }
-        }
-        return 0;
-}
-EXPORT_SYMBOL_GPL(acpi_hest_firmware_first_pci);
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 7594f65800cf..78418ce4fc78 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1207,6 +1207,15 @@ int acpi_check_mem_region(resource_size_t start, resource_size_t n,
 EXPORT_SYMBOL(acpi_check_mem_region);
 
 /*
+ * Let drivers know whether the resource checks are effective
+ */
+int acpi_resources_are_enforced(void)
+{
+        return acpi_enforce_resources == ENFORCE_RESOURCES_STRICT;
+}
+EXPORT_SYMBOL(acpi_resources_are_enforced);
+
+/*
  * Acquire a spinlock.
  *
  * handle is a pointer to the spinlock_t.
@@ -1406,7 +1415,7 @@ acpi_os_invalidate_address(
         switch (space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                /* Only interference checks against SystemIO and SytemMemory
+                /* Only interference checks against SystemIO and SystemMemory
                    are needed */
                 res.start = address;
                 res.end = address + length - 1;
@@ -1458,7 +1467,7 @@ acpi_os_validate_address (
         switch (space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                /* Only interference checks against SystemIO and SytemMemory
+                /* Only interference checks against SystemIO and SystemMemory
                    are needed */
                 res = kzalloc(sizeof(struct acpi_res_list), GFP_KERNEL);
                 if (!res)
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index b0a71ecee682..e4804fb05e23 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -401,11 +401,13 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
          * driver reported one, then use it. Exit in any case.
          */
         if (gsi < 0) {
+                u32 dev_gsi;
                 dev_warn(&dev->dev, "PCI INT %c: no GSI", pin_name(pin));
                 /* Interrupt Line values above 0xF are forbidden */
-                if (dev->irq > 0 && (dev->irq <= 0xF)) {
-                        printk(" - using IRQ %d\n", dev->irq);
-                        acpi_register_gsi(&dev->dev, dev->irq,
+                if (dev->irq > 0 && (dev->irq <= 0xF) &&
+                    (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) {
+                        printk(" - using ISA IRQ %d\n", dev->irq);
+                        acpi_register_gsi(&dev->dev, dev_gsi,
                                           ACPI_LEVEL_SENSITIVE,
                                           ACPI_ACTIVE_LOW);
                         return 0;
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index aefce33f2a09..4eac59393edc 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -120,7 +120,8 @@ acpi_handle acpi_get_pci_rootbridge_handle(unsigned int seg, unsigned int bus)
         struct acpi_pci_root *root;
         
         list_for_each_entry(root, &acpi_pci_roots, node)
-                if ((root->segment == (u16) seg) && (root->bus_nr == (u16) bus))
+                if ((root->segment == (u16) seg) &&
+                    (root->secondary.start == (u16) bus))
                         return root->device->handle;
         return NULL;            
 }
@@ -154,7 +155,7 @@ EXPORT_SYMBOL_GPL(acpi_is_root_bridge);
 static acpi_status
 get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
 {
-        int *busnr = data;
+        struct resource *res = data;
         struct acpi_resource_address64 address;
 
         if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 &&
@@ -164,28 +165,27 @@ get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
 
         acpi_resource_to_address64(resource, &address);
         if ((address.address_length > 0) &&
-            (address.resource_type == ACPI_BUS_NUMBER_RANGE))
-                *busnr = address.minimum;
+            (address.resource_type == ACPI_BUS_NUMBER_RANGE)) {
+                res->start = address.minimum;
+                res->end = address.minimum + address.address_length - 1;
+        }
 
         return AE_OK;
 }
 
 static acpi_status try_get_root_bridge_busnr(acpi_handle handle,
-                                             unsigned long long *bus)
+                                             struct resource *res)
 {
         acpi_status status;
-        int busnum;
 
-        busnum = -1;
+        res->start = -1;
         status =
             acpi_walk_resources(handle, METHOD_NAME__CRS,
-                                get_root_bridge_busnr_callback, &busnum);
+                                get_root_bridge_busnr_callback, res);
         if (ACPI_FAILURE(status))
                 return status;
-        /* Check if we really get a bus number from _CRS */
-        if (busnum == -1)
+        if (res->start == -1)
                 return AE_ERROR;
-        *bus = busnum;
         return AE_OK;
 }
 
@@ -429,34 +429,47 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
         struct acpi_device *child;
         u32 flags, base_flags;
 
+        root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
+        if (!root)
+                return -ENOMEM;
+
         segment = 0;
         status = acpi_evaluate_integer(device->handle, METHOD_NAME__SEG, NULL,
                                        &segment);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
                 printk(KERN_ERR PREFIX "can't evaluate _SEG\n");
-                return -ENODEV;
+                result = -ENODEV;
+                goto end;
         }
 
         /* Check _CRS first, then _BBN.  If no _BBN, default to zero. */
-        bus = 0;
-        status = try_get_root_bridge_busnr(device->handle, &bus);
+        root->secondary.flags = IORESOURCE_BUS;
+        status = try_get_root_bridge_busnr(device->handle, &root->secondary);
         if (ACPI_FAILURE(status)) {
+                /*
+                 * We need both the start and end of the downstream bus range
+                 * to interpret _CBA (MMCONFIG base address), so it really is
+                 * supposed to be in _CRS.  If we don't find it there, all we
+                 * can do is assume [_BBN-0xFF] or [0-0xFF].
+                 */
+                root->secondary.end = 0xFF;
+                printk(KERN_WARNING FW_BUG PREFIX
+                       "no secondary bus range in _CRS\n");
                 status = acpi_evaluate_integer(device->handle, METHOD_NAME__BBN,                                               NULL, &bus);
-                if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                        printk(KERN_ERR PREFIX
-                             "no bus number in _CRS and can't evaluate _BBN\n");
-                        return -ENODEV;
+                if (ACPI_SUCCESS(status))
+                        root->secondary.start = bus;
+                else if (status == AE_NOT_FOUND)
+                        root->secondary.start = 0;
+                else {
+                        printk(KERN_ERR PREFIX "can't evaluate _BBN\n");
+                        result = -ENODEV;
+                        goto end;
                 }
         }
 
-        root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
-        if (!root)
-                return -ENOMEM;
-
         INIT_LIST_HEAD(&root->node);
         root->device = device;
         root->segment = segment & 0xFFFF;
-        root->bus_nr = bus & 0xFF;
         strcpy(acpi_device_name(device), ACPI_PCI_ROOT_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);
         device->driver_data = root;
@@ -475,9 +488,9 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
         /* TBD: Locking */
         list_add_tail(&root->node, &acpi_pci_roots);
 
-        printk(KERN_INFO PREFIX "%s [%s] (%04x:%02x)\n",
+        printk(KERN_INFO PREFIX "%s [%s] (domain %04x %pR)\n",
                acpi_device_name(device), acpi_device_bid(device),
-               root->segment, root->bus_nr);
+               root->segment, &root->secondary);
 
         /*
          * Scan the Root Bridge
@@ -486,11 +499,11 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
          * PCI namespace does not get created until this call is made (and 
          * thus the root bridge's pci_dev does not exist).
          */
-        root->bus = pci_acpi_scan_root(device, segment, bus);
+        root->bus = pci_acpi_scan_root(root);
         if (!root->bus) {
                 printk(KERN_ERR PREFIX
                             "Bus %04x:%02x not present in PCI namespace\n",
-                            root->segment, root->bus_nr);
+                            root->segment, (unsigned int)root->secondary.start);
                 result = -ENODEV;
                 goto end;
         }
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index ddc76787b842..f74d3b31e5c9 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -172,7 +172,6 @@ static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state)
                 return -EINVAL;
 
         /* The state of the list is 'on' IFF all resources are 'on'. */
-        /* */
 
         for (i = 0; i < list->count; i++) {
                 /*
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 5675d9747e87..b1034a9ada4e 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -616,7 +616,8 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
         acpi_processor_get_limit_info(pr);
 
 
-        acpi_processor_power_init(pr, device);
+        if (cpuidle_get_driver() == &acpi_idle_driver)
+                acpi_processor_power_init(pr, device);
 
         pr->cdev = thermal_cooling_device_register("Processor", device,
                                                 &processor_cooling_ops);
@@ -920,9 +921,14 @@ static int __init acpi_processor_init(void)
         if (!acpi_processor_dir)
                 return -ENOMEM;
 #endif
-        result = cpuidle_register_driver(&acpi_idle_driver);
-        if (result < 0)
-                goto out_proc;
+
+        if (!cpuidle_register_driver(&acpi_idle_driver)) {
+                printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
+                        acpi_idle_driver.name);
+        } else {
+                printk(KERN_DEBUG "ACPI: acpi_idle yielding to %s",
+                        cpuidle_get_driver()->name);
+        }
 
         result = acpi_bus_register_driver(&acpi_processor_driver);
         if (result < 0)
@@ -941,7 +947,6 @@ static int __init acpi_processor_init(void)
 out_cpuidle:
         cpuidle_unregister_driver(&acpi_idle_driver);
 
-out_proc:
 #ifdef CONFIG_ACPI_PROCFS
         remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
 #endif
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 5939e7f7d8e9..2e8c27d48f2b 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -698,7 +698,7 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
                    "max_cstate:              C%d\n"
                    "maximum allowed latency: %d usec\n",
                    pr->power.state ? pr->power.state - pr->power.states : 0,
-                   max_cstate, pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY));
+                   max_cstate, pm_qos_request(PM_QOS_CPU_DMA_LATENCY));
 
         seq_puts(seq, "states:\n");
 
@@ -727,19 +727,9 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
                         break;
                 }
 
-                if (pr->power.states[i].promotion.state)
-                        seq_printf(seq, "promotion[C%zd] ",
-                                   (pr->power.states[i].promotion.state -
-                                    pr->power.states));
-                else
-                        seq_puts(seq, "promotion[--] ");
+                seq_puts(seq, "promotion[--] ");
 
-                if (pr->power.states[i].demotion.state)
-                        seq_printf(seq, "demotion[C%zd] ",
-                                   (pr->power.states[i].demotion.state -
-                                    pr->power.states));
-                else
-                        seq_puts(seq, "demotion[--] ");
+                seq_puts(seq, "demotion[--] ");
 
                 seq_printf(seq, "latency[%03d] usage[%08d] duration[%020llu]\n",
                            pr->power.states[i].latency,
@@ -869,6 +859,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         struct acpi_processor *pr;
         struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
         ktime_t  kt1, kt2;
+        s64 idle_time_ns;
         s64 idle_time;
         s64 sleep_ticks = 0;
 
@@ -881,6 +872,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
                 return(acpi_idle_enter_c1(dev, state));
 
         local_irq_disable();
+
         if (cx->entry_method != ACPI_CSTATE_FFH) {
                 current_thread_info()->status &= ~TS_POLLING;
                 /*
@@ -888,12 +880,12 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
                  * NEED_RESCHED:
                  */
                 smp_mb();
-        }
 
-        if (unlikely(need_resched())) {
-                current_thread_info()->status |= TS_POLLING;
-                local_irq_enable();
-                return 0;
+                if (unlikely(need_resched())) {
+                        current_thread_info()->status |= TS_POLLING;
+                        local_irq_enable();
+                        return 0;
+                }
         }
 
         /*
@@ -910,15 +902,18 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         sched_clock_idle_sleep_event();
         acpi_idle_do_entry(cx);
         kt2 = ktime_get_real();
-        idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
+        idle_time_ns = ktime_to_ns(ktime_sub(kt2, kt1));
+        idle_time = idle_time_ns;
+        do_div(idle_time, NSEC_PER_USEC);
 
         sleep_ticks = us_to_pm_timer_ticks(idle_time);
 
         /* Tell the scheduler how much we idled: */
-        sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
+        sched_clock_idle_wakeup_event(idle_time_ns);
 
         local_irq_enable();
-        current_thread_info()->status |= TS_POLLING;
+        if (cx->entry_method != ACPI_CSTATE_FFH)
+                current_thread_info()->status |= TS_POLLING;
 
         cx->usage++;
 
@@ -943,6 +938,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
         struct acpi_processor *pr;
         struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
         ktime_t  kt1, kt2;
+        s64 idle_time_ns;
         s64 idle_time;
         s64 sleep_ticks = 0;
 
@@ -968,6 +964,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
         }
 
         local_irq_disable();
+
         if (cx->entry_method != ACPI_CSTATE_FFH) {
                 current_thread_info()->status &= ~TS_POLLING;
                 /*
@@ -975,12 +972,12 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                  * NEED_RESCHED:
                  */
                 smp_mb();
-        }
 
-        if (unlikely(need_resched())) {
-                current_thread_info()->status |= TS_POLLING;
-                local_irq_enable();
-                return 0;
+                if (unlikely(need_resched())) {
+                        current_thread_info()->status |= TS_POLLING;
+                        local_irq_enable();
+                        return 0;
+                }
         }
 
         acpi_unlazy_tlb(smp_processor_id());
@@ -1025,14 +1022,17 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                 spin_unlock(&c3_lock);
         }
         kt2 = ktime_get_real();
-        idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
+        idle_time_ns = ktime_to_us(ktime_sub(kt2, kt1));
+        idle_time = idle_time_ns;
+        do_div(idle_time, NSEC_PER_USEC);
 
         sleep_ticks = us_to_pm_timer_ticks(idle_time);
         /* Tell the scheduler how much we idled: */
-        sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
+        sched_clock_idle_wakeup_event(idle_time_ns);
 
         local_irq_enable();
-        current_thread_info()->status |= TS_POLLING;
+        if (cx->entry_method != ACPI_CSTATE_FFH)
+                current_thread_info()->status |= TS_POLLING;
 
         cx->usage++;
 
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 0338f513a010..7f2e051ed4f1 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -765,7 +765,7 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
         }
 
         status = acpi_get_gpe_status(NULL, device->wakeup.gpe_number,
-                                        ACPI_NOT_ISR, &event_status);
+                                        &event_status);
         if (status == AE_OK)
                 device->wakeup.flags.run_wake =
                                 !!(event_status & ACPI_EVENT_FLAG_HANDLE);
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 504a55edac49..3fb4bdea7e06 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -80,22 +80,6 @@ static int acpi_sleep_prepare(u32 acpi_state)
 
 #ifdef CONFIG_ACPI_SLEEP
 static u32 acpi_target_sleep_state = ACPI_STATE_S0;
-/*
- * According to the ACPI specification the BIOS should make sure that ACPI is
- * enabled and SCI_EN bit is set on wake-up from S1 - S3 sleep states.  Still,
- * some BIOSes don't do that and therefore we use acpi_enable() to enable ACPI
- * on such systems during resume.  Unfortunately that doesn't help in
- * particularly pathological cases in which SCI_EN has to be set directly on
- * resume, although the specification states very clearly that this flag is
- * owned by the hardware.  The set_sci_en_on_resume variable will be set in such
- * cases.
- */
-static bool set_sci_en_on_resume;
-
-void __init acpi_set_sci_en_on_resume(void)
-{
-        set_sci_en_on_resume = true;
-}
 
 /*
  * ACPI 1.0 wants us to execute _PTS before suspending devices, so we allow the
@@ -256,11 +240,8 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
                 break;
         }
 
-        /* If ACPI is not enabled by the BIOS, we need to enable it here. */
-        if (set_sci_en_on_resume)
-                acpi_write_bit_register(ACPI_BITREG_SCI_ENABLE, 1);
-        else
-                acpi_enable();
+        /* This violates the spec but is required for bug compatibility. */
+        acpi_write_bit_register(ACPI_BITREG_SCI_ENABLE, 1);
 
         /* Reprogram control registers and execute _BFS */
         acpi_leave_sleep_state_prep(acpi_state);
@@ -357,12 +338,6 @@ static int __init init_old_suspend_ordering(const struct dmi_system_id *d)
         return 0;
 }
 
-static int __init init_set_sci_en_on_resume(const struct dmi_system_id *d)
-{
-        set_sci_en_on_resume = true;
-        return 0;
-}
-
 static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
         {
         .callback = init_old_suspend_ordering,
@@ -381,22 +356,6 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                 },
         },
         {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Apple MacBook 1,1",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Apple Computer, Inc."),
-                DMI_MATCH(DMI_PRODUCT_NAME, "MacBook1,1"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Apple MacMini 1,1",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Apple Computer, Inc."),
-                DMI_MATCH(DMI_PRODUCT_NAME, "Macmini1,1"),
-                },
-        },
-        {
         .callback = init_old_suspend_ordering,
         .ident = "Asus Pundit P1-AH2 (M2N8L motherboard)",
         .matches = {
@@ -405,94 +364,6 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                 },
         },
         {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Toshiba Satellite L300",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L300"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Hewlett-Packard HP G7000 Notebook PC",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "HP G7000 Notebook PC"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Hewlett-Packard HP Pavilion dv3 Notebook PC",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv3 Notebook PC"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Hewlett-Packard Pavilion dv4",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Hewlett-Packard Pavilion dv7",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Hewlett-Packard Compaq Presario C700 Notebook PC",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "Compaq Presario C700 Notebook PC"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Hewlett-Packard Compaq Presario CQ40 Notebook PC",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "Compaq Presario CQ40 Notebook PC"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Lenovo ThinkPad T410",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T410"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Lenovo ThinkPad T510",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T510"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Lenovo ThinkPad W510",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W510"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Lenovo ThinkPad X201[s]",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201"),
-                },
-        },
-        {
         .callback = init_old_suspend_ordering,
         .ident = "Panasonic CF51-2L",
         .matches = {
@@ -501,30 +372,6 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                 DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
                 },
         },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Dell Studio 1558",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1558"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Dell Studio 1557",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557"),
-                },
-        },
-        {
-        .callback = init_set_sci_en_on_resume,
-        .ident = "Dell Studio 1555",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1555"),
-                },
-        },
         {},
 };
 #endif /* CONFIG_SUSPEND */
diff --git a/drivers/acpi/sleep.h b/drivers/acpi/sleep.h
index 8a8f3b3382a6..25b8bd149284 100644
--- a/drivers/acpi/sleep.h
+++ b/drivers/acpi/sleep.h
@@ -1,6 +1,6 @@
 
 extern u8 sleep_states[];
-extern int acpi_suspend (u32 state);
+extern int acpi_suspend(u32 state);
 
 extern void acpi_enable_wakeup_device_prep(u8 sleep_state);
 extern void acpi_enable_wakeup_device(u8 sleep_state);
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index 4aaf24976138..c79e789ed03a 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -71,7 +71,7 @@ struct acpi_table_attr {
         struct list_head node;
 };
 
-static ssize_t acpi_table_show(struct kobject *kobj,
+static ssize_t acpi_table_show(struct file *filp, struct kobject *kobj,
                                struct bin_attribute *bin_attr, char *buf,
                                loff_t offset, size_t count)
 {
@@ -303,8 +303,7 @@ static int get_status(u32 index, acpi_event_status *status, acpi_handle *handle)
                                 "Invalid GPE 0x%x\n", index));
                         goto end;
                 }
-                result = acpi_get_gpe_status(*handle, index,
-                                                ACPI_NOT_ISR, status);
+                result = acpi_get_gpe_status(*handle, index, status);
         } else if (index < (num_gpes + ACPI_NUM_FIXED_EVENTS))
                 result = acpi_get_event_status(index - num_gpes, status);
 
@@ -395,7 +394,7 @@ static ssize_t counter_set(struct kobject *kobj,
                         result = acpi_set_gpe(handle, index, ACPI_GPE_ENABLE);
                 else if (!strcmp(buf, "clear\n") &&
                                 (status & ACPI_EVENT_FLAG_SET))
-                        result = acpi_clear_gpe(handle, index, ACPI_NOT_ISR);
+                        result = acpi_clear_gpe(handle, index);
                 else
                         all_counters[index].count = strtoul(buf, NULL, 0);
         } else if (index < num_gpes + ACPI_NUM_FIXED_EVENTS) {
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 8a0ed2800e63..f336bca7c450 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -213,7 +213,7 @@ acpi_table_parse_entries(char *id,
         unsigned long table_end;
         acpi_size tbl_size;
 
-        if (acpi_disabled && !acpi_ht)
+        if (acpi_disabled)
                 return -ENODEV;
 
         if (!handler)
@@ -280,7 +280,7 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler)
         struct acpi_table_header *table = NULL;
         acpi_size tbl_size;
 
-        if (acpi_disabled && !acpi_ht)
+        if (acpi_disabled)
                 return -ENODEV;
 
         if (!handler)
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index a0c93b321482..9865d46f49a8 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -45,6 +45,7 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include <linux/suspend.h>
+#include <acpi/video.h>
 
 #define PREFIX "ACPI: "
 
@@ -65,11 +66,6 @@
 
 #define MAX_NAME_LEN    20
 
-#define ACPI_VIDEO_DISPLAY_CRT  1
-#define ACPI_VIDEO_DISPLAY_TV   2
-#define ACPI_VIDEO_DISPLAY_DVI  3
-#define ACPI_VIDEO_DISPLAY_LCD  4
-
 #define _COMPONENT              ACPI_VIDEO_COMPONENT
 ACPI_MODULE_NAME("video");
 
@@ -1007,11 +1003,11 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                 result = acpi_video_init_brightness(device);
                 if (result)
                         return;
-                name = kzalloc(MAX_NAME_LEN, GFP_KERNEL);
+                name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
                 if (!name)
                         return;
+                count++;
 
-                sprintf(name, "acpi_video%d", count++);
                 memset(&props, 0, sizeof(struct backlight_properties));
                 props.max_brightness = device->brightness->count - 3;
                 device->backlight = backlight_device_register(name, NULL, device,
@@ -1067,10 +1063,10 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                 if (device->cap._DCS && device->cap._DSS) {
                         static int count;
                         char *name;
-                        name = kzalloc(MAX_NAME_LEN, GFP_KERNEL);
+                        name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
                         if (!name)
                                 return;
-                        sprintf(name, "acpi_video%d", count++);
+                        count++;
                         device->output_dev = video_output_register(name,
                                         NULL, device, &acpi_output_properties);
                         kfree(name);
@@ -1748,11 +1744,27 @@ acpi_video_get_device_attr(struct acpi_video_bus *video, unsigned long device_id
 }
 
 static int
+acpi_video_get_device_type(struct acpi_video_bus *video,
+                           unsigned long device_id)
+{
+        struct acpi_video_enumerated_device *ids;
+        int i;
+
+        for (i = 0; i < video->attached_count; i++) {
+                ids = &video->attached_array[i];
+                if ((ids->value.int_val & 0xffff) == device_id)
+                        return ids->value.int_val;
+        }
+
+        return 0;
+}
+
+static int
 acpi_video_bus_get_one_device(struct acpi_device *device,
                               struct acpi_video_bus *video)
 {
         unsigned long long device_id;
-        int status;
+        int status, device_type;
         struct acpi_video_device *data;
         struct acpi_video_device_attrib* attribute;
 
@@ -1797,8 +1809,25 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
                         }
                         if(attribute->bios_can_detect)
                                 data->flags.bios = 1;
-                } else
-                        data->flags.unknown = 1;
+                } else {
+                        /* Check for legacy IDs */
+                        device_type = acpi_video_get_device_type(video,
+                                                                 device_id);
+                        /* Ignore bits 16 and 18-20 */
+                        switch (device_type & 0xffe2ffff) {
+                        case ACPI_VIDEO_DISPLAY_LEGACY_MONITOR:
+                                data->flags.crt = 1;
+                                break;
+                        case ACPI_VIDEO_DISPLAY_LEGACY_PANEL:
+                                data->flags.lcd = 1;
+                                break;
+                        case ACPI_VIDEO_DISPLAY_LEGACY_TV:
+                                data->flags.tvout = 1;
+                                break;
+                        default:
+                                data->flags.unknown = 1;
+                        }
+                }
 
                 acpi_video_device_bind(video, data);
                 acpi_video_device_find_cap(data);
@@ -2032,6 +2061,71 @@ out:
         return result;
 }
 
+int acpi_video_get_edid(struct acpi_device *device, int type, int device_id,
+                        void **edid)
+{
+        struct acpi_video_bus *video;
+        struct acpi_video_device *video_device;
+        union acpi_object *buffer = NULL;
+        acpi_status status;
+        int i, length;
+
+        if (!device || !acpi_driver_data(device))
+                return -EINVAL;
+
+        video = acpi_driver_data(device);
+
+        for (i = 0; i < video->attached_count; i++) {
+                video_device = video->attached_array[i].bind_info;
+                length = 256;
+
+                if (!video_device)
+                        continue;
+
+                if (type) {
+                        switch (type) {
+                        case ACPI_VIDEO_DISPLAY_CRT:
+                                if (!video_device->flags.crt)
+                                        continue;
+                                break;
+                        case ACPI_VIDEO_DISPLAY_TV:
+                                if (!video_device->flags.tvout)
+                                        continue;
+                                break;
+                        case ACPI_VIDEO_DISPLAY_DVI:
+                                if (!video_device->flags.dvi)
+                                        continue;
+                                break;
+                        case ACPI_VIDEO_DISPLAY_LCD:
+                                if (!video_device->flags.lcd)
+                                        continue;
+                                break;
+                        }
+                } else if (video_device->device_id != device_id) {
+                        continue;
+                }
+
+                status = acpi_video_device_EDID(video_device, &buffer, length);
+
+                if (ACPI_FAILURE(status) || !buffer ||
+                    buffer->type != ACPI_TYPE_BUFFER) {
+                        length = 128;
+                        status = acpi_video_device_EDID(video_device, &buffer,
+                                                        length);
+                        if (ACPI_FAILURE(status) || !buffer ||
+                            buffer->type != ACPI_TYPE_BUFFER) {
+                                continue;
+                        }
+                }
+
+                *edid = buffer->buffer.pointer;
+                return length;
+        }
+
+        return -ENODEV;
+}
+EXPORT_SYMBOL(acpi_video_get_edid);
+
 static int
 acpi_video_bus_get_devices(struct acpi_video_bus *video,
                            struct acpi_device *device)
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index fc2f26b9b407..c5fef01b3c95 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -250,7 +250,7 @@ static int __init acpi_backlight(char *str)
                                 ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR;
                 if (!strcmp("video", str))
                         acpi_video_support |=
-                                ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO;
+                                ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO;
         }
         return 1;
 }