164 files changed, 3682 insertions, 711 deletions

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index ecb26b4f29a0..c07f44f05f9d 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -20,11 +20,12 @@ 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                          += atomicio.o
+acpi-y                          += nvs.o
 
 # sleep related files
 acpi-y                          += wakeup.o
 acpi-y                          += sleep.o
-acpi-$(CONFIG_ACPI_SLEEP)       += proc.o nvs.o
+acpi-$(CONFIG_ACPI_SLEEP)       += proc.o
 
 
 #
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index 301bd2d388ad..0ca208b6dcf0 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -8,41 +8,151 @@ ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT
 # use acpi.o to put all files here into acpi.o modparam namespace
 obj-y   += acpi.o
 
-acpi-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \
-         dsmethod.o  dsobject.o  dsutils.o   dswload.o  dswstate.o \
-         dsinit.o dsargs.o dscontrol.o dswload2.o
+acpi-y :=               \
+        dsargs.o        \
+        dscontrol.o     \
+        dsfield.o       \
+        dsinit.o        \
+        dsmethod.o      \
+        dsmthdat.o      \
+        dsobject.o      \
+        dsopcode.o      \
+        dsutils.o       \
+        dswexec.o       \
+        dswload.o       \
+        dswload2.o      \
+        dswscope.o      \
+        dswstate.o
 
-acpi-y += evevent.o  evregion.o  evsci.o    evxfevnt.o \
-         evmisc.o   evrgnini.o  evxface.o  evxfregn.o \
-         evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o evxfgpe.o evglock.o
+acpi-y +=               \
+        evevent.o       \
+        evgpe.o         \
+        evgpeblk.o      \
+        evgpeinit.o     \
+        evgpeutil.o     \
+        evglock.o       \
+        evmisc.o        \
+        evregion.o      \
+        evrgnini.o      \
+        evsci.o         \
+        evxface.o       \
+        evxfevnt.o      \
+        evxfgpe.o       \
+        evxfregn.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  exdebug.o
+acpi-y +=               \
+        exconfig.o      \
+        exconvrt.o      \
+        excreate.o      \
+        exdebug.o       \
+        exdump.o        \
+        exfield.o       \
+        exfldio.o       \
+        exmutex.o       \
+        exnames.o       \
+        exoparg1.o      \
+        exoparg2.o      \
+        exoparg3.o      \
+        exoparg6.o      \
+        exprep.o        \
+        exmisc.o        \
+        exregion.o      \
+        exresnte.o      \
+        exresolv.o      \
+        exresop.o       \
+        exstore.o       \
+        exstoren.o      \
+        exstorob.o      \
+        exsystem.o      \
+        exutils.o
 
-acpi-y += hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o hwvalid.o hwpci.o
+acpi-y +=               \
+        hwacpi.o        \
+        hwgpe.o         \
+        hwpci.o         \
+        hwregs.o        \
+        hwsleep.o       \
+        hwvalid.o       \
+        hwxface.o
 
 acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
 
-acpi-y += nsaccess.o  nsload.o    nssearch.o  nsxfeval.o \
-         nsalloc.o   nseval.o    nsnames.o   nsutils.o   nsxfname.o \
-         nsdump.o    nsinit.o    nsobject.o  nswalk.o    nsxfobj.o  \
-         nsparse.o   nspredef.o  nsrepair.o  nsrepair2.o
+acpi-y +=               \
+        nsaccess.o      \
+        nsalloc.o       \
+        nsdump.o        \
+        nseval.o        \
+        nsinit.o        \
+        nsload.o        \
+        nsnames.o       \
+        nsobject.o      \
+        nsparse.o       \
+        nspredef.o      \
+        nsrepair.o      \
+        nsrepair2.o     \
+        nssearch.o      \
+        nsutils.o       \
+        nswalk.o        \
+        nsxfeval.o      \
+        nsxfname.o      \
+        nsxfobj.o
 
 acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
 
-acpi-y += psargs.o    psparse.o  psloop.o pstree.o   pswalk.o  \
-         psopcode.o  psscope.o  psutils.o  psxface.o
+acpi-y +=               \
+        psargs.o        \
+        psloop.o        \
+        psopcode.o      \
+        psparse.o       \
+        psscope.o       \
+        pstree.o        \
+        psutils.o       \
+        pswalk.o        \
+        psxface.o
 
-acpi-y += rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \
-         rscalc.o  rsirq.o  rsmemory.o  rsutils.o
+acpi-y +=               \
+        rsaddr.o        \
+        rscalc.o        \
+        rscreate.o      \
+        rsinfo.o        \
+        rsio.o          \
+        rsirq.o         \
+        rslist.o        \
+        rsmemory.o      \
+        rsmisc.o        \
+        rsserial.o      \
+        rsutils.o       \
+        rsxface.o
 
 acpi-$(ACPI_FUTURE_USAGE) += rsdump.o
 
-acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o
+acpi-y +=               \
+        tbfadt.o        \
+        tbfind.o        \
+        tbinstal.o      \
+        tbutils.o       \
+        tbxface.o       \
+        tbxfroot.o
 
-acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
-                utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
-                utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o \
-                utosi.o utxferror.o utdecode.o
+acpi-y +=               \
+        utaddress.o     \
+        utalloc.o       \
+        utcopy.o        \
+        utdebug.o       \
+        utdecode.o      \
+        utdelete.o      \
+        uteval.o        \
+        utglobal.o      \
+        utids.o         \
+        utinit.o        \
+        utlock.o        \
+        utmath.o        \
+        utmisc.o        \
+        utmutex.o       \
+        utobject.o      \
+        utosi.o         \
+        utresrc.o       \
+        utstate.o       \
+        utxface.o       \
+        utxferror.o     \
+        utxfmutex.o
diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h
index e0ba17f0a7c8..a44bd424f9f4 100644
--- a/drivers/acpi/acpica/accommon.h
+++ b/drivers/acpi/acpica/accommon.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acconfig.h b/drivers/acpi/acpica/acconfig.h
index f895a244ca7e..1f30af613e87 100644
--- a/drivers/acpi/acpica/acconfig.h
+++ b/drivers/acpi/acpica/acconfig.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -123,6 +123,10 @@
 
 #define ACPI_MAX_SLEEP                  2000    /* Two seconds */
 
+/* Address Range lists are per-space_id (Memory and I/O only) */
+
+#define ACPI_ADDRESS_RANGE_MAX          2
+
 /******************************************************************************
  *
  * ACPI Specification constants (Do not change unless the specification changes)
@@ -202,9 +206,10 @@
 #define ACPI_RSDP_CHECKSUM_LENGTH       20
 #define ACPI_RSDP_XCHECKSUM_LENGTH      36
 
-/* SMBus and IPMI bidirectional buffer size */
+/* SMBus, GSBus and IPMI bidirectional buffer size */
 
 #define ACPI_SMBUS_BUFFER_SIZE          34
+#define ACPI_GSBUS_BUFFER_SIZE          34
 #define ACPI_IPMI_BUFFER_SIZE           66
 
 /* _sx_d and _sx_w control methods */
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index eb0b1f8dee6d..deaa81979561 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
index 2d1b7ffa377a..5935ba6707e2 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index bea3b4899183..c53caa521a30 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -162,6 +162,7 @@ acpi_status acpi_ev_initialize_op_regions(void);
 
 acpi_status
 acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
+                               union acpi_operand_object *field_obj,
                                u32 function,
                                u32 region_offset, u32 bit_width, u64 *value);
 
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 76dc02f15574..261fd5eb2b68 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -140,8 +140,19 @@ u32 acpi_gbl_trace_flags;
 acpi_name acpi_gbl_trace_method_name;
 u8 acpi_gbl_system_awake_and_running;
 
+/*
+ * ACPI 5.0 introduces the concept of a "reduced hardware platform", meaning
+ * that the ACPI hardware is no longer required. A flag in the FADT indicates
+ * a reduced HW machine, and that flag is duplicated here for convenience.
+ */
+u8 acpi_gbl_reduced_hardware;
+
 #endif
 
+/* Do not disassemble buffers to resource descriptors */
+
+ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_no_resource_disassembly, FALSE);
+
 /*****************************************************************************
  *
  * Debug support
@@ -207,7 +218,7 @@ ACPI_EXTERN struct acpi_rw_lock acpi_gbl_namespace_rw_lock;
 
 /*****************************************************************************
  *
- * Mutual exlusion within ACPICA subsystem
+ * Mutual exclusion within ACPICA subsystem
  *
  ****************************************************************************/
 
@@ -295,6 +306,8 @@ ACPI_EXTERN u8 acpi_gbl_acpi_hardware_present;
 ACPI_EXTERN u8 acpi_gbl_events_initialized;
 ACPI_EXTERN u8 acpi_gbl_osi_data;
 ACPI_EXTERN struct acpi_interface_info *acpi_gbl_supported_interfaces;
+ACPI_EXTERN struct acpi_address_range
+    *acpi_gbl_address_range_list[ACPI_ADDRESS_RANGE_MAX];
 
 #ifndef DEFINE_ACPI_GLOBALS
 
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index e7213beaafc7..677793e938f5 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index 3731e1c34b83..eb308635da72 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -468,6 +468,8 @@ void acpi_ex_eisa_id_to_string(char *dest, u64 compressed_id);
 
 void acpi_ex_integer_to_string(char *dest, u64 value);
 
+u8 acpi_is_valid_space_id(u8 space_id);
+
 /*
  * exregion - default op_region handlers
  */
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 5552125d8340..3f24068837d5 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@ typedef u32 acpi_mutex_handle;
 
 /* Total number of aml opcodes defined */
 
-#define AML_NUM_OPCODES                 0x7F
+#define AML_NUM_OPCODES                 0x81
 
 /* Forward declarations */
 
@@ -249,12 +249,16 @@ struct acpi_create_field_info {
         struct acpi_namespace_node *field_node;
         struct acpi_namespace_node *register_node;
         struct acpi_namespace_node *data_register_node;
+        struct acpi_namespace_node *connection_node;
+        u8 *resource_buffer;
         u32 bank_value;
         u32 field_bit_position;
         u32 field_bit_length;
+        u16 resource_length;
         u8 field_flags;
         u8 attribute;
         u8 field_type;
+        u8 access_length;
 };
 
 typedef
@@ -315,7 +319,8 @@ struct acpi_name_info {
 
 /*
  * Used for ACPI_PTYPE1_FIXED, ACPI_PTYPE1_VAR, ACPI_PTYPE2,
- * ACPI_PTYPE2_MIN, ACPI_PTYPE2_PKG_COUNT, ACPI_PTYPE2_COUNT
+ * ACPI_PTYPE2_MIN, ACPI_PTYPE2_PKG_COUNT, ACPI_PTYPE2_COUNT,
+ * ACPI_PTYPE2_FIX_VAR
  */
 struct acpi_package_info {
         u8 type;
@@ -625,6 +630,15 @@ union acpi_generic_state {
 
 typedef acpi_status(*ACPI_EXECUTE_OP) (struct acpi_walk_state * walk_state);
 
+/* Address Range info block */
+
+struct acpi_address_range {
+        struct acpi_address_range *next;
+        struct acpi_namespace_node *region_node;
+        acpi_physical_address start_address;
+        acpi_physical_address end_address;
+};
+
 /*****************************************************************************
  *
  * Parser typedefs and structs
@@ -951,7 +965,7 @@ struct acpi_port_info {
 #define ACPI_RESOURCE_NAME_END_DEPENDENT        0x38
 #define ACPI_RESOURCE_NAME_IO                   0x40
 #define ACPI_RESOURCE_NAME_FIXED_IO             0x48
-#define ACPI_RESOURCE_NAME_RESERVED_S1          0x50
+#define ACPI_RESOURCE_NAME_FIXED_DMA            0x50
 #define ACPI_RESOURCE_NAME_RESERVED_S2          0x58
 #define ACPI_RESOURCE_NAME_RESERVED_S3          0x60
 #define ACPI_RESOURCE_NAME_RESERVED_S4          0x68
@@ -973,7 +987,9 @@ struct acpi_port_info {
 #define ACPI_RESOURCE_NAME_EXTENDED_IRQ         0x89
 #define ACPI_RESOURCE_NAME_ADDRESS64            0x8A
 #define ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64   0x8B
-#define ACPI_RESOURCE_NAME_LARGE_MAX            0x8B
+#define ACPI_RESOURCE_NAME_GPIO                 0x8C
+#define ACPI_RESOURCE_NAME_SERIAL_BUS           0x8E
+#define ACPI_RESOURCE_NAME_LARGE_MAX            0x8E
 
 /*****************************************************************************
  *
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index b7491ee1fba6..ef338a96f5b2 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 79a598c67fe3..2c9e0f049523 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index 1055769f2f01..c065078ca83b 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -254,6 +254,7 @@ ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO};
         u32                             base_byte_offset;   /* Byte offset within containing object */\
         u32                             value;              /* Value to store into the Bank or Index register */\
         u8                              start_field_bit_offset;/* Bit offset within first field datum (0-63) */\
+        u8                              access_length;  /* For serial regions/fields */
 
 
 struct acpi_object_field_common {       /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */
@@ -261,7 +262,9 @@ struct acpi_object_field_common {	/* COMMON FIELD (for BUFFER, REGION, BANK, and
 };
 
 struct acpi_object_region_field {
-        ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO union acpi_operand_object *region_obj; /* Containing op_region object */
+        ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO u16 resource_length;
+        union acpi_operand_object *region_obj;  /* Containing op_region object */
+        u8 *resource_buffer;    /* resource_template for serial regions/fields */
 };
 
 struct acpi_object_bank_field {
@@ -358,6 +361,7 @@ typedef enum {
  */
 struct acpi_object_extra {
         ACPI_OBJECT_COMMON_HEADER struct acpi_namespace_node *method_REG;       /* _REG method for this region (if any) */
+        struct acpi_namespace_node *scope_node;
         void *region_context;   /* Region-specific data */
         u8 *aml_start;
         u32 aml_length;
diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h
index bb2ccfad7376..9440d053fbb3 100644
--- a/drivers/acpi/acpica/acopcode.h
+++ b/drivers/acpi/acpica/acopcode.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -93,6 +93,7 @@
 #define ARGP_CONCAT_OP                  ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
 #define ARGP_CONCAT_RES_OP              ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
 #define ARGP_COND_REF_OF_OP             ARGP_LIST2 (ARGP_SUPERNAME,  ARGP_SUPERNAME)
+#define ARGP_CONNECTFIELD_OP            ARGP_LIST1 (ARGP_NAMESTRING)
 #define ARGP_CONTINUE_OP                ARG_NONE
 #define ARGP_COPY_OP                    ARGP_LIST2 (ARGP_TERMARG,    ARGP_SIMPLENAME)
 #define ARGP_CREATE_BIT_FIELD_OP        ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_NAME)
@@ -164,6 +165,7 @@
 #define ARGP_RETURN_OP                  ARGP_LIST1 (ARGP_TERMARG)
 #define ARGP_REVISION_OP                ARG_NONE
 #define ARGP_SCOPE_OP                   ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_TERMLIST)
+#define ARGP_SERIALFIELD_OP             ARGP_LIST1 (ARGP_NAMESTRING)
 #define ARGP_SHIFT_LEFT_OP              ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
 #define ARGP_SHIFT_RIGHT_OP             ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
 #define ARGP_SIGNAL_OP                  ARGP_LIST1 (ARGP_SUPERNAME)
@@ -223,6 +225,7 @@
 #define ARGI_CONCAT_OP                  ARGI_LIST3 (ARGI_COMPUTEDATA,ARGI_COMPUTEDATA,   ARGI_TARGETREF)
 #define ARGI_CONCAT_RES_OP              ARGI_LIST3 (ARGI_BUFFER,     ARGI_BUFFER,        ARGI_TARGETREF)
 #define ARGI_COND_REF_OF_OP             ARGI_LIST2 (ARGI_OBJECT_REF, ARGI_TARGETREF)
+#define ARGI_CONNECTFIELD_OP            ARGI_INVALID_OPCODE
 #define ARGI_CONTINUE_OP                ARGI_INVALID_OPCODE
 #define ARGI_COPY_OP                    ARGI_LIST2 (ARGI_ANYTYPE,    ARGI_SIMPLE_TARGET)
 #define ARGI_CREATE_BIT_FIELD_OP        ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_REFERENCE)
@@ -294,6 +297,7 @@
 #define ARGI_RETURN_OP                  ARGI_INVALID_OPCODE
 #define ARGI_REVISION_OP                ARG_NONE
 #define ARGI_SCOPE_OP                   ARGI_INVALID_OPCODE
+#define ARGI_SERIALFIELD_OP             ARGI_INVALID_OPCODE
 #define ARGI_SHIFT_LEFT_OP              ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
 #define ARGI_SHIFT_RIGHT_OP             ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
 #define ARGI_SIGNAL_OP                  ARGI_LIST1 (ARGI_EVENT)
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index 5ea1e06afa20..b725d780d34d 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index c445cca490ea..bbb34c9be4e8 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -94,6 +94,14 @@
  * ACPI_PTYPE2_REV_FIXED: Revision at start, each subpackage is Fixed-length
  *      (Used for _ART, _FPS)
  *
+ * ACPI_PTYPE2_FIX_VAR: Each subpackage consists of some fixed-length elements
+ *      followed by an optional element
+ *      object type
+ *      count
+ *      object type
+ *      count = 0 (optional)
+ *      (Used for _DLM)
+ *
  *****************************************************************************/
 
 enum acpi_return_package_types {
@@ -105,7 +113,8 @@ enum acpi_return_package_types {
         ACPI_PTYPE2_PKG_COUNT = 6,
         ACPI_PTYPE2_FIXED = 7,
         ACPI_PTYPE2_MIN = 8,
-        ACPI_PTYPE2_REV_FIXED = 9
+        ACPI_PTYPE2_REV_FIXED = 9,
+        ACPI_PTYPE2_FIX_VAR = 10
 };
 
 #ifdef ACPI_CREATE_PREDEFINED_TABLE
@@ -154,6 +163,7 @@ static const union acpi_predefined_info predefined_names[] =
         {{"_AC8", 0, ACPI_RTYPE_INTEGER}},
         {{"_AC9", 0, ACPI_RTYPE_INTEGER}},
         {{"_ADR", 0, ACPI_RTYPE_INTEGER}},
+        {{"_AEI", 0, ACPI_RTYPE_BUFFER}},
         {{"_AL0", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
                           {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
 
@@ -229,6 +239,13 @@ static const union acpi_predefined_info predefined_names[] =
         {{"_CID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints/Strs) */
                           {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING, 0,0}, 0,0}},
 
+        {{"_CLS", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (3 Int) */
+        {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}},
+
+        {{"_CPC", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Ints/Bufs) */
+        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0, 0}, 0,
+          0}},
+
         {{"_CRS", 0, ACPI_RTYPE_BUFFER}},
         {{"_CRT", 0, ACPI_RTYPE_INTEGER}},
         {{"_CSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n-1 Int) */
@@ -237,12 +254,21 @@ static const union acpi_predefined_info predefined_names[] =
         {{"_CST", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n Pkg (1 Buf/3 Int) */
                           {{{ACPI_PTYPE2_PKG_COUNT,ACPI_RTYPE_BUFFER, 1, ACPI_RTYPE_INTEGER}, 3,0}},
 
+        {{"_CWS", 1, ACPI_RTYPE_INTEGER}},
         {{"_DCK", 1, ACPI_RTYPE_INTEGER}},
         {{"_DCS", 0, ACPI_RTYPE_INTEGER}},
         {{"_DDC", 1, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER}},
         {{"_DDN", 0, ACPI_RTYPE_STRING}},
+        {{"_DEP", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
+        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
+
         {{"_DGS", 0, ACPI_RTYPE_INTEGER}},
         {{"_DIS", 0, 0}},
+
+        {{"_DLM", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Pkgs) each (1 Ref, 0/1 Optional Buf/Ref) */
+        {{{ACPI_PTYPE2_FIX_VAR, ACPI_RTYPE_REFERENCE, 1,
+           ACPI_RTYPE_REFERENCE | ACPI_RTYPE_BUFFER}, 0, 0}},
+
         {{"_DMA", 0, ACPI_RTYPE_BUFFER}},
         {{"_DOD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */
                           {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
@@ -262,6 +288,7 @@ static const union acpi_predefined_info predefined_names[] =
         {{"_EJ3", 1, 0}},
         {{"_EJ4", 1, 0}},
         {{"_EJD", 0, ACPI_RTYPE_STRING}},
+        {{"_EVT", 1, 0}},
         {{"_FDE", 0, ACPI_RTYPE_BUFFER}},
         {{"_FDI", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (16 Int) */
                           {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16,0}, 0,0}},
@@ -281,14 +308,17 @@ static const union acpi_predefined_info predefined_names[] =
         {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}},
 
         {{"_GAI", 0, ACPI_RTYPE_INTEGER}},
+        {{"_GCP", 0, ACPI_RTYPE_INTEGER}},
         {{"_GHL", 0, ACPI_RTYPE_INTEGER}},
         {{"_GLK", 0, ACPI_RTYPE_INTEGER}},
         {{"_GPD", 0, ACPI_RTYPE_INTEGER}},
         {{"_GPE", 0, ACPI_RTYPE_INTEGER}}, /* _GPE method, not _GPE scope */
+        {{"_GRT", 0, ACPI_RTYPE_BUFFER}},
         {{"_GSB", 0, ACPI_RTYPE_INTEGER}},
         {{"_GTF", 0, ACPI_RTYPE_BUFFER}},
         {{"_GTM", 0, ACPI_RTYPE_BUFFER}},
         {{"_GTS", 1, 0}},
+        {{"_GWS", 1, ACPI_RTYPE_INTEGER}},
         {{"_HID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}},
         {{"_HOT", 0, ACPI_RTYPE_INTEGER}},
         {{"_HPP", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */
@@ -303,6 +333,7 @@ static const union acpi_predefined_info predefined_names[] =
         {{"_HPX", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (var Ints) */
                           {{{ACPI_PTYPE2_MIN, ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
 
+        {{"_HRV", 0, ACPI_RTYPE_INTEGER}},
         {{"_IFT", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */
         {{"_INI", 0, 0}},
         {{"_IRC", 0, 0}},
@@ -361,6 +392,9 @@ static const union acpi_predefined_info predefined_names[] =
         {{"_PR3", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
 
+        {{"_PRE", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
+        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
+
         {{"_PRL", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
 
@@ -391,6 +425,7 @@ static const union acpi_predefined_info predefined_names[] =
         {{"_PSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (5 Int) with count */
                           {{{ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER,0,0}, 0,0}},
 
+        {{"_PSE", 1, 0}},
         {{"_PSL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
                           {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
 
@@ -457,6 +492,7 @@ static const union acpi_predefined_info predefined_names[] =
         {{"_SLI", 0, ACPI_RTYPE_BUFFER}},
         {{"_SPD", 1, ACPI_RTYPE_INTEGER}},
         {{"_SRS", 1, 0}},
+        {{"_SRT", 1, ACPI_RTYPE_INTEGER}},
         {{"_SRV", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */
         {{"_SST", 1, 0}},
         {{"_STA", 0, ACPI_RTYPE_INTEGER}},
@@ -464,6 +500,7 @@ static const union acpi_predefined_info predefined_names[] =
         {{"_STP", 2, ACPI_RTYPE_INTEGER}},
         {{"_STR", 0, ACPI_RTYPE_BUFFER}},
         {{"_STV", 2, ACPI_RTYPE_INTEGER}},
+        {{"_SUB", 0, ACPI_RTYPE_STRING}},
         {{"_SUN", 0, ACPI_RTYPE_INTEGER}},
         {{"_SWS", 0, ACPI_RTYPE_INTEGER}},
         {{"_TC1", 0, ACPI_RTYPE_INTEGER}},
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index f08b55b7f3a0..0347d0993497 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -73,28 +73,40 @@ typedef const struct acpi_rsconvert_info {
 
 /* Resource conversion opcodes */
 
-#define ACPI_RSC_INITGET                0
-#define ACPI_RSC_INITSET                1
-#define ACPI_RSC_FLAGINIT               2
-#define ACPI_RSC_1BITFLAG               3
-#define ACPI_RSC_2BITFLAG               4
-#define ACPI_RSC_COUNT                  5
-#define ACPI_RSC_COUNT16                6
-#define ACPI_RSC_LENGTH                 7
-#define ACPI_RSC_MOVE8                  8
-#define ACPI_RSC_MOVE16                 9
-#define ACPI_RSC_MOVE32                 10
-#define ACPI_RSC_MOVE64                 11
-#define ACPI_RSC_SET8                   12
-#define ACPI_RSC_DATA8                  13
-#define ACPI_RSC_ADDRESS                14
-#define ACPI_RSC_SOURCE                 15
-#define ACPI_RSC_SOURCEX                16
-#define ACPI_RSC_BITMASK                17
-#define ACPI_RSC_BITMASK16              18
-#define ACPI_RSC_EXIT_NE                19
-#define ACPI_RSC_EXIT_LE                20
-#define ACPI_RSC_EXIT_EQ                21
+typedef enum {
+        ACPI_RSC_INITGET = 0,
+        ACPI_RSC_INITSET,
+        ACPI_RSC_FLAGINIT,
+        ACPI_RSC_1BITFLAG,
+        ACPI_RSC_2BITFLAG,
+        ACPI_RSC_3BITFLAG,
+        ACPI_RSC_ADDRESS,
+        ACPI_RSC_BITMASK,
+        ACPI_RSC_BITMASK16,
+        ACPI_RSC_COUNT,
+        ACPI_RSC_COUNT16,
+        ACPI_RSC_COUNT_GPIO_PIN,
+        ACPI_RSC_COUNT_GPIO_RES,
+        ACPI_RSC_COUNT_GPIO_VEN,
+        ACPI_RSC_COUNT_SERIAL_RES,
+        ACPI_RSC_COUNT_SERIAL_VEN,
+        ACPI_RSC_DATA8,
+        ACPI_RSC_EXIT_EQ,
+        ACPI_RSC_EXIT_LE,
+        ACPI_RSC_EXIT_NE,
+        ACPI_RSC_LENGTH,
+        ACPI_RSC_MOVE_GPIO_PIN,
+        ACPI_RSC_MOVE_GPIO_RES,
+        ACPI_RSC_MOVE_SERIAL_RES,
+        ACPI_RSC_MOVE_SERIAL_VEN,
+        ACPI_RSC_MOVE8,
+        ACPI_RSC_MOVE16,
+        ACPI_RSC_MOVE32,
+        ACPI_RSC_MOVE64,
+        ACPI_RSC_SET8,
+        ACPI_RSC_SOURCE,
+        ACPI_RSC_SOURCEX
+} ACPI_RSCONVERT_OPCODES;
 
 /* Resource Conversion sub-opcodes */
 
@@ -106,6 +118,9 @@ typedef const struct acpi_rsconvert_info {
 #define ACPI_RS_OFFSET(f)               (u8) ACPI_OFFSET (struct acpi_resource,f)
 #define AML_OFFSET(f)                   (u8) ACPI_OFFSET (union aml_resource,f)
 
+/*
+ * Individual entry for the resource dump tables
+ */
 typedef const struct acpi_rsdump_info {
         u8 opcode;
         u8 offset;
@@ -116,20 +131,25 @@ typedef const struct acpi_rsdump_info {
 
 /* Values for the Opcode field above */
 
-#define ACPI_RSD_TITLE                  0
-#define ACPI_RSD_LITERAL                1
-#define ACPI_RSD_STRING                 2
-#define ACPI_RSD_UINT8                  3
-#define ACPI_RSD_UINT16                 4
-#define ACPI_RSD_UINT32                 5
-#define ACPI_RSD_UINT64                 6
-#define ACPI_RSD_1BITFLAG               7
-#define ACPI_RSD_2BITFLAG               8
-#define ACPI_RSD_SHORTLIST              9
-#define ACPI_RSD_LONGLIST               10
-#define ACPI_RSD_DWORDLIST              11
-#define ACPI_RSD_ADDRESS                12
-#define ACPI_RSD_SOURCE                 13
+typedef enum {
+        ACPI_RSD_TITLE = 0,
+        ACPI_RSD_1BITFLAG,
+        ACPI_RSD_2BITFLAG,
+        ACPI_RSD_3BITFLAG,
+        ACPI_RSD_ADDRESS,
+        ACPI_RSD_DWORDLIST,
+        ACPI_RSD_LITERAL,
+        ACPI_RSD_LONGLIST,
+        ACPI_RSD_SHORTLIST,
+        ACPI_RSD_SHORTLISTX,
+        ACPI_RSD_SOURCE,
+        ACPI_RSD_STRING,
+        ACPI_RSD_UINT8,
+        ACPI_RSD_UINT16,
+        ACPI_RSD_UINT32,
+        ACPI_RSD_UINT64,
+        ACPI_RSD_WORDLIST
+} ACPI_RSDUMP_OPCODES;
 
 /* restore default alignment */
 
@@ -138,13 +158,18 @@ typedef const struct acpi_rsdump_info {
 /* Resource tables indexed by internal resource type */
 
 extern const u8 acpi_gbl_aml_resource_sizes[];
+extern const u8 acpi_gbl_aml_resource_serial_bus_sizes[];
 extern struct acpi_rsconvert_info *acpi_gbl_set_resource_dispatch[];
 
 /* Resource tables indexed by raw AML resource descriptor type */
 
 extern const u8 acpi_gbl_resource_struct_sizes[];
+extern const u8 acpi_gbl_resource_struct_serial_bus_sizes[];
 extern struct acpi_rsconvert_info *acpi_gbl_get_resource_dispatch[];
 
+extern struct acpi_rsconvert_info
+    *acpi_gbl_convert_resource_serial_bus_dispatch[];
+
 struct acpi_vendor_walk_info {
         struct acpi_vendor_uuid *uuid;
         struct acpi_buffer *buffer;
@@ -190,6 +215,10 @@ acpi_status
 acpi_rs_set_srs_method_data(struct acpi_namespace_node *node,
                             struct acpi_buffer *ret_buffer);
 
+acpi_status
+acpi_rs_get_aei_method_data(struct acpi_namespace_node *node,
+                            struct acpi_buffer *ret_buffer);
+
 /*
  * rscalc
  */
@@ -293,6 +322,11 @@ extern struct acpi_rsconvert_info acpi_rs_convert_address16[];
 extern struct acpi_rsconvert_info acpi_rs_convert_ext_irq[];
 extern struct acpi_rsconvert_info acpi_rs_convert_address64[];
 extern struct acpi_rsconvert_info acpi_rs_convert_ext_address64[];
+extern struct acpi_rsconvert_info acpi_rs_convert_gpio[];
+extern struct acpi_rsconvert_info acpi_rs_convert_fixed_dma[];
+extern struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[];
+extern struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[];
+extern struct acpi_rsconvert_info acpi_rs_convert_uart_serial_bus[];
 
 /* These resources require separate get/set tables */
 
@@ -310,6 +344,7 @@ extern struct acpi_rsconvert_info acpi_rs_set_vendor[];
  * rsinfo
  */
 extern struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[];
+extern struct acpi_rsdump_info *acpi_gbl_dump_serial_bus_dispatch[];
 
 /*
  * rsdump
@@ -331,6 +366,12 @@ extern struct acpi_rsdump_info acpi_rs_dump_address64[];
 extern struct acpi_rsdump_info acpi_rs_dump_ext_address64[];
 extern struct acpi_rsdump_info acpi_rs_dump_ext_irq[];
 extern struct acpi_rsdump_info acpi_rs_dump_generic_reg[];
+extern struct acpi_rsdump_info acpi_rs_dump_gpio[];
+extern struct acpi_rsdump_info acpi_rs_dump_fixed_dma[];
+extern struct acpi_rsdump_info acpi_rs_dump_common_serial_bus[];
+extern struct acpi_rsdump_info acpi_rs_dump_i2c_serial_bus[];
+extern struct acpi_rsdump_info acpi_rs_dump_spi_serial_bus[];
+extern struct acpi_rsdump_info acpi_rs_dump_uart_serial_bus[];
 #endif
 
 #endif                          /* __ACRESRC_H__ */
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 1623b245dde2..0404df605bc1 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 967f08124eba..d5bec304c823 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 99c140d8e348..925ccf22101b 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,6 +45,7 @@
 #define _ACUTILS_H
 
 extern const u8 acpi_gbl_resource_aml_sizes[];
+extern const u8 acpi_gbl_resource_aml_serial_bus_sizes[];
 
 /* Strings used by the disassembler and debugger resource dump routines */
 
@@ -579,6 +580,24 @@ acpi_ut_create_list(char *list_name,
 #endif                          /* ACPI_DBG_TRACK_ALLOCATIONS */
 
 /*
+ * utaddress - address range check
+ */
+acpi_status
+acpi_ut_add_address_range(acpi_adr_space_type space_id,
+                          acpi_physical_address address,
+                          u32 length, struct acpi_namespace_node *region_node);
+
+void
+acpi_ut_remove_address_range(acpi_adr_space_type space_id,
+                             struct acpi_namespace_node *region_node);
+
+u32
+acpi_ut_check_address_range(acpi_adr_space_type space_id,
+                            acpi_physical_address address, u32 length, u8 warn);
+
+void acpi_ut_delete_address_lists(void);
+
+/*
  * utxferror - various error/warning output functions
  */
 void ACPI_INTERNAL_VAR_XFACE
diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h
index 1077f17859ed..905280fec0fa 100644
--- a/drivers/acpi/acpica/amlcode.h
+++ b/drivers/acpi/acpica/amlcode.h
@@ -7,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -189,6 +189,14 @@
 #define AML_LNOTEQUAL_OP            (u16) 0x9293
 
 /*
+ * Opcodes for "Field" operators
+ */
+#define AML_FIELD_OFFSET_OP         (u8) 0x00
+#define AML_FIELD_ACCESS_OP         (u8) 0x01
+#define AML_FIELD_CONNECTION_OP     (u8) 0x02   /* ACPI 5.0 */
+#define AML_FIELD_EXT_ACCESS_OP     (u8) 0x03   /* ACPI 5.0 */
+
+/*
  * Internal opcodes
  * Use only "Unknown" AML opcodes, don't attempt to use
  * any valid ACPI ASCII values (A-Z, 0-9, '-')
@@ -202,6 +210,8 @@
 #define AML_INT_METHODCALL_OP       (u16) 0x0035
 #define AML_INT_RETURN_VALUE_OP     (u16) 0x0036
 #define AML_INT_EVAL_SUBTREE_OP     (u16) 0x0037
+#define AML_INT_CONNECTION_OP       (u16) 0x0038
+#define AML_INT_EXTACCESSFIELD_OP   (u16) 0x0039
 
 #define ARG_NONE                    0x0
 
@@ -456,13 +466,16 @@ typedef enum {
  * access_as keyword
  */
 typedef enum {
-        AML_FIELD_ATTRIB_SMB_QUICK = 0x02,
-        AML_FIELD_ATTRIB_SMB_SEND_RCV = 0x04,
-        AML_FIELD_ATTRIB_SMB_BYTE = 0x06,
-        AML_FIELD_ATTRIB_SMB_WORD = 0x08,
-        AML_FIELD_ATTRIB_SMB_BLOCK = 0x0A,
-        AML_FIELD_ATTRIB_SMB_WORD_CALL = 0x0C,
-        AML_FIELD_ATTRIB_SMB_BLOCK_CALL = 0x0D
+        AML_FIELD_ATTRIB_QUICK = 0x02,
+        AML_FIELD_ATTRIB_SEND_RCV = 0x04,
+        AML_FIELD_ATTRIB_BYTE = 0x06,
+        AML_FIELD_ATTRIB_WORD = 0x08,
+        AML_FIELD_ATTRIB_BLOCK = 0x0A,
+        AML_FIELD_ATTRIB_MULTIBYTE = 0x0B,
+        AML_FIELD_ATTRIB_WORD_CALL = 0x0C,
+        AML_FIELD_ATTRIB_BLOCK_CALL = 0x0D,
+        AML_FIELD_ATTRIB_RAW_BYTES = 0x0E,
+        AML_FIELD_ATTRIB_RAW_PROCESS = 0x0F
 } AML_ACCESS_ATTRIBUTE;
 
 /* Bit fields in the AML method_flags byte */
diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h
index 59122cde247c..7b2128f274e7 100644
--- a/drivers/acpi/acpica/amlresrc.h
+++ b/drivers/acpi/acpica/amlresrc.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,29 +58,48 @@
 #define ACPI_RESTAG_TYPESPECIFICATTRIBUTES      "_ATT"
 #define ACPI_RESTAG_BASEADDRESS                 "_BAS"
 #define ACPI_RESTAG_BUSMASTER                   "_BM_"  /* Master(1), Slave(0) */
+#define ACPI_RESTAG_DEBOUNCETIME                "_DBT"
 #define ACPI_RESTAG_DECODE                      "_DEC"
+#define ACPI_RESTAG_DEVICEPOLARITY              "_DPL"
 #define ACPI_RESTAG_DMA                         "_DMA"
 #define ACPI_RESTAG_DMATYPE                     "_TYP"  /* Compatible(0), A(1), B(2), F(3) */
+#define ACPI_RESTAG_DRIVESTRENGTH               "_DRS"
+#define ACPI_RESTAG_ENDIANNESS                  "_END"
+#define ACPI_RESTAG_FLOWCONTROL                 "_FLC"
 #define ACPI_RESTAG_GRANULARITY                 "_GRA"
 #define ACPI_RESTAG_INTERRUPT                   "_INT"
 #define ACPI_RESTAG_INTERRUPTLEVEL              "_LL_"  /* active_lo(1), active_hi(0) */
 #define ACPI_RESTAG_INTERRUPTSHARE              "_SHR"  /* Shareable(1), no_share(0) */
 #define ACPI_RESTAG_INTERRUPTTYPE               "_HE_"  /* Edge(1), Level(0) */
+#define ACPI_RESTAG_IORESTRICTION               "_IOR"
 #define ACPI_RESTAG_LENGTH                      "_LEN"
+#define ACPI_RESTAG_LINE                        "_LIN"
 #define ACPI_RESTAG_MEMATTRIBUTES               "_MTP"  /* Memory(0), Reserved(1), ACPI(2), NVS(3) */
 #define ACPI_RESTAG_MEMTYPE                     "_MEM"  /* non_cache(0), Cacheable(1) Cache+combine(2), Cache+prefetch(3) */
 #define ACPI_RESTAG_MAXADDR                     "_MAX"
 #define ACPI_RESTAG_MINADDR                     "_MIN"
 #define ACPI_RESTAG_MAXTYPE                     "_MAF"
 #define ACPI_RESTAG_MINTYPE                     "_MIF"
+#define ACPI_RESTAG_MODE                        "_MOD"
+#define ACPI_RESTAG_PARITY                      "_PAR"
+#define ACPI_RESTAG_PHASE                       "_PHA"
+#define ACPI_RESTAG_PIN                         "_PIN"
+#define ACPI_RESTAG_PINCONFIG                   "_PPI"
+#define ACPI_RESTAG_POLARITY                    "_POL"
 #define ACPI_RESTAG_REGISTERBITOFFSET           "_RBO"
 #define ACPI_RESTAG_REGISTERBITWIDTH            "_RBW"
 #define ACPI_RESTAG_RANGETYPE                   "_RNG"
 #define ACPI_RESTAG_READWRITETYPE               "_RW_"  /* read_only(0), Writeable (1) */
+#define ACPI_RESTAG_LENGTH_RX                   "_RXL"
+#define ACPI_RESTAG_LENGTH_TX                   "_TXL"
+#define ACPI_RESTAG_SLAVEMODE                   "_SLV"
+#define ACPI_RESTAG_SPEED                       "_SPE"
+#define ACPI_RESTAG_STOPBITS                    "_STB"
 #define ACPI_RESTAG_TRANSLATION                 "_TRA"
 #define ACPI_RESTAG_TRANSTYPE                   "_TRS"  /* Sparse(1), Dense(0) */
 #define ACPI_RESTAG_TYPE                        "_TTP"  /* Translation(1), Static (0) */
 #define ACPI_RESTAG_XFERTYPE                    "_SIZ"  /* 8(0), 8_and16(1), 16(2) */
+#define ACPI_RESTAG_VENDORDATA                  "_VEN"
 
 /* Default sizes for "small" resource descriptors */
 
@@ -90,6 +109,7 @@
 #define ASL_RDESC_END_DEPEND_SIZE               0x00
 #define ASL_RDESC_IO_SIZE                       0x07
 #define ASL_RDESC_FIXED_IO_SIZE                 0x03
+#define ASL_RDESC_FIXED_DMA_SIZE                0x05
 #define ASL_RDESC_END_TAG_SIZE                  0x01
 
 struct asl_resource_node {
@@ -164,6 +184,12 @@ struct aml_resource_end_tag {
         AML_RESOURCE_SMALL_HEADER_COMMON u8 checksum;
 };
 
+struct aml_resource_fixed_dma {
+        AML_RESOURCE_SMALL_HEADER_COMMON u16 request_lines;
+        u16 channels;
+        u8 width;
+};
+
 /*
  * LARGE descriptors
  */
@@ -263,6 +289,110 @@ struct aml_resource_generic_register {
         u64 address;
 };
 
+/* Common descriptor for gpio_int and gpio_io (ACPI 5.0) */
+
+struct aml_resource_gpio {
+        AML_RESOURCE_LARGE_HEADER_COMMON u8 revision_id;
+        u8 connection_type;
+        u16 flags;
+        u16 int_flags;
+        u8 pin_config;
+        u16 drive_strength;
+        u16 debounce_timeout;
+        u16 pin_table_offset;
+        u8 res_source_index;
+        u16 res_source_offset;
+        u16 vendor_offset;
+        u16 vendor_length;
+        /*
+         * Optional fields follow immediately:
+         * 1) PIN list (Words)
+         * 2) Resource Source String
+         * 3) Vendor Data bytes
+         */
+};
+
+#define AML_RESOURCE_GPIO_REVISION              1       /* ACPI 5.0 */
+
+/* Values for connection_type above */
+
+#define AML_RESOURCE_GPIO_TYPE_INT              0
+#define AML_RESOURCE_GPIO_TYPE_IO               1
+#define AML_RESOURCE_MAX_GPIOTYPE               1
+
+/* Common preamble for all serial descriptors (ACPI 5.0) */
+
+#define AML_RESOURCE_SERIAL_COMMON \
+        u8                              revision_id; \
+        u8                              res_source_index; \
+        u8                              type; \
+        u8                              flags; \
+        u16                             type_specific_flags; \
+        u8                              type_revision_id; \
+        u16                             type_data_length; \
+
+/* Values for the type field above */
+
+#define AML_RESOURCE_I2C_SERIALBUSTYPE          1
+#define AML_RESOURCE_SPI_SERIALBUSTYPE          2
+#define AML_RESOURCE_UART_SERIALBUSTYPE         3
+#define AML_RESOURCE_MAX_SERIALBUSTYPE          3
+#define AML_RESOURCE_VENDOR_SERIALBUSTYPE       192     /* Vendor defined is 0xC0-0xFF (NOT SUPPORTED) */
+
+struct aml_resource_common_serialbus {
+AML_RESOURCE_LARGE_HEADER_COMMON AML_RESOURCE_SERIAL_COMMON};
+
+struct aml_resource_i2c_serialbus {
+        AML_RESOURCE_LARGE_HEADER_COMMON
+            AML_RESOURCE_SERIAL_COMMON u32 connection_speed;
+        u16 slave_address;
+        /*
+         * Optional fields follow immediately:
+         * 1) Vendor Data bytes
+         * 2) Resource Source String
+         */
+};
+
+#define AML_RESOURCE_I2C_REVISION               1       /* ACPI 5.0 */
+#define AML_RESOURCE_I2C_TYPE_REVISION          1       /* ACPI 5.0 */
+#define AML_RESOURCE_I2C_MIN_DATA_LEN           6
+
+struct aml_resource_spi_serialbus {
+        AML_RESOURCE_LARGE_HEADER_COMMON
+            AML_RESOURCE_SERIAL_COMMON u32 connection_speed;
+        u8 data_bit_length;
+        u8 clock_phase;
+        u8 clock_polarity;
+        u16 device_selection;
+        /*
+         * Optional fields follow immediately:
+         * 1) Vendor Data bytes
+         * 2) Resource Source String
+         */
+};
+
+#define AML_RESOURCE_SPI_REVISION               1       /* ACPI 5.0 */
+#define AML_RESOURCE_SPI_TYPE_REVISION          1       /* ACPI 5.0 */
+#define AML_RESOURCE_SPI_MIN_DATA_LEN           9
+
+struct aml_resource_uart_serialbus {
+        AML_RESOURCE_LARGE_HEADER_COMMON
+            AML_RESOURCE_SERIAL_COMMON u32 default_baud_rate;
+        u16 rx_fifo_size;
+        u16 tx_fifo_size;
+        u8 parity;
+        u8 lines_enabled;
+        /*
+         * Optional fields follow immediately:
+         * 1) Vendor Data bytes
+         * 2) Resource Source String
+         */
+};
+
+#define AML_RESOURCE_UART_REVISION              1       /* ACPI 5.0 */
+#define AML_RESOURCE_UART_TYPE_REVISION         1       /* ACPI 5.0 */
+#define AML_RESOURCE_UART_MIN_DATA_LEN          10
+
 /* restore default alignment */
 
 #pragma pack()
@@ -284,6 +414,7 @@ union aml_resource {
         struct aml_resource_end_dependent end_dpf;
         struct aml_resource_io io;
         struct aml_resource_fixed_io fixed_io;
+        struct aml_resource_fixed_dma fixed_dma;
         struct aml_resource_vendor_small vendor_small;
         struct aml_resource_end_tag end_tag;
 
@@ -299,6 +430,11 @@ union aml_resource {
         struct aml_resource_address64 address64;
         struct aml_resource_extended_address64 ext_address64;
         struct aml_resource_extended_irq extended_irq;
+        struct aml_resource_gpio gpio;
+        struct aml_resource_i2c_serialbus i2c_serial_bus;
+        struct aml_resource_spi_serialbus spi_serial_bus;
+        struct aml_resource_uart_serialbus uart_serial_bus;
+        struct aml_resource_common_serialbus common_serial_bus;
 
         /* Utility overlays */
 
diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c
index 8c7b99728aa2..80eb1900297f 100644
--- a/drivers/acpi/acpica/dsargs.c
+++ b/drivers/acpi/acpica/dsargs.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -250,6 +250,13 @@ acpi_ds_get_bank_field_arguments(union acpi_operand_object *obj_desc)
         status = acpi_ds_execute_arguments(node, node->parent,
                                            extra_desc->extra.aml_length,
                                            extra_desc->extra.aml_start);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        status = acpi_ut_add_address_range(obj_desc->region.space_id,
+                                           obj_desc->region.address,
+                                           obj_desc->region.length, node);
         return_ACPI_STATUS(status);
 }
 
@@ -384,8 +391,15 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)
 
         /* Execute the argument AML */
 
-        status = acpi_ds_execute_arguments(node, node->parent,
+        status = acpi_ds_execute_arguments(node, extra_desc->extra.scope_node,
                                            extra_desc->extra.aml_length,
                                            extra_desc->extra.aml_start);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        status = acpi_ut_add_address_range(obj_desc->region.space_id,
+                                           obj_desc->region.address,
+                                           obj_desc->region.length, node);
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/dscontrol.c b/drivers/acpi/acpica/dscontrol.c
index 26c49fff58da..effe4ca1133f 100644
--- a/drivers/acpi/acpica/dscontrol.c
+++ b/drivers/acpi/acpica/dscontrol.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index 34be60c0e448..cd243cf2cab2 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -221,6 +221,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
 {
         acpi_status status;
         u64 position;
+        union acpi_parse_object *child;
 
         ACPI_FUNCTION_TRACE_PTR(ds_get_field_names, info);
 
@@ -232,10 +233,11 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
 
         while (arg) {
                 /*
-                 * Three types of field elements are handled:
-                 * 1) Offset - specifies a bit offset
-                 * 2) access_as - changes the access mode
-                 * 3) Name - Enters a new named field into the namespace
+                 * Four types of field elements are handled:
+                 * 1) Name - Enters a new named field into the namespace
+                 * 2) Offset - specifies a bit offset
+                 * 3) access_as - changes the access mode/attributes
+                 * 4) Connection - Associate a resource template with the field
                  */
                 switch (arg->common.aml_opcode) {
                 case AML_INT_RESERVEDFIELD_OP:
@@ -253,21 +255,70 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                         break;
 
                 case AML_INT_ACCESSFIELD_OP:
-
+                case AML_INT_EXTACCESSFIELD_OP:
                         /*
-                         * Get a new access_type and access_attribute -- to be used for all
-                         * field units that follow, until field end or another access_as
-                         * keyword.
+                         * Get new access_type, access_attribute, and access_length fields
+                         * -- to be used for all field units that follow, until the
+                         * end-of-field or another access_as keyword is encountered.
+                         * NOTE. These three bytes are encoded in the integer value
+                         * of the parseop for convenience.
                          *
                          * In field_flags, preserve the flag bits other than the
-                         * ACCESS_TYPE bits
+                         * ACCESS_TYPE bits.
                          */
+
+                        /* access_type (byte_acc, word_acc, etc.) */
+
                         info->field_flags = (u8)
                             ((info->
                               field_flags & ~(AML_FIELD_ACCESS_TYPE_MASK)) |
-                             ((u8) ((u32) arg->common.value.integer >> 8)));
+                             ((u8)((u32)(arg->common.value.integer & 0x07))));
+
+                        /* access_attribute (attrib_quick, attrib_byte, etc.) */
+
+                        info->attribute =
+                            (u8)((arg->common.value.integer >> 8) & 0xFF);
+
+                        /* access_length (for serial/buffer protocols) */
+
+                        info->access_length =
+                            (u8)((arg->common.value.integer >> 16) & 0xFF);
+                        break;
+
+                case AML_INT_CONNECTION_OP:
+                        /*
+                         * Clear any previous connection. New connection is used for all
+                         * fields that follow, similar to access_as
+                         */
+                        info->resource_buffer = NULL;
+                        info->connection_node = NULL;
 
-                        info->attribute = (u8) (arg->common.value.integer);
+                        /*
+                         * A Connection() is either an actual resource descriptor (buffer)
+                         * or a named reference to a resource template
+                         */
+                        child = arg->common.value.arg;
+                        if (child->common.aml_opcode == AML_INT_BYTELIST_OP) {
+                                info->resource_buffer = child->named.data;
+                                info->resource_length =
+                                    (u16)child->named.value.integer;
+                        } else {
+                                /* Lookup the Connection() namepath, it should already exist */
+
+                                status = acpi_ns_lookup(walk_state->scope_info,
+                                                        child->common.value.
+                                                        name, ACPI_TYPE_ANY,
+                                                        ACPI_IMODE_EXECUTE,
+                                                        ACPI_NS_DONT_OPEN_SCOPE,
+                                                        walk_state,
+                                                        &info->connection_node);
+                                if (ACPI_FAILURE(status)) {
+                                        ACPI_ERROR_NAMESPACE(child->common.
+                                                             value.name,
+                                                             status);
+                                        return_ACPI_STATUS(status);
+                                }
+                        }
                         break;
 
                 case AML_INT_NAMEDFIELD_OP:
@@ -374,6 +425,8 @@ acpi_ds_create_field(union acpi_parse_object *op,
                 }
         }
 
+        ACPI_MEMSET(&info, 0, sizeof(struct acpi_create_field_info));
+
         /* Second arg is the field flags */
 
         arg = arg->common.next;
@@ -386,7 +439,6 @@ acpi_ds_create_field(union acpi_parse_object *op,
         info.region_node = region_node;
 
         status = acpi_ds_get_field_names(&info, walk_state, arg->common.next);
-
         return_ACPI_STATUS(status);
 }
 
@@ -474,8 +526,8 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
          */
         while (arg) {
                 /*
-                 * Ignore OFFSET and ACCESSAS terms here; we are only interested in the
-                 * field names in order to enter them into the namespace.
+                 * Ignore OFFSET/ACCESSAS/CONNECTION terms here; we are only interested
+                 * in the field names in order to enter them into the namespace.
                  */
                 if (arg->common.aml_opcode == AML_INT_NAMEDFIELD_OP) {
                         status = acpi_ns_lookup(walk_state->scope_info,
@@ -651,6 +703,5 @@ acpi_ds_create_index_field(union acpi_parse_object *op,
         info.region_node = region_node;
 
         status = acpi_ds_get_field_names(&info, walk_state, arg->common.next);
-
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c
index a7718bf2b9a1..9e5ac7f780a7 100644
--- a/drivers/acpi/acpica/dsinit.c
+++ b/drivers/acpi/acpica/dsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index 5d797751e205..00f5dab5bcc0 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c
index 905ce29a92e1..b40bd507be5d 100644
--- a/drivers/acpi/acpica/dsmthdat.c
+++ b/drivers/acpi/acpica/dsmthdat.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index f42e17e5c252..d7045ca3e32a 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index c627a288e027..e5eff7585102 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index 2c477ce172fa..1abcda31037f 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index fe40e4c6554f..642f3c053e87 100644
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index 324acec1179a..552aa3a50c84 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c
index 976318138c56..ae7147724763 100644
--- a/drivers/acpi/acpica/dswload2.c
+++ b/drivers/acpi/acpica/dswload2.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswscope.c b/drivers/acpi/acpica/dswscope.c
index 76a661fc1e09..9e9490a9cbf0 100644
--- a/drivers/acpi/acpica/dswscope.c
+++ b/drivers/acpi/acpica/dswscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
index a6c374ef9914..c9c2ac13e7cc 100644
--- a/drivers/acpi/acpica/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evevent.c b/drivers/acpi/acpica/evevent.c
index d458b041e651..6729ebe2f1e6 100644
--- a/drivers/acpi/acpica/evevent.c
+++ b/drivers/acpi/acpica/evevent.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,12 @@ acpi_status acpi_ev_initialize_events(void)
 
         ACPI_FUNCTION_TRACE(ev_initialize_events);
 
+        /* If Hardware Reduced flag is set, there are no fixed events */
+
+        if (acpi_gbl_reduced_hardware) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
         /*
          * Initialize the Fixed and General Purpose Events. This is done prior to
          * enabling SCIs to prevent interrupts from occurring before the handlers
@@ -111,6 +117,12 @@ acpi_status acpi_ev_install_xrupt_handlers(void)
 
         ACPI_FUNCTION_TRACE(ev_install_xrupt_handlers);
 
+        /* If Hardware Reduced flag is set, there is no ACPI h/w */
+
+        if (acpi_gbl_reduced_hardware) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
         /* Install the SCI handler */
 
         status = acpi_ev_install_sci_handler();
diff --git a/drivers/acpi/acpica/evglock.c b/drivers/acpi/acpica/evglock.c
index 56a562a1e5d7..5e5683cb1f0d 100644
--- a/drivers/acpi/acpica/evglock.c
+++ b/drivers/acpi/acpica/evglock.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,12 @@ acpi_status acpi_ev_init_global_lock_handler(void)
 
         ACPI_FUNCTION_TRACE(ev_init_global_lock_handler);
 
+        /* If Hardware Reduced flag is set, there is no global lock */
+
+        if (acpi_gbl_reduced_hardware) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
         /* Attempt installation of the global lock handler */
 
         status = acpi_install_fixed_event_handler(ACPI_EVENT_GLOBAL,
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index 65c79add3b19..9e88cb6fb25e 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index ca2c41a53311..be75339cd5dd 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c
index ce9aa9f9a972..adf7494da9db 100644
--- a/drivers/acpi/acpica/evgpeinit.c
+++ b/drivers/acpi/acpica/evgpeinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c
index 80a81d0c4a80..25073932aa10 100644
--- a/drivers/acpi/acpica/evgpeutil.c
+++ b/drivers/acpi/acpica/evgpeutil.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index d0b331844427..84966f416463 100644
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index f0edf5c43c03..1b0180a1b798 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -329,6 +329,7 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
  * FUNCTION:    acpi_ev_address_space_dispatch
  *
  * PARAMETERS:  region_obj          - Internal region object
+ *              field_obj           - Corresponding field. Can be NULL.
  *              Function            - Read or Write operation
  *              region_offset       - Where in the region to read or write
  *              bit_width           - Field width in bits (8, 16, 32, or 64)
@@ -344,6 +345,7 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
 
 acpi_status
 acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
+                               union acpi_operand_object *field_obj,
                                u32 function,
                                u32 region_offset, u32 bit_width, u64 *value)
 {
@@ -353,6 +355,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
         union acpi_operand_object *handler_desc;
         union acpi_operand_object *region_obj2;
         void *region_context = NULL;
+        struct acpi_connection_info *context;
 
         ACPI_FUNCTION_TRACE(ev_address_space_dispatch);
 
@@ -375,6 +378,8 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 return_ACPI_STATUS(AE_NOT_EXIST);
         }
 
+        context = handler_desc->address_space.context;
+
         /*
          * It may be the case that the region has never been initialized.
          * Some types of regions require special init code
@@ -404,8 +409,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 acpi_ex_exit_interpreter();
 
                 status = region_setup(region_obj, ACPI_REGION_ACTIVATE,
-                                      handler_desc->address_space.context,
-                                      &region_context);
+                                      context, &region_context);
 
                 /* Re-enter the interpreter */
 
@@ -455,6 +459,25 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                           acpi_ut_get_region_name(region_obj->region.
                                                   space_id)));
 
+        /*
+         * Special handling for generic_serial_bus and general_purpose_io:
+         * There are three extra parameters that must be passed to the
+         * handler via the context:
+         *   1) Connection buffer, a resource template from Connection() op.
+         *   2) Length of the above buffer.
+         *   3) Actual access length from the access_as() op.
+         */
+        if (((region_obj->region.space_id == ACPI_ADR_SPACE_GSBUS) ||
+             (region_obj->region.space_id == ACPI_ADR_SPACE_GPIO)) &&
+            context && field_obj) {
+
+                /* Get the Connection (resource_template) buffer */
+
+                context->connection = field_obj->field.resource_buffer;
+                context->length = field_obj->field.resource_length;
+                context->access_length = field_obj->field.access_length;
+        }
+
         if (!(handler_desc->address_space.handler_flags &
               ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
                 /*
@@ -469,7 +492,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
 
         status = handler(function,
                          (region_obj->region.address + region_offset),
-                         bit_width, value, handler_desc->address_space.context,
+                         bit_width, value, context,
                          region_obj2->extra.region_context);
 
         if (ACPI_FAILURE(status)) {
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 55a5d35ef34a..819c17f5897a 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c
index 2ebd40e1a3ef..26065c612e76 100644
--- a/drivers/acpi/acpica/evsci.c
+++ b/drivers/acpi/acpica/evsci.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index f4f523bf5939..61944e89565a 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index 20516e599476..1768bbec1002 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index f06a3ee356ba..33388fd69df4 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index aee887e3ca5c..6019208cd4b6 100644
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 745a42b401f5..c86d44e41bc8 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,9 +297,9 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
         /* Bytewise reads */
 
         for (i = 0; i < length; i++) {
-                status = acpi_ev_address_space_dispatch(obj_desc, ACPI_READ,
-                                                        region_offset, 8,
-                                                        &value);
+                status =
+                    acpi_ev_address_space_dispatch(obj_desc, NULL, ACPI_READ,
+                                                   region_offset, 8, &value);
                 if (ACPI_FAILURE(status)) {
                         return status;
                 }
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index 74162a11817d..e385436bd424 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index 110711afada8..3f5bc998c1cb 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -267,7 +267,7 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)
  *
  * PARAMETERS:  aml_start           - Pointer to the region declaration AML
  *              aml_length          - Max length of the declaration AML
- *              region_space        - space_iD for the region
+ *              space_id            - Address space ID for the region
  *              walk_state          - Current state
  *
  * RETURN:      Status
@@ -279,7 +279,7 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)
 acpi_status
 acpi_ex_create_region(u8 * aml_start,
                       u32 aml_length,
-                      u8 region_space, struct acpi_walk_state *walk_state)
+                      u8 space_id, struct acpi_walk_state *walk_state)
 {
         acpi_status status;
         union acpi_operand_object *obj_desc;
@@ -304,16 +304,19 @@ acpi_ex_create_region(u8 * aml_start,
          * Space ID must be one of the predefined IDs, or in the user-defined
          * range
          */
-        if ((region_space >= ACPI_NUM_PREDEFINED_REGIONS) &&
-            (region_space < ACPI_USER_REGION_BEGIN) &&
-            (region_space != ACPI_ADR_SPACE_DATA_TABLE)) {
-                ACPI_ERROR((AE_INFO, "Invalid AddressSpace type 0x%X",
-                            region_space));
-                return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);
+        if (!acpi_is_valid_space_id(space_id)) {
+                /*
+                 * Print an error message, but continue. We don't want to abort
+                 * a table load for this exception. Instead, if the region is
+                 * actually used at runtime, abort the executing method.
+                 */
+                ACPI_ERROR((AE_INFO,
+                            "Invalid/unknown Address Space ID: 0x%2.2X",
+                            space_id));
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "Region Type - %s (0x%X)\n",
-                          acpi_ut_get_region_name(region_space), region_space));
+                          acpi_ut_get_region_name(space_id), space_id));
 
         /* Create the region descriptor */
 
@@ -330,10 +333,16 @@ acpi_ex_create_region(u8 * aml_start,
         region_obj2 = obj_desc->common.next_object;
         region_obj2->extra.aml_start = aml_start;
         region_obj2->extra.aml_length = aml_length;
+        if (walk_state->scope_info) {
+                region_obj2->extra.scope_node =
+                    walk_state->scope_info->scope.node;
+        } else {
+                region_obj2->extra.scope_node = node;
+        }
 
         /* Init the region from the operands */
 
-        obj_desc->region.space_id = region_space;
+        obj_desc->region.space_id = space_id;
         obj_desc->region.address = 0;
         obj_desc->region.length = 0;
         obj_desc->region.node = node;
diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index c7a2f1edd282..e211e9c19215 100644
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c
index 61b8c0e8b74d..2a6ac0a3bc1e 100644
--- a/drivers/acpi/acpica/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -192,10 +192,13 @@ static struct acpi_exdump_info acpi_ex_dump_buffer_field[3] = {
          "Buffer Object"}
 };
 
-static struct acpi_exdump_info acpi_ex_dump_region_field[3] = {
+static struct acpi_exdump_info acpi_ex_dump_region_field[5] = {
         {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_region_field), NULL},
         {ACPI_EXD_FIELD, 0, NULL},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.region_obj), "Region Object"}
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(field.access_length), "AccessLength"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.region_obj), "Region Object"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.resource_buffer),
+         "ResourceBuffer"}
 };
 
 static struct acpi_exdump_info acpi_ex_dump_bank_field[5] = {
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index 0bde2230c028..dc092f5b35d6 100644
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -100,18 +100,25 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
                    (obj_desc->field.region_obj->region.space_id ==
                     ACPI_ADR_SPACE_SMBUS
                     || obj_desc->field.region_obj->region.space_id ==
+                    ACPI_ADR_SPACE_GSBUS
+                    || obj_desc->field.region_obj->region.space_id ==
                     ACPI_ADR_SPACE_IPMI)) {
                 /*
-                 * This is an SMBus or IPMI read. We must create a buffer to hold
+                 * This is an SMBus, GSBus or IPMI read. We must create a buffer to hold
                  * the data and then directly access the region handler.
                  *
-                 * Note: Smbus protocol value is passed in upper 16-bits of Function
+                 * Note: SMBus and GSBus protocol value is passed in upper 16-bits of Function
                  */
                 if (obj_desc->field.region_obj->region.space_id ==
                     ACPI_ADR_SPACE_SMBUS) {
                         length = ACPI_SMBUS_BUFFER_SIZE;
                         function =
                             ACPI_READ | (obj_desc->field.attribute << 16);
+                } else if (obj_desc->field.region_obj->region.space_id ==
+                           ACPI_ADR_SPACE_GSBUS) {
+                        length = ACPI_GSBUS_BUFFER_SIZE;
+                        function =
+                            ACPI_READ | (obj_desc->field.attribute << 16);
                 } else {        /* IPMI */
 
                         length = ACPI_IPMI_BUFFER_SIZE;
@@ -248,21 +255,23 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
                    (obj_desc->field.region_obj->region.space_id ==
                     ACPI_ADR_SPACE_SMBUS
                     || obj_desc->field.region_obj->region.space_id ==
+                    ACPI_ADR_SPACE_GSBUS
+                    || obj_desc->field.region_obj->region.space_id ==
                     ACPI_ADR_SPACE_IPMI)) {
                 /*
-                 * This is an SMBus or IPMI write. We will bypass the entire field
+                 * This is an SMBus, GSBus or IPMI write. We will bypass the entire field
                  * mechanism and handoff the buffer directly to the handler. For
                  * these address spaces, the buffer is bi-directional; on a write,
                  * return data is returned in the same buffer.
                  *
                  * Source must be a buffer of sufficient size:
-                 * ACPI_SMBUS_BUFFER_SIZE or ACPI_IPMI_BUFFER_SIZE.
+                 * ACPI_SMBUS_BUFFER_SIZE, ACPI_GSBUS_BUFFER_SIZE, or ACPI_IPMI_BUFFER_SIZE.
                  *
-                 * Note: SMBus protocol type is passed in upper 16-bits of Function
+                 * Note: SMBus and GSBus protocol type is passed in upper 16-bits of Function
                  */
                 if (source_desc->common.type != ACPI_TYPE_BUFFER) {
                         ACPI_ERROR((AE_INFO,
-                                    "SMBus or IPMI write requires Buffer, found type %s",
+                                    "SMBus/IPMI/GenericSerialBus write requires Buffer, found type %s",
                                     acpi_ut_get_object_type_name(source_desc)));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
@@ -273,6 +282,11 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
                         length = ACPI_SMBUS_BUFFER_SIZE;
                         function =
                             ACPI_WRITE | (obj_desc->field.attribute << 16);
+                } else if (obj_desc->field.region_obj->region.space_id ==
+                           ACPI_ADR_SPACE_GSBUS) {
+                        length = ACPI_GSBUS_BUFFER_SIZE;
+                        function =
+                            ACPI_WRITE | (obj_desc->field.attribute << 16);
                 } else {        /* IPMI */
 
                         length = ACPI_IPMI_BUFFER_SIZE;
@@ -281,7 +295,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 %u, found length %u",
+                                    "SMBus/IPMI/GenericSerialBus 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 f915a7f3f921..149de45fdadd 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -86,6 +86,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
 {
         acpi_status status = AE_OK;
         union acpi_operand_object *rgn_desc;
+        u8 space_id;
 
         ACPI_FUNCTION_TRACE_U32(ex_setup_region, field_datum_byte_offset);
 
@@ -101,6 +102,17 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
         }
 
+        space_id = rgn_desc->region.space_id;
+
+        /* Validate the Space ID */
+
+        if (!acpi_is_valid_space_id(space_id)) {
+                ACPI_ERROR((AE_INFO,
+                            "Invalid/unknown Address Space ID: 0x%2.2X",
+                            space_id));
+                return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);
+        }
+
         /*
          * If the Region Address and Length have not been previously evaluated,
          * evaluate them now and save the results.
@@ -119,11 +131,12 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
         }
 
         /*
-         * Exit now for SMBus or IPMI address space, it has a non-linear
+         * Exit now for SMBus, GSBus or IPMI address space, it has a non-linear
          * address space and the request cannot be directly validated
          */
-        if (rgn_desc->region.space_id == ACPI_ADR_SPACE_SMBUS ||
-            rgn_desc->region.space_id == ACPI_ADR_SPACE_IPMI) {
+        if (space_id == ACPI_ADR_SPACE_SMBUS ||
+            space_id == ACPI_ADR_SPACE_GSBUS ||
+            space_id == ACPI_ADR_SPACE_IPMI) {
 
                 /* SMBus or IPMI has a non-linear address space */
 
@@ -271,11 +284,12 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
 
         /* Invoke the appropriate address_space/op_region handler */
 
-        status =
-            acpi_ev_address_space_dispatch(rgn_desc, function, region_offset,
-                                           ACPI_MUL_8(obj_desc->common_field.
-                                                      access_byte_width),
-                                           value);
+        status = acpi_ev_address_space_dispatch(rgn_desc, obj_desc,
+                                                function, region_offset,
+                                                ACPI_MUL_8(obj_desc->
+                                                           common_field.
+                                                           access_byte_width),
+                                                value);
 
         if (ACPI_FAILURE(status)) {
                 if (status == AE_NOT_IMPLEMENTED) {
@@ -316,6 +330,7 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
 static u8
 acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
 {
+        ACPI_FUNCTION_NAME(ex_register_overflow);
 
         if (obj_desc->common_field.bit_length >= ACPI_INTEGER_BIT_SIZE) {
                 /*
@@ -330,6 +345,11 @@ acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
                  * The Value is larger than the maximum value that can fit into
                  * the register.
                  */
+                ACPI_ERROR((AE_INFO,
+                            "Index value 0x%8.8X%8.8X overflows field width 0x%X",
+                            ACPI_FORMAT_UINT64(value),
+                            obj_desc->common_field.bit_length));
+
                 return (TRUE);
         }
 
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c
index 703d88ed0b3d..0a0893310348 100644
--- a/drivers/acpi/acpica/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c
index be1c56ead653..60933e9dc3c0 100644
--- a/drivers/acpi/acpica/exmutex.c
+++ b/drivers/acpi/acpica/exmutex.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exnames.c b/drivers/acpi/acpica/exnames.c
index 49ec049c157e..fcc75fa27d32 100644
--- a/drivers/acpi/acpica/exnames.c
+++ b/drivers/acpi/acpica/exnames.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index 236ead14b7f7..9ba8c73cea16 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index 2571b4a310f4..879e8a277b94 100644
--- a/drivers/acpi/acpica/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index 1b48d9d28c9a..71fcc65c9ffa 100644
--- a/drivers/acpi/acpica/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exoparg6.c b/drivers/acpi/acpica/exoparg6.c
index f4a2787e8e92..0786b8659061 100644
--- a/drivers/acpi/acpica/exoparg6.c
+++ b/drivers/acpi/acpica/exoparg6.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index cc95e2000406..30157f5a12d7 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,6 +47,7 @@
 #include "acinterp.h"
 #include "amlcode.h"
 #include "acnamesp.h"
+#include "acdispat.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exprep")
@@ -455,6 +456,30 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
                 obj_desc->field.region_obj =
                     acpi_ns_get_attached_object(info->region_node);
 
+                /* Fields specific to generic_serial_bus fields */
+
+                obj_desc->field.access_length = info->access_length;
+
+                if (info->connection_node) {
+                        second_desc = info->connection_node->object;
+                        if (!(second_desc->common.flags & AOPOBJ_DATA_VALID)) {
+                                status =
+                                    acpi_ds_get_buffer_arguments(second_desc);
+                                if (ACPI_FAILURE(status)) {
+                                        acpi_ut_delete_object_desc(obj_desc);
+                                        return_ACPI_STATUS(status);
+                                }
+                        }
+
+                        obj_desc->field.resource_buffer =
+                            second_desc->buffer.pointer;
+                        obj_desc->field.resource_length =
+                            (u16)second_desc->buffer.length;
+                } else if (info->resource_buffer) {
+                        obj_desc->field.resource_buffer = info->resource_buffer;
+                        obj_desc->field.resource_length = info->resource_length;
+                }
+
                 /* Allow full data read from EC address space */
 
                 if ((obj_desc->field.region_obj->region.space_id ==
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index f0d5e14f1f2c..12d51df6d3bf 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c
index 55997e46948b..fa50e77e64a8 100644
--- a/drivers/acpi/acpica/exresnte.c
+++ b/drivers/acpi/acpica/exresnte.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index db502cd7d934..6e335dc34528 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index e3bb00ccdff5..a67b1d925ddd 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index c0c8842dd344..c6cf843cc4c9 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exstoren.c b/drivers/acpi/acpica/exstoren.c
index a979017d56b8..b35bed52e061 100644
--- a/drivers/acpi/acpica/exstoren.c
+++ b/drivers/acpi/acpica/exstoren.c
@@ -7,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exstorob.c b/drivers/acpi/acpica/exstorob.c
index dc665cc554de..65a45d8335c8 100644
--- a/drivers/acpi/acpica/exstorob.c
+++ b/drivers/acpi/acpica/exstorob.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c
index df66e7b686be..191a12945226 100644
--- a/drivers/acpi/acpica/exsystem.c
+++ b/drivers/acpi/acpica/exsystem.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c
index 8ad93146dd32..eb6798ba8b59 100644
--- a/drivers/acpi/acpica/exutils.c
+++ b/drivers/acpi/acpica/exutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -435,4 +435,29 @@ void acpi_ex_integer_to_string(char *out_string, u64 value)
         }
 }
 
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_is_valid_space_id
+ *
+ * PARAMETERS:  space_id            - ID to be validated
+ *
+ * RETURN:      TRUE if valid/supported ID.
+ *
+ * DESCRIPTION: Validate an operation region space_iD.
+ *
+ ******************************************************************************/
+
+u8 acpi_is_valid_space_id(u8 space_id)
+{
+
+        if ((space_id >= ACPI_NUM_PREDEFINED_REGIONS) &&
+            (space_id < ACPI_USER_REGION_BEGIN) &&
+            (space_id != ACPI_ADR_SPACE_DATA_TABLE) &&
+            (space_id != ACPI_ADR_SPACE_FIXED_HARDWARE)) {
+                return (FALSE);
+        }
+
+        return (TRUE);
+}
+
 #endif
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index fc380d3d45ab..d21ec5f0b3a9 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index f610d88a66be..1a6894afef79 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwpci.c b/drivers/acpi/acpica/hwpci.c
index 050fd227951b..1455ddcdc32c 100644
--- a/drivers/acpi/acpica/hwpci.c
+++ b/drivers/acpi/acpica/hwpci.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index cc70f3fdcdd1..4ea4eeb51bfd 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -7,7 +7,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index d52da3073650..3c4a922a9fc2 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index 50d21c40b5c1..d4973d9da9f1 100644
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c
index 5f1605874655..6e5c43a60bb7 100644
--- a/drivers/acpi/acpica/hwvalid.c
+++ b/drivers/acpi/acpica/hwvalid.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -134,6 +134,8 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
         /* Supported widths are 8/16/32 */
 
         if ((bit_width != 8) && (bit_width != 16) && (bit_width != 32)) {
+                ACPI_ERROR((AE_INFO,
+                            "Bad BitWidth parameter: %8.8X", bit_width));
                 return AE_BAD_PARAMETER;
         }
 
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index c2793a82f120..7bdbbcf35f85 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index d93172fd15a8..61623f3f6826 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c
index 1d0ef15d158f..7c3d3ceb98b3 100644
--- a/drivers/acpi/acpica/nsalloc.c
+++ b/drivers/acpi/acpica/nsalloc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index b683cc2ff9d3..b7f2b3be79ac 100644
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsdumpdv.c b/drivers/acpi/acpica/nsdumpdv.c
index 2ed294b7a4db..30ea5bc53a78 100644
--- a/drivers/acpi/acpica/nsdumpdv.c
+++ b/drivers/acpi/acpica/nsdumpdv.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c
index c1bd02b1a058..f375cb82e321 100644
--- a/drivers/acpi/acpica/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index fd7c6380e294..9d84ec2f0211 100644
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index 5f7dc691c183..5cbf15ffe7d8 100644
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c
index d5fa520c3de5..b20e7c8c3ffb 100644
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c
index 3bb8bf105ea2..dd77a3ce6e50 100644
--- a/drivers/acpi/acpica/nsobject.c
+++ b/drivers/acpi/acpica/nsobject.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index b3234fa795b8..ec7ba2d3463c 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index c845c8089f39..bbe46a447d34 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -620,6 +620,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
         case ACPI_PTYPE2_FIXED:
         case ACPI_PTYPE2_MIN:
         case ACPI_PTYPE2_COUNT:
+        case ACPI_PTYPE2_FIX_VAR:
 
                 /*
                  * These types all return a single Package that consists of a
@@ -759,6 +760,34 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
                         }
                         break;
 
+                case ACPI_PTYPE2_FIX_VAR:
+                        /*
+                         * Each subpackage has a fixed number of elements and an
+                         * optional element
+                         */
+                        expected_count =
+                            package->ret_info.count1 + package->ret_info.count2;
+                        if (sub_package->package.count < expected_count) {
+                                goto package_too_small;
+                        }
+
+                        status =
+                            acpi_ns_check_package_elements(data, sub_elements,
+                                                           package->ret_info.
+                                                           object_type1,
+                                                           package->ret_info.
+                                                           count1,
+                                                           package->ret_info.
+                                                           object_type2,
+                                                           sub_package->package.
+                                                           count -
+                                                           package->ret_info.
+                                                           count1, 0);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
+                        break;
+
                 case ACPI_PTYPE2_FIXED:
 
                         /* Each sub-package has a fixed length */
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c
index ac7b854b0bd7..9c35d20eb52b 100644
--- a/drivers/acpi/acpica/nsrepair.c
+++ b/drivers/acpi/acpica/nsrepair.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -634,6 +634,7 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
         case ACPI_PTYPE2_FIXED:
         case ACPI_PTYPE2_MIN:
         case ACPI_PTYPE2_REV_FIXED:
+        case ACPI_PTYPE2_FIX_VAR:
                 break;
 
         default:
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index 024c4f263f87..726bc8e687f7 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -467,11 +467,12 @@ acpi_ns_repair_HID(struct acpi_predefined_data *data,
         }
 
         /*
-         * Copy and uppercase the string. From the ACPI specification:
+         * Copy and uppercase the string. From the ACPI 5.0 specification:
          *
          * A valid PNP ID must be of the form "AAA####" where A is an uppercase
          * letter and # is a hex digit. A valid ACPI ID must be of the form
-         * "ACPI####" where # is a hex digit.
+         * "NNNN####" where N is an uppercase letter or decimal digit, and
+         * # is a hex digit.
          */
         for (dest = new_string->string.pointer; *source; dest++, source++) {
                 *dest = (char)ACPI_TOUPPER(*source);
diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index 28b0d7a62b99..507043d66114 100644
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index cb1b104a69a2..a535b7afda5c 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nswalk.c b/drivers/acpi/acpica/nswalk.c
index 345f0c3c6ad2..f69895a54895 100644
--- a/drivers/acpi/acpica/nswalk.c
+++ b/drivers/acpi/acpica/nswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index e7f016d1b226..71d15f61807b 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index 83bf93024303..af401c9c4dfc 100644
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c
index 57e6d825ed84..880a605cee20 100644
--- a/drivers/acpi/acpica/nsxfobj.c
+++ b/drivers/acpi/acpica/nsxfobj.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index e1fad0ee0136..5ac36aba507c 100644
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -484,34 +484,54 @@ acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,
 static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
                                                        *parser_state)
 {
-        u32 aml_offset = (u32)
-            ACPI_PTR_DIFF(parser_state->aml,
-                          parser_state->aml_start);
+        u32 aml_offset;
         union acpi_parse_object *field;
+        union acpi_parse_object *arg = NULL;
         u16 opcode;
         u32 name;
+        u8 access_type;
+        u8 access_attribute;
+        u8 access_length;
+        u32 pkg_length;
+        u8 *pkg_end;
+        u32 buffer_length;
 
         ACPI_FUNCTION_TRACE(ps_get_next_field);
 
+        aml_offset =
+            (u32)ACPI_PTR_DIFF(parser_state->aml, parser_state->aml_start);
+
         /* Determine field type */
 
         switch (ACPI_GET8(parser_state->aml)) {
-        default:
+        case AML_FIELD_OFFSET_OP:
 
-                opcode = AML_INT_NAMEDFIELD_OP;
+                opcode = AML_INT_RESERVEDFIELD_OP;
+                parser_state->aml++;
                 break;
 
-        case 0x00:
+        case AML_FIELD_ACCESS_OP:
 
-                opcode = AML_INT_RESERVEDFIELD_OP;
+                opcode = AML_INT_ACCESSFIELD_OP;
                 parser_state->aml++;
                 break;
 
-        case 0x01:
+        case AML_FIELD_CONNECTION_OP:
 
-                opcode = AML_INT_ACCESSFIELD_OP;
+                opcode = AML_INT_CONNECTION_OP;
+                parser_state->aml++;
+                break;
+
+        case AML_FIELD_EXT_ACCESS_OP:
+
+                opcode = AML_INT_EXTACCESSFIELD_OP;
                 parser_state->aml++;
                 break;
+
+        default:
+
+                opcode = AML_INT_NAMEDFIELD_OP;
+                break;
         }
 
         /* Allocate a new field op */
@@ -549,16 +569,111 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
                 break;
 
         case AML_INT_ACCESSFIELD_OP:
+        case AML_INT_EXTACCESSFIELD_OP:
 
                 /*
                  * Get access_type and access_attrib and merge into the field Op
-                 * access_type is first operand, access_attribute is second
+                 * access_type is first operand, access_attribute is second. stuff
+                 * these bytes into the node integer value for convenience.
                  */
-                field->common.value.integer =
-                    (((u32) ACPI_GET8(parser_state->aml) << 8));
+
+                /* Get the two bytes (Type/Attribute) */
+
+                access_type = ACPI_GET8(parser_state->aml);
                 parser_state->aml++;
-                field->common.value.integer |= ACPI_GET8(parser_state->aml);
+                access_attribute = ACPI_GET8(parser_state->aml);
                 parser_state->aml++;
+
+                field->common.value.integer = (u8)access_type;
+                field->common.value.integer |= (u16)(access_attribute << 8);
+
+                /* This opcode has a third byte, access_length */
+
+                if (opcode == AML_INT_EXTACCESSFIELD_OP) {
+                        access_length = ACPI_GET8(parser_state->aml);
+                        parser_state->aml++;
+
+                        field->common.value.integer |=
+                            (u32)(access_length << 16);
+                }
+                break;
+
+        case AML_INT_CONNECTION_OP:
+
+                /*
+                 * Argument for Connection operator can be either a Buffer
+                 * (resource descriptor), or a name_string.
+                 */
+                if (ACPI_GET8(parser_state->aml) == AML_BUFFER_OP) {
+                        parser_state->aml++;
+
+                        pkg_end = parser_state->aml;
+                        pkg_length =
+                            acpi_ps_get_next_package_length(parser_state);
+                        pkg_end += pkg_length;
+
+                        if (parser_state->aml < pkg_end) {
+
+                                /* Non-empty list */
+
+                                arg = acpi_ps_alloc_op(AML_INT_BYTELIST_OP);
+                                if (!arg) {
+                                        return_PTR(NULL);
+                                }
+
+                                /* Get the actual buffer length argument */
+
+                                opcode = ACPI_GET8(parser_state->aml);
+                                parser_state->aml++;
+
+                                switch (opcode) {
+                                case AML_BYTE_OP:       /* AML_BYTEDATA_ARG */
+                                        buffer_length =
+                                            ACPI_GET8(parser_state->aml);
+                                        parser_state->aml += 1;
+                                        break;
+
+                                case AML_WORD_OP:       /* AML_WORDDATA_ARG */
+                                        buffer_length =
+                                            ACPI_GET16(parser_state->aml);
+                                        parser_state->aml += 2;
+                                        break;
+
+                                case AML_DWORD_OP:      /* AML_DWORDATA_ARG */
+                                        buffer_length =
+                                            ACPI_GET32(parser_state->aml);
+                                        parser_state->aml += 4;
+                                        break;
+
+                                default:
+                                        buffer_length = 0;
+                                        break;
+                                }
+
+                                /* Fill in bytelist data */
+
+                                arg->named.value.size = buffer_length;
+                                arg->named.data = parser_state->aml;
+                        }
+
+                        /* Skip to End of byte data */
+
+                        parser_state->aml = pkg_end;
+                } else {
+                        arg = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP);
+                        if (!arg) {
+                                return_PTR(NULL);
+                        }
+
+                        /* Get the Namestring argument */
+
+                        arg->common.value.name =
+                            acpi_ps_get_next_namestring(parser_state);
+                }
+
+                /* Link the buffer/namestring to parent (CONNECTION_OP) */
+
+                acpi_ps_append_arg(field, arg);
                 break;
 
         default:
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 01dd70d1de51..9547ad8a620b 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c
index bed08de7528c..a0226fdcf75c 100644
--- a/drivers/acpi/acpica/psopcode.c
+++ b/drivers/acpi/acpica/psopcode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -638,7 +638,16 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
 
 /* 7E */ ACPI_OP("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY,
                  AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R,
-                 AML_FLAGS_EXEC_0A_0T_1R)
+                         AML_FLAGS_EXEC_0A_0T_1R),
+
+/* ACPI 5.0 opcodes */
+
+/* 7F */ ACPI_OP("-ConnectField-", ARGP_CONNECTFIELD_OP,
+                         ARGI_CONNECTFIELD_OP, ACPI_TYPE_ANY,
+                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS, AML_HAS_ARGS),
+/* 80 */ ACPI_OP("-ExtAccessField-", ARGP_CONNECTFIELD_OP,
+                         ARGI_CONNECTFIELD_OP, ACPI_TYPE_ANY,
+                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0)
 
 /*! [End] no source code translation !*/
 };
@@ -657,7 +666,7 @@ static const u8 acpi_gbl_short_op_index[256] = {
 /* 0x20 */ _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK,
 /* 0x28 */ _UNK, _UNK, _UNK, _UNK, _UNK, 0x63, _PFX, _PFX,
 /* 0x30 */ 0x67, 0x66, 0x68, 0x65, 0x69, 0x64, 0x6A, 0x7D,
-/* 0x38 */ _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK,
+/* 0x38 */ 0x7F, 0x80, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK,
 /* 0x40 */ _UNK, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC,
 /* 0x48 */ _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC,
 /* 0x50 */ _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC,
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index 9bb0cbd37b5e..2ff9c35a1968 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psscope.c b/drivers/acpi/acpica/psscope.c
index a5faa1323a02..c872aa4b926e 100644
--- a/drivers/acpi/acpica/psscope.c
+++ b/drivers/acpi/acpica/psscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/pstree.c b/drivers/acpi/acpica/pstree.c
index f1464c03aa42..2b03cdbbe1c0 100644
--- a/drivers/acpi/acpica/pstree.c
+++ b/drivers/acpi/acpica/pstree.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -74,6 +74,12 @@ union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn)
 
         ACPI_FUNCTION_ENTRY();
 
+/*
+        if (Op->Common.aml_opcode == AML_INT_CONNECTION_OP)
+        {
+                return (Op->Common.Value.Arg);
+        }
+*/
         /* Get the info structure for this opcode */
 
         op_info = acpi_ps_get_opcode_info(op->common.aml_opcode);
diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c
index 7eda78503422..13bb131ae125 100644
--- a/drivers/acpi/acpica/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/pswalk.c b/drivers/acpi/acpica/pswalk.c
index 3312d6368bf1..ab96cf47896d 100644
--- a/drivers/acpi/acpica/pswalk.c
+++ b/drivers/acpi/acpica/pswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index 8086805d4494..9d98c5ff66a5 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsaddr.c b/drivers/acpi/acpica/rsaddr.c
index 9e66f9078426..a0305652394f 100644
--- a/drivers/acpi/acpica/rsaddr.c
+++ b/drivers/acpi/acpica/rsaddr.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
index 3a8a89ec2ca4..3c6df4b7eb2d 100644
--- a/drivers/acpi/acpica/rscalc.c
+++ b/drivers/acpi/acpica/rscalc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -313,6 +313,38 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)
                                                           resource_source));
                         break;
 
+                case ACPI_RESOURCE_TYPE_GPIO:
+
+                        total_size =
+                            (acpi_rs_length) (total_size +
+                                              (resource->data.gpio.
+                                               pin_table_length * 2) +
+                                              resource->data.gpio.
+                                              resource_source.string_length +
+                                              resource->data.gpio.
+                                              vendor_length);
+
+                        break;
+
+                case ACPI_RESOURCE_TYPE_SERIAL_BUS:
+
+                        total_size =
+                            acpi_gbl_aml_resource_serial_bus_sizes[resource->
+                                                                   data.
+                                                                   common_serial_bus.
+                                                                   type];
+
+                        total_size = (acpi_rs_length) (total_size +
+                                                       resource->data.
+                                                       i2c_serial_bus.
+                                                       resource_source.
+                                                       string_length +
+                                                       resource->data.
+                                                       i2c_serial_bus.
+                                                       vendor_length);
+
+                        break;
+
                 default:
                         break;
                 }
@@ -362,10 +394,11 @@ acpi_rs_get_list_length(u8 * aml_buffer,
         u32 extra_struct_bytes;
         u8 resource_index;
         u8 minimum_aml_resource_length;
+        union aml_resource *aml_resource;
 
         ACPI_FUNCTION_TRACE(rs_get_list_length);
 
-        *size_needed = 0;
+        *size_needed = ACPI_RS_SIZE_MIN;        /* Minimum size is one end_tag */
         end_aml = aml_buffer + aml_buffer_length;
 
         /* Walk the list of AML resource descriptors */
@@ -376,9 +409,15 @@ acpi_rs_get_list_length(u8 * aml_buffer,
 
                 status = acpi_ut_validate_resource(aml_buffer, &resource_index);
                 if (ACPI_FAILURE(status)) {
+                        /*
+                         * Exit on failure. Cannot continue because the descriptor length
+                         * may be bogus also.
+                         */
                         return_ACPI_STATUS(status);
                 }
 
+                aml_resource = (void *)aml_buffer;
+
                 /* Get the resource length and base (minimum) AML size */
 
                 resource_length = acpi_ut_get_resource_length(aml_buffer);
@@ -422,10 +461,8 @@ acpi_rs_get_list_length(u8 * aml_buffer,
 
                 case ACPI_RESOURCE_NAME_END_TAG:
                         /*
-                         * End Tag:
-                         * This is the normal exit, add size of end_tag
+                         * End Tag: This is the normal exit
                          */
-                        *size_needed += ACPI_RS_SIZE_MIN;
                         return_ACPI_STATUS(AE_OK);
 
                 case ACPI_RESOURCE_NAME_ADDRESS32:
@@ -457,6 +494,33 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                                                          minimum_aml_resource_length);
                         break;
 
+                case ACPI_RESOURCE_NAME_GPIO:
+
+                        /* Vendor data is optional */
+
+                        if (aml_resource->gpio.vendor_length) {
+                                extra_struct_bytes +=
+                                    aml_resource->gpio.vendor_offset -
+                                    aml_resource->gpio.pin_table_offset +
+                                    aml_resource->gpio.vendor_length;
+                        } else {
+                                extra_struct_bytes +=
+                                    aml_resource->large_header.resource_length +
+                                    sizeof(struct aml_resource_large_header) -
+                                    aml_resource->gpio.pin_table_offset;
+                        }
+                        break;
+
+                case ACPI_RESOURCE_NAME_SERIAL_BUS:
+
+                        minimum_aml_resource_length =
+                            acpi_gbl_resource_aml_serial_bus_sizes
+                            [aml_resource->common_serial_bus.type];
+                        extra_struct_bytes +=
+                            aml_resource->common_serial_bus.resource_length -
+                            minimum_aml_resource_length;
+                        break;
+
                 default:
                         break;
                 }
@@ -467,9 +531,18 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                  * Important: Round the size up for the appropriate alignment. This
                  * is a requirement on IA64.
                  */
-                buffer_size = acpi_gbl_resource_struct_sizes[resource_index] +
-                    extra_struct_bytes;
-                buffer_size = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(buffer_size);
+                if (acpi_ut_get_resource_type(aml_buffer) ==
+                    ACPI_RESOURCE_NAME_SERIAL_BUS) {
+                        buffer_size =
+                            acpi_gbl_resource_struct_serial_bus_sizes
+                            [aml_resource->common_serial_bus.type] +
+                            extra_struct_bytes;
+                } else {
+                        buffer_size =
+                            acpi_gbl_resource_struct_sizes[resource_index] +
+                            extra_struct_bytes;
+                }
+                buffer_size = (u32)ACPI_ROUND_UP_TO_NATIVE_WORD(buffer_size);
 
                 *size_needed += buffer_size;
 
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index 4ce6e1147e80..46d6eb38ae66 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,70 @@ ACPI_MODULE_NAME("rscreate")
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_buffer_to_resource
+ *
+ * PARAMETERS:  aml_buffer          - Pointer to the resource byte stream
+ *              aml_buffer_length   - Length of the aml_buffer
+ *              resource_ptr        - Where the converted resource is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Convert a raw AML buffer to a resource list
+ *
+ ******************************************************************************/
+acpi_status
+acpi_buffer_to_resource(u8 *aml_buffer,
+                        u16 aml_buffer_length,
+                        struct acpi_resource **resource_ptr)
+{
+        acpi_status status;
+        acpi_size list_size_needed;
+        void *resource;
+        void *current_resource_ptr;
+
+        /*
+         * Note: we allow AE_AML_NO_RESOURCE_END_TAG, since an end tag
+         * is not required here.
+         */
+
+        /* Get the required length for the converted resource */
+
+        status = acpi_rs_get_list_length(aml_buffer, aml_buffer_length,
+                                         &list_size_needed);
+        if (status == AE_AML_NO_RESOURCE_END_TAG) {
+                status = AE_OK;
+        }
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* Allocate a buffer for the converted resource */
+
+        resource = ACPI_ALLOCATE_ZEROED(list_size_needed);
+        current_resource_ptr = resource;
+        if (!resource) {
+                return (AE_NO_MEMORY);
+        }
+
+        /* Perform the AML-to-Resource conversion */
+
+        status = acpi_ut_walk_aml_resources(aml_buffer, aml_buffer_length,
+                                            acpi_rs_convert_aml_to_resources,
+                                            &current_resource_ptr);
+        if (status == AE_AML_NO_RESOURCE_END_TAG) {
+                status = AE_OK;
+        }
+        if (ACPI_FAILURE(status)) {
+                ACPI_FREE(resource);
+        } else {
+                *resource_ptr = resource;
+        }
+
+        return (status);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_rs_create_resource_list
  *
  * PARAMETERS:  aml_buffer          - Pointer to the resource byte stream
@@ -66,9 +130,10 @@ ACPI_MODULE_NAME("rscreate")
  *              of device resources.
  *
  ******************************************************************************/
+
 acpi_status
 acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
-                             struct acpi_buffer *output_buffer)
+                             struct acpi_buffer * output_buffer)
 {
 
         acpi_status status;
diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c
index 33db7520c74b..b4c581132393 100644
--- a/drivers/acpi/acpica/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -61,11 +61,13 @@ static void acpi_rs_out_integer64(char *title, u64 value);
 
 static void acpi_rs_out_title(char *title);
 
-static void acpi_rs_dump_byte_list(u16 length, u8 * data);
+static void acpi_rs_dump_byte_list(u16 length, u8 *data);
 
-static void acpi_rs_dump_dword_list(u8 length, u32 * data);
+static void acpi_rs_dump_word_list(u16 length, u16 *data);
 
-static void acpi_rs_dump_short_byte_list(u8 length, u8 * data);
+static void acpi_rs_dump_dword_list(u8 length, u32 *data);
+
+static void acpi_rs_dump_short_byte_list(u8 length, u8 *data);
 
 static void
 acpi_rs_dump_resource_source(struct acpi_resource_source *resource_source);
@@ -309,6 +311,125 @@ struct acpi_rsdump_info acpi_rs_dump_generic_reg[6] = {
         {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(generic_reg.address), "Address", NULL}
 };
 
+struct acpi_rsdump_info acpi_rs_dump_gpio[16] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_gpio), "GPIO", NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.revision_id), "RevisionId", NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.connection_type),
+         "ConnectionType", acpi_gbl_ct_decode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(gpio.producer_consumer),
+         "ProducerConsumer", acpi_gbl_consume_decode},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.pin_config), "PinConfig",
+         acpi_gbl_ppc_decode},
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.sharable), "Sharable",
+         acpi_gbl_shr_decode},
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.io_restriction),
+         "IoRestriction", acpi_gbl_ior_decode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(gpio.triggering), "Triggering",
+         acpi_gbl_he_decode},
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.polarity), "Polarity",
+         acpi_gbl_ll_decode},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.drive_strength), "DriveStrength",
+         NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.debounce_timeout),
+         "DebounceTimeout", NULL},
+        {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(gpio.resource_source),
+         "ResourceSource", NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.pin_table_length),
+         "PinTableLength", NULL},
+        {ACPI_RSD_WORDLIST, ACPI_RSD_OFFSET(gpio.pin_table), "PinTable", NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.vendor_length), "VendorLength",
+         NULL},
+        {ACPI_RSD_SHORTLISTX, ACPI_RSD_OFFSET(gpio.vendor_data), "VendorData",
+         NULL},
+};
+
+struct acpi_rsdump_info acpi_rs_dump_fixed_dma[4] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_fixed_dma),
+         "FixedDma", NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(fixed_dma.request_lines),
+         "RequestLines", NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(fixed_dma.channels), "Channels",
+         NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(fixed_dma.width), "TransferWidth",
+         acpi_gbl_dts_decode},
+};
+
+#define ACPI_RS_DUMP_COMMON_SERIAL_BUS \
+        {ACPI_RSD_UINT8,    ACPI_RSD_OFFSET (common_serial_bus.revision_id),    "RevisionId",               NULL}, \
+        {ACPI_RSD_UINT8,    ACPI_RSD_OFFSET (common_serial_bus.type),           "Type",                     acpi_gbl_sbt_decode}, \
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (common_serial_bus.producer_consumer), "ProducerConsumer",      acpi_gbl_consume_decode}, \
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (common_serial_bus.slave_mode),     "SlaveMode",                acpi_gbl_sm_decode}, \
+        {ACPI_RSD_UINT8,    ACPI_RSD_OFFSET (common_serial_bus.type_revision_id), "TypeRevisionId",         NULL}, \
+        {ACPI_RSD_UINT16,   ACPI_RSD_OFFSET (common_serial_bus.type_data_length), "TypeDataLength",         NULL}, \
+        {ACPI_RSD_SOURCE,   ACPI_RSD_OFFSET (common_serial_bus.resource_source), "ResourceSource",          NULL}, \
+        {ACPI_RSD_UINT16,   ACPI_RSD_OFFSET (common_serial_bus.vendor_length),  "VendorLength",             NULL}, \
+        {ACPI_RSD_SHORTLISTX,ACPI_RSD_OFFSET (common_serial_bus.vendor_data),   "VendorData",               NULL},
+
+struct acpi_rsdump_info acpi_rs_dump_common_serial_bus[10] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_common_serial_bus),
+         "Common Serial Bus", NULL},
+        ACPI_RS_DUMP_COMMON_SERIAL_BUS
+};
+
+struct acpi_rsdump_info acpi_rs_dump_i2c_serial_bus[13] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_i2c_serial_bus),
+         "I2C Serial Bus", NULL},
+        ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_1BITFLAG,
+                                        ACPI_RSD_OFFSET(i2c_serial_bus.
+                                                        access_mode),
+                                        "AccessMode", acpi_gbl_am_decode},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(i2c_serial_bus.connection_speed),
+         "ConnectionSpeed", NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(i2c_serial_bus.slave_address),
+         "SlaveAddress", NULL},
+};
+
+struct acpi_rsdump_info acpi_rs_dump_spi_serial_bus[17] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_spi_serial_bus),
+         "Spi Serial Bus", NULL},
+        ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_1BITFLAG,
+                                        ACPI_RSD_OFFSET(spi_serial_bus.
+                                                        wire_mode), "WireMode",
+                                        acpi_gbl_wm_decode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(spi_serial_bus.device_polarity),
+         "DevicePolarity", acpi_gbl_dp_decode},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(spi_serial_bus.data_bit_length),
+         "DataBitLength", NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(spi_serial_bus.clock_phase),
+         "ClockPhase", acpi_gbl_cph_decode},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(spi_serial_bus.clock_polarity),
+         "ClockPolarity", acpi_gbl_cpo_decode},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(spi_serial_bus.device_selection),
+         "DeviceSelection", NULL},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(spi_serial_bus.connection_speed),
+         "ConnectionSpeed", NULL},
+};
+
+struct acpi_rsdump_info acpi_rs_dump_uart_serial_bus[19] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_uart_serial_bus),
+         "Uart Serial Bus", NULL},
+        ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_2BITFLAG,
+                                        ACPI_RSD_OFFSET(uart_serial_bus.
+                                                        flow_control),
+                                        "FlowControl", acpi_gbl_fc_decode},
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(uart_serial_bus.stop_bits),
+         "StopBits", acpi_gbl_sb_decode},
+        {ACPI_RSD_3BITFLAG, ACPI_RSD_OFFSET(uart_serial_bus.data_bits),
+         "DataBits", acpi_gbl_bpb_decode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(uart_serial_bus.endian), "Endian",
+         acpi_gbl_ed_decode},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(uart_serial_bus.parity), "Parity",
+         acpi_gbl_pt_decode},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(uart_serial_bus.lines_enabled),
+         "LinesEnabled", NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(uart_serial_bus.rx_fifo_size),
+         "RxFifoSize", NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(uart_serial_bus.tx_fifo_size),
+         "TxFifoSize", NULL},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(uart_serial_bus.default_baud_rate),
+         "ConnectionSpeed", NULL},
+};
+
 /*
  * Tables used for common address descriptor flag fields
  */
@@ -413,7 +534,14 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         /* Data items, 8/16/32/64 bit */
 
                 case ACPI_RSD_UINT8:
-                        acpi_rs_out_integer8(name, ACPI_GET8(target));
+                        if (table->pointer) {
+                                acpi_rs_out_string(name, ACPI_CAST_PTR(char,
+                                                                       table->
+                                                                       pointer
+                                                                       [*target]));
+                        } else {
+                                acpi_rs_out_integer8(name, ACPI_GET8(target));
+                        }
                         break;
 
                 case ACPI_RSD_UINT16:
@@ -444,6 +572,13 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                                                                        0x03]));
                         break;
 
+                case ACPI_RSD_3BITFLAG:
+                        acpi_rs_out_string(name, ACPI_CAST_PTR(char,
+                                                               table->
+                                                               pointer[*target &
+                                                                       0x07]));
+                        break;
+
                 case ACPI_RSD_SHORTLIST:
                         /*
                          * Short byte list (single line output) for DMA and IRQ resources
@@ -456,6 +591,20 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         }
                         break;
 
+                case ACPI_RSD_SHORTLISTX:
+                        /*
+                         * Short byte list (single line output) for GPIO vendor data
+                         * Note: The list length is obtained from the previous table entry
+                         */
+                        if (previous_target) {
+                                acpi_rs_out_title(name);
+                                acpi_rs_dump_short_byte_list(*previous_target,
+                                                             *
+                                                             (ACPI_CAST_INDIRECT_PTR
+                                                              (u8, target)));
+                        }
+                        break;
+
                 case ACPI_RSD_LONGLIST:
                         /*
                          * Long byte list for Vendor resource data
@@ -480,6 +629,18 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         }
                         break;
 
+                case ACPI_RSD_WORDLIST:
+                        /*
+                         * Word list for GPIO Pin Table
+                         * Note: The list length is obtained from the previous table entry
+                         */
+                        if (previous_target) {
+                                acpi_rs_dump_word_list(*previous_target,
+                                                       *(ACPI_CAST_INDIRECT_PTR
+                                                         (u16, target)));
+                        }
+                        break;
+
                 case ACPI_RSD_ADDRESS:
                         /*
                          * Common flags for all Address resources
@@ -627,14 +788,20 @@ void acpi_rs_dump_resource_list(struct acpi_resource *resource_list)
 
                 /* Dump the resource descriptor */
 
-                acpi_rs_dump_descriptor(&resource_list->data,
-                                        acpi_gbl_dump_resource_dispatch[type]);
+                if (type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {
+                        acpi_rs_dump_descriptor(&resource_list->data,
+                                                acpi_gbl_dump_serial_bus_dispatch
+                                                [resource_list->data.
+                                                 common_serial_bus.type]);
+                } else {
+                        acpi_rs_dump_descriptor(&resource_list->data,
+                                                acpi_gbl_dump_resource_dispatch
+                                                [type]);
+                }
 
                 /* Point to the next resource structure */
 
-                resource_list =
-                    ACPI_ADD_PTR(struct acpi_resource, resource_list,
-                                 resource_list->length);
+                resource_list = ACPI_NEXT_RESOURCE(resource_list);
 
                 /* Exit when END_TAG descriptor is reached */
 
@@ -768,4 +935,13 @@ static void acpi_rs_dump_dword_list(u8 length, u32 * data)
         }
 }
 
+static void acpi_rs_dump_word_list(u16 length, u16 *data)
+{
+        u16 i;
+
+        for (i = 0; i < length; i++) {
+                acpi_os_printf("%25s%2.2X : %4.4X\n", "Word", i, data[i]);
+        }
+}
+
 #endif
diff --git a/drivers/acpi/acpica/rsinfo.c b/drivers/acpi/acpica/rsinfo.c
index f9ea60872aa4..a9fa5158200b 100644
--- a/drivers/acpi/acpica/rsinfo.c
+++ b/drivers/acpi/acpica/rsinfo.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -76,7 +76,10 @@ struct acpi_rsconvert_info *acpi_gbl_set_resource_dispatch[] = {
         acpi_rs_convert_address64,      /* 0x0D, ACPI_RESOURCE_TYPE_ADDRESS64 */
         acpi_rs_convert_ext_address64,  /* 0x0E, ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */
         acpi_rs_convert_ext_irq,        /* 0x0F, ACPI_RESOURCE_TYPE_EXTENDED_IRQ */
-        acpi_rs_convert_generic_reg     /* 0x10, ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
+        acpi_rs_convert_generic_reg,    /* 0x10, ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
+        acpi_rs_convert_gpio,   /* 0x11, ACPI_RESOURCE_TYPE_GPIO */
+        acpi_rs_convert_fixed_dma,      /* 0x12, ACPI_RESOURCE_TYPE_FIXED_DMA */
+        NULL,                   /* 0x13, ACPI_RESOURCE_TYPE_SERIAL_BUS - Use subtype table below */
 };
 
 /* Dispatch tables for AML-to-resource (Get Resource) conversion functions */
@@ -94,7 +97,7 @@ struct acpi_rsconvert_info *acpi_gbl_get_resource_dispatch[] = {
         acpi_rs_convert_end_dpf,        /* 0x07, ACPI_RESOURCE_NAME_END_DEPENDENT */
         acpi_rs_convert_io,     /* 0x08, ACPI_RESOURCE_NAME_IO */
         acpi_rs_convert_fixed_io,       /* 0x09, ACPI_RESOURCE_NAME_FIXED_IO */
-        NULL,                   /* 0x0A, Reserved */
+        acpi_rs_convert_fixed_dma,      /* 0x0A, ACPI_RESOURCE_NAME_FIXED_DMA */
         NULL,                   /* 0x0B, Reserved */
         NULL,                   /* 0x0C, Reserved */
         NULL,                   /* 0x0D, Reserved */
@@ -114,7 +117,19 @@ struct acpi_rsconvert_info *acpi_gbl_get_resource_dispatch[] = {
         acpi_rs_convert_address16,      /* 0x08, ACPI_RESOURCE_NAME_ADDRESS16 */
         acpi_rs_convert_ext_irq,        /* 0x09, ACPI_RESOURCE_NAME_EXTENDED_IRQ */
         acpi_rs_convert_address64,      /* 0x0A, ACPI_RESOURCE_NAME_ADDRESS64 */
-        acpi_rs_convert_ext_address64   /* 0x0B, ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64 */
+        acpi_rs_convert_ext_address64,  /* 0x0B, ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64 */
+        acpi_rs_convert_gpio,   /* 0x0C, ACPI_RESOURCE_NAME_GPIO */
+        NULL,                   /* 0x0D, Reserved */
+        NULL,                   /* 0x0E, ACPI_RESOURCE_NAME_SERIAL_BUS - Use subtype table below */
+};
+
+/* Subtype table for serial_bus -- I2C, SPI, and UART */
+
+struct acpi_rsconvert_info *acpi_gbl_convert_resource_serial_bus_dispatch[] = {
+        NULL,
+        acpi_rs_convert_i2c_serial_bus,
+        acpi_rs_convert_spi_serial_bus,
+        acpi_rs_convert_uart_serial_bus,
 };
 
 #ifdef ACPI_FUTURE_USAGE
@@ -140,6 +155,16 @@ struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[] = {
         acpi_rs_dump_ext_address64,     /* ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */
         acpi_rs_dump_ext_irq,   /* ACPI_RESOURCE_TYPE_EXTENDED_IRQ */
         acpi_rs_dump_generic_reg,       /* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
+        acpi_rs_dump_gpio,      /* ACPI_RESOURCE_TYPE_GPIO */
+        acpi_rs_dump_fixed_dma, /* ACPI_RESOURCE_TYPE_FIXED_DMA */
+        NULL,                   /* ACPI_RESOURCE_TYPE_SERIAL_BUS */
+};
+
+struct acpi_rsdump_info *acpi_gbl_dump_serial_bus_dispatch[] = {
+        NULL,
+        acpi_rs_dump_i2c_serial_bus,    /* AML_RESOURCE_I2C_BUS_TYPE */
+        acpi_rs_dump_spi_serial_bus,    /* AML_RESOURCE_SPI_BUS_TYPE */
+        acpi_rs_dump_uart_serial_bus,   /* AML_RESOURCE_UART_BUS_TYPE */
 };
 #endif
 
@@ -166,7 +191,10 @@ const u8 acpi_gbl_aml_resource_sizes[] = {
         sizeof(struct aml_resource_address64),  /* ACPI_RESOURCE_TYPE_ADDRESS64 */
         sizeof(struct aml_resource_extended_address64), /*ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */
         sizeof(struct aml_resource_extended_irq),       /* ACPI_RESOURCE_TYPE_EXTENDED_IRQ */
-        sizeof(struct aml_resource_generic_register)    /* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
+        sizeof(struct aml_resource_generic_register),   /* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
+        sizeof(struct aml_resource_gpio),       /* ACPI_RESOURCE_TYPE_GPIO */
+        sizeof(struct aml_resource_fixed_dma),  /* ACPI_RESOURCE_TYPE_FIXED_DMA */
+        sizeof(struct aml_resource_common_serialbus),   /* ACPI_RESOURCE_TYPE_SERIAL_BUS */
 };
 
 const u8 acpi_gbl_resource_struct_sizes[] = {
@@ -182,7 +210,7 @@ const u8 acpi_gbl_resource_struct_sizes[] = {
         ACPI_RS_SIZE_MIN,
         ACPI_RS_SIZE(struct acpi_resource_io),
         ACPI_RS_SIZE(struct acpi_resource_fixed_io),
-        0,
+        ACPI_RS_SIZE(struct acpi_resource_fixed_dma),
         0,
         0,
         0,
@@ -202,5 +230,21 @@ const u8 acpi_gbl_resource_struct_sizes[] = {
         ACPI_RS_SIZE(struct acpi_resource_address16),
         ACPI_RS_SIZE(struct acpi_resource_extended_irq),
         ACPI_RS_SIZE(struct acpi_resource_address64),
-        ACPI_RS_SIZE(struct acpi_resource_extended_address64)
+        ACPI_RS_SIZE(struct acpi_resource_extended_address64),
+        ACPI_RS_SIZE(struct acpi_resource_gpio),
+        ACPI_RS_SIZE(struct acpi_resource_common_serialbus)
+};
+
+const u8 acpi_gbl_aml_resource_serial_bus_sizes[] = {
+        0,
+        sizeof(struct aml_resource_i2c_serialbus),
+        sizeof(struct aml_resource_spi_serialbus),
+        sizeof(struct aml_resource_uart_serialbus),
+};
+
+const u8 acpi_gbl_resource_struct_serial_bus_sizes[] = {
+        0,
+        ACPI_RS_SIZE(struct acpi_resource_i2c_serialbus),
+        ACPI_RS_SIZE(struct acpi_resource_spi_serialbus),
+        ACPI_RS_SIZE(struct acpi_resource_uart_serialbus),
 };
diff --git a/drivers/acpi/acpica/rsio.c b/drivers/acpi/acpica/rsio.c
index 0c7efef008be..f6a081057a22 100644
--- a/drivers/acpi/acpica/rsio.c
+++ b/drivers/acpi/acpica/rsio.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsirq.c b/drivers/acpi/acpica/rsirq.c
index 50b8ad211167..e23a9ec248cb 100644
--- a/drivers/acpi/acpica/rsirq.c
+++ b/drivers/acpi/acpica/rsirq.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -264,3 +264,34 @@ struct acpi_rsconvert_info acpi_rs_convert_dma[6] = {
          AML_OFFSET(dma.dma_channel_mask),
          ACPI_RS_OFFSET(data.dma.channel_count)}
 };
+
+/*******************************************************************************
+ *
+ * acpi_rs_convert_fixed_dma
+ *
+ ******************************************************************************/
+
+struct acpi_rsconvert_info acpi_rs_convert_fixed_dma[4] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_FIXED_DMA,
+         ACPI_RS_SIZE(struct acpi_resource_fixed_dma),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_fixed_dma)},
+
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_FIXED_DMA,
+         sizeof(struct aml_resource_fixed_dma),
+         0},
+
+        /*
+         * These fields are contiguous in both the source and destination:
+         * request_lines
+         * Channels
+         */
+
+        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.fixed_dma.request_lines),
+         AML_OFFSET(fixed_dma.request_lines),
+         2},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.fixed_dma.width),
+         AML_OFFSET(fixed_dma.width),
+         1},
+
+};
diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c
index 1bfcef736c50..9be129f5d6f4 100644
--- a/drivers/acpi/acpica/rslist.c
+++ b/drivers/acpi/acpica/rslist.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,8 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
         struct acpi_resource **resource_ptr =
             ACPI_CAST_INDIRECT_PTR(struct acpi_resource, context);
         struct acpi_resource *resource;
+        union aml_resource *aml_resource;
+        struct acpi_rsconvert_info *conversion_table;
         acpi_status status;
 
         ACPI_FUNCTION_TRACE(rs_convert_aml_to_resources);
@@ -84,14 +86,37 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
                               "Misaligned resource pointer %p", resource));
         }
 
+        /* Get the appropriate conversion info table */
+
+        aml_resource = ACPI_CAST_PTR(union aml_resource, aml);
+        if (acpi_ut_get_resource_type(aml) == ACPI_RESOURCE_NAME_SERIAL_BUS) {
+                if (aml_resource->common_serial_bus.type >
+                    AML_RESOURCE_MAX_SERIALBUSTYPE) {
+                        conversion_table = NULL;
+                } else {
+                        /* This is an I2C, SPI, or UART serial_bus descriptor */
+
+                        conversion_table =
+                            acpi_gbl_convert_resource_serial_bus_dispatch
+                            [aml_resource->common_serial_bus.type];
+                }
+        } else {
+                conversion_table =
+                    acpi_gbl_get_resource_dispatch[resource_index];
+        }
+
+        if (!conversion_table) {
+                ACPI_ERROR((AE_INFO,
+                            "Invalid/unsupported resource descriptor: Type 0x%2.2X",
+                            resource_index));
+                return (AE_AML_INVALID_RESOURCE_TYPE);
+        }
+
         /* Convert the AML byte stream resource to a local resource struct */
 
         status =
-            acpi_rs_convert_aml_to_resource(resource,
-                                            ACPI_CAST_PTR(union aml_resource,
-                                                          aml),
-                                            acpi_gbl_get_resource_dispatch
-                                            [resource_index]);
+            acpi_rs_convert_aml_to_resource(resource, aml_resource,
+                                            conversion_table);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status,
                                 "Could not convert AML resource (Type 0x%X)",
@@ -106,7 +131,7 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
 
         /* Point to the next structure in the output buffer */
 
-        *resource_ptr = ACPI_ADD_PTR(void, resource, resource->length);
+        *resource_ptr = ACPI_NEXT_RESOURCE(resource);
         return_ACPI_STATUS(AE_OK);
 }
 
@@ -135,6 +160,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
 {
         u8 *aml = output_buffer;
         u8 *end_aml = output_buffer + aml_size_needed;
+        struct acpi_rsconvert_info *conversion_table;
         acpi_status status;
 
         ACPI_FUNCTION_TRACE(rs_convert_resources_to_aml);
@@ -154,11 +180,34 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
 
                 /* Perform the conversion */
 
-                status = acpi_rs_convert_resource_to_aml(resource, ACPI_CAST_PTR(union
-                                                                                 aml_resource,
-                                                                                 aml),
-                                                         acpi_gbl_set_resource_dispatch
-                                                         [resource->type]);
+                if (resource->type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {
+                        if (resource->data.common_serial_bus.type >
+                            AML_RESOURCE_MAX_SERIALBUSTYPE) {
+                                conversion_table = NULL;
+                        } else {
+                                /* This is an I2C, SPI, or UART serial_bus descriptor */
+
+                                conversion_table =
+                                    acpi_gbl_convert_resource_serial_bus_dispatch
+                                    [resource->data.common_serial_bus.type];
+                        }
+                } else {
+                        conversion_table =
+                            acpi_gbl_set_resource_dispatch[resource->type];
+                }
+
+                if (!conversion_table) {
+                        ACPI_ERROR((AE_INFO,
+                                    "Invalid/unsupported resource descriptor: Type 0x%2.2X",
+                                    resource->type));
+                        return (AE_AML_INVALID_RESOURCE_TYPE);
+                }
+
+                status = acpi_rs_convert_resource_to_aml(resource,
+                                                         ACPI_CAST_PTR(union
+                                                                       aml_resource,
+                                                                       aml),
+                                                         conversion_table);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
                                         "Could not convert resource (type 0x%X) to AML",
@@ -192,9 +241,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
 
                 /* Point to the next input resource descriptor */
 
-                resource =
-                    ACPI_ADD_PTR(struct acpi_resource, resource,
-                                 resource->length);
+                resource = ACPI_NEXT_RESOURCE(resource);
         }
 
         /* Completed buffer, but did not find an end_tag resource descriptor */
diff --git a/drivers/acpi/acpica/rsmemory.c b/drivers/acpi/acpica/rsmemory.c
index 7cc6d8625f1e..4fd611ad02b4 100644
--- a/drivers/acpi/acpica/rsmemory.c
+++ b/drivers/acpi/acpica/rsmemory.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsmisc.c b/drivers/acpi/acpica/rsmisc.c
index 410264b22a29..8073b371cc7c 100644
--- a/drivers/acpi/acpica/rsmisc.c
+++ b/drivers/acpi/acpica/rsmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -83,6 +83,10 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
 
         ACPI_FUNCTION_TRACE(rs_convert_aml_to_resource);
 
+        if (!info) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
         if (((acpi_size) resource) & 0x3) {
 
                 /* Each internal resource struct is expected to be 32-bit aligned */
@@ -101,7 +105,6 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
          * table length (# of table entries)
          */
         count = INIT_TABLE_LENGTH(info);
-
         while (count) {
                 /*
                  * Source is the external AML byte stream buffer,
@@ -145,6 +148,14 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                             ((ACPI_GET8(source) >> info->value) & 0x03);
                         break;
 
+                case ACPI_RSC_3BITFLAG:
+                        /*
+                         * Mask and shift the flag bits
+                         */
+                        ACPI_SET8(destination) = (u8)
+                            ((ACPI_GET8(source) >> info->value) & 0x07);
+                        break;
+
                 case ACPI_RSC_COUNT:
 
                         item_count = ACPI_GET8(source);
@@ -163,6 +174,69 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                             (info->value * (item_count - 1));
                         break;
 
+                case ACPI_RSC_COUNT_GPIO_PIN:
+
+                        target = ACPI_ADD_PTR(void, aml, info->value);
+                        item_count = ACPI_GET16(target) - ACPI_GET16(source);
+
+                        resource->length = resource->length + item_count;
+                        item_count = item_count / 2;
+                        ACPI_SET16(destination) = item_count;
+                        break;
+
+                case ACPI_RSC_COUNT_GPIO_VEN:
+
+                        item_count = ACPI_GET8(source);
+                        ACPI_SET8(destination) = (u8)item_count;
+
+                        resource->length = resource->length +
+                            (info->value * item_count);
+                        break;
+
+                case ACPI_RSC_COUNT_GPIO_RES:
+
+                        /*
+                         * Vendor data is optional (length/offset may both be zero)
+                         * Examine vendor data length field first
+                         */
+                        target = ACPI_ADD_PTR(void, aml, (info->value + 2));
+                        if (ACPI_GET16(target)) {
+
+                                /* Use vendor offset to get resource source length */
+
+                                target = ACPI_ADD_PTR(void, aml, info->value);
+                                item_count =
+                                    ACPI_GET16(target) - ACPI_GET16(source);
+                        } else {
+                                /* No vendor data to worry about */
+
+                                item_count = aml->large_header.resource_length +
+                                    sizeof(struct aml_resource_large_header) -
+                                    ACPI_GET16(source);
+                        }
+
+                        resource->length = resource->length + item_count;
+                        ACPI_SET16(destination) = item_count;
+                        break;
+
+                case ACPI_RSC_COUNT_SERIAL_VEN:
+
+                        item_count = ACPI_GET16(source) - info->value;
+
+                        resource->length = resource->length + item_count;
+                        ACPI_SET16(destination) = item_count;
+                        break;
+
+                case ACPI_RSC_COUNT_SERIAL_RES:
+
+                        item_count = (aml_resource_length +
+                                      sizeof(struct aml_resource_large_header))
+                            - ACPI_GET16(source) - info->value;
+
+                        resource->length = resource->length + item_count;
+                        ACPI_SET16(destination) = item_count;
+                        break;
+
                 case ACPI_RSC_LENGTH:
 
                         resource->length = resource->length + info->value;
@@ -183,6 +257,72 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                                           info->opcode);
                         break;
 
+                case ACPI_RSC_MOVE_GPIO_PIN:
+
+                        /* Generate and set the PIN data pointer */
+
+                        target = (char *)ACPI_ADD_PTR(void, resource,
+                                                      (resource->length -
+                                                       item_count * 2));
+                        *(u16 **)destination = ACPI_CAST_PTR(u16, target);
+
+                        /* Copy the PIN data */
+
+                        source = ACPI_ADD_PTR(void, aml, ACPI_GET16(source));
+                        acpi_rs_move_data(target, source, item_count,
+                                          info->opcode);
+                        break;
+
+                case ACPI_RSC_MOVE_GPIO_RES:
+
+                        /* Generate and set the resource_source string pointer */
+
+                        target = (char *)ACPI_ADD_PTR(void, resource,
+                                                      (resource->length -
+                                                       item_count));
+                        *(u8 **)destination = ACPI_CAST_PTR(u8, target);
+
+                        /* Copy the resource_source string */
+
+                        source = ACPI_ADD_PTR(void, aml, ACPI_GET16(source));
+                        acpi_rs_move_data(target, source, item_count,
+                                          info->opcode);
+                        break;
+
+                case ACPI_RSC_MOVE_SERIAL_VEN:
+
+                        /* Generate and set the Vendor Data pointer */
+
+                        target = (char *)ACPI_ADD_PTR(void, resource,
+                                                      (resource->length -
+                                                       item_count));
+                        *(u8 **)destination = ACPI_CAST_PTR(u8, target);
+
+                        /* Copy the Vendor Data */
+
+                        source = ACPI_ADD_PTR(void, aml, info->value);
+                        acpi_rs_move_data(target, source, item_count,
+                                          info->opcode);
+                        break;
+
+                case ACPI_RSC_MOVE_SERIAL_RES:
+
+                        /* Generate and set the resource_source string pointer */
+
+                        target = (char *)ACPI_ADD_PTR(void, resource,
+                                                      (resource->length -
+                                                       item_count));
+                        *(u8 **)destination = ACPI_CAST_PTR(u8, target);
+
+                        /* Copy the resource_source string */
+
+                        source =
+                            ACPI_ADD_PTR(void, aml,
+                                         (ACPI_GET16(source) + info->value));
+                        acpi_rs_move_data(target, source, item_count,
+                                          info->opcode);
+                        break;
+
                 case ACPI_RSC_SET8:
 
                         ACPI_MEMSET(destination, info->aml_offset, info->value);
@@ -219,13 +359,18 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                          * Optional resource_source (Index and String). This is the more
                          * complicated case used by the Interrupt() macro
                          */
-                        target =
-                            ACPI_ADD_PTR(char, resource,
-                                         info->aml_offset + (item_count * 4));
+                        target = ACPI_ADD_PTR(char, resource,
+                                              info->aml_offset +
+                                              (item_count * 4));
 
                         resource->length +=
                             acpi_rs_get_resource_source(aml_resource_length,
-                                                        (acpi_rs_length) (((item_count - 1) * sizeof(u32)) + info->value), destination, aml, target);
+                                                        (acpi_rs_length)
+                                                        (((item_count -
+                                                           1) * sizeof(u32)) +
+                                                         info->value),
+                                                        destination, aml,
+                                                        target);
                         break;
 
                 case ACPI_RSC_BITMASK:
@@ -327,6 +472,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
 {
         void *source = NULL;
         void *destination;
+        char *target;
         acpi_rsdesc_size aml_length = 0;
         u8 count;
         u16 temp16 = 0;
@@ -334,6 +480,10 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
 
         ACPI_FUNCTION_TRACE(rs_convert_resource_to_aml);
 
+        if (!info) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
         /*
          * First table entry must be ACPI_RSC_INITxxx and must contain the
          * table length (# of table entries)
@@ -383,6 +533,14 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                             ((ACPI_GET8(source) & 0x03) << info->value);
                         break;
 
+                case ACPI_RSC_3BITFLAG:
+                        /*
+                         * Mask and shift the flag bits
+                         */
+                        ACPI_SET8(destination) |= (u8)
+                            ((ACPI_GET8(source) & 0x07) << info->value);
+                        break;
+
                 case ACPI_RSC_COUNT:
 
                         item_count = ACPI_GET8(source);
@@ -400,6 +558,63 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                         acpi_rs_set_resource_length(aml_length, aml);
                         break;
 
+                case ACPI_RSC_COUNT_GPIO_PIN:
+
+                        item_count = ACPI_GET16(source);
+                        ACPI_SET16(destination) = (u16)aml_length;
+
+                        aml_length = (u16)(aml_length + item_count * 2);
+                        target = ACPI_ADD_PTR(void, aml, info->value);
+                        ACPI_SET16(target) = (u16)aml_length;
+                        acpi_rs_set_resource_length(aml_length, aml);
+                        break;
+
+                case ACPI_RSC_COUNT_GPIO_VEN:
+
+                        item_count = ACPI_GET16(source);
+                        ACPI_SET16(destination) = (u16)item_count;
+
+                        aml_length =
+                            (u16)(aml_length + (info->value * item_count));
+                        acpi_rs_set_resource_length(aml_length, aml);
+                        break;
+
+                case ACPI_RSC_COUNT_GPIO_RES:
+
+                        /* Set resource source string length */
+
+                        item_count = ACPI_GET16(source);
+                        ACPI_SET16(destination) = (u16)aml_length;
+
+                        /* Compute offset for the Vendor Data */
+
+                        aml_length = (u16)(aml_length + item_count);
+                        target = ACPI_ADD_PTR(void, aml, info->value);
+
+                        /* Set vendor offset only if there is vendor data */
+
+                        if (resource->data.gpio.vendor_length) {
+                                ACPI_SET16(target) = (u16)aml_length;
+                        }
+
+                        acpi_rs_set_resource_length(aml_length, aml);
+                        break;
+
+                case ACPI_RSC_COUNT_SERIAL_VEN:
+
+                        item_count = ACPI_GET16(source);
+                        ACPI_SET16(destination) = item_count + info->value;
+                        aml_length = (u16)(aml_length + item_count);
+                        acpi_rs_set_resource_length(aml_length, aml);
+                        break;
+
+                case ACPI_RSC_COUNT_SERIAL_RES:
+
+                        item_count = ACPI_GET16(source);
+                        aml_length = (u16)(aml_length + item_count);
+                        acpi_rs_set_resource_length(aml_length, aml);
+                        break;
+
                 case ACPI_RSC_LENGTH:
 
                         acpi_rs_set_resource_length(info->value, aml);
@@ -417,6 +632,48 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                                           info->opcode);
                         break;
 
+                case ACPI_RSC_MOVE_GPIO_PIN:
+
+                        destination = (char *)ACPI_ADD_PTR(void, aml,
+                                                           ACPI_GET16
+                                                           (destination));
+                        source = *(u16 **)source;
+                        acpi_rs_move_data(destination, source, item_count,
+                                          info->opcode);
+                        break;
+
+                case ACPI_RSC_MOVE_GPIO_RES:
+
+                        /* Used for both resource_source string and vendor_data */
+
+                        destination = (char *)ACPI_ADD_PTR(void, aml,
+                                                           ACPI_GET16
+                                                           (destination));
+                        source = *(u8 **)source;
+                        acpi_rs_move_data(destination, source, item_count,
+                                          info->opcode);
+                        break;
+
+                case ACPI_RSC_MOVE_SERIAL_VEN:
+
+                        destination = (char *)ACPI_ADD_PTR(void, aml,
+                                                           (aml_length -
+                                                            item_count));
+                        source = *(u8 **)source;
+                        acpi_rs_move_data(destination, source, item_count,
+                                          info->opcode);
+                        break;
+
+                case ACPI_RSC_MOVE_SERIAL_RES:
+
+                        destination = (char *)ACPI_ADD_PTR(void, aml,
+                                                           (aml_length -
+                                                            item_count));
+                        source = *(u8 **)source;
+                        acpi_rs_move_data(destination, source, item_count,
+                                          info->opcode);
+                        break;
+
                 case ACPI_RSC_ADDRESS:
 
                         /* Set the Resource Type, General Flags, and Type-Specific Flags */
diff --git a/drivers/acpi/acpica/rsserial.c b/drivers/acpi/acpica/rsserial.c
new file mode 100644
index 000000000000..9aa5e689b444
--- /dev/null
+++ b/drivers/acpi/acpica/rsserial.c
@@ -0,0 +1,441 @@
+/*******************************************************************************
+ *
+ * Module Name: rsserial - GPIO/serial_bus resource descriptors
+ *
+ ******************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2012, 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 "acresrc.h"
+
+#define _COMPONENT          ACPI_RESOURCES
+ACPI_MODULE_NAME("rsserial")
+
+/*******************************************************************************
+ *
+ * acpi_rs_convert_gpio
+ *
+ ******************************************************************************/
+struct acpi_rsconvert_info acpi_rs_convert_gpio[17] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_GPIO,
+         ACPI_RS_SIZE(struct acpi_resource_gpio),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_gpio)},
+
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_GPIO,
+         sizeof(struct aml_resource_gpio),
+         0},
+
+        /*
+         * These fields are contiguous in both the source and destination:
+         * revision_id
+         * connection_type
+         */
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.gpio.revision_id),
+         AML_OFFSET(gpio.revision_id),
+         2},
+
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.gpio.producer_consumer),
+         AML_OFFSET(gpio.flags),
+         0},
+
+        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.gpio.sharable),
+         AML_OFFSET(gpio.int_flags),
+         3},
+
+        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.gpio.io_restriction),
+         AML_OFFSET(gpio.int_flags),
+         0},
+
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.gpio.triggering),
+         AML_OFFSET(gpio.int_flags),
+         0},
+
+        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.gpio.polarity),
+         AML_OFFSET(gpio.int_flags),
+         1},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.gpio.pin_config),
+         AML_OFFSET(gpio.pin_config),
+         1},
+
+        /*
+         * These fields are contiguous in both the source and destination:
+         * drive_strength
+         * debounce_timeout
+         */
+        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.gpio.drive_strength),
+         AML_OFFSET(gpio.drive_strength),
+         2},
+
+        /* Pin Table */
+
+        {ACPI_RSC_COUNT_GPIO_PIN, ACPI_RS_OFFSET(data.gpio.pin_table_length),
+         AML_OFFSET(gpio.pin_table_offset),
+         AML_OFFSET(gpio.res_source_offset)},
+
+        {ACPI_RSC_MOVE_GPIO_PIN, ACPI_RS_OFFSET(data.gpio.pin_table),
+         AML_OFFSET(gpio.pin_table_offset),
+         0},
+
+        /* Resource Source */
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.gpio.resource_source.index),
+         AML_OFFSET(gpio.res_source_index),
+         1},
+
+        {ACPI_RSC_COUNT_GPIO_RES,
+         ACPI_RS_OFFSET(data.gpio.resource_source.string_length),
+         AML_OFFSET(gpio.res_source_offset),
+         AML_OFFSET(gpio.vendor_offset)},
+
+        {ACPI_RSC_MOVE_GPIO_RES,
+         ACPI_RS_OFFSET(data.gpio.resource_source.string_ptr),
+         AML_OFFSET(gpio.res_source_offset),
+         0},
+
+        /* Vendor Data */
+
+        {ACPI_RSC_COUNT_GPIO_VEN, ACPI_RS_OFFSET(data.gpio.vendor_length),
+         AML_OFFSET(gpio.vendor_length),
+         1},
+
+        {ACPI_RSC_MOVE_GPIO_RES, ACPI_RS_OFFSET(data.gpio.vendor_data),
+         AML_OFFSET(gpio.vendor_offset),
+         0},
+};
+
+/*******************************************************************************
+ *
+ * acpi_rs_convert_i2c_serial_bus
+ *
+ ******************************************************************************/
+
+struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[16] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS,
+         ACPI_RS_SIZE(struct acpi_resource_i2c_serialbus),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_i2c_serial_bus)},
+
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_SERIAL_BUS,
+         sizeof(struct aml_resource_i2c_serialbus),
+         0},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.revision_id),
+         AML_OFFSET(common_serial_bus.revision_id),
+         1},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.type),
+         AML_OFFSET(common_serial_bus.type),
+         1},
+
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.common_serial_bus.slave_mode),
+         AML_OFFSET(common_serial_bus.flags),
+         0},
+
+        {ACPI_RSC_1BITFLAG,
+         ACPI_RS_OFFSET(data.common_serial_bus.producer_consumer),
+         AML_OFFSET(common_serial_bus.flags),
+         1},
+
+        {ACPI_RSC_MOVE8,
+         ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id),
+         AML_OFFSET(common_serial_bus.type_revision_id),
+         1},
+
+        {ACPI_RSC_MOVE16,
+         ACPI_RS_OFFSET(data.common_serial_bus.type_data_length),
+         AML_OFFSET(common_serial_bus.type_data_length),
+         1},
+
+        /* Vendor data */
+
+        {ACPI_RSC_COUNT_SERIAL_VEN,
+         ACPI_RS_OFFSET(data.common_serial_bus.vendor_length),
+         AML_OFFSET(common_serial_bus.type_data_length),
+         AML_RESOURCE_I2C_MIN_DATA_LEN},
+
+        {ACPI_RSC_MOVE_SERIAL_VEN,
+         ACPI_RS_OFFSET(data.common_serial_bus.vendor_data),
+         0,
+         sizeof(struct aml_resource_i2c_serialbus)},
+
+        /* Resource Source */
+
+        {ACPI_RSC_MOVE8,
+         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.index),
+         AML_OFFSET(common_serial_bus.res_source_index),
+         1},
+
+        {ACPI_RSC_COUNT_SERIAL_RES,
+         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_length),
+         AML_OFFSET(common_serial_bus.type_data_length),
+         sizeof(struct aml_resource_common_serialbus)},
+
+        {ACPI_RSC_MOVE_SERIAL_RES,
+         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_ptr),
+         AML_OFFSET(common_serial_bus.type_data_length),
+         sizeof(struct aml_resource_common_serialbus)},
+
+        /* I2C bus type specific */
+
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.i2c_serial_bus.access_mode),
+         AML_OFFSET(i2c_serial_bus.type_specific_flags),
+         0},
+
+        {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.i2c_serial_bus.connection_speed),
+         AML_OFFSET(i2c_serial_bus.connection_speed),
+         1},
+
+        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.i2c_serial_bus.slave_address),
+         AML_OFFSET(i2c_serial_bus.slave_address),
+         1},
+};
+
+/*******************************************************************************
+ *
+ * acpi_rs_convert_spi_serial_bus
+ *
+ ******************************************************************************/
+
+struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[20] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS,
+         ACPI_RS_SIZE(struct acpi_resource_spi_serialbus),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_spi_serial_bus)},
+
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_SERIAL_BUS,
+         sizeof(struct aml_resource_spi_serialbus),
+         0},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.revision_id),
+         AML_OFFSET(common_serial_bus.revision_id),
+         1},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.type),
+         AML_OFFSET(common_serial_bus.type),
+         1},
+
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.common_serial_bus.slave_mode),
+         AML_OFFSET(common_serial_bus.flags),
+         0},
+
+        {ACPI_RSC_1BITFLAG,
+         ACPI_RS_OFFSET(data.common_serial_bus.producer_consumer),
+         AML_OFFSET(common_serial_bus.flags),
+         1},
+
+        {ACPI_RSC_MOVE8,
+         ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id),
+         AML_OFFSET(common_serial_bus.type_revision_id),
+         1},
+
+        {ACPI_RSC_MOVE16,
+         ACPI_RS_OFFSET(data.common_serial_bus.type_data_length),
+         AML_OFFSET(common_serial_bus.type_data_length),
+         1},
+
+        /* Vendor data */
+
+        {ACPI_RSC_COUNT_SERIAL_VEN,
+         ACPI_RS_OFFSET(data.common_serial_bus.vendor_length),
+         AML_OFFSET(common_serial_bus.type_data_length),
+         AML_RESOURCE_SPI_MIN_DATA_LEN},
+
+        {ACPI_RSC_MOVE_SERIAL_VEN,
+         ACPI_RS_OFFSET(data.common_serial_bus.vendor_data),
+         0,
+         sizeof(struct aml_resource_spi_serialbus)},
+
+        /* Resource Source */
+
+        {ACPI_RSC_MOVE8,
+         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.index),
+         AML_OFFSET(common_serial_bus.res_source_index),
+         1},
+
+        {ACPI_RSC_COUNT_SERIAL_RES,
+         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_length),
+         AML_OFFSET(common_serial_bus.type_data_length),
+         sizeof(struct aml_resource_common_serialbus)},
+
+        {ACPI_RSC_MOVE_SERIAL_RES,
+         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_ptr),
+         AML_OFFSET(common_serial_bus.type_data_length),
+         sizeof(struct aml_resource_common_serialbus)},
+
+        /* Spi bus type specific  */
+
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.spi_serial_bus.wire_mode),
+         AML_OFFSET(spi_serial_bus.type_specific_flags),
+         0},
+
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.spi_serial_bus.device_polarity),
+         AML_OFFSET(spi_serial_bus.type_specific_flags),
+         1},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.spi_serial_bus.data_bit_length),
+         AML_OFFSET(spi_serial_bus.data_bit_length),
+         1},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.spi_serial_bus.clock_phase),
+         AML_OFFSET(spi_serial_bus.clock_phase),
+         1},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.spi_serial_bus.clock_polarity),
+         AML_OFFSET(spi_serial_bus.clock_polarity),
+         1},
+
+        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.spi_serial_bus.device_selection),
+         AML_OFFSET(spi_serial_bus.device_selection),
+         1},
+
+        {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.spi_serial_bus.connection_speed),
+         AML_OFFSET(spi_serial_bus.connection_speed),
+         1},
+};
+
+/*******************************************************************************
+ *
+ * acpi_rs_convert_uart_serial_bus
+ *
+ ******************************************************************************/
+
+struct acpi_rsconvert_info acpi_rs_convert_uart_serial_bus[22] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS,
+         ACPI_RS_SIZE(struct acpi_resource_uart_serialbus),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_uart_serial_bus)},
+
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_SERIAL_BUS,
+         sizeof(struct aml_resource_uart_serialbus),
+         0},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.revision_id),
+         AML_OFFSET(common_serial_bus.revision_id),
+         1},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.type),
+         AML_OFFSET(common_serial_bus.type),
+         1},
+
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.common_serial_bus.slave_mode),
+         AML_OFFSET(common_serial_bus.flags),
+         0},
+
+        {ACPI_RSC_1BITFLAG,
+         ACPI_RS_OFFSET(data.common_serial_bus.producer_consumer),
+         AML_OFFSET(common_serial_bus.flags),
+         1},
+
+        {ACPI_RSC_MOVE8,
+         ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id),
+         AML_OFFSET(common_serial_bus.type_revision_id),
+         1},
+
+        {ACPI_RSC_MOVE16,
+         ACPI_RS_OFFSET(data.common_serial_bus.type_data_length),
+         AML_OFFSET(common_serial_bus.type_data_length),
+         1},
+
+        /* Vendor data */
+
+        {ACPI_RSC_COUNT_SERIAL_VEN,
+         ACPI_RS_OFFSET(data.common_serial_bus.vendor_length),
+         AML_OFFSET(common_serial_bus.type_data_length),
+         AML_RESOURCE_UART_MIN_DATA_LEN},
+
+        {ACPI_RSC_MOVE_SERIAL_VEN,
+         ACPI_RS_OFFSET(data.common_serial_bus.vendor_data),
+         0,
+         sizeof(struct aml_resource_uart_serialbus)},
+
+        /* Resource Source */
+
+        {ACPI_RSC_MOVE8,
+         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.index),
+         AML_OFFSET(common_serial_bus.res_source_index),
+         1},
+
+        {ACPI_RSC_COUNT_SERIAL_RES,
+         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_length),
+         AML_OFFSET(common_serial_bus.type_data_length),
+         sizeof(struct aml_resource_common_serialbus)},
+
+        {ACPI_RSC_MOVE_SERIAL_RES,
+         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_ptr),
+         AML_OFFSET(common_serial_bus.type_data_length),
+         sizeof(struct aml_resource_common_serialbus)},
+
+        /* Uart bus type specific  */
+
+        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.flow_control),
+         AML_OFFSET(uart_serial_bus.type_specific_flags),
+         0},
+
+        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.stop_bits),
+         AML_OFFSET(uart_serial_bus.type_specific_flags),
+         2},
+
+        {ACPI_RSC_3BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.data_bits),
+         AML_OFFSET(uart_serial_bus.type_specific_flags),
+         4},
+
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.endian),
+         AML_OFFSET(uart_serial_bus.type_specific_flags),
+         7},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.uart_serial_bus.parity),
+         AML_OFFSET(uart_serial_bus.parity),
+         1},
+
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.uart_serial_bus.lines_enabled),
+         AML_OFFSET(uart_serial_bus.lines_enabled),
+         1},
+
+        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.uart_serial_bus.rx_fifo_size),
+         AML_OFFSET(uart_serial_bus.rx_fifo_size),
+         1},
+
+        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.uart_serial_bus.tx_fifo_size),
+         AML_OFFSET(uart_serial_bus.tx_fifo_size),
+         1},
+
+        {ACPI_RSC_MOVE32,
+         ACPI_RS_OFFSET(data.uart_serial_bus.default_baud_rate),
+         AML_OFFSET(uart_serial_bus.default_baud_rate),
+         1},
+};
diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c
index 231811e56939..433a375deb93 100644
--- a/drivers/acpi/acpica/rsutils.c
+++ b/drivers/acpi/acpica/rsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -144,6 +144,9 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
                          * since there are no alignment or endian issues
                          */
                 case ACPI_RSC_MOVE8:
+                case ACPI_RSC_MOVE_GPIO_RES:
+                case ACPI_RSC_MOVE_SERIAL_VEN:
+                case ACPI_RSC_MOVE_SERIAL_RES:
                         ACPI_MEMCPY(destination, source, item_count);
                         return;
 
@@ -153,6 +156,7 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
                          * misaligned memory transfers
                          */
                 case ACPI_RSC_MOVE16:
+                case ACPI_RSC_MOVE_GPIO_PIN:
                         ACPI_MOVE_16_TO_16(&ACPI_CAST_PTR(u16, destination)[i],
                                            &ACPI_CAST_PTR(u16, source)[i]);
                         break;
@@ -590,6 +594,56 @@ acpi_rs_get_prs_method_data(struct acpi_namespace_node *node,
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_rs_get_aei_method_data
+ *
+ * PARAMETERS:  Node            - Device node
+ *              ret_buffer      - Pointer to a buffer structure for the
+ *                                results
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This function is called to get the _AEI value of an object
+ *              contained in an object specified by the handle passed in
+ *
+ *              If the function fails an appropriate status will be returned
+ *              and the contents of the callers buffer is undefined.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_rs_get_aei_method_data(struct acpi_namespace_node *node,
+                            struct acpi_buffer *ret_buffer)
+{
+        union acpi_operand_object *obj_desc;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(rs_get_aei_method_data);
+
+        /* Parameters guaranteed valid by caller */
+
+        /* Execute the method, no parameters */
+
+        status = acpi_ut_evaluate_object(node, METHOD_NAME__AEI,
+                                         ACPI_BTYPE_BUFFER, &obj_desc);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /*
+         * Make the call to create a resource linked list from the
+         * byte stream buffer that comes back from the _CRS method
+         * execution.
+         */
+        status = acpi_rs_create_resource_list(obj_desc, ret_buffer);
+
+        /* On exit, we must delete the object returned by evaluate_object */
+
+        acpi_ut_remove_reference(obj_desc);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_rs_get_method_data
  *
  * PARAMETERS:  Handle          - Handle to the containing object
diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c
index fe86b37b16ce..f58c098c7aeb 100644
--- a/drivers/acpi/acpica/rsxface.c
+++ b/drivers/acpi/acpica/rsxface.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -307,6 +307,46 @@ acpi_set_current_resources(acpi_handle device_handle,
 
 ACPI_EXPORT_SYMBOL(acpi_set_current_resources)
 
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_get_event_resources
+ *
+ * PARAMETERS:  device_handle   - Handle to the device object for the
+ *                                device we are getting resources
+ *              in_buffer       - Pointer to a buffer containing the
+ *                                resources to be set for the device
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This function is called to get the event resources for a
+ *              specific device. The caller must first acquire a handle for
+ *              the desired device. The resource data is passed to the routine
+ *              the buffer pointed to by the in_buffer variable. Uses the
+ *              _AEI method.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_get_event_resources(acpi_handle device_handle,
+                         struct acpi_buffer *ret_buffer)
+{
+        acpi_status status;
+        struct acpi_namespace_node *node;
+
+        ACPI_FUNCTION_TRACE(acpi_get_event_resources);
+
+        /* Validate parameters then dispatch to internal routine */
+
+        status = acpi_rs_validate_parameters(device_handle, ret_buffer, &node);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        status = acpi_rs_get_aei_method_data(node, ret_buffer);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_get_event_resources)
+
 /******************************************************************************
  *
  * FUNCTION:    acpi_resource_to_address64
@@ -486,8 +526,9 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
  *
  * PARAMETERS:  device_handle   - Handle to the device object for the
  *                                device we are querying
- *              Name            - Method name of the resources we want
- *                                (METHOD_NAME__CRS or METHOD_NAME__PRS)
+ *              Name            - Method name of the resources we want.
+ *                                (METHOD_NAME__CRS, METHOD_NAME__PRS, or
+ *                                METHOD_NAME__AEI)
  *              user_function   - Called for each resource
  *              Context         - Passed to user_function
  *
@@ -514,11 +555,12 @@ acpi_walk_resources(acpi_handle device_handle,
 
         if (!device_handle || !user_function || !name ||
             (!ACPI_COMPARE_NAME(name, METHOD_NAME__CRS) &&
-             !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS))) {
+             !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS) &&
+             !ACPI_COMPARE_NAME(name, METHOD_NAME__AEI))) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        /* Get the _CRS or _PRS resource list */
+        /* Get the _CRS/_PRS/_AEI resource list */
 
         buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
         status = acpi_rs_get_method_data(device_handle, name, &buffer);
diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index 6f5588e62c0a..c5d870406f41 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,14 +63,15 @@ static void acpi_tb_setup_fadt_registers(void);
 
 typedef struct acpi_fadt_info {
         char *name;
-        u8 address64;
-        u8 address32;
-        u8 length;
+        u16 address64;
+        u16 address32;
+        u16 length;
         u8 default_length;
         u8 type;
 
 } acpi_fadt_info;
 
+#define ACPI_FADT_OPTIONAL          0
 #define ACPI_FADT_REQUIRED          1
 #define ACPI_FADT_SEPARATE_LENGTH   2
 
@@ -87,7 +88,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
          ACPI_FADT_OFFSET(pm1b_event_block),
          ACPI_FADT_OFFSET(pm1_event_length),
          ACPI_PM1_REGISTER_WIDTH * 2,   /* Enable + Status register */
-         0},
+         ACPI_FADT_OPTIONAL},
 
         {"Pm1aControlBlock",
          ACPI_FADT_OFFSET(xpm1a_control_block),
@@ -101,7 +102,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
          ACPI_FADT_OFFSET(pm1b_control_block),
          ACPI_FADT_OFFSET(pm1_control_length),
          ACPI_PM1_REGISTER_WIDTH,
-         0},
+         ACPI_FADT_OPTIONAL},
 
         {"Pm2ControlBlock",
          ACPI_FADT_OFFSET(xpm2_control_block),
@@ -139,7 +140,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
 
 typedef struct acpi_fadt_pm_info {
         struct acpi_generic_address *target;
-        u8 source;
+        u16 source;
         u8 register_num;
 
 } acpi_fadt_pm_info;
@@ -253,8 +254,13 @@ void acpi_tb_parse_fadt(u32 table_index)
         acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xdsdt,
                               ACPI_SIG_DSDT, ACPI_TABLE_INDEX_DSDT);
 
-        acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xfacs,
-                              ACPI_SIG_FACS, ACPI_TABLE_INDEX_FACS);
+        /* If Hardware Reduced flag is set, there is no FACS */
+
+        if (!acpi_gbl_reduced_hardware) {
+                acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.
+                                      Xfacs, ACPI_SIG_FACS,
+                                      ACPI_TABLE_INDEX_FACS);
+        }
 }
 
 /*******************************************************************************
@@ -277,12 +283,12 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
 {
         /*
          * Check if the FADT is larger than the largest table that we expect
-         * (the ACPI 2.0/3.0 version). If so, truncate the table, and issue
+         * (the ACPI 5.0 version). If so, truncate the table, and issue
          * a warning.
          */
         if (length > sizeof(struct acpi_table_fadt)) {
                 ACPI_WARNING((AE_INFO,
-                              "FADT (revision %u) is longer than ACPI 2.0 version, "
+                              "FADT (revision %u) is longer than ACPI 5.0 version, "
                               "truncating length %u to %u",
                               table->revision, length,
                               (u32)sizeof(struct acpi_table_fadt)));
@@ -297,6 +303,13 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
         ACPI_MEMCPY(&acpi_gbl_FADT, table,
                     ACPI_MIN(length, sizeof(struct acpi_table_fadt)));
 
+        /* Take a copy of the Hardware Reduced flag */
+
+        acpi_gbl_reduced_hardware = FALSE;
+        if (acpi_gbl_FADT.flags & ACPI_FADT_HW_REDUCED) {
+                acpi_gbl_reduced_hardware = TRUE;
+        }
+
         /* Convert the local copy of the FADT to the common internal format */
 
         acpi_tb_convert_fadt();
@@ -502,6 +515,12 @@ static void acpi_tb_validate_fadt(void)
                 acpi_gbl_FADT.Xdsdt = (u64) acpi_gbl_FADT.dsdt;
         }
 
+        /* If Hardware Reduced flag is set, we are all done */
+
+        if (acpi_gbl_reduced_hardware) {
+                return;
+        }
+
         /* Examine all of the 64-bit extended address fields (X fields) */
 
         for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) {
diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c
index a55cb2bb5abb..4903e36ea75a 100644
--- a/drivers/acpi/acpica/tbfind.c
+++ b/drivers/acpi/acpica/tbfind.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 62365f6075dd..1aecf7baa4e0 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 0f2d395feaba..09ca39e14337 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -135,6 +135,13 @@ acpi_status acpi_tb_initialize_facs(void)
 {
         acpi_status status;
 
+        /* If Hardware Reduced flag is set, there is no FACS */
+
+        if (acpi_gbl_reduced_hardware) {
+                acpi_gbl_FACS = NULL;
+                return (AE_OK);
+        }
+
         status = acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
                                          ACPI_CAST_INDIRECT_PTR(struct
                                                                 acpi_table_header,
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index e7d13f5d3f2d..abcc6412c244 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index 7eb6c6cc1edf..4258f647ca3d 100644
--- a/drivers/acpi/acpica/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utaddress.c b/drivers/acpi/acpica/utaddress.c
new file mode 100644
index 000000000000..67932aebe6dd
--- /dev/null
+++ b/drivers/acpi/acpica/utaddress.c
@@ -0,0 +1,294 @@
+/******************************************************************************
+ *
+ * Module Name: utaddress - op_region address range check
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2012, 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 "acnamesp.h"
+
+#define _COMPONENT          ACPI_UTILITIES
+ACPI_MODULE_NAME("utaddress")
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_add_address_range
+ *
+ * PARAMETERS:  space_id            - Address space ID
+ *              Address             - op_region start address
+ *              Length              - op_region length
+ *              region_node         - op_region namespace node
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Add the Operation Region address range to the global list.
+ *              The only supported Space IDs are Memory and I/O. Called when
+ *              the op_region address/length operands are fully evaluated.
+ *
+ * MUTEX:       Locks the namespace
+ *
+ * NOTE: Because this interface is only called when an op_region argument
+ * list is evaluated, there cannot be any duplicate region_nodes.
+ * Duplicate Address/Length values are allowed, however, so that multiple
+ * address conflicts can be detected.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_ut_add_address_range(acpi_adr_space_type space_id,
+                          acpi_physical_address address,
+                          u32 length, struct acpi_namespace_node *region_node)
+{
+        struct acpi_address_range *range_info;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(ut_add_address_range);
+
+        if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &&
+            (space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* Allocate/init a new info block, add it to the appropriate list */
+
+        range_info = ACPI_ALLOCATE(sizeof(struct acpi_address_range));
+        if (!range_info) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
+
+        range_info->start_address = address;
+        range_info->end_address = (address + length - 1);
+        range_info->region_node = region_node;
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                ACPI_FREE(range_info);
+                return_ACPI_STATUS(status);
+        }
+
+        range_info->next = acpi_gbl_address_range_list[space_id];
+        acpi_gbl_address_range_list[space_id] = range_info;
+
+        ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
+                          "\nAdded [%4.4s] address range: 0x%p-0x%p\n",
+                          acpi_ut_get_node_name(range_info->region_node),
+                          ACPI_CAST_PTR(void, address),
+                          ACPI_CAST_PTR(void, range_info->end_address)));
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+        return_ACPI_STATUS(AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_remove_address_range
+ *
+ * PARAMETERS:  space_id            - Address space ID
+ *              region_node         - op_region namespace node
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Remove the Operation Region from the global list. The only
+ *              supported Space IDs are Memory and I/O. Called when an
+ *              op_region is deleted.
+ *
+ * MUTEX:       Assumes the namespace is locked
+ *
+ ******************************************************************************/
+
+void
+acpi_ut_remove_address_range(acpi_adr_space_type space_id,
+                             struct acpi_namespace_node *region_node)
+{
+        struct acpi_address_range *range_info;
+        struct acpi_address_range *prev;
+
+        ACPI_FUNCTION_TRACE(ut_remove_address_range);
+
+        if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &&
+            (space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
+                return_VOID;
+        }
+
+        /* Get the appropriate list head and check the list */
+
+        range_info = prev = acpi_gbl_address_range_list[space_id];
+        while (range_info) {
+                if (range_info->region_node == region_node) {
+                        if (range_info == prev) {       /* Found at list head */
+                                acpi_gbl_address_range_list[space_id] =
+                                    range_info->next;
+                        } else {
+                                prev->next = range_info->next;
+                        }
+
+                        ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
+                                          "\nRemoved [%4.4s] address range: 0x%p-0x%p\n",
+                                          acpi_ut_get_node_name(range_info->
+                                                                region_node),
+                                          ACPI_CAST_PTR(void,
+                                                        range_info->
+                                                        start_address),
+                                          ACPI_CAST_PTR(void,
+                                                        range_info->
+                                                        end_address)));
+
+                        ACPI_FREE(range_info);
+                        return_VOID;
+                }
+
+                prev = range_info;
+                range_info = range_info->next;
+        }
+
+        return_VOID;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_check_address_range
+ *
+ * PARAMETERS:  space_id            - Address space ID
+ *              Address             - Start address
+ *              Length              - Length of address range
+ *              Warn                - TRUE if warning on overlap desired
+ *
+ * RETURN:      Count of the number of conflicts detected. Zero is always
+ *              returned for Space IDs other than Memory or I/O.
+ *
+ * DESCRIPTION: Check if the input address range overlaps any of the
+ *              ASL operation region address ranges. The only supported
+ *              Space IDs are Memory and I/O.
+ *
+ * MUTEX:       Assumes the namespace is locked.
+ *
+ ******************************************************************************/
+
+u32
+acpi_ut_check_address_range(acpi_adr_space_type space_id,
+                            acpi_physical_address address, u32 length, u8 warn)
+{
+        struct acpi_address_range *range_info;
+        acpi_physical_address end_address;
+        char *pathname;
+        u32 overlap_count = 0;
+
+        ACPI_FUNCTION_TRACE(ut_check_address_range);
+
+        if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &&
+            (space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
+                return_UINT32(0);
+        }
+
+        range_info = acpi_gbl_address_range_list[space_id];
+        end_address = address + length - 1;
+
+        /* Check entire list for all possible conflicts */
+
+        while (range_info) {
+                /*
+                 * Check if the requested Address/Length overlaps this address_range.
+                 * Four cases to consider:
+                 *
+                 * 1) Input address/length is contained completely in the address range
+                 * 2) Input address/length overlaps range at the range start
+                 * 3) Input address/length overlaps range at the range end
+                 * 4) Input address/length completely encompasses the range
+                 */
+                if ((address <= range_info->end_address) &&
+                    (end_address >= range_info->start_address)) {
+
+                        /* Found an address range overlap */
+
+                        overlap_count++;
+                        if (warn) {     /* Optional warning message */
+                                pathname =
+                                    acpi_ns_get_external_pathname(range_info->
+                                                                  region_node);
+
+                                ACPI_WARNING((AE_INFO,
+                                              "0x%p-0x%p %s conflicts with Region %s %d",
+                                              ACPI_CAST_PTR(void, address),
+                                              ACPI_CAST_PTR(void, end_address),
+                                              acpi_ut_get_region_name(space_id),
+                                              pathname, overlap_count));
+                                ACPI_FREE(pathname);
+                        }
+                }
+
+                range_info = range_info->next;
+        }
+
+        return_UINT32(overlap_count);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_delete_address_lists
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Delete all global address range lists (called during
+ *              subsystem shutdown).
+ *
+ ******************************************************************************/
+
+void acpi_ut_delete_address_lists(void)
+{
+        struct acpi_address_range *next;
+        struct acpi_address_range *range_info;
+        int i;
+
+        /* Delete all elements in all address range lists */
+
+        for (i = 0; i < ACPI_ADDRESS_RANGE_MAX; i++) {
+                next = acpi_gbl_address_range_list[i];
+
+                while (next) {
+                        range_info = next;
+                        next = range_info->next;
+                        ACPI_FREE(range_info);
+                }
+
+                acpi_gbl_address_range_list[i] = NULL;
+        }
+}
diff --git a/drivers/acpi/acpica/utalloc.c b/drivers/acpi/acpica/utalloc.c
index 0a697351cf69..9982d2ea66fb 100644
--- a/drivers/acpi/acpica/utalloc.c
+++ b/drivers/acpi/acpica/utalloc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index aded299a2fa8..3317c0a406ee 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index a1f8d7509e66..a0998a886318 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index 8b087e2d64f4..d42ede5260c7 100644
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -171,7 +171,9 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
         "SMBus",
         "SystemCMOS",
         "PCIBARTarget",
-        "IPMI"
+        "IPMI",
+        "GeneralPurposeIo",
+        "GenericSerialBus"
 };
 
 char *acpi_ut_get_region_name(u8 space_id)
diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index 31f5a7832ef1..2a6c3e183697 100644
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -215,11 +215,14 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                 ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
                                   "***** Region %p\n", object));
 
-                /* Invalidate the region address/length via the host OS */
-
-                acpi_os_invalidate_address(object->region.space_id,
-                                          object->region.address,
-                                          (acpi_size) object->region.length);
+                /*
+                 * Update address_range list. However, only permanent regions
+                 * are installed in this list. (Not created within a method)
+                 */
+                if (!(object->region.node->flags & ANOBJ_TEMPORARY)) {
+                        acpi_ut_remove_address_range(object->region.space_id,
+                                                     object->region.node);
+                }
 
                 second_desc = acpi_ns_get_secondary_object(object);
                 if (second_desc) {
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index 18f73c9d10bc..479f32b33415 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index ffba0a39c3e8..4153584cf526 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -264,6 +264,12 @@ acpi_status acpi_ut_init_globals(void)
                 return_ACPI_STATUS(status);
         }
 
+        /* Address Range lists */
+
+        for (i = 0; i < ACPI_ADDRESS_RANGE_MAX; i++) {
+                acpi_gbl_address_range_list[i] = NULL;
+        }
+
         /* Mutex locked flags */
 
         for (i = 0; i < ACPI_NUM_MUTEX; i++) {
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
index b679ea693545..c92eb1d93785 100644
--- a/drivers/acpi/acpica/utids.c
+++ b/drivers/acpi/acpica/utids.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utinit.c b/drivers/acpi/acpica/utinit.c
index 191b6828cce9..8359c0c5dc98 100644
--- a/drivers/acpi/acpica/utinit.c
+++ b/drivers/acpi/acpica/utinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -92,6 +92,7 @@ static void acpi_ut_terminate(void)
                 gpe_xrupt_info = next_gpe_xrupt_info;
         }
 
+        acpi_ut_delete_address_lists();
         return_VOID;
 }
 
diff --git a/drivers/acpi/acpica/utlock.c b/drivers/acpi/acpica/utlock.c
index f6bb75c6faf5..155fd786d0f2 100644
--- a/drivers/acpi/acpica/utlock.c
+++ b/drivers/acpi/acpica/utlock.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c
index ce481da9bb45..2491a552b0e6 100644
--- a/drivers/acpi/acpica/utmath.c
+++ b/drivers/acpi/acpica/utmath.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c
index c33a852d4f42..86f19db74e05 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
index 7d797e2baecd..43174df33121 100644
--- a/drivers/acpi/acpica/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -293,14 +293,10 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
 
 acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
 {
-        acpi_thread_id this_thread_id;
-
         ACPI_FUNCTION_NAME(ut_release_mutex);
 
-        this_thread_id = acpi_os_get_thread_id();
-
         ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Thread %u releasing Mutex [%s]\n",
-                          (u32)this_thread_id,
+                          (u32)acpi_os_get_thread_id(),
                           acpi_ut_get_mutex_name(mutex_id)));
 
         if (mutex_id > ACPI_MAX_MUTEX) {
@@ -329,7 +325,8 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
                  * the ACPI subsystem code.
                  */
                 for (i = mutex_id; i < ACPI_NUM_MUTEX; i++) {
-                        if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {
+                        if (acpi_gbl_mutex_info[i].thread_id ==
+                            acpi_os_get_thread_id()) {
                                 if (i == mutex_id) {
                                         continue;
                                 }
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index 188340a017b4..b112744fc9ae 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c
index 1fb10cb8f11d..2360cf70c18c 100644
--- a/drivers/acpi/acpica/utosi.c
+++ b/drivers/acpi/acpica/utosi.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c
index 6ffd3a8bdaa5..9d441ea70305 100644
--- a/drivers/acpi/acpica/utresrc.c
+++ b/drivers/acpi/acpica/utresrc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include "amlresrc.h"
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utresrc")
@@ -154,6 +154,138 @@ const char *acpi_gbl_typ_decode[] = {
         "TypeF"
 };
 
+const char *acpi_gbl_ppc_decode[] = {
+        "PullDefault",
+        "PullUp",
+        "PullDown",
+        "PullNone"
+};
+
+const char *acpi_gbl_ior_decode[] = {
+        "IoRestrictionNone",
+        "IoRestrictionInputOnly",
+        "IoRestrictionOutputOnly",
+        "IoRestrictionNoneAndPreserve"
+};
+
+const char *acpi_gbl_dts_decode[] = {
+        "Width8bit",
+        "Width16bit",
+        "Width32bit",
+        "Width64bit",
+        "Width128bit",
+        "Width256bit",
+};
+
+/* GPIO connection type */
+
+const char *acpi_gbl_ct_decode[] = {
+        "Interrupt",
+        "I/O"
+};
+
+/* Serial bus type */
+
+const char *acpi_gbl_sbt_decode[] = {
+        "/* UNKNOWN serial bus type */",
+        "I2C",
+        "SPI",
+        "UART"
+};
+
+/* I2C serial bus access mode */
+
+const char *acpi_gbl_am_decode[] = {
+        "AddressingMode7Bit",
+        "AddressingMode10Bit"
+};
+
+/* I2C serial bus slave mode */
+
+const char *acpi_gbl_sm_decode[] = {
+        "ControllerInitiated",
+        "DeviceInitiated"
+};
+
+/* SPI serial bus wire mode */
+
+const char *acpi_gbl_wm_decode[] = {
+        "FourWireMode",
+        "ThreeWireMode"
+};
+
+/* SPI serial clock phase */
+
+const char *acpi_gbl_cph_decode[] = {
+        "ClockPhaseFirst",
+        "ClockPhaseSecond"
+};
+
+/* SPI serial bus clock polarity */
+
+const char *acpi_gbl_cpo_decode[] = {
+        "ClockPolarityLow",
+        "ClockPolarityHigh"
+};
+
+/* SPI serial bus device polarity */
+
+const char *acpi_gbl_dp_decode[] = {
+        "PolarityLow",
+        "PolarityHigh"
+};
+
+/* UART serial bus endian */
+
+const char *acpi_gbl_ed_decode[] = {
+        "LittleEndian",
+        "BigEndian"
+};
+
+/* UART serial bus bits per byte */
+
+const char *acpi_gbl_bpb_decode[] = {
+        "DataBitsFive",
+        "DataBitsSix",
+        "DataBitsSeven",
+        "DataBitsEight",
+        "DataBitsNine",
+        "/* UNKNOWN Bits per byte */",
+        "/* UNKNOWN Bits per byte */",
+        "/* UNKNOWN Bits per byte */"
+};
+
+/* UART serial bus stop bits */
+
+const char *acpi_gbl_sb_decode[] = {
+        "StopBitsNone",
+        "StopBitsOne",
+        "StopBitsOnePlusHalf",
+        "StopBitsTwo"
+};
+
+/* UART serial bus flow control */
+
+const char *acpi_gbl_fc_decode[] = {
+        "FlowControlNone",
+        "FlowControlHardware",
+        "FlowControlXON",
+        "/* UNKNOWN flow control keyword */"
+};
+
+/* UART serial bus parity type */
+
+const char *acpi_gbl_pt_decode[] = {
+        "ParityTypeNone",
+        "ParityTypeEven",
+        "ParityTypeOdd",
+        "ParityTypeMark",
+        "ParityTypeSpace",
+        "/* UNKNOWN parity keyword */",
+        "/* UNKNOWN parity keyword */",
+        "/* UNKNOWN parity keyword */"
+};
+
 #endif
 
 /*
@@ -173,7 +305,7 @@ const u8 acpi_gbl_resource_aml_sizes[] = {
         ACPI_AML_SIZE_SMALL(struct aml_resource_end_dependent),
         ACPI_AML_SIZE_SMALL(struct aml_resource_io),
         ACPI_AML_SIZE_SMALL(struct aml_resource_fixed_io),
-        0,
+        ACPI_AML_SIZE_SMALL(struct aml_resource_fixed_dma),
         0,
         0,
         0,
@@ -193,7 +325,17 @@ const u8 acpi_gbl_resource_aml_sizes[] = {
         ACPI_AML_SIZE_LARGE(struct aml_resource_address16),
         ACPI_AML_SIZE_LARGE(struct aml_resource_extended_irq),
         ACPI_AML_SIZE_LARGE(struct aml_resource_address64),
-        ACPI_AML_SIZE_LARGE(struct aml_resource_extended_address64)
+        ACPI_AML_SIZE_LARGE(struct aml_resource_extended_address64),
+        ACPI_AML_SIZE_LARGE(struct aml_resource_gpio),
+        0,
+        ACPI_AML_SIZE_LARGE(struct aml_resource_common_serialbus),
+};
+
+const u8 acpi_gbl_resource_aml_serial_bus_sizes[] = {
+        0,
+        ACPI_AML_SIZE_LARGE(struct aml_resource_i2c_serialbus),
+        ACPI_AML_SIZE_LARGE(struct aml_resource_spi_serialbus),
+        ACPI_AML_SIZE_LARGE(struct aml_resource_uart_serialbus),
 };
 
 /*
@@ -209,35 +351,49 @@ static const u8 acpi_gbl_resource_types[] = {
         0,
         0,
         0,
-        ACPI_SMALL_VARIABLE_LENGTH,
-        ACPI_FIXED_LENGTH,
-        ACPI_SMALL_VARIABLE_LENGTH,
-        ACPI_FIXED_LENGTH,
-        ACPI_FIXED_LENGTH,
-        ACPI_FIXED_LENGTH,
-        0,
+        ACPI_SMALL_VARIABLE_LENGTH,     /* 04 IRQ */
+        ACPI_FIXED_LENGTH,      /* 05 DMA */
+        ACPI_SMALL_VARIABLE_LENGTH,     /* 06 start_dependent_functions */
+        ACPI_FIXED_LENGTH,      /* 07 end_dependent_functions */
+        ACPI_FIXED_LENGTH,      /* 08 IO */
+        ACPI_FIXED_LENGTH,      /* 09 fixed_iO */
+        ACPI_FIXED_LENGTH,      /* 0_a fixed_dMA */
         0,
         0,
         0,
-        ACPI_VARIABLE_LENGTH,
-        ACPI_FIXED_LENGTH,
+        ACPI_VARIABLE_LENGTH,   /* 0_e vendor_short */
+        ACPI_FIXED_LENGTH,      /* 0_f end_tag */
 
         /* Large descriptors */
 
         0,
-        ACPI_FIXED_LENGTH,
-        ACPI_FIXED_LENGTH,
+        ACPI_FIXED_LENGTH,      /* 01 Memory24 */
+        ACPI_FIXED_LENGTH,      /* 02 generic_register */
         0,
-        ACPI_VARIABLE_LENGTH,
-        ACPI_FIXED_LENGTH,
-        ACPI_FIXED_LENGTH,
-        ACPI_VARIABLE_LENGTH,
-        ACPI_VARIABLE_LENGTH,
-        ACPI_VARIABLE_LENGTH,
-        ACPI_VARIABLE_LENGTH,
-        ACPI_FIXED_LENGTH
+        ACPI_VARIABLE_LENGTH,   /* 04 vendor_long */
+        ACPI_FIXED_LENGTH,      /* 05 Memory32 */
+        ACPI_FIXED_LENGTH,      /* 06 memory32_fixed */
+        ACPI_VARIABLE_LENGTH,   /* 07 Dword* address */
+        ACPI_VARIABLE_LENGTH,   /* 08 Word* address */
+        ACPI_VARIABLE_LENGTH,   /* 09 extended_iRQ */
+        ACPI_VARIABLE_LENGTH,   /* 0_a Qword* address */
+        ACPI_FIXED_LENGTH,      /* 0_b Extended* address */
+        ACPI_VARIABLE_LENGTH,   /* 0_c Gpio* */
+        0,
+        ACPI_VARIABLE_LENGTH    /* 0_e *serial_bus */
 };
 
+/*
+ * For the i_aSL compiler/disassembler, we don't want any error messages
+ * because the disassembler uses the resource validation code to determine
+ * if Buffer objects are actually Resource Templates.
+ */
+#ifdef ACPI_ASL_COMPILER
+#define ACPI_RESOURCE_ERROR(plist)
+#else
+#define ACPI_RESOURCE_ERROR(plist)  ACPI_ERROR(plist)
+#endif
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_walk_aml_resources
@@ -265,6 +421,7 @@ acpi_ut_walk_aml_resources(u8 * aml,
         u8 resource_index;
         u32 length;
         u32 offset = 0;
+        u8 end_tag[2] = { 0x79, 0x00 };
 
         ACPI_FUNCTION_TRACE(ut_walk_aml_resources);
 
@@ -286,6 +443,10 @@ acpi_ut_walk_aml_resources(u8 * aml,
 
                 status = acpi_ut_validate_resource(aml, &resource_index);
                 if (ACPI_FAILURE(status)) {
+                        /*
+                         * Exit on failure. Cannot continue because the descriptor length
+                         * may be bogus also.
+                         */
                         return_ACPI_STATUS(status);
                 }
 
@@ -300,7 +461,7 @@ acpi_ut_walk_aml_resources(u8 * aml,
                             user_function(aml, length, offset, resource_index,
                                           context);
                         if (ACPI_FAILURE(status)) {
-                                return (status);
+                                return_ACPI_STATUS(status);
                         }
                 }
 
@@ -333,7 +494,19 @@ acpi_ut_walk_aml_resources(u8 * aml,
 
         /* Did not find an end_tag descriptor */
 
-        return (AE_AML_NO_RESOURCE_END_TAG);
+        if (user_function) {
+
+                /* Insert an end_tag anyway. acpi_rs_get_list_length always leaves room */
+
+                (void)acpi_ut_validate_resource(end_tag, &resource_index);
+                status =
+                    user_function(end_tag, 2, offset, resource_index, context);
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+        }
+
+        return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);
 }
 
 /*******************************************************************************
@@ -354,6 +527,7 @@ acpi_ut_walk_aml_resources(u8 * aml,
 
 acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
 {
+        union aml_resource *aml_resource;
         u8 resource_type;
         u8 resource_index;
         acpi_rs_length resource_length;
@@ -375,7 +549,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
                 /* Verify the large resource type (name) against the max */
 
                 if (resource_type > ACPI_RESOURCE_NAME_LARGE_MAX) {
-                        return (AE_AML_INVALID_RESOURCE_TYPE);
+                        goto invalid_resource;
                 }
 
                 /*
@@ -392,15 +566,17 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
                     ((resource_type & ACPI_RESOURCE_NAME_SMALL_MASK) >> 3);
         }
 
-        /* Check validity of the resource type, zero indicates name is invalid */
-
+        /*
+         * Check validity of the resource type, via acpi_gbl_resource_types. Zero
+         * indicates an invalid resource.
+         */
         if (!acpi_gbl_resource_types[resource_index]) {
-                return (AE_AML_INVALID_RESOURCE_TYPE);
+                goto invalid_resource;
         }
 
         /*
-         * 2) Validate the resource_length field. This ensures that the length
-         *    is at least reasonable, and guarantees that it is non-zero.
+         * Validate the resource_length field. This ensures that the length
+         * is at least reasonable, and guarantees that it is non-zero.
          */
         resource_length = acpi_ut_get_resource_length(aml);
         minimum_resource_length = acpi_gbl_resource_aml_sizes[resource_index];
@@ -413,7 +589,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
                 /* Fixed length resource, length must match exactly */
 
                 if (resource_length != minimum_resource_length) {
-                        return (AE_AML_BAD_RESOURCE_LENGTH);
+                        goto bad_resource_length;
                 }
                 break;
 
@@ -422,7 +598,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
                 /* Variable length resource, length must be at least the minimum */
 
                 if (resource_length < minimum_resource_length) {
-                        return (AE_AML_BAD_RESOURCE_LENGTH);
+                        goto bad_resource_length;
                 }
                 break;
 
@@ -432,7 +608,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
 
                 if ((resource_length > minimum_resource_length) ||
                     (resource_length < (minimum_resource_length - 1))) {
-                        return (AE_AML_BAD_RESOURCE_LENGTH);
+                        goto bad_resource_length;
                 }
                 break;
 
@@ -440,7 +616,23 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
 
                 /* Shouldn't happen (because of validation earlier), but be sure */
 
-                return (AE_AML_INVALID_RESOURCE_TYPE);
+                goto invalid_resource;
+        }
+
+        aml_resource = ACPI_CAST_PTR(union aml_resource, aml);
+        if (resource_type == ACPI_RESOURCE_NAME_SERIAL_BUS) {
+
+                /* Validate the bus_type field */
+
+                if ((aml_resource->common_serial_bus.type == 0) ||
+                    (aml_resource->common_serial_bus.type >
+                     AML_RESOURCE_MAX_SERIALBUSTYPE)) {
+                        ACPI_RESOURCE_ERROR((AE_INFO,
+                                             "Invalid/unsupported SerialBus resource descriptor: BusType 0x%2.2X",
+                                             aml_resource->common_serial_bus.
+                                             type));
+                        return (AE_AML_INVALID_RESOURCE_TYPE);
+                }
         }
 
         /* Optionally return the resource table index */
@@ -450,6 +642,22 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
         }
 
         return (AE_OK);
+
+      invalid_resource:
+
+        ACPI_RESOURCE_ERROR((AE_INFO,
+                             "Invalid/unsupported resource descriptor: Type 0x%2.2X",
+                             resource_type));
+        return (AE_AML_INVALID_RESOURCE_TYPE);
+
+      bad_resource_length:
+
+        ACPI_RESOURCE_ERROR((AE_INFO,
+                             "Invalid resource descriptor length: Type "
+                             "0x%2.2X, Length 0x%4.4X, MinLength 0x%4.4X",
+                             resource_type, resource_length,
+                             minimum_resource_length));
+        return (AE_AML_BAD_RESOURCE_LENGTH);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/utstate.c b/drivers/acpi/acpica/utstate.c
index 30c21e1a9360..4267477c2797 100644
--- a/drivers/acpi/acpica/utstate.c
+++ b/drivers/acpi/acpica/utstate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utxface.c b/drivers/acpi/acpica/utxface.c
index 420ebfe08c72..644e8c8ebc4b 100644
--- a/drivers/acpi/acpica/utxface.c
+++ b/drivers/acpi/acpica/utxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,6 +48,7 @@
 #include "acnamesp.h"
 #include "acdebug.h"
 #include "actables.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utxface")
@@ -640,4 +641,41 @@ acpi_status acpi_install_interface_handler(acpi_interface_handler handler)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_install_interface_handler)
+
+/*****************************************************************************
+ *
+ * FUNCTION:    acpi_check_address_range
+ *
+ * PARAMETERS:  space_id            - Address space ID
+ *              Address             - Start address
+ *              Length              - Length
+ *              Warn                - TRUE if warning on overlap desired
+ *
+ * RETURN:      Count of the number of conflicts detected.
+ *
+ * DESCRIPTION: Check if the input address range overlaps any of the
+ *              ASL operation region address ranges.
+ *
+ ****************************************************************************/
+u32
+acpi_check_address_range(acpi_adr_space_type space_id,
+                         acpi_physical_address address,
+                         acpi_size length, u8 warn)
+{
+        u32 overlaps;
+        acpi_status status;
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return (0);
+        }
+
+        overlaps = acpi_ut_check_address_range(space_id, address,
+                                               (u32)length, warn);
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+        return (overlaps);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_check_address_range)
 #endif                          /* !ACPI_ASL_COMPILER */
diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c
index 8d0245ec4315..52b568af1819 100644
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utxfmutex.c b/drivers/acpi/acpica/utxfmutex.c
new file mode 100644
index 000000000000..1427d191d15a
--- /dev/null
+++ b/drivers/acpi/acpica/utxfmutex.c
@@ -0,0 +1,187 @@
+/*******************************************************************************
+ *
+ * Module Name: utxfmutex - external AML mutex access functions
+ *
+ ******************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2012, 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 "acnamesp.h"
+
+#define _COMPONENT          ACPI_UTILITIES
+ACPI_MODULE_NAME("utxfmutex")
+
+/* Local prototypes */
+static acpi_status
+acpi_ut_get_mutex_object(acpi_handle handle,
+                         acpi_string pathname,
+                         union acpi_operand_object **ret_obj);
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_mutex_object
+ *
+ * PARAMETERS:  Handle              - Mutex or prefix handle (optional)
+ *              Pathname            - Mutex pathname (optional)
+ *              ret_obj             - Where the mutex object is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Get an AML mutex object. The mutex node is pointed to by
+ *              Handle:Pathname. Either Handle or Pathname can be NULL, but
+ *              not both.
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_ut_get_mutex_object(acpi_handle handle,
+                         acpi_string pathname,
+                         union acpi_operand_object **ret_obj)
+{
+        struct acpi_namespace_node *mutex_node;
+        union acpi_operand_object *mutex_obj;
+        acpi_status status;
+
+        /* Parameter validation */
+
+        if (!ret_obj || (!handle && !pathname)) {
+                return (AE_BAD_PARAMETER);
+        }
+
+        /* Get a the namespace node for the mutex */
+
+        mutex_node = handle;
+        if (pathname != NULL) {
+                status = acpi_get_handle(handle, pathname,
+                                         ACPI_CAST_PTR(acpi_handle,
+                                                       &mutex_node));
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+        }
+
+        /* Ensure that we actually have a Mutex object */
+
+        if (!mutex_node || (mutex_node->type != ACPI_TYPE_MUTEX)) {
+                return (AE_TYPE);
+        }
+
+        /* Get the low-level mutex object */
+
+        mutex_obj = acpi_ns_get_attached_object(mutex_node);
+        if (!mutex_obj) {
+                return (AE_NULL_OBJECT);
+        }
+
+        *ret_obj = mutex_obj;
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_acquire_mutex
+ *
+ * PARAMETERS:  Handle              - Mutex or prefix handle (optional)
+ *              Pathname            - Mutex pathname (optional)
+ *              Timeout             - Max time to wait for the lock (millisec)
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Acquire an AML mutex. This is a device driver interface to
+ *              AML mutex objects, and allows for transaction locking between
+ *              drivers and AML code. The mutex node is pointed to by
+ *              Handle:Pathname. Either Handle or Pathname can be NULL, but
+ *              not both.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_acquire_mutex(acpi_handle handle, acpi_string pathname, u16 timeout)
+{
+        acpi_status status;
+        union acpi_operand_object *mutex_obj;
+
+        /* Get the low-level mutex associated with Handle:Pathname */
+
+        status = acpi_ut_get_mutex_object(handle, pathname, &mutex_obj);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* Acquire the OS mutex */
+
+        status = acpi_os_acquire_mutex(mutex_obj->mutex.os_mutex, timeout);
+        return (status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_release_mutex
+ *
+ * PARAMETERS:  Handle              - Mutex or prefix handle (optional)
+ *              Pathname            - Mutex pathname (optional)
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Release an AML mutex. This is a device driver interface to
+ *              AML mutex objects, and allows for transaction locking between
+ *              drivers and AML code. The mutex node is pointed to by
+ *              Handle:Pathname. Either Handle or Pathname can be NULL, but
+ *              not both.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_release_mutex(acpi_handle handle, acpi_string pathname)
+{
+        acpi_status status;
+        union acpi_operand_object *mutex_obj;
+
+        /* Get the low-level mutex associated with Handle:Pathname */
+
+        status = acpi_ut_get_mutex_object(handle, pathname, &mutex_obj);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* Release the OS mutex */
+
+        acpi_os_release_mutex(mutex_obj->mutex.os_mutex);
+        return (AE_OK);
+}
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 61540360d5ce..e45350cb6ac8 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -34,13 +34,13 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
+#include <linux/acpi_io.h>
 #include <linux/slab.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"
 
@@ -70,7 +70,7 @@ int __apei_exec_read_register(struct acpi_whea_header *entry, u64 *val)
 {
         int rc;
 
-        rc = acpi_atomic_read(val, &entry->register_region);
+        rc = apei_read(val, &entry->register_region);
         if (rc)
                 return rc;
         *val >>= entry->register_region.bit_offset;
@@ -116,13 +116,13 @@ int __apei_exec_write_register(struct acpi_whea_header *entry, u64 val)
         val <<= entry->register_region.bit_offset;
         if (entry->flags & APEI_EXEC_PRESERVE_REGISTER) {
                 u64 valr = 0;
-                rc = acpi_atomic_read(&valr, &entry->register_region);
+                rc = apei_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);
+        rc = apei_write(val, &entry->register_region);
 
         return rc;
 }
@@ -243,7 +243,7 @@ static int pre_map_gar_callback(struct apei_exec_context *ctx,
         u8 ins = entry->instruction;
 
         if (ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER)
-                return acpi_pre_map_gar(&entry->register_region);
+                return acpi_os_map_generic_address(&entry->register_region);
 
         return 0;
 }
@@ -276,7 +276,7 @@ static int post_unmap_gar_callback(struct apei_exec_context *ctx,
         u8 ins = entry->instruction;
 
         if (ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER)
-                acpi_post_unmap_gar(&entry->register_region);
+                acpi_os_unmap_generic_address(&entry->register_region);
 
         return 0;
 }
@@ -421,6 +421,17 @@ static int apei_resources_merge(struct apei_resources *resources1,
         return 0;
 }
 
+int apei_resources_add(struct apei_resources *resources,
+                       unsigned long start, unsigned long size,
+                       bool iomem)
+{
+        if (iomem)
+                return apei_res_add(&resources->iomem, start, size);
+        else
+                return apei_res_add(&resources->ioport, start, size);
+}
+EXPORT_SYMBOL_GPL(apei_resources_add);
+
 /*
  * EINJ has two groups of GARs (EINJ table entry and trigger table
  * entry), so common resources are subtracted from the trigger table
@@ -438,8 +449,19 @@ int apei_resources_sub(struct apei_resources *resources1,
 }
 EXPORT_SYMBOL_GPL(apei_resources_sub);
 
+static int apei_get_nvs_callback(__u64 start, __u64 size, void *data)
+{
+        struct apei_resources *resources = data;
+        return apei_res_add(&resources->iomem, start, size);
+}
+
+static int apei_get_nvs_resources(struct apei_resources *resources)
+{
+        return acpi_nvs_for_each_region(apei_get_nvs_callback, resources);
+}
+
 /*
- * IO memory/port rersource management mechanism is used to check
+ * IO memory/port resource management mechanism is used to check
  * whether memory/port area used by GARs conflicts with normal memory
  * or IO memory/port of devices.
  */
@@ -448,21 +470,35 @@ int apei_resources_request(struct apei_resources *resources,
 {
         struct apei_res *res, *res_bak = NULL;
         struct resource *r;
+        struct apei_resources nvs_resources;
         int rc;
 
         rc = apei_resources_sub(resources, &apei_resources_all);
         if (rc)
                 return rc;
 
+        /*
+         * Some firmware uses ACPI NVS region, that has been marked as
+         * busy, so exclude it from APEI resources to avoid false
+         * conflict.
+         */
+        apei_resources_init(&nvs_resources);
+        rc = apei_get_nvs_resources(&nvs_resources);
+        if (rc)
+                goto res_fini;
+        rc = apei_resources_sub(resources, &nvs_resources);
+        if (rc)
+                goto res_fini;
+
         rc = -EINVAL;
         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",
+                "Can not request [mem %#010llx-%#010llx] for %s registers\n",
                                (unsigned long long)res->start,
-                               (unsigned long long)res->end);
+                               (unsigned long long)res->end - 1, desc);
                         res_bak = res;
                         goto err_unmap_iomem;
                 }
@@ -472,9 +508,9 @@ int apei_resources_request(struct apei_resources *resources,
                 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",
+                "Can not request [io  %#06llx-%#06llx] for %s registers\n",
                                (unsigned long long)res->start,
-                               (unsigned long long)res->end);
+                               (unsigned long long)res->end - 1, desc);
                         res_bak = res;
                         goto err_unmap_ioport;
                 }
@@ -500,6 +536,8 @@ err_unmap_iomem:
                         break;
                 release_mem_region(res->start, res->end - res->start);
         }
+res_fini:
+        apei_resources_fini(&nvs_resources);
         return rc;
 }
 EXPORT_SYMBOL_GPL(apei_resources_request);
@@ -553,6 +591,96 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr)
         return 0;
 }
 
+/* read GAR in interrupt (including NMI) or process context */
+int apei_read(u64 *val, struct acpi_generic_address *reg)
+{
+        int rc;
+        u64 address;
+        u32 tmp, width = reg->bit_width;
+        acpi_status status;
+
+        rc = apei_check_gar(reg, &address);
+        if (rc)
+                return rc;
+
+        if (width == 64)
+                width = 32;     /* Break into two 32-bit transfers */
+
+        *val = 0;
+        switch(reg->space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+                status = acpi_os_read_memory((acpi_physical_address)
+                                             address, &tmp, width);
+                if (ACPI_FAILURE(status))
+                        return -EIO;
+                *val = tmp;
+
+                if (reg->bit_width == 64) {
+                        /* Read the top 32 bits */
+                        status = acpi_os_read_memory((acpi_physical_address)
+                                                     (address + 4), &tmp, 32);
+                        if (ACPI_FAILURE(status))
+                                return -EIO;
+                        *val |= ((u64)tmp << 32);
+                }
+                break;
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+                status = acpi_os_read_port(address, (u32 *)val, reg->bit_width);
+                if (ACPI_FAILURE(status))
+                        return -EIO;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(apei_read);
+
+/* write GAR in interrupt (including NMI) or process context */
+int apei_write(u64 val, struct acpi_generic_address *reg)
+{
+        int rc;
+        u64 address;
+        u32 width = reg->bit_width;
+        acpi_status status;
+
+        rc = apei_check_gar(reg, &address);
+        if (rc)
+                return rc;
+
+        if (width == 64)
+                width = 32;     /* Break into two 32-bit transfers */
+
+        switch (reg->space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+                status = acpi_os_write_memory((acpi_physical_address)
+                                              address, ACPI_LODWORD(val),
+                                              width);
+                if (ACPI_FAILURE(status))
+                        return -EIO;
+
+                if (reg->bit_width == 64) {
+                        status = acpi_os_write_memory((acpi_physical_address)
+                                                      (address + 4),
+                                                      ACPI_HIDWORD(val), 32);
+                        if (ACPI_FAILURE(status))
+                                return -EIO;
+                }
+                break;
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+                status = acpi_os_write_port(address, val, reg->bit_width);
+                if (ACPI_FAILURE(status))
+                        return -EIO;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(apei_write);
+
 static int collect_res_callback(struct apei_exec_context *ctx,
                                 struct acpi_whea_header *entry,
                                 void *data)
diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
index f57050e7a5e7..cca240a33038 100644
--- a/drivers/acpi/apei/apei-internal.h
+++ b/drivers/acpi/apei/apei-internal.h
@@ -68,6 +68,9 @@ static inline int apei_exec_run_optional(struct apei_exec_context *ctx, u8 actio
 /* IP has been set in instruction function */
 #define APEI_EXEC_SET_IP        1
 
+int apei_read(u64 *val, struct acpi_generic_address *reg);
+int apei_write(u64 val, struct acpi_generic_address *reg);
+
 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,
@@ -95,6 +98,9 @@ static inline void apei_resources_init(struct apei_resources *resources)
 }
 
 void apei_resources_fini(struct apei_resources *resources);
+int apei_resources_add(struct apei_resources *resources,
+                       unsigned long start, unsigned long size,
+                       bool iomem);
 int apei_resources_sub(struct apei_resources *resources1,
                        struct apei_resources *resources2);
 int apei_resources_request(struct apei_resources *resources,
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index 31546fd21029..5b898d4dda99 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -286,8 +286,29 @@ static int einj_check_trigger_header(struct acpi_einj_trigger *trigger_tab)
         return 0;
 }
 
+static struct acpi_generic_address *einj_get_trigger_parameter_region(
+        struct acpi_einj_trigger *trigger_tab, u64 param1, u64 param2)
+{
+        int i;
+        struct acpi_whea_header *entry;
+
+        entry = (struct acpi_whea_header *)
+                ((char *)trigger_tab + sizeof(struct acpi_einj_trigger));
+        for (i = 0; i < trigger_tab->entry_count; i++) {
+                if (entry->action == ACPI_EINJ_TRIGGER_ERROR &&
+                entry->instruction == ACPI_EINJ_WRITE_REGISTER_VALUE &&
+                entry->register_region.space_id ==
+                        ACPI_ADR_SPACE_SYSTEM_MEMORY &&
+                (entry->register_region.address & param2) == (param1 & param2))
+                        return &entry->register_region;
+                entry++;
+        }
+
+        return NULL;
+}
 /* Execute instructions in trigger error action table */
-static int __einj_error_trigger(u64 trigger_paddr)
+static int __einj_error_trigger(u64 trigger_paddr, u32 type,
+                                u64 param1, u64 param2)
 {
         struct acpi_einj_trigger *trigger_tab = NULL;
         struct apei_exec_context trigger_ctx;
@@ -296,14 +317,16 @@ static int __einj_error_trigger(u64 trigger_paddr)
         struct resource *r;
         u32 table_size;
         int rc = -EIO;
+        struct acpi_generic_address *trigger_param_region = NULL;
 
         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",
+        "Can not request [mem %#010llx-%#010llx] for Trigger table\n",
                        (unsigned long long)trigger_paddr,
-                       (unsigned long long)trigger_paddr+sizeof(*trigger_tab));
+                       (unsigned long long)trigger_paddr +
+                            sizeof(*trigger_tab) - 1);
                 goto out;
         }
         trigger_tab = ioremap_cache(trigger_paddr, sizeof(*trigger_tab));
@@ -324,9 +347,9 @@ static int __einj_error_trigger(u64 trigger_paddr)
                                "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);
+"Can not request [mem %#010llx-%#010llx] for Trigger Table Entry\n",
+                       (unsigned long long)trigger_paddr + sizeof(*trigger_tab),
+                       (unsigned long long)trigger_paddr + table_size - 1);
                 goto out_rel_header;
         }
         iounmap(trigger_tab);
@@ -347,6 +370,30 @@ static int __einj_error_trigger(u64 trigger_paddr)
         rc = apei_resources_sub(&trigger_resources, &einj_resources);
         if (rc)
                 goto out_fini;
+        /*
+         * Some firmware will access target address specified in
+         * param1 to trigger the error when injecting memory error.
+         * This will cause resource conflict with regular memory.  So
+         * remove it from trigger table resources.
+         */
+        if (param_extension && (type & 0x0038) && param2) {
+                struct apei_resources addr_resources;
+                apei_resources_init(&addr_resources);
+                trigger_param_region = einj_get_trigger_parameter_region(
+                        trigger_tab, param1, param2);
+                if (trigger_param_region) {
+                        rc = apei_resources_add(&addr_resources,
+                                trigger_param_region->address,
+                                trigger_param_region->bit_width/8, true);
+                        if (rc)
+                                goto out_fini;
+                        rc = apei_resources_sub(&trigger_resources,
+                                        &addr_resources);
+                }
+                apei_resources_fini(&addr_resources);
+                if (rc)
+                        goto out_fini;
+        }
         rc = apei_resources_request(&trigger_resources, "APEI EINJ Trigger");
         if (rc)
                 goto out_fini;
@@ -460,7 +507,7 @@ static int __einj_error_inject(u32 type, u64 param1, u64 param2)
         if (rc)
                 return rc;
         trigger_paddr = apei_exec_ctx_get_output(&ctx);
-        rc = __einj_error_trigger(trigger_paddr);
+        rc = __einj_error_trigger(trigger_paddr, type, param1, param2);
         if (rc)
                 return rc;
         rc = apei_exec_run_optional(&ctx, ACPI_EINJ_END_OPERATION);
@@ -610,10 +657,9 @@ static int __init einj_init(void)
 
         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");
+        if (status == AE_NOT_FOUND)
                 return -ENODEV;
-        } else if (ACPI_FAILURE(status)) {
+        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;
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 631b9477b99c..8e8d786c5d23 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -1125,10 +1125,9 @@ static int __init erst_init(void)
 
         status = acpi_get_table(ACPI_SIG_ERST, 0,
                                 (struct acpi_table_header **)&erst_tab);
-        if (status == AE_NOT_FOUND) {
-                pr_info(ERST_PFX "Table is not found!\n");
+        if (status == AE_NOT_FOUND)
                 goto err;
-        } else if (ACPI_FAILURE(status)) {
+        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;
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index b8e08cb67a18..b3207e16670e 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -33,6 +33,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
+#include <linux/acpi_io.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/timer.h>
@@ -45,8 +46,9 @@
 #include <linux/irq_work.h>
 #include <linux/llist.h>
 #include <linux/genalloc.h>
+#include <linux/pci.h>
+#include <linux/aer.h>
 #include <acpi/apei.h>
-#include <acpi/atomicio.h>
 #include <acpi/hed.h>
 #include <asm/mce.h>
 #include <asm/tlbflush.h>
@@ -299,7 +301,7 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)
         if (!ghes)
                 return ERR_PTR(-ENOMEM);
         ghes->generic = generic;
-        rc = acpi_pre_map_gar(&generic->error_status_address);
+        rc = acpi_os_map_generic_address(&generic->error_status_address);
         if (rc)
                 goto err_free;
         error_block_length = generic->error_block_length;
@@ -319,7 +321,7 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)
         return ghes;
 
 err_unmap:
-        acpi_post_unmap_gar(&generic->error_status_address);
+        acpi_os_unmap_generic_address(&generic->error_status_address);
 err_free:
         kfree(ghes);
         return ERR_PTR(rc);
@@ -328,7 +330,7 @@ err_free:
 static void ghes_fini(struct ghes *ghes)
 {
         kfree(ghes->estatus);
-        acpi_post_unmap_gar(&ghes->generic->error_status_address);
+        acpi_os_unmap_generic_address(&ghes->generic->error_status_address);
 }
 
 enum {
@@ -399,7 +401,7 @@ static int ghes_read_estatus(struct ghes *ghes, int silent)
         u32 len;
         int rc;
 
-        rc = acpi_atomic_read(&buf_paddr, &g->error_status_address);
+        rc = apei_read(&buf_paddr, &g->error_status_address);
         if (rc) {
                 if (!silent && printk_ratelimit())
                         pr_warning(FW_WARN GHES_PFX
@@ -476,6 +478,27 @@ static void ghes_do_proc(const struct acpi_hest_generic_status *estatus)
                         }
 #endif
                 }
+#ifdef CONFIG_ACPI_APEI_PCIEAER
+                else if (!uuid_le_cmp(*(uuid_le *)gdata->section_type,
+                                      CPER_SEC_PCIE)) {
+                        struct cper_sec_pcie *pcie_err;
+                        pcie_err = (struct cper_sec_pcie *)(gdata+1);
+                        if (sev == GHES_SEV_RECOVERABLE &&
+                            sec_sev == GHES_SEV_RECOVERABLE &&
+                            pcie_err->validation_bits & CPER_PCIE_VALID_DEVICE_ID &&
+                            pcie_err->validation_bits & CPER_PCIE_VALID_AER_INFO) {
+                                unsigned int devfn;
+                                int aer_severity;
+                                devfn = PCI_DEVFN(pcie_err->device_id.device,
+                                                  pcie_err->device_id.function);
+                                aer_severity = cper_severity_to_aer(sev);
+                                aer_recover_queue(pcie_err->device_id.segment,
+                                                  pcie_err->device_id.bus,
+                                                  devfn, aer_severity);
+                        }
+
+                }
+#endif
         }
 }
 
@@ -483,16 +506,22 @@ static void __ghes_print_estatus(const char *pfx,
                                  const struct acpi_hest_generic *generic,
                                  const struct acpi_hest_generic_status *estatus)
 {
+        static atomic_t seqno;
+        unsigned int curr_seqno;
+        char pfx_seq[64];
+
         if (pfx == NULL) {
                 if (ghes_severity(estatus->error_severity) <=
                     GHES_SEV_CORRECTED)
-                        pfx = KERN_WARNING HW_ERR;
+                        pfx = KERN_WARNING;
                 else
-                        pfx = KERN_ERR HW_ERR;
+                        pfx = KERN_ERR;
         }
+        curr_seqno = atomic_inc_return(&seqno);
+        snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
         printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
-               pfx, generic->header.source_id);
-        apei_estatus_print(pfx, estatus);
+               pfx_seq, generic->header.source_id);
+        apei_estatus_print(pfx_seq, estatus);
 }
 
 static int ghes_print_estatus(const char *pfx,
@@ -711,26 +740,34 @@ static int ghes_notify_sci(struct notifier_block *this,
         return ret;
 }
 
+static struct llist_node *llist_nodes_reverse(struct llist_node *llnode)
+{
+        struct llist_node *next, *tail = NULL;
+
+        while (llnode) {
+                next = llnode->next;
+                llnode->next = tail;
+                tail = llnode;
+                llnode = next;
+        }
+
+        return tail;
+}
+
 static void ghes_proc_in_irq(struct irq_work *irq_work)
 {
-        struct llist_node *llnode, *next, *tail = NULL;
+        struct llist_node *llnode, *next;
         struct ghes_estatus_node *estatus_node;
         struct acpi_hest_generic *generic;
         struct acpi_hest_generic_status *estatus;
         u32 len, node_len;
 
+        llnode = llist_del_all(&ghes_estatus_llist);
         /*
          * Because the time order of estatus in list is reversed,
          * revert it back to proper order.
          */
-        llnode = llist_del_all(&ghes_estatus_llist);
-        while (llnode) {
-                next = llnode->next;
-                llnode->next = tail;
-                tail = llnode;
-                llnode = next;
-        }
-        llnode = tail;
+        llnode = llist_nodes_reverse(llnode);
         while (llnode) {
                 next = llnode->next;
                 estatus_node = llist_entry(llnode, struct ghes_estatus_node,
@@ -750,6 +787,32 @@ static void ghes_proc_in_irq(struct irq_work *irq_work)
         }
 }
 
+static void ghes_print_queued_estatus(void)
+{
+        struct llist_node *llnode;
+        struct ghes_estatus_node *estatus_node;
+        struct acpi_hest_generic *generic;
+        struct acpi_hest_generic_status *estatus;
+        u32 len, node_len;
+
+        llnode = llist_del_all(&ghes_estatus_llist);
+        /*
+         * Because the time order of estatus in list is reversed,
+         * revert it back to proper order.
+         */
+        llnode = llist_nodes_reverse(llnode);
+        while (llnode) {
+                estatus_node = llist_entry(llnode, struct ghes_estatus_node,
+                                           llnode);
+                estatus = GHES_ESTATUS_FROM_NODE(estatus_node);
+                len = apei_estatus_len(estatus);
+                node_len = GHES_ESTATUS_NODE_LEN(len);
+                generic = estatus_node->generic;
+                ghes_print_estatus(NULL, generic, estatus);
+                llnode = llnode->next;
+        }
+}
+
 static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)
 {
         struct ghes *ghes, *ghes_global = NULL;
@@ -775,7 +838,8 @@ static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)
 
         if (sev_global >= GHES_SEV_PANIC) {
                 oops_begin();
-                __ghes_print_estatus(KERN_EMERG HW_ERR, ghes_global->generic,
+                ghes_print_queued_estatus();
+                __ghes_print_estatus(KERN_EMERG, ghes_global->generic,
                                      ghes_global->estatus);
                 /* reboot to log the error! */
                 if (panic_timeout == 0)
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 05fee06f4d6e..f709269d4932 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -221,10 +221,9 @@ void __init acpi_hest_init(void)
 
         status = acpi_get_table(ACPI_SIG_HEST, 0,
                                 (struct acpi_table_header **)&hest_tab);
-        if (status == AE_NOT_FOUND) {
-                pr_info(HEST_PFX "Table not found.\n");
+        if (status == AE_NOT_FOUND)
                 goto err;
-        } else if (ACPI_FAILURE(status)) {
+        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;
diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c
index cfc0cc10af39..d4a5b3d3657b 100644
--- a/drivers/acpi/atomicio.c
+++ b/drivers/acpi/atomicio.c
@@ -32,6 +32,8 @@
 #include <linux/rculist.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/mm.h>
+#include <linux/highmem.h>
 #include <acpi/atomicio.h>
 
 #define ACPI_PFX "ACPI: "
@@ -97,6 +99,37 @@ static void __iomem *__acpi_try_ioremap(phys_addr_t paddr,
                 return NULL;
 }
 
+#ifndef CONFIG_IA64
+#define should_use_kmap(pfn)    page_is_ram(pfn)
+#else
+/* ioremap will take care of cache attributes */
+#define should_use_kmap(pfn)    0
+#endif
+
+static void __iomem *acpi_map(phys_addr_t pg_off, unsigned long pg_sz)
+{
+        unsigned long pfn;
+
+        pfn = pg_off >> PAGE_SHIFT;
+        if (should_use_kmap(pfn)) {
+                if (pg_sz > PAGE_SIZE)
+                        return NULL;
+                return (void __iomem __force *)kmap(pfn_to_page(pfn));
+        } else
+                return ioremap(pg_off, pg_sz);
+}
+
+static void acpi_unmap(phys_addr_t pg_off, void __iomem *vaddr)
+{
+        unsigned long pfn;
+
+        pfn = pg_off >> PAGE_SHIFT;
+        if (page_is_ram(pfn))
+                kunmap(pfn_to_page(pfn));
+        else
+                iounmap(vaddr);
+}
+
 /*
  * 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
@@ -119,7 +152,7 @@ static void __iomem *acpi_pre_map(phys_addr_t paddr,
 
         pg_off = paddr & PAGE_MASK;
         pg_sz = ((paddr + size + PAGE_SIZE - 1) & PAGE_MASK) - pg_off;
-        vaddr = ioremap(pg_off, pg_sz);
+        vaddr = acpi_map(pg_off, pg_sz);
         if (!vaddr)
                 return NULL;
         map = kmalloc(sizeof(*map), GFP_KERNEL);
@@ -135,7 +168,7 @@ static void __iomem *acpi_pre_map(phys_addr_t paddr,
         vaddr = __acpi_try_ioremap(paddr, size);
         if (vaddr) {
                 spin_unlock_irqrestore(&acpi_iomaps_lock, flags);
-                iounmap(map->vaddr);
+                acpi_unmap(pg_off, map->vaddr);
                 kfree(map);
                 return vaddr;
         }
@@ -144,7 +177,7 @@ static void __iomem *acpi_pre_map(phys_addr_t paddr,
 
         return map->vaddr + (paddr - map->paddr);
 err_unmap:
-        iounmap(vaddr);
+        acpi_unmap(pg_off, vaddr);
         return NULL;
 }
 
@@ -177,7 +210,7 @@ static void acpi_post_unmap(phys_addr_t paddr, unsigned long size)
                 return;
 
         synchronize_rcu();
-        iounmap(map->vaddr);
+        acpi_unmap(map->paddr, map->vaddr);
         kfree(map);
 }
 
@@ -260,6 +293,21 @@ int acpi_post_unmap_gar(struct acpi_generic_address *reg)
 }
 EXPORT_SYMBOL_GPL(acpi_post_unmap_gar);
 
+#ifdef readq
+static inline u64 read64(const volatile void __iomem *addr)
+{
+        return readq(addr);
+}
+#else
+static inline u64 read64(const volatile void __iomem *addr)
+{
+        u64 l, h;
+        l = readl(addr);
+        h = readl(addr+4);
+        return l | (h << 32);
+}
+#endif
+
 /*
  * Can be used in atomic (including NMI) or process context. RCU read
  * lock can only be released after the IO memory area accessing.
@@ -280,11 +328,9 @@ static int acpi_atomic_read_mem(u64 paddr, u64 *val, u32 width)
         case 32:
                 *val = readl(addr);
                 break;
-#ifdef readq
         case 64:
-                *val = readq(addr);
+                *val = read64(addr);
                 break;
-#endif
         default:
                 return -EINVAL;
         }
@@ -293,6 +339,19 @@ static int acpi_atomic_read_mem(u64 paddr, u64 *val, u32 width)
         return 0;
 }
 
+#ifdef writeq
+static inline void write64(u64 val, volatile void __iomem *addr)
+{
+        writeq(val, addr);
+}
+#else
+static inline void write64(u64 val, volatile void __iomem *addr)
+{
+        writel(val, addr);
+        writel(val>>32, addr+4);
+}
+#endif
+
 static int acpi_atomic_write_mem(u64 paddr, u64 val, u32 width)
 {
         void __iomem *addr;
@@ -309,11 +368,9 @@ static int acpi_atomic_write_mem(u64 paddr, u64 val, u32 width)
         case 32:
                 writel(val, addr);
                 break;
-#ifdef writeq
         case 64:
-                writeq(val, addr);
+                write64(val, addr);
                 break;
-#endif
         default:
                 return -EINVAL;
         }
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 3b5c3189fd99..e56f3be7b07d 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -45,6 +45,8 @@ static int pxm_to_node_map[MAX_PXM_DOMAINS]
 static int node_to_pxm_map[MAX_NUMNODES]
                         = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
 
+unsigned char acpi_srat_revision __initdata;
+
 int pxm_to_node(int pxm)
 {
         if (pxm < 0)
@@ -255,9 +257,13 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header,
 
 static int __init acpi_parse_srat(struct acpi_table_header *table)
 {
+        struct acpi_table_srat *srat;
         if (!table)
                 return -EINVAL;
 
+        srat = (struct acpi_table_srat *)table;
+        acpi_srat_revision = srat->header.revision;
+
         /* Real work done in acpi_table_parse_srat below. */
 
         return 0;
diff --git a/drivers/acpi/nvs.c b/drivers/acpi/nvs.c
index 096787b43c96..7a2035fa8c71 100644
--- a/drivers/acpi/nvs.c
+++ b/drivers/acpi/nvs.c
@@ -15,6 +15,56 @@
 #include <linux/acpi_io.h>
 #include <acpi/acpiosxf.h>
 
+/* ACPI NVS regions, APEI may use it */
+
+struct nvs_region {
+        __u64 phys_start;
+        __u64 size;
+        struct list_head node;
+};
+
+static LIST_HEAD(nvs_region_list);
+
+#ifdef CONFIG_ACPI_SLEEP
+static int suspend_nvs_register(unsigned long start, unsigned long size);
+#else
+static inline int suspend_nvs_register(unsigned long a, unsigned long b)
+{
+        return 0;
+}
+#endif
+
+int acpi_nvs_register(__u64 start, __u64 size)
+{
+        struct nvs_region *region;
+
+        region = kmalloc(sizeof(*region), GFP_KERNEL);
+        if (!region)
+                return -ENOMEM;
+        region->phys_start = start;
+        region->size = size;
+        list_add_tail(&region->node, &nvs_region_list);
+
+        return suspend_nvs_register(start, size);
+}
+
+int acpi_nvs_for_each_region(int (*func)(__u64 start, __u64 size, void *data),
+                             void *data)
+{
+        int rc;
+        struct nvs_region *region;
+
+        list_for_each_entry(region, &nvs_region_list, node) {
+                rc = func(region->phys_start, region->size, data);
+                if (rc)
+                        return rc;
+        }
+
+        return 0;
+}
+
+
+#ifdef CONFIG_ACPI_SLEEP
 /*
  * Platforms, like ACPI, may want us to save some memory used by them during
  * suspend and to restore the contents of this memory during the subsequent
@@ -41,7 +91,7 @@ static LIST_HEAD(nvs_list);
  *      things so that the data from page-aligned addresses in this region will
  *      be copied into separate RAM pages.
  */
-int suspend_nvs_register(unsigned long start, unsigned long size)
+static int suspend_nvs_register(unsigned long start, unsigned long size)
 {
         struct nvs_page *entry, *next;
 
@@ -159,3 +209,4 @@ void suspend_nvs_restore(void)
                 if (entry->data)
                         memcpy(entry->kaddr, entry->data, entry->size);
 }
+#endif
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index f31c5c5f1b7e..fcc12d842bcc 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -83,19 +83,6 @@ static struct workqueue_struct *kacpi_notify_wq;
 struct workqueue_struct *kacpi_hotplug_wq;
 EXPORT_SYMBOL(kacpi_hotplug_wq);
 
-struct acpi_res_list {
-        resource_size_t start;
-        resource_size_t end;
-        acpi_adr_space_type resource_type; /* IO port, System memory, ...*/
-        char name[5];   /* only can have a length of 4 chars, make use of this
-                           one instead of res->name, no need to kalloc then */
-        struct list_head resource_list;
-        int count;
-};
-
-static LIST_HEAD(resource_list_head);
-static DEFINE_SPINLOCK(acpi_res_lock);
-
 /*
  * This list of permanent mappings is for memory that may be accessed from
  * interrupt context, where we can't do the ioremap().
@@ -166,17 +153,21 @@ static u32 acpi_osi_handler(acpi_string interface, u32 supported)
         return supported;
 }
 
-static void __init acpi_request_region (struct acpi_generic_address *addr,
+static void __init acpi_request_region (struct acpi_generic_address *gas,
         unsigned int length, char *desc)
 {
-        if (!addr->address || !length)
+        u64 addr;
+
+        /* Handle possible alignment issues */
+        memcpy(&addr, &gas->address, sizeof(addr));
+        if (!addr || !length)
                 return;
 
         /* Resources are never freed */
-        if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_IO)
-                request_region(addr->address, length, desc);
-        else if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
-                request_mem_region(addr->address, length, desc);
+        if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO)
+                request_region(addr, length, desc);
+        else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
+                request_mem_region(addr, length, desc);
 }
 
 static int __init acpi_reserve_resources(void)
@@ -427,35 +418,42 @@ void __init early_acpi_os_unmap_memory(void __iomem *virt, acpi_size size)
                 __acpi_unmap_table(virt, size);
 }
 
-static int acpi_os_map_generic_address(struct acpi_generic_address *addr)
+int acpi_os_map_generic_address(struct acpi_generic_address *gas)
 {
+        u64 addr;
         void __iomem *virt;
 
-        if (addr->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
+        if (gas->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
                 return 0;
 
-        if (!addr->address || !addr->bit_width)
+        /* Handle possible alignment issues */
+        memcpy(&addr, &gas->address, sizeof(addr));
+        if (!addr || !gas->bit_width)
                 return -EINVAL;
 
-        virt = acpi_os_map_memory(addr->address, addr->bit_width / 8);
+        virt = acpi_os_map_memory(addr, gas->bit_width / 8);
         if (!virt)
                 return -EIO;
 
         return 0;
 }
+EXPORT_SYMBOL(acpi_os_map_generic_address);
 
-static void acpi_os_unmap_generic_address(struct acpi_generic_address *addr)
+void acpi_os_unmap_generic_address(struct acpi_generic_address *gas)
 {
+        u64 addr;
         struct acpi_ioremap *map;
 
-        if (addr->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
+        if (gas->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
                 return;
 
-        if (!addr->address || !addr->bit_width)
+        /* Handle possible alignment issues */
+        memcpy(&addr, &gas->address, sizeof(addr));
+        if (!addr || !gas->bit_width)
                 return;
 
         mutex_lock(&acpi_ioremap_lock);
-        map = acpi_map_lookup(addr->address, addr->bit_width / 8);
+        map = acpi_map_lookup(addr, gas->bit_width / 8);
         if (!map) {
                 mutex_unlock(&acpi_ioremap_lock);
                 return;
@@ -465,6 +463,7 @@ static void acpi_os_unmap_generic_address(struct acpi_generic_address *addr)
 
         acpi_os_map_cleanup(map);
 }
+EXPORT_SYMBOL(acpi_os_unmap_generic_address);
 
 #ifdef ACPI_FUTURE_USAGE
 acpi_status
@@ -1278,44 +1277,28 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup);
  * drivers */
 int acpi_check_resource_conflict(const struct resource *res)
 {
-        struct acpi_res_list *res_list_elem;
-        int ioport = 0, clash = 0;
+        acpi_adr_space_type space_id;
+        acpi_size length;
+        u8 warn = 0;
+        int clash = 0;
 
         if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)
                 return 0;
         if (!(res->flags & IORESOURCE_IO) && !(res->flags & IORESOURCE_MEM))
                 return 0;
 
-        ioport = res->flags & IORESOURCE_IO;
-
-        spin_lock(&acpi_res_lock);
-        list_for_each_entry(res_list_elem, &resource_list_head,
-                            resource_list) {
-                if (ioport && (res_list_elem->resource_type
-                               != ACPI_ADR_SPACE_SYSTEM_IO))
-                        continue;
-                if (!ioport && (res_list_elem->resource_type
-                                != ACPI_ADR_SPACE_SYSTEM_MEMORY))
-                        continue;
+        if (res->flags & IORESOURCE_IO)
+                space_id = ACPI_ADR_SPACE_SYSTEM_IO;
+        else
+                space_id = ACPI_ADR_SPACE_SYSTEM_MEMORY;
 
-                if (res->end < res_list_elem->start
-                    || res_list_elem->end < res->start)
-                        continue;
-                clash = 1;
-                break;
-        }
-        spin_unlock(&acpi_res_lock);
+        length = res->end - res->start + 1;
+        if (acpi_enforce_resources != ENFORCE_RESOURCES_NO)
+                warn = 1;
+        clash = acpi_check_address_range(space_id, res->start, length, warn);
 
         if (clash) {
                 if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {
-                        printk(KERN_WARNING "ACPI: resource %s %pR"
-                               " conflicts with ACPI region %s "
-                               "[%s 0x%zx-0x%zx]\n",
-                               res->name, res, res_list_elem->name,
-                               (res_list_elem->resource_type ==
-                                ACPI_ADR_SPACE_SYSTEM_IO) ? "io" : "mem",
-                               (size_t) res_list_elem->start,
-                               (size_t) res_list_elem->end);
                         if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)
                                 printk(KERN_NOTICE "ACPI: This conflict may"
                                        " cause random problems and system"
@@ -1467,155 +1450,6 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object)
         kmem_cache_free(cache, object);
         return (AE_OK);
 }
-
-static inline int acpi_res_list_add(struct acpi_res_list *res)
-{
-        struct acpi_res_list *res_list_elem;
-
-        list_for_each_entry(res_list_elem, &resource_list_head,
-                            resource_list) {
-
-                if (res->resource_type == res_list_elem->resource_type &&
-                    res->start == res_list_elem->start &&
-                    res->end == res_list_elem->end) {
-
-                        /*
-                         * The Region(addr,len) already exist in the list,
-                         * just increase the count
-                         */
-
-                        res_list_elem->count++;
-                        return 0;
-                }
-        }
-
-        res->count = 1;
-        list_add(&res->resource_list, &resource_list_head);
-        return 1;
-}
-
-static inline void acpi_res_list_del(struct acpi_res_list *res)
-{
-        struct acpi_res_list *res_list_elem;
-
-        list_for_each_entry(res_list_elem, &resource_list_head,
-                            resource_list) {
-
-                if (res->resource_type == res_list_elem->resource_type &&
-                    res->start == res_list_elem->start &&
-                    res->end == res_list_elem->end) {
-
-                        /*
-                         * If the res count is decreased to 0,
-                         * remove and free it
-                         */
-
-                        if (--res_list_elem->count == 0) {
-                                list_del(&res_list_elem->resource_list);
-                                kfree(res_list_elem);
-                        }
-                        return;
-                }
-        }
-}
-
-acpi_status
-acpi_os_invalidate_address(
-    u8                   space_id,
-    acpi_physical_address   address,
-    acpi_size               length)
-{
-        struct acpi_res_list res;
-
-        switch (space_id) {
-        case ACPI_ADR_SPACE_SYSTEM_IO:
-        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                /* Only interference checks against SystemIO and SystemMemory
-                   are needed */
-                res.start = address;
-                res.end = address + length - 1;
-                res.resource_type = space_id;
-                spin_lock(&acpi_res_lock);
-                acpi_res_list_del(&res);
-                spin_unlock(&acpi_res_lock);
-                break;
-        case ACPI_ADR_SPACE_PCI_CONFIG:
-        case ACPI_ADR_SPACE_EC:
-        case ACPI_ADR_SPACE_SMBUS:
-        case ACPI_ADR_SPACE_CMOS:
-        case ACPI_ADR_SPACE_PCI_BAR_TARGET:
-        case ACPI_ADR_SPACE_DATA_TABLE:
-        case ACPI_ADR_SPACE_FIXED_HARDWARE:
-                break;
-        }
-        return AE_OK;
-}
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_os_validate_address
- *
- * PARAMETERS:  space_id             - ACPI space ID
- *              address             - Physical address
- *              length              - Address length
- *
- * RETURN:      AE_OK if address/length is valid for the space_id. Otherwise,
- *              should return AE_AML_ILLEGAL_ADDRESS.
- *
- * DESCRIPTION: Validate a system address via the host OS. Used to validate
- *              the addresses accessed by AML operation regions.
- *
- *****************************************************************************/
-
-acpi_status
-acpi_os_validate_address (
-    u8                   space_id,
-    acpi_physical_address   address,
-    acpi_size               length,
-    char *name)
-{
-        struct acpi_res_list *res;
-        int added;
-        if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)
-                return AE_OK;
-
-        switch (space_id) {
-        case ACPI_ADR_SPACE_SYSTEM_IO:
-        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                /* Only interference checks against SystemIO and SystemMemory
-                   are needed */
-                res = kzalloc(sizeof(struct acpi_res_list), GFP_KERNEL);
-                if (!res)
-                        return AE_OK;
-                /* ACPI names are fixed to 4 bytes, still better use strlcpy */
-                strlcpy(res->name, name, 5);
-                res->start = address;
-                res->end = address + length - 1;
-                res->resource_type = space_id;
-                spin_lock(&acpi_res_lock);
-                added = acpi_res_list_add(res);
-                spin_unlock(&acpi_res_lock);
-                pr_debug("%s %s resource: start: 0x%llx, end: 0x%llx, "
-                         "name: %s\n", added ? "Added" : "Already exist",
-                         (space_id == ACPI_ADR_SPACE_SYSTEM_IO)
-                         ? "SystemIO" : "System Memory",
-                         (unsigned long long)res->start,
-                         (unsigned long long)res->end,
-                         res->name);
-                if (!added)
-                        kfree(res);
-                break;
-        case ACPI_ADR_SPACE_PCI_CONFIG:
-        case ACPI_ADR_SPACE_EC:
-        case ACPI_ADR_SPACE_SMBUS:
-        case ACPI_ADR_SPACE_CMOS:
-        case ACPI_ADR_SPACE_PCI_BAR_TARGET:
-        case ACPI_ADR_SPACE_DATA_TABLE:
-        case ACPI_ADR_SPACE_FIXED_HARDWARE:
-                break;
-        }
-        return AE_OK;
-}
 #endif
 
 acpi_status __init acpi_os_initialize(void)
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 3a0428e8435c..c850de4c9a14 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -173,8 +173,30 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
         apic_id = map_mat_entry(handle, type, acpi_id);
         if (apic_id == -1)
                 apic_id = map_madt_entry(type, acpi_id);
-        if (apic_id == -1)
-                return apic_id;
+        if (apic_id == -1) {
+                /*
+                 * On UP processor, there is no _MAT or MADT table.
+                 * So above apic_id is always set to -1.
+                 *
+                 * BIOS may define multiple CPU handles even for UP processor.
+                 * For example,
+                 *
+                 * Scope (_PR)
+                 * {
+                 *     Processor (CPU0, 0x00, 0x00000410, 0x06) {}
+                 *     Processor (CPU1, 0x01, 0x00000410, 0x06) {}
+                 *     Processor (CPU2, 0x02, 0x00000410, 0x06) {}
+                 *     Processor (CPU3, 0x03, 0x00000410, 0x06) {}
+                 * }
+                 *
+                 * Ignores apic_id and always return 0 for CPU0's handle.
+                 * Return -1 for other CPU's handle.
+                 */
+                if (acpi_id == 0)
+                        return acpi_id;
+                else
+                        return apic_id;
+        }
 
 #ifdef CONFIG_SMP
         for_each_possible_cpu(i) {
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 9d7bc9f6b6cc..b9cbd9b09450 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -82,7 +82,7 @@ MODULE_LICENSE("GPL");
 static int acpi_processor_add(struct acpi_device *device);
 static int acpi_processor_remove(struct acpi_device *device, int type);
 static void acpi_processor_notify(struct acpi_device *device, u32 event);
-static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu);
+static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr);
 static int acpi_processor_handle_eject(struct acpi_processor *pr);
 
 
@@ -324,10 +324,8 @@ static int acpi_processor_get_info(struct acpi_device *device)
          *  they are physically not present.
          */
         if (pr->id == -1) {
-                if (ACPI_FAILURE
-                    (acpi_processor_hotadd_init(pr->handle, &pr->id))) {
+                if (ACPI_FAILURE(acpi_processor_hotadd_init(pr)))
                         return -ENODEV;
-                }
         }
         /*
          * On some boxes several processors use the same processor bus id.
@@ -539,6 +537,7 @@ err_thermal_unregister:
         thermal_cooling_device_unregister(pr->cdev);
 err_power_exit:
         acpi_processor_power_exit(pr, device);
+        sysfs_remove_link(&device->dev.kobj, "sysdev");
 err_free_cpumask:
         free_cpumask_var(pr->throttling.shared_cpu_map);
 
@@ -720,18 +719,19 @@ processor_walk_namespace_cb(acpi_handle handle,
         return (AE_OK);
 }
 
-static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu)
+static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr)
 {
+        acpi_handle handle = pr->handle;
 
         if (!is_processor_present(handle)) {
                 return AE_ERROR;
         }
 
-        if (acpi_map_lsapic(handle, p_cpu))
+        if (acpi_map_lsapic(handle, &pr->id))
                 return AE_ERROR;
 
-        if (arch_register_cpu(*p_cpu)) {
-                acpi_unmap_lsapic(*p_cpu);
+        if (arch_register_cpu(pr->id)) {
+                acpi_unmap_lsapic(pr->id);
                 return AE_ERROR;
         }
 
@@ -748,7 +748,7 @@ static int acpi_processor_handle_eject(struct acpi_processor *pr)
         return (0);
 }
 #else
-static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu)
+static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr)
 {
         return AE_ERROR;
 }
@@ -827,8 +827,6 @@ static void __exit acpi_processor_exit(void)
 
         acpi_bus_unregister_driver(&acpi_processor_driver);
 
-        cpuidle_unregister_driver(&acpi_idle_driver);
-
         return;
 }
 
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 5d2f8e13cf0e..20bce51c2e82 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -197,7 +197,7 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {
                 .enter = &intel_idle },
 };
 
-static int get_driver_data(int cstate)
+static long get_driver_data(int cstate)
 {
         int driver_data;
         switch (cstate) {
@@ -232,6 +232,7 @@ static int get_driver_data(int cstate)
  * @drv: cpuidle driver
  * @index: index of cpuidle state
  *
+ * Must be called under local_irq_disable().
  */
 static int intel_idle(struct cpuidle_device *dev,
                 struct cpuidle_driver *drv, int index)
@@ -247,8 +248,6 @@ static int intel_idle(struct cpuidle_device *dev,
 
         cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1;
 
-        local_irq_disable();
-
         /*
          * leave_mm() to avoid costly and often unnecessary wakeups
          * for flushing the user TLB's associated with the active mm.
@@ -348,7 +347,8 @@ static int intel_idle_probe(void)
         cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates);
 
         if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) ||
-                !(ecx & CPUID5_ECX_INTERRUPT_BREAK))
+            !(ecx & CPUID5_ECX_INTERRUPT_BREAK) ||
+            !mwait_substates)
                         return -ENODEV;
 
         pr_debug(PREFIX "MWAIT substates: 0x%x\n", mwait_substates);
@@ -394,7 +394,7 @@ static int intel_idle_probe(void)
         if (boot_cpu_has(X86_FEATURE_ARAT))     /* Always Reliable APIC Timer */
                 lapic_timer_reliable_states = LAPIC_TIMER_ALWAYS_RELIABLE;
         else {
-                smp_call_function(__setup_broadcast_timer, (void *)true, 1);
+                on_each_cpu(__setup_broadcast_timer, (void *)true, 1);
                 register_cpu_notifier(&setup_broadcast_notifier);
         }
 
@@ -471,71 +471,67 @@ static int intel_idle_cpuidle_driver_init(void)
         }
 
         if (auto_demotion_disable_flags)
-                smp_call_function(auto_demotion_disable, NULL, 1);
+                on_each_cpu(auto_demotion_disable, NULL, 1);
 
         return 0;
 }
 
 
 /*
- * intel_idle_cpuidle_devices_init()
+ * intel_idle_cpu_init()
  * allocate, initialize, register cpuidle_devices
+ * @cpu: cpu/core to initialize
  */
-static int intel_idle_cpuidle_devices_init(void)
+int intel_idle_cpu_init(int cpu)
 {
-        int i, cstate;
+        int cstate;
         struct cpuidle_device *dev;
 
-        intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);
-        if (intel_idle_cpuidle_devices == NULL)
-                return -ENOMEM;
-
-        for_each_online_cpu(i) {
-                dev = per_cpu_ptr(intel_idle_cpuidle_devices, i);
+        dev = per_cpu_ptr(intel_idle_cpuidle_devices, cpu);
 
-                dev->state_count = 1;
+        dev->state_count = 1;
 
-                for (cstate = 1; cstate < MWAIT_MAX_NUM_CSTATES; ++cstate) {
-                        int num_substates;
+        for (cstate = 1; cstate < MWAIT_MAX_NUM_CSTATES; ++cstate) {
+                int num_substates;
 
-                        if (cstate > max_cstate) {
-                                printk(PREFIX "max_cstate %d reached\n",
-                                        max_cstate);
-                                break;
-                        }
+                if (cstate > max_cstate) {
+                        printk(PREFIX "max_cstate %d reached\n",
+                               max_cstate);
+                        break;
+                }
 
-                        /* does the state exist in CPUID.MWAIT? */
-                        num_substates = (mwait_substates >> ((cstate) * 4))
-                                                & MWAIT_SUBSTATE_MASK;
-                        if (num_substates == 0)
-                                continue;
-                        /* is the state not enabled? */
-                        if (cpuidle_state_table[cstate].enter == NULL) {
-                                continue;
-                        }
+                /* does the state exist in CPUID.MWAIT? */
+                num_substates = (mwait_substates >> ((cstate) * 4))
+                        & MWAIT_SUBSTATE_MASK;
+                if (num_substates == 0)
+                        continue;
+                /* is the state not enabled? */
+                if (cpuidle_state_table[cstate].enter == NULL)
+                        continue;
 
-                        dev->states_usage[dev->state_count].driver_data =
-                                (void *)get_driver_data(cstate);
+                dev->states_usage[dev->state_count].driver_data =
+                        (void *)get_driver_data(cstate);
 
                         dev->state_count += 1;
                 }
+        dev->cpu = cpu;
 
-                dev->cpu = i;
-                if (cpuidle_register_device(dev)) {
-                        pr_debug(PREFIX "cpuidle_register_device %d failed!\n",
-                                 i);
-                        intel_idle_cpuidle_devices_uninit();
-                        return -EIO;
-                }
+        if (cpuidle_register_device(dev)) {
+                pr_debug(PREFIX "cpuidle_register_device %d failed!\n", cpu);
+                intel_idle_cpuidle_devices_uninit();
+                return -EIO;
         }
 
+        if (auto_demotion_disable_flags)
+                smp_call_function_single(cpu, auto_demotion_disable, NULL, 1);
+
         return 0;
 }
 
 
 static int __init intel_idle_init(void)
 {
-        int retval;
+        int retval, i;
 
         /* Do not load intel_idle at all for now if idle= is passed */
         if (boot_option_idle_override != IDLE_NO_OVERRIDE)
@@ -553,10 +549,16 @@ static int __init intel_idle_init(void)
                 return retval;
         }
 
-        retval = intel_idle_cpuidle_devices_init();
-        if (retval) {
-                cpuidle_unregister_driver(&intel_idle_driver);
-                return retval;
+        intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);
+        if (intel_idle_cpuidle_devices == NULL)
+                return -ENOMEM;
+
+        for_each_online_cpu(i) {
+                retval = intel_idle_cpu_init(i);
+                if (retval) {
+                        cpuidle_unregister_driver(&intel_idle_driver);
+                        return retval;
+                }
         }
 
         return 0;
@@ -568,7 +570,7 @@ static void __exit intel_idle_exit(void)
         cpuidle_unregister_driver(&intel_idle_driver);
 
         if (lapic_timer_reliable_states != LAPIC_TIMER_ALWAYS_RELIABLE) {
-                smp_call_function(__setup_broadcast_timer, (void *)false, 1);
+                on_each_cpu(__setup_broadcast_timer, (void *)false, 1);
                 unregister_cpu_notifier(&setup_broadcast_notifier);
         }