180 files changed, 1240 insertions, 1217 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 90ff0a47c12e..4e015c77e48e 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -357,6 +357,16 @@ config ACPI_TABLE_UPGRADE
           initrd, therefore it's safe to say Y.
           See Documentation/acpi/initrd_table_override.txt for details
 
+config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD
+        bool "Override ACPI tables from built-in initrd"
+        depends on ACPI_TABLE_UPGRADE
+        depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION=""
+        help
+          This option provides functionality to override arbitrary ACPI tables
+          from built-in uncompressed initrd.
+
+          See Documentation/acpi/initrd_table_override.txt for details
+
 config ACPI_DEBUG
         bool "Debug Statements"
         help
diff --git a/drivers/acpi/acpi_dbg.c b/drivers/acpi/acpi_dbg.c
index a2dcd62ea32f..4a434c23a196 100644
--- a/drivers/acpi/acpi_dbg.c
+++ b/drivers/acpi/acpi_dbg.c
@@ -750,48 +750,36 @@ static const struct acpi_debugger_ops acpi_aml_debugger = {
 
 int __init acpi_aml_init(void)
 {
-        int ret = 0;
-
-        if (!acpi_debugfs_dir) {
-                ret = -ENOENT;
-                goto err_exit;
-        }
+        int ret;
 
         /* Initialize AML IO interface */
         mutex_init(&acpi_aml_io.lock);
         init_waitqueue_head(&acpi_aml_io.wait);
         acpi_aml_io.out_crc.buf = acpi_aml_io.out_buf;
         acpi_aml_io.in_crc.buf = acpi_aml_io.in_buf;
+
         acpi_aml_dentry = debugfs_create_file("acpidbg",
                                               S_IFREG | S_IRUGO | S_IWUSR,
                                               acpi_debugfs_dir, NULL,
                                               &acpi_aml_operations);
-        if (acpi_aml_dentry == NULL) {
-                ret = -ENODEV;
-                goto err_exit;
-        }
-        ret = acpi_register_debugger(THIS_MODULE, &acpi_aml_debugger);
-        if (ret)
-                goto err_fs;
-        acpi_aml_initialized = true;
 
-err_fs:
+        ret = acpi_register_debugger(THIS_MODULE, &acpi_aml_debugger);
         if (ret) {
                 debugfs_remove(acpi_aml_dentry);
                 acpi_aml_dentry = NULL;
+                return ret;
         }
-err_exit:
-        return ret;
+
+        acpi_aml_initialized = true;
+        return 0;
 }
 
 void __exit acpi_aml_exit(void)
 {
         if (acpi_aml_initialized) {
                 acpi_unregister_debugger(&acpi_aml_debugger);
-                if (acpi_aml_dentry) {
-                        debugfs_remove(acpi_aml_dentry);
-                        acpi_aml_dentry = NULL;
-                }
+                debugfs_remove(acpi_aml_dentry);
+                acpi_aml_dentry = NULL;
                 acpi_aml_initialized = false;
         }
 }
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index f0b52266b3ac..d73afb562ad9 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -2124,21 +2124,29 @@ static int __init intel_opregion_present(void)
         return opregion;
 }
 
+/* Check if the chassis-type indicates there is no builtin LCD panel */
 static bool dmi_is_desktop(void)
 {
         const char *chassis_type;
+        unsigned long type;
 
         chassis_type = dmi_get_system_info(DMI_CHASSIS_TYPE);
         if (!chassis_type)
                 return false;
 
-        if (!strcmp(chassis_type, "3") || /*  3: Desktop */
-            !strcmp(chassis_type, "4") || /*  4: Low Profile Desktop */
-            !strcmp(chassis_type, "5") || /*  5: Pizza Box */
-            !strcmp(chassis_type, "6") || /*  6: Mini Tower */
-            !strcmp(chassis_type, "7") || /*  7: Tower */
-            !strcmp(chassis_type, "11"))  /* 11: Main Server Chassis */
+        if (kstrtoul(chassis_type, 10, &type) != 0)
+                return false;
+
+        switch (type) {
+        case 0x03: /* Desktop */
+        case 0x04: /* Low Profile Desktop */
+        case 0x05: /* Pizza Box */
+        case 0x06: /* Mini Tower */
+        case 0x07: /* Tower */
+        case 0x10: /* Lunch Box */
+        case 0x11: /* Main Server Chassis */
                 return true;
+        }
 
         return false;
 }
diff --git a/drivers/acpi/acpica/acapps.h b/drivers/acpi/acpica/acapps.h
index 5a9c2febc0fb..863ade9add6d 100644
--- a/drivers/acpi/acpica/acapps.h
+++ b/drivers/acpi/acpica/acapps.h
@@ -3,7 +3,7 @@
  *
  * Module Name: acapps - common include for ACPI applications/tools
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -17,7 +17,7 @@
 /* Common info for tool signons */
 
 #define ACPICA_NAME                 "Intel ACPI Component Architecture"
-#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2018 Intel Corporation"
+#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2019 Intel Corporation"
 
 #if ACPI_MACHINE_WIDTH == 64
 #define ACPI_WIDTH          " (64-bit version)"
diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h
index 8bc935977d8e..54f81eac7ec9 100644
--- a/drivers/acpi/acpica/accommon.h
+++ b/drivers/acpi/acpica/accommon.h
@@ -3,7 +3,7 @@
  *
  * Name: accommon.h - Common include files for generation of ACPICA source
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/acconvert.h b/drivers/acpi/acpica/acconvert.h
index 4ebe18826646..d5478cd4a857 100644
--- a/drivers/acpi/acpica/acconvert.h
+++ b/drivers/acpi/acpica/acconvert.h
@@ -3,7 +3,7 @@
  *
  * Module Name: acapps - common include for ACPI applications/tools
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index 57d9495e5933..32f2e38c7570 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -3,7 +3,7 @@
  *
  * Name: acdebug.h - ACPI/AML debugger
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -16,7 +16,8 @@
 #include "acdisasm.h"
 #endif
 
-#define ACPI_DEBUG_BUFFER_SIZE  0x4000  /* 16K buffer for return objects */
+#define ACPI_DEBUG_BUFFER_SIZE      0x4000      /* 16K buffer for return objects */
+#define ACPI_DEBUG_LENGTH_FORMAT    " (%.4X bits, %.3X bytes)"
 
 struct acpi_db_command_info {
         const char *name;       /* Command Name */
diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
index e577f3a40e6a..82f81501566b 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h
@@ -3,7 +3,7 @@
  *
  * Name: acdispat.h - dispatcher (parser to interpreter interface)
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index b412aa909907..831660179662 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -3,7 +3,7 @@
  *
  * Name: acevents.h - Event subcomponent prototypes and defines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 87d6eb01beaf..d056a1845613 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -3,7 +3,7 @@
  *
  * Name: acglobal.h - Declarations for global variables
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -164,6 +164,7 @@ ACPI_GLOBAL(struct acpi_memory_list *, acpi_gbl_global_list);
 ACPI_GLOBAL(struct acpi_memory_list *, acpi_gbl_ns_node_list);
 ACPI_GLOBAL(u8, acpi_gbl_display_final_mem_stats);
 ACPI_GLOBAL(u8, acpi_gbl_disable_mem_tracking);
+ACPI_GLOBAL(u8, acpi_gbl_verbose_leak_dump);
 #endif
 
 /*****************************************************************************
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index ef99e2fc37f8..bcf8f7501db7 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -3,7 +3,7 @@
  *
  * Name: achware.h -- hardware specific interfaces
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index c5b2be0b6613..20706adbc148 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h
@@ -3,7 +3,7 @@
  *
  * Name: acinterp.h - Interpreter subcomponent prototypes and defines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 99b0da899109..a2dfbf6b004e 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -3,7 +3,7 @@
  *
  * Name: aclocal.h - Internal data types used across the ACPI subsystem
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -802,7 +802,7 @@ struct acpi_comment_addr_node {
 
 /*
  * File node - used for "Include" operator file stack and
- * depdendency tree for the -ca option
+ * dependency tree for the -ca option
  */
 struct acpi_file_node {
         void *file;
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index de52cd6e868a..283614e82a20 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -3,7 +3,7 @@
  *
  * Name: acmacros.h - C macros for the entire subsystem.
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -462,7 +462,7 @@
 #define ACPI_IS_OCTAL_DIGIT(d)              (((char)(d) >= '0') && ((char)(d) <= '7'))
 
 /*
- * Macors used for the ASL-/ASL+ converter utility
+ * Macros used for the ASL-/ASL+ converter utility
  */
 #ifdef ACPI_ASL_COMPILER
 
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 9bd25f36c608..39812fc4386a 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -3,7 +3,7 @@
  *
  * Name: acnamesp.h - Namespace subcomponent prototypes and defines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index ac992b6ebce9..b2ef703d7df8 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -3,7 +3,7 @@
  *
  * Name: acobject.h - Definition of union acpi_operand_object  (Internal object only)
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -239,6 +239,7 @@ struct acpi_object_region_field {
         union acpi_operand_object *region_obj;  /* Containing op_region object */
         u8 *resource_buffer;    /* resource_template for serial regions/fields */
         u16 pin_number_index;   /* Index relative to previous Connection/Template */
+        u8 *internal_pcc_buffer;        /* Internal buffer for fields associated with PCC */
 };
 
 struct acpi_object_bank_field {
diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h
index 818eba413614..9d78134428e3 100644
--- a/drivers/acpi/acpica/acopcode.h
+++ b/drivers/acpi/acpica/acopcode.h
@@ -3,7 +3,7 @@
  *
  * Name: acopcode.h - AML opcode information for the AML parser and interpreter
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index ab48196ae55e..6e32c97cba6c 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h
@@ -3,7 +3,7 @@
  *
  * Module Name: acparser.h - AML Parser subcomponent prototypes and defines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index d31bb04facb6..387163b962a7 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -3,7 +3,7 @@
  *
  * Name: acpredef - Information table for ACPI predefined methods and objects
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -631,6 +631,21 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = {
         {{"_MTL", METHOD_0ARGS, /* ACPI 6.0 */
           METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
 
+        {{"_NBS", METHOD_0ARGS, /* ACPI 6.3 */
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_NCH", METHOD_0ARGS, /* ACPI 6.3 */
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_NIC", METHOD_0ARGS, /* ACPI 6.3 */
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_NIG", METHOD_1ARGS(ACPI_TYPE_BUFFER),       /* ACPI 6.3 */
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_NIH", METHOD_0ARGS, /* ACPI 6.3 */
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
         {{"_NTT", METHOD_0ARGS,
           METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
 
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index 59ae8b1a6e40..422cd8f2b92e 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -3,7 +3,7 @@
  *
  * Name: acresrc.h - Resource Manager function prototypes
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 14be32961b4c..8a4e6b4aaf2c 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -3,7 +3,7 @@
  *
  * Name: acstruct.h - Internal structs
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 12fac33ce77e..dfbf1dbd4033 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -3,7 +3,7 @@
  *
  * Name: actables.h - ACPI table management
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 3374d41582b5..9022537567e9 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -3,7 +3,7 @@
  *
  * Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h
index 6c05355447c1..49e412edd7c6 100644
--- a/drivers/acpi/acpica/amlcode.h
+++ b/drivers/acpi/acpica/amlcode.h
@@ -5,7 +5,7 @@
  *                   Declarations and definitions contained herein are derived
  *                   directly from the ACPI specification.
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h
index cdb590176e9d..7c3bd4ab60fc 100644
--- a/drivers/acpi/acpica/amlresrc.h
+++ b/drivers/acpi/acpica/amlresrc.h
@@ -3,7 +3,7 @@
  *
  * Module Name: amlresrc.h - AML resource descriptors
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/dbdisply.c b/drivers/acpi/acpica/dbdisply.c
index 9fcb8ec64681..30ab62b0fec8 100644
--- a/drivers/acpi/acpica/dbdisply.c
+++ b/drivers/acpi/acpica/dbdisply.c
@@ -237,7 +237,7 @@ void acpi_db_decode_and_display_object(char *target, char *output_type)
 
                 default:
 
-                        /* Is not a recognizeable object */
+                        /* Is not a recognizable object */
 
                         acpi_os_printf
                             ("Not a known ACPI internal object, descriptor type %2.2X\n",
@@ -647,7 +647,7 @@ void acpi_db_display_object_type(char *object_arg)
  *
  * DESCRIPTION: Display the result of an AML opcode
  *
- * Note: Curently only displays the result object if we are single stepping.
+ * Note: Currently only displays the result object if we are single stepping.
  * However, this output may be useful in other contexts and could be enabled
  * to do so if needed.
  *
diff --git a/drivers/acpi/acpica/dbexec.c b/drivers/acpi/acpica/dbexec.c
index 6abb6b834d97..bb43305cb215 100644
--- a/drivers/acpi/acpica/dbexec.c
+++ b/drivers/acpi/acpica/dbexec.c
@@ -160,12 +160,12 @@ acpi_db_execute_method(struct acpi_db_method_info *info,
                 }
 
                 ACPI_EXCEPTION((AE_INFO, status,
-                                "while executing %s from debugger",
+                                "while executing %s from AML Debugger",
                                 info->pathname));
 
                 if (status == AE_BUFFER_OVERFLOW) {
                         ACPI_ERROR((AE_INFO,
-                                    "Possible overflow of internal debugger "
+                                    "Possible buffer overflow within AML Debugger "
                                     "buffer (size 0x%X needed 0x%X)",
                                     ACPI_DEBUG_BUFFER_SIZE,
                                     (u32)return_obj->length));
diff --git a/drivers/acpi/acpica/dbhistry.c b/drivers/acpi/acpica/dbhistry.c
index b0b9a26c7db5..7809bd94a18d 100644
--- a/drivers/acpi/acpica/dbhistry.c
+++ b/drivers/acpi/acpica/dbhistry.c
@@ -3,7 +3,7 @@
  *
  * Module Name: dbhistry - debugger HISTORY command
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/dbnames.c b/drivers/acpi/acpica/dbnames.c
index 992bd7b92540..004d34d9369b 100644
--- a/drivers/acpi/acpica/dbnames.c
+++ b/drivers/acpi/acpica/dbnames.c
@@ -904,7 +904,7 @@ acpi_db_bus_walk(acpi_handle obj_handle,
  *
  * RETURN:      None
  *
- * DESCRIPTION: Display info about system busses.
+ * DESCRIPTION: Display info about system buses.
  *
  ******************************************************************************/
 
diff --git a/drivers/acpi/acpica/dbobject.c b/drivers/acpi/acpica/dbobject.c
index a1c76bf21122..d220168dca01 100644
--- a/drivers/acpi/acpica/dbobject.c
+++ b/drivers/acpi/acpica/dbobject.c
@@ -243,7 +243,7 @@ acpi_db_display_internal_object(union acpi_operand_object *obj_desc,
                         acpi_os_printf("[%s] ",
                                        acpi_ut_get_reference_name(obj_desc));
 
-                        /* Decode the refererence */
+                        /* Decode the reference */
 
                         switch (obj_desc->reference.class) {
                         case ACPI_REFCLASS_LOCAL:
diff --git a/drivers/acpi/acpica/dbtest.c b/drivers/acpi/acpica/dbtest.c
index 8a5462439a97..6db44a5ac786 100644
--- a/drivers/acpi/acpica/dbtest.c
+++ b/drivers/acpi/acpica/dbtest.c
@@ -10,6 +10,7 @@
 #include "acdebug.h"
 #include "acnamesp.h"
 #include "acpredef.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_CA_DEBUGGER
 ACPI_MODULE_NAME("dbtest")
@@ -33,6 +34,9 @@ acpi_db_test_string_type(struct acpi_namespace_node *node, u32 byte_length);
 static acpi_status acpi_db_test_package_type(struct acpi_namespace_node *node);
 
 static acpi_status
+acpi_db_test_field_unit_type(union acpi_operand_object *obj_desc);
+
+static acpi_status
 acpi_db_read_from_object(struct acpi_namespace_node *node,
                          acpi_object_type expected_type,
                          union acpi_object **value);
@@ -74,7 +78,7 @@ static struct acpi_db_argument_info acpi_db_test_types[] = {
 static acpi_handle read_handle = NULL;
 static acpi_handle write_handle = NULL;
 
-/* ASL Definitions of the debugger read/write control methods */
+/* ASL Definitions of the debugger read/write control methods. AML below. */
 
 #if 0
 definition_block("ssdt.aml", "SSDT", 2, "Intel", "DEBUG", 0x00000001)
@@ -227,10 +231,8 @@ static void acpi_db_test_all_objects(void)
  * RETURN:      Status
  *
  * DESCRIPTION: Test one namespace object. Supported types are Integer,
- *              String, Buffer, buffer_field, and field_unit. All other object
- *              types are simply ignored.
- *
- *              Note: Support for Packages is not implemented.
+ *              String, Buffer, Package, buffer_field, and field_unit.
+ *              All other object types are simply ignored.
  *
  ******************************************************************************/
 
@@ -240,7 +242,6 @@ acpi_db_test_one_object(acpi_handle obj_handle,
 {
         struct acpi_namespace_node *node;
         union acpi_operand_object *obj_desc;
-        union acpi_operand_object *region_obj;
         acpi_object_type local_type;
         u32 bit_length = 0;
         u32 byte_length = 0;
@@ -281,18 +282,21 @@ acpi_db_test_one_object(acpi_handle obj_handle,
                 break;
 
         case ACPI_TYPE_FIELD_UNIT:
-        case ACPI_TYPE_BUFFER_FIELD:
         case ACPI_TYPE_LOCAL_REGION_FIELD:
         case ACPI_TYPE_LOCAL_INDEX_FIELD:
         case ACPI_TYPE_LOCAL_BANK_FIELD:
 
+                local_type = ACPI_TYPE_FIELD_UNIT;
+                break;
+
+        case ACPI_TYPE_BUFFER_FIELD:
+                /*
+                 * The returned object will be a Buffer if the field length
+                 * is larger than the size of an Integer (32 or 64 bits
+                 * depending on the DSDT version).
+                 */
                 local_type = ACPI_TYPE_INTEGER;
                 if (obj_desc) {
-                        /*
-                         * Returned object will be a Buffer if the field length
-                         * is larger than the size of an Integer (32 or 64 bits
-                         * depending on the DSDT version).
-                         */
                         bit_length = obj_desc->common_field.bit_length;
                         byte_length = ACPI_ROUND_BITS_UP_TO_BYTES(bit_length);
                         if (bit_length > acpi_gbl_integer_bit_width) {
@@ -303,7 +307,7 @@ acpi_db_test_one_object(acpi_handle obj_handle,
 
         default:
 
-                /* Ignore all other types */
+                /* Ignore all non-data types - Methods, Devices, Scopes, etc. */
 
                 return (AE_OK);
         }
@@ -314,40 +318,10 @@ acpi_db_test_one_object(acpi_handle obj_handle,
                        acpi_ut_get_type_name(node->type), node->name.ascii);
 
         if (!obj_desc) {
-                acpi_os_printf(" Ignoring, no attached object\n");
+                acpi_os_printf(" No attached sub-object, ignoring\n");
                 return (AE_OK);
         }
 
-        /*
-         * Check for unsupported region types. Note: acpi_exec simulates
-         * access to system_memory, system_IO, PCI_Config, and EC.
-         */
-        switch (node->type) {
-        case ACPI_TYPE_LOCAL_REGION_FIELD:
-
-                region_obj = obj_desc->field.region_obj;
-                switch (region_obj->region.space_id) {
-                case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                case ACPI_ADR_SPACE_SYSTEM_IO:
-                case ACPI_ADR_SPACE_PCI_CONFIG:
-
-                        break;
-
-                default:
-
-                        acpi_os_printf
-                            ("    %s space is not supported in this command [%4.4s]\n",
-                             acpi_ut_get_region_name(region_obj->region.
-                                                     space_id),
-                             region_obj->region.node->name.ascii);
-                        return (AE_OK);
-                }
-                break;
-
-        default:
-                break;
-        }
-
         /* At this point, we have resolved the object to one of the major types */
 
         switch (local_type) {
@@ -371,6 +345,11 @@ acpi_db_test_one_object(acpi_handle obj_handle,
                 status = acpi_db_test_package_type(node);
                 break;
 
+        case ACPI_TYPE_FIELD_UNIT:
+
+                status = acpi_db_test_field_unit_type(obj_desc);
+                break;
+
         default:
 
                 acpi_os_printf(" Ignoring, type not implemented (%2.2X)",
@@ -382,24 +361,8 @@ acpi_db_test_one_object(acpi_handle obj_handle,
 
         if (ACPI_FAILURE(status)) {
                 status = AE_OK;
-                goto exit;
-        }
-
-        switch (node->type) {
-        case ACPI_TYPE_LOCAL_REGION_FIELD:
-
-                region_obj = obj_desc->field.region_obj;
-                acpi_os_printf(" (%s)",
-                               acpi_ut_get_region_name(region_obj->region.
-                                                       space_id));
-
-                break;
-
-        default:
-                break;
         }
 
-exit:
         acpi_os_printf("\n");
         return (status);
 }
@@ -444,7 +407,7 @@ acpi_db_test_integer_type(struct acpi_namespace_node *node, u32 bit_length)
                 return (status);
         }
 
-        acpi_os_printf(" (%4.4X/%3.3X) %8.8X%8.8X",
+        acpi_os_printf(ACPI_DEBUG_LENGTH_FORMAT " %8.8X%8.8X",
                        bit_length, ACPI_ROUND_BITS_UP_TO_BYTES(bit_length),
                        ACPI_FORMAT_UINT64(temp1->integer.value));
 
@@ -558,8 +521,9 @@ acpi_db_test_buffer_type(struct acpi_namespace_node *node, u32 bit_length)
 
         /* Emit a few bytes of the buffer */
 
-        acpi_os_printf(" (%4.4X/%3.3X)", bit_length, temp1->buffer.length);
-        for (i = 0; ((i < 4) && (i < byte_length)); i++) {
+        acpi_os_printf(ACPI_DEBUG_LENGTH_FORMAT, bit_length,
+                       temp1->buffer.length);
+        for (i = 0; ((i < 8) && (i < byte_length)); i++) {
                 acpi_os_printf(" %2.2X", temp1->buffer.pointer[i]);
         }
         acpi_os_printf("... ");
@@ -665,8 +629,9 @@ acpi_db_test_string_type(struct acpi_namespace_node *node, u32 byte_length)
                 return (status);
         }
 
-        acpi_os_printf(" (%4.4X/%3.3X) \"%s\"", (temp1->string.length * 8),
-                       temp1->string.length, temp1->string.pointer);
+        acpi_os_printf(ACPI_DEBUG_LENGTH_FORMAT " \"%s\"",
+                       (temp1->string.length * 8), temp1->string.length,
+                       temp1->string.pointer);
 
         /* Write a new value */
 
@@ -750,13 +715,80 @@ static acpi_status acpi_db_test_package_type(struct acpi_namespace_node *node)
                 return (status);
         }
 
-        acpi_os_printf(" %8.8X Elements", temp1->package.count);
+        acpi_os_printf(" %.2X Elements", temp1->package.count);
         acpi_os_free(temp1);
         return (status);
 }
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_db_test_field_unit_type
+ *
+ * PARAMETERS:  obj_desc                - A field unit object
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Test read/write on a named field unit.
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_db_test_field_unit_type(union acpi_operand_object *obj_desc)
+{
+        union acpi_operand_object *region_obj;
+        u32 bit_length = 0;
+        u32 byte_length = 0;
+        acpi_status status = AE_OK;
+        union acpi_operand_object *ret_buffer_desc;
+
+        /* Supported spaces are memory/io/pci_config */
+
+        region_obj = obj_desc->field.region_obj;
+        switch (region_obj->region.space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+        case ACPI_ADR_SPACE_PCI_CONFIG:
+
+                /* Need the interpreter to execute */
+
+                acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
+                acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+
+                /* Exercise read-then-write */
+
+                status =
+                    acpi_ex_read_data_from_field(NULL, obj_desc,
+                                                 &ret_buffer_desc);
+                if (status == AE_OK) {
+                        acpi_ex_write_data_to_field(ret_buffer_desc, obj_desc,
+                                                    NULL);
+                        acpi_ut_remove_reference(ret_buffer_desc);
+                }
+
+                acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+                acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
+
+                bit_length = obj_desc->common_field.bit_length;
+                byte_length = ACPI_ROUND_BITS_UP_TO_BYTES(bit_length);
+
+                acpi_os_printf(ACPI_DEBUG_LENGTH_FORMAT " [%s]", bit_length,
+                               byte_length,
+                               acpi_ut_get_region_name(region_obj->region.
+                                                       space_id));
+                return (status);
+
+        default:
+
+                acpi_os_printf
+                    ("      %s address space is not supported in this command [%4.4s]",
+                     acpi_ut_get_region_name(region_obj->region.space_id),
+                     region_obj->region.node->name.ascii);
+                return (AE_OK);
+        }
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_db_read_from_object
  *
  * PARAMETERS:  node                - Parent NS node for the object
diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c
index 6b15625e8099..85b34d02233e 100644
--- a/drivers/acpi/acpica/dsargs.c
+++ b/drivers/acpi/acpica/dsargs.c
@@ -4,7 +4,7 @@
  * Module Name: dsargs - Support for execution of dynamic arguments for static
  *                       objects (regions, fields, buffer fields, etc.)
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/dscontrol.c b/drivers/acpi/acpica/dscontrol.c
index 0da96268deb5..4847f89c678c 100644
--- a/drivers/acpi/acpica/dscontrol.c
+++ b/drivers/acpi/acpica/dscontrol.c
@@ -4,7 +4,7 @@
  * Module Name: dscontrol - Support for execution control opcodes -
  *                          if/else/while/return
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/dsdebug.c b/drivers/acpi/acpica/dsdebug.c
index 9d33f0bb2885..0d3e1ced1f57 100644
--- a/drivers/acpi/acpica/dsdebug.c
+++ b/drivers/acpi/acpica/dsdebug.c
@@ -3,7 +3,7 @@
  *
  * Module Name: dsdebug - Parser/Interpreter interface - debugging
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index 30fe89545d6a..cf4e061bb0f0 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -3,7 +3,7 @@
  *
  * Module Name: dsfield - Dispatcher field routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -518,6 +518,13 @@ 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);
+        if (info.region_node->object->region.space_id ==
+            ACPI_ADR_SPACE_PLATFORM_COMM
+            && !(region_node->object->field.internal_pcc_buffer =
+                 ACPI_ALLOCATE_ZEROED(info.region_node->object->region.
+                                      length))) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c
index e8de1b0ce2f5..a4a24ffe5fae 100644
--- a/drivers/acpi/acpica/dsinit.c
+++ b/drivers/acpi/acpica/dsinit.c
@@ -3,7 +3,7 @@
  *
  * Module Name: dsinit - Object initialization namespace walk
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index c1a4d02fafd5..f59b4d944f7f 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -3,7 +3,7 @@
  *
  * Module Name: dsmethod - Parser/Interpreter interface - control method parsing
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index 6a9cc613adaa..179129a2deb1 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -3,7 +3,7 @@
  *
  * Module Name: dsobject - Dispatcher object management routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index 78f9de260d5f..10f32b62608e 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -3,7 +3,7 @@
  *
  * Module Name: dsopcode - Dispatcher support for regions and fields
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -130,8 +130,8 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
                 /* Must have a valid (>0) bit count */
 
                 if (bit_count == 0) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Attempt to CreateField of length zero"));
+                        ACPI_BIOS_ERROR((AE_INFO,
+                                         "Attempt to CreateField of length zero"));
                         status = AE_AML_OPERAND_VALUE;
                         goto cleanup;
                 }
@@ -194,12 +194,13 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
         /* Entire field must fit within the current length of the buffer */
 
         if ((bit_offset + bit_count) > (8 * (u32)buffer_desc->buffer.length)) {
-                ACPI_ERROR((AE_INFO,
-                            "Field [%4.4s] at bit offset/length %u/%u "
-                            "exceeds size of target Buffer (%u bits)",
-                            acpi_ut_get_node_name(result_desc), bit_offset,
-                            bit_count, 8 * (u32)buffer_desc->buffer.length));
                 status = AE_AML_BUFFER_LIMIT;
+                ACPI_BIOS_EXCEPTION((AE_INFO, status,
+                                     "Field [%4.4s] at bit offset/length %u/%u "
+                                     "exceeds size of target Buffer (%u bits)",
+                                     acpi_ut_get_node_name(result_desc),
+                                     bit_offset, bit_count,
+                                     8 * (u32)buffer_desc->buffer.length));
                 goto cleanup;
         }
 
@@ -355,6 +356,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
         union acpi_operand_object *operand_desc;
         struct acpi_namespace_node *node;
         union acpi_parse_object *next_op;
+        acpi_adr_space_type space_id;
 
         ACPI_FUNCTION_TRACE_PTR(ds_eval_region_operands, op);
 
@@ -367,6 +369,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
         /* next_op points to the op that holds the space_ID */
 
         next_op = op->common.value.arg;
+        space_id = (acpi_adr_space_type)next_op->common.value.integer;
 
         /* next_op points to address op */
 
@@ -402,6 +405,15 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
         obj_desc->region.length = (u32) operand_desc->integer.value;
         acpi_ut_remove_reference(operand_desc);
 
+        /* A zero-length operation region is unusable. Just warn */
+
+        if (!obj_desc->region.length
+            && (space_id < ACPI_NUM_PREDEFINED_REGIONS)) {
+                ACPI_WARNING((AE_INFO,
+                              "Operation Region [%4.4s] has zero length (SpaceId %X)",
+                              node->name.ascii, space_id));
+        }
+
         /*
          * Get the address and save it
          * (at top of stack - 1)
diff --git a/drivers/acpi/acpica/dspkginit.c b/drivers/acpi/acpica/dspkginit.c
index 584853385268..997faa10f615 100644
--- a/drivers/acpi/acpica/dspkginit.c
+++ b/drivers/acpi/acpica/dspkginit.c
@@ -3,7 +3,7 @@
  *
  * Module Name: dspkginit - Completion of deferred package initialization
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index 1504b93cc5f4..d75aae304595 100644
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -4,7 +4,7 @@
  * Module Name: dswexec - Dispatcher method execution callbacks;
  *                        dispatch to interpreter.
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index e2ef09643d50..c88fd31208a5 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -3,7 +3,7 @@
  *
  * Module Name: dswload - Dispatcher first pass namespace load callbacks
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c
index 9a309f5c4de8..935a8e2623e4 100644
--- a/drivers/acpi/acpica/dswload2.c
+++ b/drivers/acpi/acpica/dswload2.c
@@ -3,7 +3,7 @@
  *
  * Module Name: dswload2 - Dispatcher second pass namespace load callbacks
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -24,7 +24,7 @@ ACPI_MODULE_NAME("dswload2")
  * FUNCTION:    acpi_ds_load2_begin_op
  *
  * PARAMETERS:  walk_state      - Current state of the parse tree walk
- *              out_op          - Wher to return op if a new one is created
+ *              out_op          - Where to return op if a new one is created
  *
  * RETURN:      Status
  *
diff --git a/drivers/acpi/acpica/dswscope.c b/drivers/acpi/acpica/dswscope.c
index 7592176a8fa2..39acf7b286da 100644
--- a/drivers/acpi/acpica/dswscope.c
+++ b/drivers/acpi/acpica/dswscope.c
@@ -3,7 +3,7 @@
  *
  * Module Name: dswscope - Scope stack manipulation
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
index 4c1ec202d5ab..de79f835a373 100644
--- a/drivers/acpi/acpica/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -3,7 +3,7 @@
  *
  * Module Name: dswstate - Dispatcher parse tree walk management routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/evevent.c b/drivers/acpi/acpica/evevent.c
index b3d07cc14d75..9e2f5a05c066 100644
--- a/drivers/acpi/acpica/evevent.c
+++ b/drivers/acpi/acpica/evevent.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evevent - Fixed Event handling and dispatch
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/evglock.c b/drivers/acpi/acpica/evglock.c
index 1b8a662a14a9..5c77bee5d31f 100644
--- a/drivers/acpi/acpica/evglock.c
+++ b/drivers/acpi/acpica/evglock.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evglock - Global Lock support
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index e10fec99a182..62d3aa74277b 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evgpe - General Purpose Event handling and dispatch
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -801,7 +801,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
                                                               dispatch.handler->
                                                               context);
 
-                /* If requested, clear (if level-triggered) and reenable the GPE */
+                /* If requested, clear (if level-triggered) and re-enable the GPE */
 
                 if (return_value & ACPI_REENABLE_GPE) {
                         (void)acpi_ev_finish_gpe(gpe_event_info);
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index b253063b09d3..328d1d6123ad 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evgpeblk - GPE block creation and initialization.
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c
index 1f686750bb1a..c92d2f6ebe01 100644
--- a/drivers/acpi/acpica/evgpeinit.c
+++ b/drivers/acpi/acpica/evgpeinit.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evgpeinit - System GPE initialization and update
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c
index 0fb6c70f44ed..917892227e09 100644
--- a/drivers/acpi/acpica/evgpeutil.c
+++ b/drivers/acpi/acpica/evgpeutil.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evgpeutil - GPE utilities
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/evhandler.c b/drivers/acpi/acpica/evhandler.c
index 4ed1e67db6be..3ef4e27995f0 100644
--- a/drivers/acpi/acpica/evhandler.c
+++ b/drivers/acpi/acpica/evhandler.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evhandler - Support for Address Space handlers
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index baadd635b5af..d45f7639f7ee 100644
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evmisc - Miscellaneous event manager support functions
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 49decca4e08f..45dc797df05d 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evregion - Operation Region support
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -250,7 +250,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 /*
                  * For handlers other than the default (supplied) handlers, we must
                  * exit the interpreter because the handler *might* block -- we don't
-                 * know what it will do, so we can't hold the lock on the intepreter.
+                 * know what it will do, so we can't hold the lock on the interpreter.
                  */
                 acpi_ex_exit_interpreter();
         }
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 17df5dacd43c..0b47bbcd2a23 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evrgnini- ACPI address_space (op_region) init
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -516,25 +516,6 @@ acpi_status acpi_ev_initialize_region(union acpi_operand_object *region_obj)
                                 handler_obj = obj_desc->common_notify.handler;
                                 break;
 
-                        case ACPI_TYPE_METHOD:
-                                /*
-                                 * If we are executing module level code, the original
-                                 * Node's object was replaced by this Method object and we
-                                 * saved the handler in the method object.
-                                 *
-                                 * Note: Only used for the legacy MLC support. Will
-                                 * be removed in the future.
-                                 *
-                                 * See acpi_ns_exec_module_code
-                                 */
-                                if (!acpi_gbl_execute_tables_as_methods &&
-                                    obj_desc->method.
-                                    info_flags & ACPI_METHOD_MODULE_LEVEL) {
-                                        handler_obj =
-                                            obj_desc->method.dispatch.handler;
-                                }
-                                break;
-
                         default:
 
                                 /* Ignore other objects */
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index febc332b00ac..3df00eb6621b 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evxface - External interfaces for ACPI events
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index 970e940bdb17..e528fe56b755 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evxfevnt - External Interfaces, ACPI event disable/enable
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index b2d5f66cc1b0..30a083902f52 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evxfgpe - External Interfaces for General Purpose Events (GPEs)
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -669,9 +669,9 @@ ACPI_EXPORT_SYMBOL(acpi_dispatch_gpe)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Clear and conditionally reenable a GPE. This completes the GPE
+ * DESCRIPTION: Clear and conditionally re-enable a GPE. This completes the GPE
  *              processing. Intended for use by asynchronous host-installed
- *              GPE handlers. The GPE is only reenabled if the enable_for_run bit
+ *              GPE handlers. The GPE is only re-enabled if the enable_for_run bit
  *              is set in the GPE info.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index 3b3a25d9f0e6..47265b073e6f 100644
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -4,7 +4,7 @@
  * Module Name: evxfregn - External Interfaces, ACPI Operation Regions and
  *                         Address Spaces.
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exconcat.c b/drivers/acpi/acpica/exconcat.c
index 5e75c510ca25..c7af07566b7b 100644
--- a/drivers/acpi/acpica/exconcat.c
+++ b/drivers/acpi/acpica/exconcat.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exconcat - Concatenate-type AML operators
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 2373a7492151..587aeeeb5070 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exconfig - Namespace reconfiguration (Load/Unload opcodes)
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index 1a70b80cc406..ca2966bacb50 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exconvrt - Object conversion routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -520,7 +520,7 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                 for (i = 0; i < obj_desc->buffer.length; i++) {
                         if (base == 16) {
 
-                                /* Emit 0x prefix for explict/implicit hex conversion */
+                                /* Emit 0x prefix for explicit/implicit hex conversion */
 
                                 *new_buf++ = '0';
                                 *new_buf++ = 'x';
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index 3304c6b1e8a7..f376fc00064e 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -3,7 +3,7 @@
  *
  * Module Name: excreate - Named object creation
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index ebbc244039ab..b1aeec8cac55 100644
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exdebug - Support for stores to the AML Debug Object
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c
index f71dfa1e90e1..6526b2deeaad 100644
--- a/drivers/acpi/acpica/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exdump - Interpreter debug output routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index e5798f15793a..d3d2dbfba680 100644
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exfield - AML execution - field_unit read/write
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -41,6 +41,17 @@ const u8 acpi_protocol_lengths[] = {
         0xFF                    /* F - ATTRIB_RAW_PROCESS_BYTES */
 };
 
+#define PCC_MASTER_SUBSPACE     3
+
+/*
+ * The following macros determine a given offset is a COMD field.
+ * According to the specification, generic subspaces (types 0-2) contains a
+ * 2-byte COMD field at offset 4 and master subspaces (type 3) contains a 4-byte
+ * COMD field starting at offset 12.
+ */
+#define GENERIC_SUBSPACE_COMMAND(a)     (4 == a || a == 5)
+#define MASTER_SUBSPACE_COMMAND(a)      (12 <= a && a <= 15)
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_get_protocol_buffer_length
@@ -177,6 +188,25 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
 
                 status = acpi_ex_read_gpio(obj_desc, buffer);
                 goto exit;
+        } else if ((obj_desc->common.type == ACPI_TYPE_LOCAL_REGION_FIELD) &&
+                   (obj_desc->field.region_obj->region.space_id ==
+                    ACPI_ADR_SPACE_PLATFORM_COMM)) {
+                /*
+                 * Reading from a PCC field unit does not require the handler because
+                 * it only requires reading from the internal_pcc_buffer.
+                 */
+                ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
+                                  "PCC FieldRead bits %u\n",
+                                  obj_desc->field.bit_length));
+
+                memcpy(buffer,
+                       obj_desc->field.region_obj->field.internal_pcc_buffer +
+                       obj_desc->field.base_byte_offset,
+                       (acpi_size)ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->field.
+                                                              bit_length));
+
+                *ret_buffer_desc = buffer_desc;
+                return AE_OK;
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
@@ -229,6 +259,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
 {
         acpi_status status;
         u32 buffer_length;
+        u32 data_length;
         void *buffer;
 
         ACPI_FUNCTION_TRACE_PTR(ex_write_data_to_field, obj_desc);
@@ -272,6 +303,44 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
                     acpi_ex_write_serial_bus(source_desc, obj_desc,
                                              result_desc);
                 return_ACPI_STATUS(status);
+        } else if ((obj_desc->common.type == ACPI_TYPE_LOCAL_REGION_FIELD) &&
+                   (obj_desc->field.region_obj->region.space_id ==
+                    ACPI_ADR_SPACE_PLATFORM_COMM)) {
+                /*
+                 * According to the spec a write to the COMD field will invoke the
+                 * region handler. Otherwise, write to the pcc_internal buffer. This
+                 * implementation will use the offsets specified rather than the name
+                 * of the field. This is considered safer because some firmware tools
+                 * are known to obfiscate named objects.
+                 */
+                data_length =
+                    (acpi_size)ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->field.
+                                                           bit_length);
+                memcpy(obj_desc->field.region_obj->field.internal_pcc_buffer +
+                       obj_desc->field.base_byte_offset,
+                       source_desc->buffer.pointer, data_length);
+
+                if ((obj_desc->field.region_obj->region.address ==
+                     PCC_MASTER_SUBSPACE
+                     && MASTER_SUBSPACE_COMMAND(obj_desc->field.
+                                                base_byte_offset))
+                    || GENERIC_SUBSPACE_COMMAND(obj_desc->field.
+                                                base_byte_offset)) {
+
+                        /* Perform the write */
+
+                        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
+                                          "PCC COMD field has been written. Invoking PCC handler now.\n"));
+
+                        status =
+                            acpi_ex_access_region(obj_desc, 0,
+                                                  (u64 *)obj_desc->field.
+                                                  region_obj->field.
+                                                  internal_pcc_buffer,
+                                                  ACPI_WRITE);
+                        return_ACPI_STATUS(status);
+                }
+                return (AE_OK);
         }
 
         /* Get a pointer to the data to be written */
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c
index 516994133128..95a0dcb4f7b9 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exfldio - Aml Field I/O
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c
index d91f15cdf3ae..60e854965af9 100644
--- a/drivers/acpi/acpica/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c
index c06079774bad..775cd62af5b3 100644
--- a/drivers/acpi/acpica/exmutex.c
+++ b/drivers/acpi/acpica/exmutex.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exmutex - ASL Mutex Acquire/Release functions
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exnames.c b/drivers/acpi/acpica/exnames.c
index 7eed79dcda83..bd68d66e89f0 100644
--- a/drivers/acpi/acpica/exnames.c
+++ b/drivers/acpi/acpica/exnames.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exnames - interpreter/scanner name load/execute
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index ba9fbae0cf91..06e35ea09823 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exoparg1 - AML execution - opcodes with 1 argument
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index 3a477566ba1b..5e4a31a11df4 100644
--- a/drivers/acpi/acpica/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exoparg2 - AML execution - opcodes with 2 arguments
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -390,10 +390,10 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                 /* Failure means that the Index was beyond the end of the object */
 
                 if (ACPI_FAILURE(status)) {
-                        ACPI_EXCEPTION((AE_INFO, status,
-                                        "Index (0x%X%8.8X) is beyond end of object (length 0x%X)",
-                                        ACPI_FORMAT_UINT64(index),
-                                        (u32)length));
+                        ACPI_BIOS_EXCEPTION((AE_INFO, status,
+                                             "Index (0x%X%8.8X) is beyond end of object (length 0x%X)",
+                                             ACPI_FORMAT_UINT64(index),
+                                             (u32)length));
                         goto cleanup;
                 }
 
diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index 764fa6f924ff..a4ebce417930 100644
--- a/drivers/acpi/acpica/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exoparg3 - AML execution - opcodes with 3 arguments
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exoparg6.c b/drivers/acpi/acpica/exoparg6.c
index 3941525f3d6b..31385a0b2dab 100644
--- a/drivers/acpi/acpica/exoparg6.c
+++ b/drivers/acpi/acpica/exoparg6.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exoparg6 - AML execution - opcodes with 6 arguments
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index 738f3c732363..728d752f7adc 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exprep - ACPI AML field prep utilities
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 2c58f5e00b1a..c08521194b29 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exregion - ACPI default op_region (address space) handlers
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c
index ea4b0fe674f1..b223d01e6bf8 100644
--- a/drivers/acpi/acpica/exresnte.c
+++ b/drivers/acpi/acpica/exresnte.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exresnte - AML Interpreter object resolution
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index 5e42c7de46fa..36da5c0ef69c 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exresolv - AML Interpreter object resolution
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index d94190bc5985..bdfe4d33b483 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exresop - AML Interpreter operand/object resolution
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exserial.c b/drivers/acpi/acpica/exserial.c
index ec61553c4483..c5aa4b0deb70 100644
--- a/drivers/acpi/acpica/exserial.c
+++ b/drivers/acpi/acpica/exserial.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exserial - field_unit support for serial address spaces
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -21,7 +21,7 @@ ACPI_MODULE_NAME("exserial")
  * FUNCTION:    acpi_ex_read_gpio
  *
  * PARAMETERS:  obj_desc            - The named field to read
- *              buffer              - Where the return data is returnd
+ *              buffer              - Where the return data is returned
  *
  * RETURN:      Status
  *
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index 75d5665b7b2f..7f3c3571c292 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exstore - AML Interpreter object store support
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exstoren.c b/drivers/acpi/acpica/exstoren.c
index 31cba19652ed..4e43c8277f07 100644
--- a/drivers/acpi/acpica/exstoren.c
+++ b/drivers/acpi/acpica/exstoren.c
@@ -4,7 +4,7 @@
  * Module Name: exstoren - AML Interpreter object store support,
  *                        Store to Node (namespace object)
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exstorob.c b/drivers/acpi/acpica/exstorob.c
index 4cd82ff509bc..dc9e2b1c1ad9 100644
--- a/drivers/acpi/acpica/exstorob.c
+++ b/drivers/acpi/acpica/exstorob.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exstorob - AML object store support, store to object
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c
index ec8b5a22cad4..a538f7799b78 100644
--- a/drivers/acpi/acpica/exsystem.c
+++ b/drivers/acpi/acpica/exsystem.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exsystem - Interface to OS services
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/extrace.c b/drivers/acpi/acpica/extrace.c
index 9bd3fa56b51a..db7f93ca539f 100644
--- a/drivers/acpi/acpica/extrace.c
+++ b/drivers/acpi/acpica/extrace.c
@@ -3,7 +3,7 @@
  *
  * Module Name: extrace - Support for interpreter execution tracing
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c
index bd22e27adf9b..75380be1c2ef 100644
--- a/drivers/acpi/acpica/exutils.c
+++ b/drivers/acpi/acpica/exutils.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exutils - interpreter/scanner utilities
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -160,7 +160,7 @@ u8 acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc)
  * RETURN:      None
  *
  * DESCRIPTION: Obtain the ACPI hardware Global Lock, only if the field
- *              flags specifiy that it is to be obtained before field access.
+ *              flags specify that it is to be obtained before field access.
  *
  ******************************************************************************/
 
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index 525e6ea5c114..926f7e080f22 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -3,7 +3,7 @@
  *
  * Module Name: hwacpi - ACPI Hardware Initialization/Mode Interface
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/hwesleep.c b/drivers/acpi/acpica/hwesleep.c
index e0ad3f11142e..dee3affaca49 100644
--- a/drivers/acpi/acpica/hwesleep.c
+++ b/drivers/acpi/acpica/hwesleep.c
@@ -4,7 +4,7 @@
  * Name: hwesleep.c - ACPI Hardware Sleep/Wake Support functions for the
  *                    extended FADT-V5 sleep registers.
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index 2d2e2e41a685..565bd3f29f31 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -3,7 +3,7 @@
  *
  * Module Name: hwgpe - Low level GPE enable/disable/clear functions
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index d8b8fc2ff563..b62db8ec446f 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -4,7 +4,7 @@
  * Name: hwsleep.c - ACPI Hardware Sleep/Wake Support functions for the
  *                   original/legacy sleep/PM registers.
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index 5d5e27146fc2..2fb9f75d71c5 100644
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -3,7 +3,7 @@
  *
  * Name: hwtimer.c - ACPI Power Management Timer Interface
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c
index 24f9b61aa404..cd576153257c 100644
--- a/drivers/acpi/acpica/hwvalid.c
+++ b/drivers/acpi/acpica/hwvalid.c
@@ -3,7 +3,7 @@
  *
  * Module Name: hwvalid - I/O request validation
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index 6e39a771a56e..c4fd97104024 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -3,7 +3,7 @@
  *
  * Module Name: hwxface - Public ACPICA hardware interfaces
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
index 3f22f7dd4556..abbf9702aa7f 100644
--- a/drivers/acpi/acpica/hwxfsleep.c
+++ b/drivers/acpi/acpica/hwxfsleep.c
@@ -3,7 +3,7 @@
  *
  * Name: hwxfsleep.c - ACPI Hardware Sleep/Wake External Interfaces
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -23,33 +23,6 @@ acpi_hw_set_firmware_waking_vector(struct acpi_table_facs *facs,
                                    acpi_physical_address physical_address64);
 #endif
 
-static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
-
-/*
- * Dispatch table used to efficiently branch to the various sleep
- * functions.
- */
-#define ACPI_SLEEP_FUNCTION_ID         0
-#define ACPI_WAKE_PREP_FUNCTION_ID     1
-#define ACPI_WAKE_FUNCTION_ID          2
-
-/* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
-
-static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
-        {ACPI_STRUCT_INIT(legacy_function,
-                          ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep)),
-         ACPI_STRUCT_INIT(extended_function,
-                          acpi_hw_extended_sleep)},
-        {ACPI_STRUCT_INIT(legacy_function,
-                          ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep)),
-         ACPI_STRUCT_INIT(extended_function,
-                          acpi_hw_extended_wake_prep)},
-        {ACPI_STRUCT_INIT(legacy_function,
-                          ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake)),
-         ACPI_STRUCT_INIT(extended_function,
-                          acpi_hw_extended_wake)}
-};
-
 /*
  * These functions are removed for the ACPI_REDUCED_HARDWARE case:
  *      acpi_set_firmware_waking_vector
@@ -209,53 +182,6 @@ acpi_status acpi_enter_sleep_state_s4bios(void)
 
 ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios)
 #endif                          /* !ACPI_REDUCED_HARDWARE */
-/*******************************************************************************
- *
- * FUNCTION:    acpi_hw_sleep_dispatch
- *
- * PARAMETERS:  sleep_state         - Which sleep state to enter/exit
- *              function_id         - Sleep, wake_prep, or Wake
- *
- * RETURN:      Status from the invoked sleep handling function.
- *
- * DESCRIPTION: Dispatch a sleep/wake request to the appropriate handling
- *              function.
- *
- ******************************************************************************/
-static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id)
-{
-        acpi_status status;
-        struct acpi_sleep_functions *sleep_functions =
-            &acpi_sleep_dispatch[function_id];
-
-#if (!ACPI_REDUCED_HARDWARE)
-        /*
-         * If the Hardware Reduced flag is set (from the FADT), we must
-         * use the extended sleep registers (FADT). Note: As per the ACPI
-         * specification, these extended registers are to be used for HW-reduced
-         * platforms only. They are not general-purpose replacements for the
-         * legacy PM register sleep support.
-         */
-        if (acpi_gbl_reduced_hardware) {
-                status = sleep_functions->extended_function(sleep_state);
-        } else {
-                /* Legacy sleep */
-
-                status = sleep_functions->legacy_function(sleep_state);
-        }
-
-        return (status);
-
-#else
-        /*
-         * For the case where reduced-hardware-only code is being generated,
-         * we know that only the extended sleep registers are available
-         */
-        status = sleep_functions->extended_function(sleep_state);
-        return (status);
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
-}
 
 /*******************************************************************************
  *
@@ -362,7 +288,12 @@ acpi_status acpi_enter_sleep_state(u8 sleep_state)
                 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
         }
 
-        status = acpi_hw_sleep_dispatch(sleep_state, ACPI_SLEEP_FUNCTION_ID);
+#if !ACPI_REDUCED_HARDWARE
+        if (!acpi_gbl_reduced_hardware)
+                status = acpi_hw_legacy_sleep(sleep_state);
+        else
+#endif
+                status = acpi_hw_extended_sleep(sleep_state);
         return_ACPI_STATUS(status);
 }
 
@@ -388,8 +319,12 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state)
 
         ACPI_FUNCTION_TRACE(acpi_leave_sleep_state_prep);
 
-        status =
-            acpi_hw_sleep_dispatch(sleep_state, ACPI_WAKE_PREP_FUNCTION_ID);
+#if !ACPI_REDUCED_HARDWARE
+        if (!acpi_gbl_reduced_hardware)
+                status = acpi_hw_legacy_wake_prep(sleep_state);
+        else
+#endif
+                status = acpi_hw_extended_wake_prep(sleep_state);
         return_ACPI_STATUS(status);
 }
 
@@ -413,7 +348,12 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
 
         ACPI_FUNCTION_TRACE(acpi_leave_sleep_state);
 
-        status = acpi_hw_sleep_dispatch(sleep_state, ACPI_WAKE_FUNCTION_ID);
+#if !ACPI_REDUCED_HARDWARE
+        if (!acpi_gbl_reduced_hardware)
+                status = acpi_hw_legacy_wake(sleep_state);
+        else
+#endif
+                status = acpi_hw_extended_wake(sleep_state);
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/acpica/nsarguments.c b/drivers/acpi/acpica/nsarguments.c
index b9ede797b654..0e97ed38973f 100644
--- a/drivers/acpi/acpica/nsarguments.c
+++ b/drivers/acpi/acpica/nsarguments.c
@@ -3,7 +3,7 @@
  *
  * Module Name: nsarguments - Validation of args for ACPI predefined methods
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/nsconvert.c b/drivers/acpi/acpica/nsconvert.c
index f9527346b0f7..14cbf63f1991 100644
--- a/drivers/acpi/acpica/nsconvert.c
+++ b/drivers/acpi/acpica/nsconvert.c
@@ -4,7 +4,7 @@
  * Module Name: nsconvert - Object conversions for objects returned by
  *                          predefined methods
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index 90ccffcd770b..15070bd0c28a 100644
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -3,7 +3,7 @@
  *
  * Module Name: nsdump - table dumping routines for debug
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/nsdumpdv.c b/drivers/acpi/acpica/nsdumpdv.c
index 2b291c500fb0..73e5c83c8c9f 100644
--- a/drivers/acpi/acpica/nsdumpdv.c
+++ b/drivers/acpi/acpica/nsdumpdv.c
@@ -3,7 +3,7 @@
  *
  * Module Name: nsdump - table dumping routines for debug
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index d77257d1c827..19fb8dda870f 100644
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -3,7 +3,7 @@
  *
  * Module Name: nsinit - namespace initialization
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index 04bc73e82aed..35fff5c75da1 100644
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -3,7 +3,7 @@
  *
  * Module Name: nsload - namespace loading/expanding/contracting procedures
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -75,7 +75,7 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
                 /*
                  * On error, delete any namespace objects created by this table.
                  * We cannot initialize these objects, so delete them. There are
-                 * a couple of expecially bad cases:
+                 * a couple of especially bad cases:
                  * AE_ALREADY_EXISTS - namespace collision.
                  * AE_NOT_FOUND - the target of a Scope operator does not
                  * exist. This target of Scope must already exist in the
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index 488ff39d86f7..c0b4f7bedfab 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -3,7 +3,7 @@
  *
  * Module Name: nsparse - namespace interface to AML parser
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -253,61 +253,19 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
 
         ACPI_FUNCTION_TRACE(ns_parse_table);
 
-        if (acpi_gbl_execute_tables_as_methods) {
-                /*
-                 * This case executes the AML table as one large control method.
-                 * The point of this is to execute any module-level code in-place
-                 * as the table is parsed. Some AML code depends on this behavior.
-                 *
-                 * It is a run-time option at this time, but will eventually become
-                 * the default.
-                 *
-                 * Note: This causes the table to only have a single-pass parse.
-                 * However, this is compatible with other ACPI implementations.
-                 */
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_PARSE,
-                                      "%s: **** Start table execution pass\n",
-                                      ACPI_GET_FUNCTION_NAME));
-
-                status = acpi_ns_execute_table(table_index, start_node);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        } else {
-                /*
-                 * AML Parse, pass 1
-                 *
-                 * In this pass, we load most of the namespace. Control methods
-                 * are not parsed until later. A parse tree is not created.
-                 * Instead, each Parser Op subtree is deleted when it is finished.
-                 * This saves a great deal of memory, and allows a small cache of
-                 * parse objects to service the entire parse. The second pass of
-                 * the parse then performs another complete parse of the AML.
-                 */
-                ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start pass 1\n"));
-
-                status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1,
-                                                    table_index, start_node);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
+        /*
+         * Executes the AML table as one large control method.
+         * The point of this is to execute any module-level code in-place
+         * as the table is parsed. Some AML code depends on this behavior.
+         *
+         * Note: This causes the table to only have a single-pass parse.
+         * However, this is compatible with other ACPI implementations.
+         */
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_PARSE,
+                              "%s: **** Start table execution pass\n",
+                              ACPI_GET_FUNCTION_NAME));
 
-                /*
-                 * AML Parse, pass 2
-                 *
-                 * In this pass, we resolve forward references and other things
-                 * that could not be completed during the first pass.
-                 * Another complete parse of the AML is performed, but the
-                 * overhead of this is compensated for by the fact that the
-                 * parse objects are all cached.
-                 */
-                ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start pass 2\n"));
-                status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2,
-                                                    table_index, start_node);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
+        status = acpi_ns_execute_table(table_index, start_node);
 
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index 29c68b15a64f..2f9d93122d0c 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -3,7 +3,7 @@
  *
  * Module Name: nspredef - Validation of ACPI predefined methods and objects
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/nsprepkg.c b/drivers/acpi/acpica/nsprepkg.c
index 51523473e7fe..9a80e3b23496 100644
--- a/drivers/acpi/acpica/nsprepkg.c
+++ b/drivers/acpi/acpica/nsprepkg.c
@@ -3,7 +3,7 @@
  *
  * Module Name: nsprepkg - Validation of package objects for predefined names
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c
index ff2ab8fbec38..0aacfa48e20d 100644
--- a/drivers/acpi/acpica/nsrepair.c
+++ b/drivers/acpi/acpica/nsrepair.c
@@ -3,7 +3,7 @@
  *
  * Module Name: nsrepair - Repair for objects returned by predefined methods
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index a3bd6280882c..d5804a6d1d65 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -4,7 +4,7 @@
  * Module Name: nsrepair2 - Repair for objects returned by specific
  *                          predefined methods
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index a2bf4b2caa6c..e5cef1edf49f 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -4,7 +4,7 @@
  * Module Name: nsutils - Utilities for accessing ACPI namespace, accessing
  *                        parents and siblings and Scope manipulation
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -350,7 +350,7 @@ acpi_ns_internalize_name(const char *external_name, char **converted_name)
  *
  * FUNCTION:    acpi_ns_externalize_name
  *
- * PARAMETERS:  internal_name_length - Lenth of the internal name below
+ * PARAMETERS:  internal_name_length - Length of the internal name below
  *              internal_name       - Internal representation of name
  *              converted_name_length - Where the length is returned
  *              converted_name      - Where the resulting external name
diff --git a/drivers/acpi/acpica/nswalk.c b/drivers/acpi/acpica/nswalk.c
index e9a061da9bb2..ceea6af79d12 100644
--- a/drivers/acpi/acpica/nswalk.c
+++ b/drivers/acpi/acpica/nswalk.c
@@ -3,7 +3,7 @@
  *
  * Module Name: nswalk - Functions for walking the ACPI namespace
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index b2915c9cceaf..de2d3135d6a9 100644
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -4,7 +4,7 @@
  * Module Name: nsxfname - Public interfaces to the ACPI subsystem
  *                         ACPI Namespace oriented interfaces
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index 176d28d60125..9d9d442cd999 100644
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -3,7 +3,7 @@
  *
  * Module Name: psargs - Parse AML opcode arguments
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index e00d1af6fa80..207805047bc4 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -3,7 +3,7 @@
  *
  * Module Name: psloop - Main AML parse loop
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -32,10 +32,6 @@ static acpi_status
 acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                       u8 * aml_op_start, union acpi_parse_object *op);
 
-static void
-acpi_ps_link_module_code(union acpi_parse_object *parent_op,
-                         u8 *aml_start, u32 aml_length, acpi_owner_id owner_id);
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ps_get_arguments
@@ -56,7 +52,6 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
 {
         acpi_status status = AE_OK;
         union acpi_parse_object *arg = NULL;
-        const struct acpi_opcode_info *op_info;
 
         ACPI_FUNCTION_TRACE_PTR(ps_get_arguments, walk_state);
 
@@ -136,96 +131,6 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                                   walk_state->arg_count,
                                   walk_state->pass_number));
 
-                /*
-                 * This case handles the legacy option that groups all module-level
-                 * code blocks together and defers execution until all of the tables
-                 * are loaded. Execute all of these blocks at this time.
-                 * Execute any module-level code that was detected during the table
-                 * load phase.
-                 *
-                 * Note: this option is deprecated and will be eliminated in the
-                 * future. Use of this option can cause problems with AML code that
-                 * depends upon in-order immediate execution of module-level code.
-                 */
-                if (!acpi_gbl_execute_tables_as_methods &&
-                    (walk_state->pass_number <= ACPI_IMODE_LOAD_PASS2) &&
-                    ((walk_state->parse_flags & ACPI_PARSE_DISASSEMBLE) == 0)) {
-                        /*
-                         * We want to skip If/Else/While constructs during Pass1 because we
-                         * want to actually conditionally execute the code during Pass2.
-                         *
-                         * Except for disassembly, where we always want to walk the
-                         * If/Else/While packages
-                         */
-                        switch (op->common.aml_opcode) {
-                        case AML_IF_OP:
-                        case AML_ELSE_OP:
-                        case AML_WHILE_OP:
-                                /*
-                                 * Currently supported module-level opcodes are:
-                                 * IF/ELSE/WHILE. These appear to be the most common,
-                                 * and easiest to support since they open an AML
-                                 * package.
-                                 */
-                                if (walk_state->pass_number ==
-                                    ACPI_IMODE_LOAD_PASS1) {
-                                        acpi_ps_link_module_code(op->common.
-                                                                 parent,
-                                                                 aml_op_start,
-                                                                 (u32)
-                                                                 (walk_state->
-                                                                 parser_state.
-                                                                 pkg_end -
-                                                                 aml_op_start),
-                                                                 walk_state->
-                                                                 owner_id);
-                                }
-
-                                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                                  "Pass1: Skipping an If/Else/While body\n"));
-
-                                /* Skip body of if/else/while in pass 1 */
-
-                                walk_state->parser_state.aml =
-                                    walk_state->parser_state.pkg_end;
-                                walk_state->arg_count = 0;
-                                break;
-
-                        default:
-                                /*
-                                 * Check for an unsupported executable opcode at module
-                                 * level. We must be in PASS1, the parent must be a SCOPE,
-                                 * The opcode class must be EXECUTE, and the opcode must
-                                 * not be an argument to another opcode.
-                                 */
-                                if ((walk_state->pass_number ==
-                                     ACPI_IMODE_LOAD_PASS1)
-                                    && (op->common.parent->common.aml_opcode ==
-                                        AML_SCOPE_OP)) {
-                                        op_info =
-                                            acpi_ps_get_opcode_info(op->common.
-                                                                    aml_opcode);
-                                        if ((op_info->class ==
-                                             AML_CLASS_EXECUTE) && (!arg)) {
-                                                ACPI_WARNING((AE_INFO,
-                                                              "Unsupported module-level executable opcode "
-                                                              "0x%.2X at table offset 0x%.4X",
-                                                              op->common.
-                                                              aml_opcode,
-                                                              (u32)
-                                                              (ACPI_PTR_DIFF
-                                                               (aml_op_start,
-                                                                walk_state->
-                                                                parser_state.
-                                                                aml_start) +
-                                                               sizeof(struct
-                                                                      acpi_table_header))));
-                                        }
-                                }
-                                break;
-                        }
-                }
-
                 /* Special processing for certain opcodes */
 
                 switch (op->common.aml_opcode) {
@@ -302,104 +207,6 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ps_link_module_code
- *
- * PARAMETERS:  parent_op           - Parent parser op
- *              aml_start           - Pointer to the AML
- *              aml_length          - Length of executable AML
- *              owner_id            - owner_id of module level code
- *
- * RETURN:      None.
- *
- * DESCRIPTION: Wrap the module-level code with a method object and link the
- *              object to the global list. Note, the mutex field of the method
- *              object is used to link multiple module-level code objects.
- *
- * NOTE: In this legacy option, each block of detected executable AML
- * code that is outside of any control method is wrapped with a temporary
- * control method object and placed on a global list below.
- *
- * This function executes the module-level code for all tables only after
- * all of the tables have been loaded. It is a legacy option and is
- * not compatible with other ACPI implementations. See acpi_ns_load_table.
- *
- * This function will be removed when the legacy option is removed.
- *
- ******************************************************************************/
-
-static void
-acpi_ps_link_module_code(union acpi_parse_object *parent_op,
-                         u8 *aml_start, u32 aml_length, acpi_owner_id owner_id)
-{
-        union acpi_operand_object *prev;
-        union acpi_operand_object *next;
-        union acpi_operand_object *method_obj;
-        struct acpi_namespace_node *parent_node;
-
-        ACPI_FUNCTION_TRACE(ps_link_module_code);
-
-        /* Get the tail of the list */
-
-        prev = next = acpi_gbl_module_code_list;
-        while (next) {
-                prev = next;
-                next = next->method.mutex;
-        }
-
-        /*
-         * Insert the module level code into the list. Merge it if it is
-         * adjacent to the previous element.
-         */
-        if (!prev ||
-            ((prev->method.aml_start + prev->method.aml_length) != aml_start)) {
-
-                /* Create, initialize, and link a new temporary method object */
-
-                method_obj = acpi_ut_create_internal_object(ACPI_TYPE_METHOD);
-                if (!method_obj) {
-                        return_VOID;
-                }
-
-                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                  "Create/Link new code block: %p\n",
-                                  method_obj));
-
-                if (parent_op->common.node) {
-                        parent_node = parent_op->common.node;
-                } else {
-                        parent_node = acpi_gbl_root_node;
-                }
-
-                method_obj->method.aml_start = aml_start;
-                method_obj->method.aml_length = aml_length;
-                method_obj->method.owner_id = owner_id;
-                method_obj->method.info_flags |= ACPI_METHOD_MODULE_LEVEL;
-
-                /*
-                 * Save the parent node in next_object. This is cheating, but we
-                 * don't want to expand the method object.
-                 */
-                method_obj->method.next_object =
-                    ACPI_CAST_PTR(union acpi_operand_object, parent_node);
-
-                if (!prev) {
-                        acpi_gbl_module_code_list = method_obj;
-                } else {
-                        prev->method.mutex = method_obj;
-                }
-        } else {
-                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                  "Appending to existing code block: %p\n",
-                                  prev));
-
-                prev->method.aml_length += aml_length;
-        }
-
-        return_VOID;
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ps_parse_loop
  *
  * PARAMETERS:  walk_state          - Current state
diff --git a/drivers/acpi/acpica/psobject.c b/drivers/acpi/acpica/psobject.c
index e1fd819a2955..98e5c7400e54 100644
--- a/drivers/acpi/acpica/psobject.c
+++ b/drivers/acpi/acpica/psobject.c
@@ -3,7 +3,7 @@
  *
  * Module Name: psobject - Support for parse objects
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c
index 8d7dc98bad17..43775c5ce17c 100644
--- a/drivers/acpi/acpica/psopcode.c
+++ b/drivers/acpi/acpica/psopcode.c
@@ -3,7 +3,7 @@
  *
  * Module Name: psopcode - Parser/Interpreter opcode information table
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/psopinfo.c b/drivers/acpi/acpica/psopinfo.c
index f310954eea59..15e7563829f1 100644
--- a/drivers/acpi/acpica/psopinfo.c
+++ b/drivers/acpi/acpica/psopinfo.c
@@ -3,7 +3,7 @@
  *
  * Module Name: psopinfo - AML opcode information functions and dispatch tables
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index 65603473b6cb..9b386530ffbe 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -3,7 +3,7 @@
  *
  * Module Name: psparse - Parser top level AML parse routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -523,12 +523,12 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                         if (status == AE_ABORT_METHOD) {
                                 acpi_ns_print_node_pathname(walk_state->
                                                             method_node,
-                                                            "Method aborted:");
+                                                            "Aborting method");
                                 acpi_os_printf("\n");
                         } else {
-                                ACPI_ERROR_METHOD
-                                    ("Method parse/execution failed",
-                                     walk_state->method_node, NULL, status);
+                                ACPI_ERROR_METHOD("Aborting method",
+                                                  walk_state->method_node, NULL,
+                                                  status);
                         }
                         acpi_ex_enter_interpreter();
 
diff --git a/drivers/acpi/acpica/psscope.c b/drivers/acpi/acpica/psscope.c
index 00c67bc249aa..f153ca804740 100644
--- a/drivers/acpi/acpica/psscope.c
+++ b/drivers/acpi/acpica/psscope.c
@@ -3,7 +3,7 @@
  *
  * Module Name: psscope - Parser scope stack management routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/pstree.c b/drivers/acpi/acpica/pstree.c
index 64a8329a17f1..22d8a2becdd0 100644
--- a/drivers/acpi/acpica/pstree.c
+++ b/drivers/acpi/acpica/pstree.c
@@ -3,7 +3,7 @@
  *
  * Module Name: pstree - Parser op tree manipulation/traversal/search
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c
index ef8a5805a836..2512f584fa3c 100644
--- a/drivers/acpi/acpica/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -3,7 +3,7 @@
  *
  * Module Name: psutils - Parser miscellaneous utilities (Parser only)
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/pswalk.c b/drivers/acpi/acpica/pswalk.c
index bd6af8c87d48..cf91841297c2 100644
--- a/drivers/acpi/acpica/pswalk.c
+++ b/drivers/acpi/acpica/pswalk.c
@@ -3,7 +3,7 @@
  *
  * Module Name: pswalk - Parser routines to walk parsed op tree(s)
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index 5743b22399a0..ee2ee2c858f2 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -3,7 +3,7 @@
  *
  * Module Name: psxface - Parser external interfaces
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/rsdumpinfo.c b/drivers/acpi/acpica/rsdumpinfo.c
index 77a3263169fa..cafa8134b4c6 100644
--- a/drivers/acpi/acpica/rsdumpinfo.c
+++ b/drivers/acpi/acpica/rsdumpinfo.c
@@ -32,7 +32,7 @@ struct acpi_rsdump_info acpi_rs_dump_irq[7] = {
          acpi_gbl_he_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.polarity), "Polarity",
          acpi_gbl_ll_decode},
-        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(irq.sharable), "Sharing",
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(irq.shareable), "Sharing",
          acpi_gbl_shr_decode},
         {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(irq.interrupt_count),
          "Interrupt Count", NULL},
@@ -222,7 +222,7 @@ struct acpi_rsdump_info acpi_rs_dump_ext_irq[8] = {
          "Triggering", acpi_gbl_he_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.polarity), "Polarity",
          acpi_gbl_ll_decode},
-        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(extended_irq.sharable), "Sharing",
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(extended_irq.shareable), "Sharing",
          acpi_gbl_shr_decode},
         {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(extended_irq.resource_source), NULL,
          NULL},
@@ -255,7 +255,7 @@ struct acpi_rsdump_info acpi_rs_dump_gpio[16] = {
          "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), "Sharing",
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.shareable), "Sharing",
          acpi_gbl_shr_decode},
         {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.io_restriction),
          "IoRestriction", acpi_gbl_ior_decode},
@@ -285,7 +285,7 @@ struct acpi_rsdump_info acpi_rs_dump_pin_function[10] = {
          "RevisionId", NULL},
         {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(pin_function.pin_config), "PinConfig",
          acpi_gbl_ppc_decode},
-        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_function.sharable), "Sharing",
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_function.shareable), "Sharing",
          acpi_gbl_shr_decode},
         {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(pin_function.function_number),
          "FunctionNumber", NULL},
@@ -308,7 +308,7 @@ struct acpi_rsdump_info acpi_rs_dump_pin_config[11] = {
          NULL},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_config.producer_consumer),
          "ProducerConsumer", acpi_gbl_consume_decode},
-        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_config.sharable), "Sharing",
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_config.shareable), "Sharing",
          acpi_gbl_shr_decode},
         {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(pin_config.pin_config_type),
          "PinConfigType", NULL},
@@ -353,7 +353,7 @@ struct acpi_rsdump_info acpi_rs_dump_pin_group_function[9] = {
         {ACPI_RSD_1BITFLAG,
          ACPI_RSD_OFFSET(pin_group_function.producer_consumer),
          "ProducerConsumer", acpi_gbl_consume_decode},
-        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_group_function.sharable),
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_group_function.shareable),
          "Sharing", acpi_gbl_shr_decode},
         {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(pin_group_function.function_number),
          "FunctionNumber", NULL},
@@ -375,7 +375,7 @@ struct acpi_rsdump_info acpi_rs_dump_pin_group_config[10] = {
          "RevisionId", NULL},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_group_config.producer_consumer),
          "ProducerConsumer", acpi_gbl_consume_decode},
-        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_group_config.sharable),
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_group_config.shareable),
          "Sharing", acpi_gbl_shr_decode},
         {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(pin_group_config.pin_config_type),
          "PinConfigType", NULL},
diff --git a/drivers/acpi/acpica/rsirq.c b/drivers/acpi/acpica/rsirq.c
index 134b67cd48ee..b0d970efa072 100644
--- a/drivers/acpi/acpica/rsirq.c
+++ b/drivers/acpi/acpica/rsirq.c
@@ -54,7 +54,7 @@ struct acpi_rsconvert_info acpi_rs_get_irq[9] = {
          AML_OFFSET(irq.flags),
          3},
 
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable),
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.shareable),
          AML_OFFSET(irq.flags),
          4},
 
@@ -92,7 +92,7 @@ struct acpi_rsconvert_info acpi_rs_set_irq[14] = {
          AML_OFFSET(irq.flags),
          3},
 
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable),
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.shareable),
          AML_OFFSET(irq.flags),
          4},
 
@@ -139,7 +139,7 @@ struct acpi_rsconvert_info acpi_rs_set_irq[14] = {
          ACPI_ACTIVE_HIGH},
 
         {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_VALUE,
-         ACPI_RS_OFFSET(data.irq.sharable),
+         ACPI_RS_OFFSET(data.irq.shareable),
          ACPI_EXCLUSIVE},
 
         /* We can optimize to a 2-byte irq_no_flags() descriptor */
@@ -178,7 +178,7 @@ struct acpi_rsconvert_info acpi_rs_convert_ext_irq[10] = {
          AML_OFFSET(extended_irq.flags),
          2},
 
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.extended_irq.sharable),
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.extended_irq.shareable),
          AML_OFFSET(extended_irq.flags),
          3},
 
diff --git a/drivers/acpi/acpica/rsserial.c b/drivers/acpi/acpica/rsserial.c
index d073ebb51f90..1b937d88980f 100644
--- a/drivers/acpi/acpica/rsserial.c
+++ b/drivers/acpi/acpica/rsserial.c
@@ -39,7 +39,7 @@ struct acpi_rsconvert_info acpi_rs_convert_gpio[18] = {
          AML_OFFSET(gpio.flags),
          0},
 
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.gpio.sharable),
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.gpio.shareable),
          AML_OFFSET(gpio.int_flags),
          3},
 
@@ -128,7 +128,7 @@ struct acpi_rsconvert_info acpi_rs_convert_pin_function[13] = {
          AML_OFFSET(pin_function.revision_id),
          1},
 
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_function.sharable),
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_function.shareable),
          AML_OFFSET(pin_function.flags),
          0},
 
@@ -518,7 +518,7 @@ struct acpi_rsconvert_info acpi_rs_convert_pin_config[14] = {
          AML_OFFSET(pin_config.revision_id),
          1},
 
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_config.sharable),
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_config.shareable),
          AML_OFFSET(pin_config.flags),
          0},
 
@@ -658,7 +658,7 @@ struct acpi_rsconvert_info acpi_rs_convert_pin_group_function[13] = {
          AML_OFFSET(pin_group_function.revision_id),
          1},
 
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_group_function.sharable),
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_group_function.shareable),
          AML_OFFSET(pin_group_function.flags),
          0},
 
@@ -735,7 +735,7 @@ struct acpi_rsconvert_info acpi_rs_convert_pin_group_config[14] = {
          AML_OFFSET(pin_group_config.revision_id),
          1},
 
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_group_config.sharable),
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_group_config.shareable),
          AML_OFFSET(pin_group_config.flags),
          0},
 
diff --git a/drivers/acpi/acpica/tbdata.c b/drivers/acpi/acpica/tbdata.c
index 862149c8a208..0cecd0039acf 100644
--- a/drivers/acpi/acpica/tbdata.c
+++ b/drivers/acpi/acpica/tbdata.c
@@ -3,7 +3,7 @@
  *
  * Module Name: tbdata - Table manager data structure functions
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index 99d325a51816..0041bfba9abc 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -3,7 +3,7 @@
  *
  * Module Name: tbfadt   - FADT table utilities
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -556,7 +556,7 @@ static void acpi_tb_convert_fadt(void)
                                  * 64-bit X length field.
                                  * Note: If the legacy length field is > 0xFF bits, ignore
                                  * this check. (GPE registers can be larger than the
-                                 * 64-bit GAS structure can accomodate, 0xFF bits).
+                                 * 64-bit GAS structure can accommodate, 0xFF bits).
                                  */
                                 if ((ACPI_MUL_8(length) <= ACPI_UINT8_MAX) &&
                                     (address64->bit_width !=
diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c
index f00694b1d000..951bd8e1c50a 100644
--- a/drivers/acpi/acpica/tbfind.c
+++ b/drivers/acpi/acpica/tbfind.c
@@ -3,7 +3,7 @@
  *
  * Module Name: tbfind   - find table
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 5f8e7b561c90..be6642bf6366 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -3,7 +3,7 @@
  *
  * Module Name: tbinstal - ACPI table installation and removal
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/tbprint.c b/drivers/acpi/acpica/tbprint.c
index e303418a895b..9b5df95d881b 100644
--- a/drivers/acpi/acpica/tbprint.c
+++ b/drivers/acpi/acpica/tbprint.c
@@ -3,7 +3,7 @@
  *
  * Module Name: tbprint - Table output utilities
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index b526096560b5..2469e01310e2 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -3,7 +3,7 @@
  *
  * Module Name: tbutils - ACPI Table utilities
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index e4d0dc8948cd..36592888f0e7 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -3,7 +3,7 @@
  *
  * Module Name: tbxface - ACPI table-oriented external interfaces
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -108,7 +108,7 @@ acpi_initialize_tables(struct acpi_table_desc *initial_table_array,
         /*
          * Get the root table (RSDT or XSDT) and extract all entries to the local
          * Root Table Array. This array contains the information of the RSDT/XSDT
-         * in a common, more useable format.
+         * in a common, more usable format.
          */
         status = acpi_tb_parse_root_table(rsdp_address);
         return_ACPI_STATUS(status);
@@ -169,7 +169,7 @@ acpi_status ACPI_INIT_FUNCTION acpi_reallocate_root_table(void)
         if (!acpi_gbl_enable_table_validation) {
                 /*
                  * Now it's safe to do full table validation. We can do deferred
-                 * table initilization here once the flag is set.
+                 * table initialization here once the flag is set.
                  */
                 acpi_gbl_enable_table_validation = TRUE;
                 for (i = 0; i < acpi_gbl_root_table_list.current_table_count;
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c
index 9011297552af..1a2592cc3245 100644
--- a/drivers/acpi/acpica/tbxfload.c
+++ b/drivers/acpi/acpica/tbxfload.c
@@ -3,7 +3,7 @@
  *
  * Module Name: tbxfload - Table load/unload external interfaces
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -69,23 +69,18 @@ acpi_status ACPI_INIT_FUNCTION acpi_load_tables(void)
                                 "While loading namespace from ACPI tables"));
         }
 
-        if (acpi_gbl_execute_tables_as_methods) {
-                /*
-                 * If the module-level code support is enabled, initialize the objects
-                 * in the namespace that remain uninitialized. This runs the executable
-                 * AML that may be part of the declaration of these name objects:
-                 *     operation_regions, buffer_fields, Buffers, and Packages.
-                 *
-                 * Note: The module-level code is optional at this time, but will
-                 * become the default in the future.
-                 */
-                status = acpi_ns_initialize_objects();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
+        /*
+         * Initialize the objects in the namespace that remain uninitialized.
+         * This runs the executable AML that may be part of the declaration of
+         * these name objects:
+         *     operation_regions, buffer_fields, Buffers, and Packages.
+         *
+         */
+        status = acpi_ns_initialize_objects();
+        if (ACPI_SUCCESS(status)) {
+                acpi_gbl_namespace_initialized = TRUE;
         }
 
-        acpi_gbl_namespace_initialized = TRUE;
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index 483d0ce5180a..e2859d09ca2e 100644
--- a/drivers/acpi/acpica/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -3,7 +3,7 @@
  *
  * Module Name: tbxfroot - Find the root ACPI table (RSDT)
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utaddress.c b/drivers/acpi/acpica/utaddress.c
index dbabe680ff58..bb260376bd59 100644
--- a/drivers/acpi/acpica/utaddress.c
+++ b/drivers/acpi/acpica/utaddress.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utaddress - op_region address range check
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utalloc.c b/drivers/acpi/acpica/utalloc.c
index 8cbcd7d6bd5e..d64da4d9e8d0 100644
--- a/drivers/acpi/acpica/utalloc.c
+++ b/drivers/acpi/acpica/utalloc.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utalloc - local memory allocation routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utascii.c b/drivers/acpi/acpica/utascii.c
index 04ff61e284f5..79d7426fd7bf 100644
--- a/drivers/acpi/acpica/utascii.c
+++ b/drivers/acpi/acpica/utascii.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utascii - Utility ascii functions
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utbuffer.c b/drivers/acpi/acpica/utbuffer.c
index fffa6f5ae59e..61db9967ebe4 100644
--- a/drivers/acpi/acpica/utbuffer.c
+++ b/drivers/acpi/acpica/utbuffer.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utbuffer - Buffer dump routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utcache.c b/drivers/acpi/acpica/utcache.c
index 97d6ec174c28..8533fce7fa93 100644
--- a/drivers/acpi/acpica/utcache.c
+++ b/drivers/acpi/acpica/utcache.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utcache - local cache allocation routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index a872ed7879ca..1fb8327f3c3b 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utcopy - Internal to external object translation utilities
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index aabdc25effd9..01b1b36c8a8e 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utdebug - Debug print/trace routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index dad02b821e19..ad9f77eb554f 100644
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utdecode - Utility decoding routines (value-to-string)
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -284,7 +284,7 @@ const char *acpi_ut_get_node_name(void *object)
 
 static const char *acpi_gbl_desc_type_names[] = {
         /* 00 */ "Not a Descriptor",
-        /* 01 */ "Cached",
+        /* 01 */ "Cached Object",
         /* 02 */ "State-Generic",
         /* 03 */ "State-Update",
         /* 04 */ "State-Package",
@@ -295,10 +295,10 @@ static const char *acpi_gbl_desc_type_names[] = {
         /* 09 */ "State-Result",
         /* 10 */ "State-Notify",
         /* 11 */ "State-Thread",
-        /* 12 */ "Walk",
-        /* 13 */ "Parser",
-        /* 14 */ "Operand",
-        /* 15 */ "Node"
+        /* 12 */ "Tree Walk State",
+        /* 13 */ "Parse Tree Op",
+        /* 14 */ "Operand Object",
+        /* 15 */ "Namespace Node"
 };
 
 const char *acpi_ut_get_descriptor_name(void *object)
@@ -430,8 +430,10 @@ static const char *acpi_gbl_generic_notify[ACPI_GENERIC_NOTIFY_MAX + 1] = {
                                                                 /* 0C */ "Reserved (was previously Shutdown Request)",
                                                                 /* Reserved in ACPI 6.0 */
         /* 0D */ "System Resource Affinity Update",
-                                                                /* 0E */ "Heterogeneous Memory Attributes Update"
+                                                                /* 0E */ "Heterogeneous Memory Attributes Update",
                                                                 /* ACPI 6.2 */
+                                                /* 0F */ "Error Disconnect Recover"
+                                                /* ACPI 6.3 */
 };
 
 static const char *acpi_gbl_device_notify[5] = {
@@ -461,13 +463,13 @@ static const char *acpi_gbl_thermal_notify[5] = {
 const char *acpi_ut_get_notify_name(u32 notify_value, acpi_object_type type)
 {
 
-        /* 00 - 0D are "common to all object types" (from ACPI Spec) */
+        /* 00 - 0F are "common to all object types" (from ACPI Spec) */
 
         if (notify_value <= ACPI_GENERIC_NOTIFY_MAX) {
                 return (acpi_gbl_generic_notify[notify_value]);
         }
 
-        /* 0E - 7F are reserved */
+        /* 10 - 7F are reserved */
 
         if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
                 return ("Reserved");
diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index 8cc4392c61f3..eee263cb7beb 100644
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -257,6 +257,10 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
 
                         acpi_ut_delete_object_desc(second_desc);
                 }
+                if (object->field.internal_pcc_buffer) {
+                        ACPI_FREE(object->field.internal_pcc_buffer);
+                }
+
                 break;
 
         case ACPI_TYPE_BUFFER_FIELD:
diff --git a/drivers/acpi/acpica/uterror.c b/drivers/acpi/acpica/uterror.c
index e47430272692..075457341bad 100644
--- a/drivers/acpi/acpica/uterror.c
+++ b/drivers/acpi/acpica/uterror.c
@@ -183,19 +183,19 @@ acpi_ut_prefixed_namespace_error(const char *module_name,
         case AE_ALREADY_EXISTS:
 
                 acpi_os_printf(ACPI_MSG_BIOS_ERROR);
-                message = "Failure creating";
+                message = "Failure creating named object";
                 break;
 
         case AE_NOT_FOUND:
 
                 acpi_os_printf(ACPI_MSG_BIOS_ERROR);
-                message = "Could not resolve";
+                message = "Could not resolve symbol";
                 break;
 
         default:
 
                 acpi_os_printf(ACPI_MSG_ERROR);
-                message = "Failure resolving";
+                message = "Failure resolving symbol";
                 break;
         }
 
@@ -317,7 +317,8 @@ acpi_ut_method_error(const char *module_name,
         }
 
         acpi_ns_print_node_pathname(node, message);
-        acpi_os_printf(", %s", acpi_format_exception(method_status));
+        acpi_os_printf(" due to previous error (%s)",
+                       acpi_format_exception(method_status));
 
         ACPI_MSG_SUFFIX;
         ACPI_MSG_REDIRECT_END;
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index c56ae6e058d5..558a9f3b0678 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -3,7 +3,7 @@
  *
  * Module Name: uteval - Object evaluation
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index f8c5b49344df..b0622ec4bb85 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utglobal - Global variables for the ACPI subsystem
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/uthex.c b/drivers/acpi/acpica/uthex.c
index 3d63a9e8da4f..b6da135d5f41 100644
--- a/drivers/acpi/acpica/uthex.c
+++ b/drivers/acpi/acpica/uthex.c
@@ -3,7 +3,7 @@
  *
  * Module Name: uthex -- Hex/ASCII support functions
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
index 70e6bf1107a1..e805abdd95b8 100644
--- a/drivers/acpi/acpica/utids.c
+++ b/drivers/acpi/acpica/utids.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utids - support for device Ids - HID, UID, CID, SUB, CLS
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utinit.c b/drivers/acpi/acpica/utinit.c
index 0646ed62b351..bc124591320e 100644
--- a/drivers/acpi/acpica/utinit.c
+++ b/drivers/acpi/acpica/utinit.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utinit - Common ACPI subsystem initialization
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utlock.c b/drivers/acpi/acpica/utlock.c
index d61e01bd01a3..8b4ff11d617a 100644
--- a/drivers/acpi/acpica/utlock.c
+++ b/drivers/acpi/acpica/utlock.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utlock - Reader/Writer lock interfaces
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index ae6d8cc18cec..eee97a902696 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utobject - ACPI object create/delete/size/cache routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c
index 902a47463abf..688c61a90725 100644
--- a/drivers/acpi/acpica/utosi.c
+++ b/drivers/acpi/acpica/utosi.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utosi - Support for the _OSI predefined control method
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utpredef.c b/drivers/acpi/acpica/utpredef.c
index 65ca9807c2a8..a9f08f43c685 100644
--- a/drivers/acpi/acpica/utpredef.c
+++ b/drivers/acpi/acpica/utpredef.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utpredef - support functions for predefined names
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utprint.c b/drivers/acpi/acpica/utprint.c
index a98c334c3bb7..5839f2fa7400 100644
--- a/drivers/acpi/acpica/utprint.c
+++ b/drivers/acpi/acpica/utprint.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utprint - Formatted printing routines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/uttrack.c b/drivers/acpi/acpica/uttrack.c
index 016a6621cc6f..8052f7ef5025 100644
--- a/drivers/acpi/acpica/uttrack.c
+++ b/drivers/acpi/acpica/uttrack.c
@@ -3,7 +3,7 @@
  *
  * Module Name: uttrack - Memory allocation tracking routines (debug only)
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -588,6 +588,18 @@ void acpi_ut_dump_allocations(u32 component, const char *module)
                                              acpi_ut_get_descriptor_name
                                              (descriptor));
 
+                                        /* Optional object hex dump */
+
+                                        if (acpi_gbl_verbose_leak_dump) {
+                                                acpi_os_printf("\n");
+                                                acpi_ut_dump_buffer((u8 *)
+                                                                    descriptor,
+                                                                    element->
+                                                                    size,
+                                                                    DB_BYTE_DISPLAY,
+                                                                    0);
+                                        }
+
                                         /* Validate the descriptor type using Type field and length */
 
                                         descriptor_type = 0;    /* Not a valid descriptor type */
diff --git a/drivers/acpi/acpica/utuuid.c b/drivers/acpi/acpica/utuuid.c
index 59ae118092a3..0a7cf8007643 100644
--- a/drivers/acpi/acpica/utuuid.c
+++ b/drivers/acpi/acpica/utuuid.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utuuid -- UUID support functions
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utxface.c b/drivers/acpi/acpica/utxface.c
index d2d6cc065181..f497c4b30e65 100644
--- a/drivers/acpi/acpica/utxface.c
+++ b/drivers/acpi/acpica/utxface.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utxface - External interfaces, miscellaneous utility functions
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c
index 6bb85d691fcb..a1ed7fced4db 100644
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -187,6 +187,50 @@ ACPI_EXPORT_SYMBOL(acpi_bios_error)
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_bios_exception
+ *
+ * PARAMETERS:  module_name         - Caller's module name (for error output)
+ *              line_number         - Caller's line number (for error output)
+ *              status              - Status value to be decoded/formatted
+ *              format              - Printf format string + additional args
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Print an "ACPI Firmware Error" message with module/line/version
+ *              info as well as decoded acpi_status.
+ *
+ ******************************************************************************/
+void ACPI_INTERNAL_VAR_XFACE
+acpi_bios_exception(const char *module_name,
+                    u32 line_number,
+                    acpi_status status, const char *format, ...)
+{
+        va_list arg_list;
+
+        ACPI_MSG_REDIRECT_BEGIN;
+
+        /* For AE_OK, just print the message */
+
+        if (ACPI_SUCCESS(status)) {
+                acpi_os_printf(ACPI_MSG_BIOS_ERROR);
+
+        } else {
+                acpi_os_printf(ACPI_MSG_BIOS_ERROR "%s, ",
+                               acpi_format_exception(status));
+        }
+
+        va_start(arg_list, format);
+        acpi_os_vprintf(format, arg_list);
+        ACPI_MSG_SUFFIX;
+        va_end(arg_list);
+
+        ACPI_MSG_REDIRECT_END;
+}
+
+ACPI_EXPORT_SYMBOL(acpi_bios_exception)
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_bios_warning
  *
  * PARAMETERS:  module_name         - Caller's module name (for warning output)
diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c
index e3c60f57c9f0..9f3b1e3a09de 100644
--- a/drivers/acpi/acpica/utxfinit.c
+++ b/drivers/acpi/acpica/utxfinit.c
@@ -3,7 +3,7 @@
  *
  * Module Name: utxfinit - External interfaces for ACPICA initialization
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig
index 52ae5438edeb..6b18f8bc7be3 100644
--- a/drivers/acpi/apei/Kconfig
+++ b/drivers/acpi/apei/Kconfig
@@ -41,19 +41,9 @@ config ACPI_APEI_PCIEAER
           Turn on this option to enable the corresponding support.
 
 config ACPI_APEI_SEA
-        bool "APEI Synchronous External Abort logging/recovering support"
+        bool
         depends on ARM64 && ACPI_APEI_GHES
         default y
-        help
-          This option should be enabled if the system supports
-          firmware first handling of SEA (Synchronous External Abort).
-          SEA happens with certain faults of data abort or instruction
-          abort synchronous exceptions on ARMv8 systems. If a system
-          supports firmware first handling of SEA, the platform analyzes
-          and handles hardware error notifications from SEA, and it may then
-          form a HW error record for the OS to parse and handle. This
-          option allows the OS to look for such hardware error record, and
-          take appropriate action.
 
 config ACPI_APEI_MEMORY_FAILURE
         bool "APEI memory error recovering support"
diff --git a/drivers/acpi/apei/bert.c b/drivers/acpi/apei/bert.c
index 12771fcf0417..0d948d0a41af 100644
--- a/drivers/acpi/apei/bert.c
+++ b/drivers/acpi/apei/bert.c
@@ -42,15 +42,7 @@ static void __init bert_print_all(struct acpi_bert_region *region,
         int remain = region_len;
         u32 estatus_len;
 
-        if (!estatus->block_status)
-                return;
-
-        while (remain > sizeof(struct acpi_bert_region)) {
-                if (cper_estatus_check(estatus)) {
-                        pr_err(FW_BUG "Invalid error record.\n");
-                        return;
-                }
-
+        while (remain >= sizeof(struct acpi_bert_region)) {
                 estatus_len = cper_estatus_len(estatus);
                 if (remain < estatus_len) {
                         pr_err(FW_BUG "Truncated status block (length: %u).\n",
@@ -58,6 +50,15 @@ static void __init bert_print_all(struct acpi_bert_region *region,
                         return;
                 }
 
+                /* No more error records. */
+                if (!estatus->block_status)
+                        return;
+
+                if (cper_estatus_check(estatus)) {
+                        pr_err(FW_BUG "Invalid error record.\n");
+                        return;
+                }
+
                 pr_info_once("Error records from previous boot:\n");
 
                 cper_estatus_print(KERN_INFO HW_ERR, estatus);
@@ -70,10 +71,6 @@ static void __init bert_print_all(struct acpi_bert_region *region,
                 estatus->block_status = 0;
 
                 estatus = (void *)estatus + estatus_len;
-                /* No more error records. */
-                if (!estatus->block_status)
-                        return;
-
                 remain -= estatus_len;
         }
 }
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index fcccbfdbdd1a..2d4be94f8c00 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -644,8 +644,8 @@ static int error_type_set(void *data, u64 val)
         return 0;
 }
 
-DEFINE_SIMPLE_ATTRIBUTE(error_type_fops, error_type_get,
-                        error_type_set, "0x%llx\n");
+DEFINE_DEBUGFS_ATTRIBUTE(error_type_fops, error_type_get, error_type_set,
+                         "0x%llx\n");
 
 static int error_inject_set(void *data, u64 val)
 {
@@ -656,8 +656,7 @@ static int error_inject_set(void *data, u64 val)
                 error_param3, error_param4);
 }
 
-DEFINE_SIMPLE_ATTRIBUTE(error_inject_fops, NULL,
-                        error_inject_set, "%llu\n");
+DEFINE_DEBUGFS_ATTRIBUTE(error_inject_fops, NULL, error_inject_set, "%llu\n");
 
 static int einj_check_table(struct acpi_table_einj *einj_tab)
 {
@@ -679,7 +678,6 @@ static int __init einj_init(void)
 {
         int rc;
         acpi_status status;
-        struct dentry *fentry;
         struct apei_exec_context ctx;
 
         if (acpi_disabled) {
@@ -707,25 +705,13 @@ static int __init einj_init(void)
 
         rc = -ENOMEM;
         einj_debug_dir = debugfs_create_dir("einj", apei_get_debugfs_dir());
-        if (!einj_debug_dir) {
-                pr_err("Error creating debugfs node.\n");
-                goto err_cleanup;
-        }
 
-        fentry = debugfs_create_file("available_error_type", S_IRUSR,
-                                     einj_debug_dir, NULL,
-                                     &available_error_type_fops);
-        if (!fentry)
-                goto err_cleanup;
-
-        fentry = debugfs_create_file("error_type", S_IRUSR | S_IWUSR,
-                                     einj_debug_dir, NULL, &error_type_fops);
-        if (!fentry)
-                goto err_cleanup;
-        fentry = debugfs_create_file("error_inject", S_IWUSR,
-                                     einj_debug_dir, NULL, &error_inject_fops);
-        if (!fentry)
-                goto err_cleanup;
+        debugfs_create_file("available_error_type", S_IRUSR, einj_debug_dir,
+                            NULL, &available_error_type_fops);
+        debugfs_create_file_unsafe("error_type", 0600, einj_debug_dir,
+                                   NULL, &error_type_fops);
+        debugfs_create_file_unsafe("error_inject", 0200, einj_debug_dir,
+                                   NULL, &error_inject_fops);
 
         apei_resources_init(&einj_resources);
         einj_exec_ctx_init(&ctx);
@@ -750,66 +736,37 @@ static int __init einj_init(void)
         rc = -ENOMEM;
         einj_param = einj_get_parameter_address();
         if ((param_extension || acpi5) && einj_param) {
-                fentry = debugfs_create_x32("flags", S_IRUSR | S_IWUSR,
-                                            einj_debug_dir, &error_flags);
-                if (!fentry)
-                        goto err_unmap;
-                fentry = debugfs_create_x64("param1", S_IRUSR | S_IWUSR,
-                                            einj_debug_dir, &error_param1);
-                if (!fentry)
-                        goto err_unmap;
-                fentry = debugfs_create_x64("param2", S_IRUSR | S_IWUSR,
-                                            einj_debug_dir, &error_param2);
-                if (!fentry)
-                        goto err_unmap;
-                fentry = debugfs_create_x64("param3", S_IRUSR | S_IWUSR,
-                                            einj_debug_dir, &error_param3);
-                if (!fentry)
-                        goto err_unmap;
-                fentry = debugfs_create_x64("param4", S_IRUSR | S_IWUSR,
-                                            einj_debug_dir, &error_param4);
-                if (!fentry)
-                        goto err_unmap;
-
-                fentry = debugfs_create_x32("notrigger", S_IRUSR | S_IWUSR,
-                                            einj_debug_dir, &notrigger);
-                if (!fentry)
-                        goto err_unmap;
+                debugfs_create_x32("flags", S_IRUSR | S_IWUSR, einj_debug_dir,
+                                   &error_flags);
+                debugfs_create_x64("param1", S_IRUSR | S_IWUSR, einj_debug_dir,
+                                   &error_param1);
+                debugfs_create_x64("param2", S_IRUSR | S_IWUSR, einj_debug_dir,
+                                   &error_param2);
+                debugfs_create_x64("param3", S_IRUSR | S_IWUSR, einj_debug_dir,
+                                   &error_param3);
+                debugfs_create_x64("param4", S_IRUSR | S_IWUSR, einj_debug_dir,
+                                   &error_param4);
+                debugfs_create_x32("notrigger", S_IRUSR | S_IWUSR,
+                                   einj_debug_dir, &notrigger);
         }
 
         if (vendor_dev[0]) {
                 vendor_blob.data = vendor_dev;
                 vendor_blob.size = strlen(vendor_dev);
-                fentry = debugfs_create_blob("vendor", S_IRUSR,
-                                             einj_debug_dir, &vendor_blob);
-                if (!fentry)
-                        goto err_unmap;
-                fentry = debugfs_create_x32("vendor_flags", S_IRUSR | S_IWUSR,
-                                            einj_debug_dir, &vendor_flags);
-                if (!fentry)
-                        goto err_unmap;
+                debugfs_create_blob("vendor", S_IRUSR, einj_debug_dir,
+                                    &vendor_blob);
+                debugfs_create_x32("vendor_flags", S_IRUSR | S_IWUSR,
+                                   einj_debug_dir, &vendor_flags);
         }
 
         pr_info("Error INJection is initialized.\n");
 
         return 0;
 
-err_unmap:
-        if (einj_param) {
-                acpi_size size = (acpi5) ?
-                        sizeof(struct set_error_type_with_address) :
-                        sizeof(struct einj_parameter);
-
-                acpi_os_unmap_iomem(einj_param, size);
-                pr_err("Error creating param extension debugfs nodes.\n");
-        }
-        apei_exec_post_unmap_gars(&ctx);
 err_release:
         apei_resources_release(&einj_resources);
 err_fini:
         apei_resources_fini(&einj_resources);
-err_cleanup:
-        pr_err("Error creating primary debugfs nodes.\n");
         debugfs_remove_recursive(einj_debug_dir);
 
         return rc;
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 9953e50667ec..389d88e35ffb 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -938,17 +938,17 @@ static struct pstore_info erst_info = {
 };
 
 #define CPER_CREATOR_PSTORE                                             \
-        UUID_LE(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c,     \
-                0x64, 0x90, 0xb8, 0x9d)
+        GUID_INIT(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c,   \
+                  0x64, 0x90, 0xb8, 0x9d)
 #define CPER_SECTION_TYPE_DMESG                                         \
-        UUID_LE(0xc197e04e, 0xd545, 0x4a70, 0x9c, 0x17, 0xa5, 0x54,     \
-                0x94, 0x19, 0xeb, 0x12)
+        GUID_INIT(0xc197e04e, 0xd545, 0x4a70, 0x9c, 0x17, 0xa5, 0x54,   \
+                  0x94, 0x19, 0xeb, 0x12)
 #define CPER_SECTION_TYPE_DMESG_Z                                       \
-        UUID_LE(0x4f118707, 0x04dd, 0x4055, 0xb5, 0xdd, 0x95, 0x6d,     \
-                0x34, 0xdd, 0xfa, 0xc6)
+        GUID_INIT(0x4f118707, 0x04dd, 0x4055, 0xb5, 0xdd, 0x95, 0x6d,   \
+                  0x34, 0xdd, 0xfa, 0xc6)
 #define CPER_SECTION_TYPE_MCE                                           \
-        UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96,     \
-                0x04, 0x4a, 0x38, 0xfc)
+        GUID_INIT(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96,   \
+                  0x04, 0x4a, 0x38, 0xfc)
 
 struct cper_pstore_record {
         struct cper_record_header hdr;
@@ -1012,7 +1012,7 @@ skip:
                 rc = -EIO;
                 goto out;
         }
-        if (uuid_le_cmp(rcd->hdr.creator_id, CPER_CREATOR_PSTORE) != 0)
+        if (!guid_equal(&rcd->hdr.creator_id, &CPER_CREATOR_PSTORE))
                 goto skip;
 
         record->buf = kmalloc(len, GFP_KERNEL);
@@ -1024,15 +1024,12 @@ skip:
         record->id = record_id;
         record->compressed = false;
         record->ecc_notice_size = 0;
-        if (uuid_le_cmp(rcd->sec_hdr.section_type,
-                        CPER_SECTION_TYPE_DMESG_Z) == 0) {
+        if (guid_equal(&rcd->sec_hdr.section_type, &CPER_SECTION_TYPE_DMESG_Z)) {
                 record->type = PSTORE_TYPE_DMESG;
                 record->compressed = true;
-        } else if (uuid_le_cmp(rcd->sec_hdr.section_type,
-                        CPER_SECTION_TYPE_DMESG) == 0)
+        } else if (guid_equal(&rcd->sec_hdr.section_type, &CPER_SECTION_TYPE_DMESG))
                 record->type = PSTORE_TYPE_DMESG;
-        else if (uuid_le_cmp(rcd->sec_hdr.section_type,
-                             CPER_SECTION_TYPE_MCE) == 0)
+        else if (guid_equal(&rcd->sec_hdr.section_type, &CPER_SECTION_TYPE_MCE))
                 record->type = PSTORE_TYPE_MCE;
         else
                 record->type = PSTORE_TYPE_MAX;
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index f008ba7c9ced..0b5ae91fd0fb 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -25,6 +25,7 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/arm_sdei.h>
 #include <linux/kernel.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
@@ -33,7 +34,6 @@
 #include <linux/interrupt.h>
 #include <linux/timer.h>
 #include <linux/cper.h>
-#include <linux/kdebug.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
 #include <linux/ratelimit.h>
@@ -42,6 +42,7 @@
 #include <linux/llist.h>
 #include <linux/genalloc.h>
 #include <linux/pci.h>
+#include <linux/pfn.h>
 #include <linux/aer.h>
 #include <linux/nmi.h>
 #include <linux/sched/clock.h>
@@ -85,6 +86,15 @@
         ((struct acpi_hest_generic_status *)                            \
          ((struct ghes_estatus_node *)(estatus_node) + 1))
 
+/*
+ *  NMI-like notifications vary by architecture, before the compiler can prune
+ *  unused static functions it needs a value for these enums.
+ */
+#ifndef CONFIG_ARM_SDE_INTERFACE
+#define FIX_APEI_GHES_SDEI_NORMAL       __end_of_fixed_addresses
+#define FIX_APEI_GHES_SDEI_CRITICAL     __end_of_fixed_addresses
+#endif
+
 static inline bool is_hest_type_generic_v2(struct ghes *ghes)
 {
         return ghes->generic->header.type == ACPI_HEST_TYPE_GENERIC_ERROR_V2;
@@ -115,11 +125,10 @@ static DEFINE_MUTEX(ghes_list_mutex);
  * handler, but general ioremap can not be used in atomic context, so
  * the fixmap is used instead.
  *
- * These 2 spinlocks are used to prevent the fixmap entries from being used
+ * This spinlock is used to prevent the fixmap entry from being used
  * simultaneously.
  */
-static DEFINE_RAW_SPINLOCK(ghes_ioremap_lock_nmi);
-static DEFINE_SPINLOCK(ghes_ioremap_lock_irq);
+static DEFINE_SPINLOCK(ghes_notify_lock_irq);
 
 static struct gen_pool *ghes_estatus_pool;
 static unsigned long ghes_estatus_pool_size_request;
@@ -129,82 +138,49 @@ static atomic_t ghes_estatus_cache_alloced;
 
 static int ghes_panic_timeout __read_mostly = 30;
 
-static void __iomem *ghes_ioremap_pfn_nmi(u64 pfn)
+static void __iomem *ghes_map(u64 pfn, enum fixed_addresses fixmap_idx)
 {
         phys_addr_t paddr;
         pgprot_t prot;
 
-        paddr = pfn << PAGE_SHIFT;
+        paddr = PFN_PHYS(pfn);
         prot = arch_apei_get_mem_attribute(paddr);
-        __set_fixmap(FIX_APEI_GHES_NMI, paddr, prot);
+        __set_fixmap(fixmap_idx, paddr, prot);
 
-        return (void __iomem *) fix_to_virt(FIX_APEI_GHES_NMI);
+        return (void __iomem *) __fix_to_virt(fixmap_idx);
 }
 
-static void __iomem *ghes_ioremap_pfn_irq(u64 pfn)
+static void ghes_unmap(void __iomem *vaddr, enum fixed_addresses fixmap_idx)
 {
-        phys_addr_t paddr;
-        pgprot_t prot;
-
-        paddr = pfn << PAGE_SHIFT;
-        prot = arch_apei_get_mem_attribute(paddr);
-        __set_fixmap(FIX_APEI_GHES_IRQ, paddr, prot);
-
-        return (void __iomem *) fix_to_virt(FIX_APEI_GHES_IRQ);
-}
+        int _idx = virt_to_fix((unsigned long)vaddr);
 
-static void ghes_iounmap_nmi(void)
-{
-        clear_fixmap(FIX_APEI_GHES_NMI);
+        WARN_ON_ONCE(fixmap_idx != _idx);
+        clear_fixmap(fixmap_idx);
 }
 
-static void ghes_iounmap_irq(void)
+int ghes_estatus_pool_init(int num_ghes)
 {
-        clear_fixmap(FIX_APEI_GHES_IRQ);
-}
+        unsigned long addr, len;
 
-static int ghes_estatus_pool_init(void)
-{
         ghes_estatus_pool = gen_pool_create(GHES_ESTATUS_POOL_MIN_ALLOC_ORDER, -1);
         if (!ghes_estatus_pool)
                 return -ENOMEM;
-        return 0;
-}
 
-static void ghes_estatus_pool_free_chunk_page(struct gen_pool *pool,
-                                              struct gen_pool_chunk *chunk,
-                                              void *data)
-{
-        free_page(chunk->start_addr);
-}
-
-static void ghes_estatus_pool_exit(void)
-{
-        gen_pool_for_each_chunk(ghes_estatus_pool,
-                                ghes_estatus_pool_free_chunk_page, NULL);
-        gen_pool_destroy(ghes_estatus_pool);
-}
+        len = GHES_ESTATUS_CACHE_AVG_SIZE * GHES_ESTATUS_CACHE_ALLOCED_MAX;
+        len += (num_ghes * GHES_ESOURCE_PREALLOC_MAX_SIZE);
 
-static int ghes_estatus_pool_expand(unsigned long len)
-{
-        unsigned long i, pages, size, addr;
-        int ret;
+        ghes_estatus_pool_size_request = PAGE_ALIGN(len);
+        addr = (unsigned long)vmalloc(PAGE_ALIGN(len));
+        if (!addr)
+                return -ENOMEM;
 
-        ghes_estatus_pool_size_request += PAGE_ALIGN(len);
-        size = gen_pool_size(ghes_estatus_pool);
-        if (size >= ghes_estatus_pool_size_request)
-                return 0;
-        pages = (ghes_estatus_pool_size_request - size) / PAGE_SIZE;
-        for (i = 0; i < pages; i++) {
-                addr = __get_free_page(GFP_KERNEL);
-                if (!addr)
-                        return -ENOMEM;
-                ret = gen_pool_add(ghes_estatus_pool, addr, PAGE_SIZE, -1);
-                if (ret)
-                        return ret;
-        }
+        /*
+         * New allocation must be visible in all pgd before it can be found by
+         * an NMI allocating from the pool.
+         */
+        vmalloc_sync_all();
 
-        return 0;
+        return gen_pool_add(ghes_estatus_pool, addr, PAGE_ALIGN(len), -1);
 }
 
 static int map_gen_v2(struct ghes *ghes)
@@ -217,6 +193,21 @@ static void unmap_gen_v2(struct ghes *ghes)
         apei_unmap_generic_address(&ghes->generic_v2->read_ack_register);
 }
 
+static void ghes_ack_error(struct acpi_hest_generic_v2 *gv2)
+{
+        int rc;
+        u64 val = 0;
+
+        rc = apei_read(&val, &gv2->read_ack_register);
+        if (rc)
+                return;
+
+        val &= gv2->read_ack_preserve << gv2->read_ack_register.bit_offset;
+        val |= gv2->read_ack_write    << gv2->read_ack_register.bit_offset;
+
+        apei_write(val, &gv2->read_ack_register);
+}
+
 static struct ghes *ghes_new(struct acpi_hest_generic *generic)
 {
         struct ghes *ghes;
@@ -289,23 +280,16 @@ static inline int ghes_severity(int severity)
 }
 
 static void ghes_copy_tofrom_phys(void *buffer, u64 paddr, u32 len,
-                                  int from_phys)
+                                  int from_phys,
+                                  enum fixed_addresses fixmap_idx)
 {
         void __iomem *vaddr;
-        unsigned long flags = 0;
-        int in_nmi = in_nmi();
         u64 offset;
         u32 trunk;
 
         while (len > 0) {
                 offset = paddr - (paddr & PAGE_MASK);
-                if (in_nmi) {
-                        raw_spin_lock(&ghes_ioremap_lock_nmi);
-                        vaddr = ghes_ioremap_pfn_nmi(paddr >> PAGE_SHIFT);
-                } else {
-                        spin_lock_irqsave(&ghes_ioremap_lock_irq, flags);
-                        vaddr = ghes_ioremap_pfn_irq(paddr >> PAGE_SHIFT);
-                }
+                vaddr = ghes_map(PHYS_PFN(paddr), fixmap_idx);
                 trunk = PAGE_SIZE - offset;
                 trunk = min(trunk, len);
                 if (from_phys)
@@ -315,72 +299,114 @@ static void ghes_copy_tofrom_phys(void *buffer, u64 paddr, u32 len,
                 len -= trunk;
                 paddr += trunk;
                 buffer += trunk;
-                if (in_nmi) {
-                        ghes_iounmap_nmi();
-                        raw_spin_unlock(&ghes_ioremap_lock_nmi);
-                } else {
-                        ghes_iounmap_irq();
-                        spin_unlock_irqrestore(&ghes_ioremap_lock_irq, flags);
-                }
+                ghes_unmap(vaddr, fixmap_idx);
+        }
+}
+
+/* Check the top-level record header has an appropriate size. */
+static int __ghes_check_estatus(struct ghes *ghes,
+                                struct acpi_hest_generic_status *estatus)
+{
+        u32 len = cper_estatus_len(estatus);
+
+        if (len < sizeof(*estatus)) {
+                pr_warn_ratelimited(FW_WARN GHES_PFX "Truncated error status block!\n");
+                return -EIO;
+        }
+
+        if (len > ghes->generic->error_block_length) {
+                pr_warn_ratelimited(FW_WARN GHES_PFX "Invalid error status block length!\n");
+                return -EIO;
+        }
+
+        if (cper_estatus_check_header(estatus)) {
+                pr_warn_ratelimited(FW_WARN GHES_PFX "Invalid CPER header!\n");
+                return -EIO;
         }
+
+        return 0;
 }
 
-static int ghes_read_estatus(struct ghes *ghes, int silent)
+/* Read the CPER block, returning its address, and header in estatus. */
+static int __ghes_peek_estatus(struct ghes *ghes,
+                               struct acpi_hest_generic_status *estatus,
+                               u64 *buf_paddr, enum fixed_addresses fixmap_idx)
 {
         struct acpi_hest_generic *g = ghes->generic;
-        u64 buf_paddr;
-        u32 len;
         int rc;
 
-        rc = apei_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
+                *buf_paddr = 0;
+                pr_warn_ratelimited(FW_WARN GHES_PFX
 "Failed to read error status block address for hardware error source: %d.\n",
                                    g->header.source_id);
                 return -EIO;
         }
-        if (!buf_paddr)
+        if (!*buf_paddr)
                 return -ENOENT;
 
-        ghes_copy_tofrom_phys(ghes->estatus, buf_paddr,
-                              sizeof(*ghes->estatus), 1);
-        if (!ghes->estatus->block_status)
+        ghes_copy_tofrom_phys(estatus, *buf_paddr, sizeof(*estatus), 1,
+                              fixmap_idx);
+        if (!estatus->block_status) {
+                *buf_paddr = 0;
                 return -ENOENT;
+        }
 
-        ghes->buffer_paddr = buf_paddr;
-        ghes->flags |= GHES_TO_CLEAR;
+        return __ghes_check_estatus(ghes, estatus);
+}
 
-        rc = -EIO;
-        len = cper_estatus_len(ghes->estatus);
-        if (len < sizeof(*ghes->estatus))
-                goto err_read_block;
-        if (len > ghes->generic->error_block_length)
-                goto err_read_block;
-        if (cper_estatus_check_header(ghes->estatus))
-                goto err_read_block;
-        ghes_copy_tofrom_phys(ghes->estatus + 1,
-                              buf_paddr + sizeof(*ghes->estatus),
-                              len - sizeof(*ghes->estatus), 1);
-        if (cper_estatus_check(ghes->estatus))
-                goto err_read_block;
-        rc = 0;
-
-err_read_block:
-        if (rc && !silent && printk_ratelimit())
-                pr_warning(FW_WARN GHES_PFX
-                           "Failed to read error status block!\n");
-        return rc;
+static int __ghes_read_estatus(struct acpi_hest_generic_status *estatus,
+                               u64 buf_paddr, enum fixed_addresses fixmap_idx,
+                               size_t buf_len)
+{
+        ghes_copy_tofrom_phys(estatus, buf_paddr, buf_len, 1, fixmap_idx);
+        if (cper_estatus_check(estatus)) {
+                pr_warn_ratelimited(FW_WARN GHES_PFX
+                                    "Failed to read error status block!\n");
+                return -EIO;
+        }
+
+        return 0;
 }
 
-static void ghes_clear_estatus(struct ghes *ghes)
+static int ghes_read_estatus(struct ghes *ghes,
+                             struct acpi_hest_generic_status *estatus,
+                             u64 *buf_paddr, enum fixed_addresses fixmap_idx)
 {
-        ghes->estatus->block_status = 0;
-        if (!(ghes->flags & GHES_TO_CLEAR))
+        int rc;
+
+        rc = __ghes_peek_estatus(ghes, estatus, buf_paddr, fixmap_idx);
+        if (rc)
+                return rc;
+
+        rc = __ghes_check_estatus(ghes, estatus);
+        if (rc)
+                return rc;
+
+        return __ghes_read_estatus(estatus, *buf_paddr, fixmap_idx,
+                                   cper_estatus_len(estatus));
+}
+
+static void ghes_clear_estatus(struct ghes *ghes,
+                               struct acpi_hest_generic_status *estatus,
+                               u64 buf_paddr, enum fixed_addresses fixmap_idx)
+{
+        estatus->block_status = 0;
+
+        if (!buf_paddr)
                 return;
-        ghes_copy_tofrom_phys(ghes->estatus, ghes->buffer_paddr,
-                              sizeof(ghes->estatus->block_status), 0);
-        ghes->flags &= ~GHES_TO_CLEAR;
+
+        ghes_copy_tofrom_phys(estatus, buf_paddr,
+                              sizeof(estatus->block_status), 0,
+                              fixmap_idx);
+
+        /*
+         * GHESv2 type HEST entries introduce support for error acknowledgment,
+         * so only acknowledge the error if this support is present.
+         */
+        if (is_hest_type_generic_v2(ghes))
+                ghes_ack_error(ghes->generic_v2);
 }
 
 static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int sev)
@@ -672,26 +698,13 @@ static void ghes_estatus_cache_add(
         rcu_read_unlock();
 }
 
-static int ghes_ack_error(struct acpi_hest_generic_v2 *gv2)
+static void __ghes_panic(struct ghes *ghes,
+                         struct acpi_hest_generic_status *estatus,
+                         u64 buf_paddr, enum fixed_addresses fixmap_idx)
 {
-        int rc;
-        u64 val = 0;
+        __ghes_print_estatus(KERN_EMERG, ghes->generic, estatus);
 
-        rc = apei_read(&val, &gv2->read_ack_register);
-        if (rc)
-                return rc;
-
-        val &= gv2->read_ack_preserve << gv2->read_ack_register.bit_offset;
-        val |= gv2->read_ack_write    << gv2->read_ack_register.bit_offset;
-
-        return apei_write(val, &gv2->read_ack_register);
-}
-
-static void __ghes_panic(struct ghes *ghes)
-{
-        __ghes_print_estatus(KERN_EMERG, ghes->generic, ghes->estatus);
-
-        ghes_clear_estatus(ghes);
+        ghes_clear_estatus(ghes, estatus, buf_paddr, fixmap_idx);
 
         /* reboot to log the error! */
         if (!panic_timeout)
@@ -701,34 +714,25 @@ static void __ghes_panic(struct ghes *ghes)
 
 static int ghes_proc(struct ghes *ghes)
 {
+        struct acpi_hest_generic_status *estatus = ghes->estatus;
+        u64 buf_paddr;
         int rc;
 
-        rc = ghes_read_estatus(ghes, 0);
+        rc = ghes_read_estatus(ghes, estatus, &buf_paddr, FIX_APEI_GHES_IRQ);
         if (rc)
                 goto out;
 
-        if (ghes_severity(ghes->estatus->error_severity) >= GHES_SEV_PANIC) {
-                __ghes_panic(ghes);
-        }
+        if (ghes_severity(estatus->error_severity) >= GHES_SEV_PANIC)
+                __ghes_panic(ghes, estatus, buf_paddr, FIX_APEI_GHES_IRQ);
 
-        if (!ghes_estatus_cached(ghes->estatus)) {
-                if (ghes_print_estatus(NULL, ghes->generic, ghes->estatus))
-                        ghes_estatus_cache_add(ghes->generic, ghes->estatus);
+        if (!ghes_estatus_cached(estatus)) {
+                if (ghes_print_estatus(NULL, ghes->generic, estatus))
+                        ghes_estatus_cache_add(ghes->generic, estatus);
         }
-        ghes_do_proc(ghes, ghes->estatus);
+        ghes_do_proc(ghes, estatus);
 
 out:
-        ghes_clear_estatus(ghes);
-
-        if (rc == -ENOENT)
-                return rc;
-
-        /*
-         * GHESv2 type HEST entries introduce support for error acknowledgment,
-         * so only acknowledge the error if this support is present.
-         */
-        if (is_hest_type_generic_v2(ghes))
-                return ghes_ack_error(ghes->generic_v2);
+        ghes_clear_estatus(ghes, estatus, buf_paddr, FIX_APEI_GHES_IRQ);
 
         return rc;
 }
@@ -751,8 +755,11 @@ static void ghes_add_timer(struct ghes *ghes)
 static void ghes_poll_func(struct timer_list *t)
 {
         struct ghes *ghes = from_timer(ghes, t, timer);
+        unsigned long flags;
 
+        spin_lock_irqsave(&ghes_notify_lock_irq, flags);
         ghes_proc(ghes);
+        spin_unlock_irqrestore(&ghes_notify_lock_irq, flags);
         if (!(ghes->flags & GHES_EXITING))
                 ghes_add_timer(ghes);
 }
@@ -760,9 +767,12 @@ static void ghes_poll_func(struct timer_list *t)
 static irqreturn_t ghes_irq_func(int irq, void *data)
 {
         struct ghes *ghes = data;
+        unsigned long flags;
         int rc;
 
+        spin_lock_irqsave(&ghes_notify_lock_irq, flags);
         rc = ghes_proc(ghes);
+        spin_unlock_irqrestore(&ghes_notify_lock_irq, flags);
         if (rc)
                 return IRQ_NONE;
 
@@ -773,14 +783,17 @@ static int ghes_notify_hed(struct notifier_block *this, unsigned long event,
                            void *data)
 {
         struct ghes *ghes;
+        unsigned long flags;
         int ret = NOTIFY_DONE;
 
+        spin_lock_irqsave(&ghes_notify_lock_irq, flags);
         rcu_read_lock();
         list_for_each_entry_rcu(ghes, &ghes_hed, list) {
                 if (!ghes_proc(ghes))
                         ret = NOTIFY_OK;
         }
         rcu_read_unlock();
+        spin_unlock_irqrestore(&ghes_notify_lock_irq, flags);
 
         return ret;
 }
@@ -789,66 +802,20 @@ static struct notifier_block ghes_notifier_hed = {
         .notifier_call = ghes_notify_hed,
 };
 
-#ifdef CONFIG_ACPI_APEI_SEA
-static LIST_HEAD(ghes_sea);
-
-/*
- * Return 0 only if one of the SEA error sources successfully reported an error
- * record sent from the firmware.
- */
-int ghes_notify_sea(void)
-{
-        struct ghes *ghes;
-        int ret = -ENOENT;
-
-        rcu_read_lock();
-        list_for_each_entry_rcu(ghes, &ghes_sea, list) {
-                if (!ghes_proc(ghes))
-                        ret = 0;
-        }
-        rcu_read_unlock();
-        return ret;
-}
-
-static void ghes_sea_add(struct ghes *ghes)
-{
-        mutex_lock(&ghes_list_mutex);
-        list_add_rcu(&ghes->list, &ghes_sea);
-        mutex_unlock(&ghes_list_mutex);
-}
-
-static void ghes_sea_remove(struct ghes *ghes)
-{
-        mutex_lock(&ghes_list_mutex);
-        list_del_rcu(&ghes->list);
-        mutex_unlock(&ghes_list_mutex);
-        synchronize_rcu();
-}
-#else /* CONFIG_ACPI_APEI_SEA */
-static inline void ghes_sea_add(struct ghes *ghes) { }
-static inline void ghes_sea_remove(struct ghes *ghes) { }
-#endif /* CONFIG_ACPI_APEI_SEA */
-
-#ifdef CONFIG_HAVE_ACPI_APEI_NMI
 /*
- * printk is not safe in NMI context.  So in NMI handler, we allocate
- * required memory from lock-less memory allocator
- * (ghes_estatus_pool), save estatus into it, put them into lock-less
- * list (ghes_estatus_llist), then delay printk into IRQ context via
- * irq_work (ghes_proc_irq_work).  ghes_estatus_size_request record
- * required pool size by all NMI error source.
+ * Handlers for CPER records may not be NMI safe. For example,
+ * memory_failure_queue() takes spinlocks and calls schedule_work_on().
+ * In any NMI-like handler, memory from ghes_estatus_pool is used to save
+ * estatus, and added to the ghes_estatus_llist. irq_work_queue() causes
+ * ghes_proc_in_irq() to run in IRQ context where each estatus in
+ * ghes_estatus_llist is processed.
+ *
+ * Memory from the ghes_estatus_pool is also used with the ghes_estatus_cache
+ * to suppress frequent messages.
  */
 static struct llist_head ghes_estatus_llist;
 static struct irq_work ghes_proc_irq_work;
 
-/*
- * NMI may be triggered on any CPU, so ghes_in_nmi is used for
- * having only one concurrent reader.
- */
-static atomic_t ghes_in_nmi = ATOMIC_INIT(0);
-
-static LIST_HEAD(ghes_nmi);
-
 static void ghes_proc_in_irq(struct irq_work *irq_work)
 {
         struct llist_node *llnode, *next;
@@ -905,96 +872,154 @@ static void ghes_print_queued_estatus(void)
         }
 }
 
-/* Save estatus for further processing in IRQ context */
-static void __process_error(struct ghes *ghes)
+static int ghes_in_nmi_queue_one_entry(struct ghes *ghes,
+                                       enum fixed_addresses fixmap_idx)
 {
-#ifdef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG
-        u32 len, node_len;
+        struct acpi_hest_generic_status *estatus, tmp_header;
         struct ghes_estatus_node *estatus_node;
-        struct acpi_hest_generic_status *estatus;
+        u32 len, node_len;
+        u64 buf_paddr;
+        int sev, rc;
 
-        if (ghes_estatus_cached(ghes->estatus))
-                return;
+        if (!IS_ENABLED(CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG))
+                return -EOPNOTSUPP;
 
-        len = cper_estatus_len(ghes->estatus);
-        node_len = GHES_ESTATUS_NODE_LEN(len);
+        rc = __ghes_peek_estatus(ghes, &tmp_header, &buf_paddr, fixmap_idx);
+        if (rc) {
+                ghes_clear_estatus(ghes, &tmp_header, buf_paddr, fixmap_idx);
+                return rc;
+        }
 
+        rc = __ghes_check_estatus(ghes, &tmp_header);
+        if (rc) {
+                ghes_clear_estatus(ghes, &tmp_header, buf_paddr, fixmap_idx);
+                return rc;
+        }
+
+        len = cper_estatus_len(&tmp_header);
+        node_len = GHES_ESTATUS_NODE_LEN(len);
         estatus_node = (void *)gen_pool_alloc(ghes_estatus_pool, node_len);
         if (!estatus_node)
-                return;
+                return -ENOMEM;
 
         estatus_node->ghes = ghes;
         estatus_node->generic = ghes->generic;
         estatus = GHES_ESTATUS_FROM_NODE(estatus_node);
-        memcpy(estatus, ghes->estatus, len);
-        llist_add(&estatus_node->llnode, &ghes_estatus_llist);
-#endif
-}
 
-static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)
-{
-        struct ghes *ghes;
-        int sev, ret = NMI_DONE;
+        if (__ghes_read_estatus(estatus, buf_paddr, fixmap_idx, len)) {
+                ghes_clear_estatus(ghes, estatus, buf_paddr, fixmap_idx);
+                rc = -ENOENT;
+                goto no_work;
+        }
 
-        if (!atomic_add_unless(&ghes_in_nmi, 1, 1))
-                return ret;
+        sev = ghes_severity(estatus->error_severity);
+        if (sev >= GHES_SEV_PANIC) {
+                ghes_print_queued_estatus();
+                __ghes_panic(ghes, estatus, buf_paddr, fixmap_idx);
+        }
 
-        list_for_each_entry_rcu(ghes, &ghes_nmi, list) {
-                if (ghes_read_estatus(ghes, 1)) {
-                        ghes_clear_estatus(ghes);
-                        continue;
-                } else {
-                        ret = NMI_HANDLED;
-                }
+        ghes_clear_estatus(ghes, &tmp_header, buf_paddr, fixmap_idx);
 
-                sev = ghes_severity(ghes->estatus->error_severity);
-                if (sev >= GHES_SEV_PANIC) {
-                        oops_begin();
-                        ghes_print_queued_estatus();
-                        __ghes_panic(ghes);
-                }
+        /* This error has been reported before, don't process it again. */
+        if (ghes_estatus_cached(estatus))
+                goto no_work;
 
-                if (!(ghes->flags & GHES_TO_CLEAR))
-                        continue;
+        llist_add(&estatus_node->llnode, &ghes_estatus_llist);
+
+        return rc;
+
+no_work:
+        gen_pool_free(ghes_estatus_pool, (unsigned long)estatus_node,
+                      node_len);
+
+        return rc;
+}
 
-                __process_error(ghes);
-                ghes_clear_estatus(ghes);
+static int ghes_in_nmi_spool_from_list(struct list_head *rcu_list,
+                                       enum fixed_addresses fixmap_idx)
+{
+        int ret = -ENOENT;
+        struct ghes *ghes;
+
+        rcu_read_lock();
+        list_for_each_entry_rcu(ghes, rcu_list, list) {
+                if (!ghes_in_nmi_queue_one_entry(ghes, fixmap_idx))
+                        ret = 0;
         }
+        rcu_read_unlock();
 
-#ifdef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG
-        if (ret == NMI_HANDLED)
+        if (IS_ENABLED(CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG) && !ret)
                 irq_work_queue(&ghes_proc_irq_work);
-#endif
-        atomic_dec(&ghes_in_nmi);
+
         return ret;
 }
 
-static unsigned long ghes_esource_prealloc_size(
-        const struct acpi_hest_generic *generic)
+#ifdef CONFIG_ACPI_APEI_SEA
+static LIST_HEAD(ghes_sea);
+
+/*
+ * Return 0 only if one of the SEA error sources successfully reported an error
+ * record sent from the firmware.
+ */
+int ghes_notify_sea(void)
 {
-        unsigned long block_length, prealloc_records, prealloc_size;
+        static DEFINE_RAW_SPINLOCK(ghes_notify_lock_sea);
+        int rv;
 
-        block_length = min_t(unsigned long, generic->error_block_length,
-                             GHES_ESTATUS_MAX_SIZE);
-        prealloc_records = max_t(unsigned long,
-                                 generic->records_to_preallocate, 1);
-        prealloc_size = min_t(unsigned long, block_length * prealloc_records,
-                              GHES_ESOURCE_PREALLOC_MAX_SIZE);
+        raw_spin_lock(&ghes_notify_lock_sea);
+        rv = ghes_in_nmi_spool_from_list(&ghes_sea, FIX_APEI_GHES_SEA);
+        raw_spin_unlock(&ghes_notify_lock_sea);
 
-        return prealloc_size;
+        return rv;
 }
 
-static void ghes_estatus_pool_shrink(unsigned long len)
+static void ghes_sea_add(struct ghes *ghes)
 {
-        ghes_estatus_pool_size_request -= PAGE_ALIGN(len);
+        mutex_lock(&ghes_list_mutex);
+        list_add_rcu(&ghes->list, &ghes_sea);
+        mutex_unlock(&ghes_list_mutex);
 }
 
-static void ghes_nmi_add(struct ghes *ghes)
+static void ghes_sea_remove(struct ghes *ghes)
 {
-        unsigned long len;
+        mutex_lock(&ghes_list_mutex);
+        list_del_rcu(&ghes->list);
+        mutex_unlock(&ghes_list_mutex);
+        synchronize_rcu();
+}
+#else /* CONFIG_ACPI_APEI_SEA */
+static inline void ghes_sea_add(struct ghes *ghes) { }
+static inline void ghes_sea_remove(struct ghes *ghes) { }
+#endif /* CONFIG_ACPI_APEI_SEA */
+
+#ifdef CONFIG_HAVE_ACPI_APEI_NMI
+/*
+ * NMI may be triggered on any CPU, so ghes_in_nmi is used for
+ * having only one concurrent reader.
+ */
+static atomic_t ghes_in_nmi = ATOMIC_INIT(0);
+
+static LIST_HEAD(ghes_nmi);
+
+static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)
+{
+        static DEFINE_RAW_SPINLOCK(ghes_notify_lock_nmi);
+        int ret = NMI_DONE;
+
+        if (!atomic_add_unless(&ghes_in_nmi, 1, 1))
+                return ret;
+
+        raw_spin_lock(&ghes_notify_lock_nmi);
+        if (!ghes_in_nmi_spool_from_list(&ghes_nmi, FIX_APEI_GHES_NMI))
+                ret = NMI_HANDLED;
+        raw_spin_unlock(&ghes_notify_lock_nmi);
 
-        len = ghes_esource_prealloc_size(ghes->generic);
-        ghes_estatus_pool_expand(len);
+        atomic_dec(&ghes_in_nmi);
+        return ret;
+}
+
+static void ghes_nmi_add(struct ghes *ghes)
+{
         mutex_lock(&ghes_list_mutex);
         if (list_empty(&ghes_nmi))
                 register_nmi_handler(NMI_LOCAL, ghes_notify_nmi, 0, "ghes");
@@ -1004,8 +1029,6 @@ static void ghes_nmi_add(struct ghes *ghes)
 
 static void ghes_nmi_remove(struct ghes *ghes)
 {
-        unsigned long len;
-
         mutex_lock(&ghes_list_mutex);
         list_del_rcu(&ghes->list);
         if (list_empty(&ghes_nmi))
@@ -1016,24 +1039,79 @@ static void ghes_nmi_remove(struct ghes *ghes)
          * freed after NMI handler finishes.
          */
         synchronize_rcu();
-        len = ghes_esource_prealloc_size(ghes->generic);
-        ghes_estatus_pool_shrink(len);
 }
+#else /* CONFIG_HAVE_ACPI_APEI_NMI */
+static inline void ghes_nmi_add(struct ghes *ghes) { }
+static inline void ghes_nmi_remove(struct ghes *ghes) { }
+#endif /* CONFIG_HAVE_ACPI_APEI_NMI */
 
 static void ghes_nmi_init_cxt(void)
 {
         init_irq_work(&ghes_proc_irq_work, ghes_proc_in_irq);
 }
-#else /* CONFIG_HAVE_ACPI_APEI_NMI */
-static inline void ghes_nmi_add(struct ghes *ghes) { }
-static inline void ghes_nmi_remove(struct ghes *ghes) { }
-static inline void ghes_nmi_init_cxt(void) { }
-#endif /* CONFIG_HAVE_ACPI_APEI_NMI */
+
+static int __ghes_sdei_callback(struct ghes *ghes,
+                                enum fixed_addresses fixmap_idx)
+{
+        if (!ghes_in_nmi_queue_one_entry(ghes, fixmap_idx)) {
+                irq_work_queue(&ghes_proc_irq_work);
+
+                return 0;
+        }
+
+        return -ENOENT;
+}
+
+static int ghes_sdei_normal_callback(u32 event_num, struct pt_regs *regs,
+                                      void *arg)
+{
+        static DEFINE_RAW_SPINLOCK(ghes_notify_lock_sdei_normal);
+        struct ghes *ghes = arg;
+        int err;
+
+        raw_spin_lock(&ghes_notify_lock_sdei_normal);
+        err = __ghes_sdei_callback(ghes, FIX_APEI_GHES_SDEI_NORMAL);
+        raw_spin_unlock(&ghes_notify_lock_sdei_normal);
+
+        return err;
+}
+
+static int ghes_sdei_critical_callback(u32 event_num, struct pt_regs *regs,
+                                       void *arg)
+{
+        static DEFINE_RAW_SPINLOCK(ghes_notify_lock_sdei_critical);
+        struct ghes *ghes = arg;
+        int err;
+
+        raw_spin_lock(&ghes_notify_lock_sdei_critical);
+        err = __ghes_sdei_callback(ghes, FIX_APEI_GHES_SDEI_CRITICAL);
+        raw_spin_unlock(&ghes_notify_lock_sdei_critical);
+
+        return err;
+}
+
+static int apei_sdei_register_ghes(struct ghes *ghes)
+{
+        if (!IS_ENABLED(CONFIG_ARM_SDE_INTERFACE))
+                return -EOPNOTSUPP;
+
+        return sdei_register_ghes(ghes, ghes_sdei_normal_callback,
+                                 ghes_sdei_critical_callback);
+}
+
+static int apei_sdei_unregister_ghes(struct ghes *ghes)
+{
+        if (!IS_ENABLED(CONFIG_ARM_SDE_INTERFACE))
+                return -EOPNOTSUPP;
+
+        return sdei_unregister_ghes(ghes);
+}
 
 static int ghes_probe(struct platform_device *ghes_dev)
 {
         struct acpi_hest_generic *generic;
         struct ghes *ghes = NULL;
+        unsigned long flags;
 
         int rc = -EINVAL;
 
@@ -1064,6 +1142,13 @@ static int ghes_probe(struct platform_device *ghes_dev)
                         goto err;
                 }
                 break;
+        case ACPI_HEST_NOTIFY_SOFTWARE_DELEGATED:
+                if (!IS_ENABLED(CONFIG_ARM_SDE_INTERFACE)) {
+                        pr_warn(GHES_PFX "Generic hardware error source: %d notified via SDE Interface is not supported!\n",
+                                generic->header.source_id);
+                        goto err;
+                }
+                break;
         case ACPI_HEST_NOTIFY_LOCAL:
                 pr_warning(GHES_PFX "Generic hardware error source: %d notified via local interrupt is not supported!\n",
                            generic->header.source_id);
@@ -1127,6 +1212,11 @@ static int ghes_probe(struct platform_device *ghes_dev)
         case ACPI_HEST_NOTIFY_NMI:
                 ghes_nmi_add(ghes);
                 break;
+        case ACPI_HEST_NOTIFY_SOFTWARE_DELEGATED:
+                rc = apei_sdei_register_ghes(ghes);
+                if (rc)
+                        goto err;
+                break;
         default:
                 BUG();
         }
@@ -1136,7 +1226,9 @@ static int ghes_probe(struct platform_device *ghes_dev)
         ghes_edac_register(ghes, &ghes_dev->dev);
 
         /* Handle any pending errors right away */
+        spin_lock_irqsave(&ghes_notify_lock_irq, flags);
         ghes_proc(ghes);
+        spin_unlock_irqrestore(&ghes_notify_lock_irq, flags);
 
         return 0;
 
@@ -1150,6 +1242,7 @@ err:
 
 static int ghes_remove(struct platform_device *ghes_dev)
 {
+        int rc;
         struct ghes *ghes;
         struct acpi_hest_generic *generic;
 
@@ -1182,6 +1275,11 @@ static int ghes_remove(struct platform_device *ghes_dev)
         case ACPI_HEST_NOTIFY_NMI:
                 ghes_nmi_remove(ghes);
                 break;
+        case ACPI_HEST_NOTIFY_SOFTWARE_DELEGATED:
+                rc = apei_sdei_unregister_ghes(ghes);
+                if (rc)
+                        return rc;
+                break;
         default:
                 BUG();
                 break;
@@ -1230,18 +1328,9 @@ static int __init ghes_init(void)
 
         ghes_nmi_init_cxt();
 
-        rc = ghes_estatus_pool_init();
-        if (rc)
-                goto err;
-
-        rc = ghes_estatus_pool_expand(GHES_ESTATUS_CACHE_AVG_SIZE *
-                                      GHES_ESTATUS_CACHE_ALLOCED_MAX);
-        if (rc)
-                goto err_pool_exit;
-
         rc = platform_driver_register(&ghes_platform_driver);
         if (rc)
-                goto err_pool_exit;
+                goto err;
 
         rc = apei_osc_setup();
         if (rc == 0 && osc_sb_apei_support_acked)
@@ -1254,8 +1343,6 @@ static int __init ghes_init(void)
                 pr_info(GHES_PFX "Failed to enable APEI firmware first mode.\n");
 
         return 0;
-err_pool_exit:
-        ghes_estatus_pool_exit();
 err:
         return rc;
 }
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index b1e9f81ebeea..8113ddb14d28 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -32,6 +32,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <acpi/apei.h>
+#include <acpi/ghes.h>
 
 #include "apei-internal.h"
 
@@ -53,6 +54,7 @@ static const int hest_esrc_len_tab[ACPI_HEST_TYPE_RESERVED] = {
         [ACPI_HEST_TYPE_AER_BRIDGE] = sizeof(struct acpi_hest_aer_bridge),
         [ACPI_HEST_TYPE_GENERIC_ERROR] = sizeof(struct acpi_hest_generic),
         [ACPI_HEST_TYPE_GENERIC_ERROR_V2] = sizeof(struct acpi_hest_generic_v2),
+        [ACPI_HEST_TYPE_IA32_DEFERRED_CHECK] = -1,
 };
 
 static int hest_esrc_len(struct acpi_hest_header *hest_hdr)
@@ -75,6 +77,11 @@ static int hest_esrc_len(struct acpi_hest_header *hest_hdr)
                 mc = (struct acpi_hest_ia_machine_check *)hest_hdr;
                 len = sizeof(*mc) + mc->num_hardware_banks *
                         sizeof(struct acpi_hest_ia_error_bank);
+        } else if (hest_type == ACPI_HEST_TYPE_IA32_DEFERRED_CHECK) {
+                struct acpi_hest_ia_deferred_check *mc;
+                mc = (struct acpi_hest_ia_deferred_check *)hest_hdr;
+                len = sizeof(*mc) + mc->num_hardware_banks *
+                        sizeof(struct acpi_hest_ia_error_bank);
         }
         BUG_ON(len == -1);
 
@@ -203,6 +210,11 @@ static int __init hest_ghes_dev_register(unsigned int ghes_count)
         rc = apei_hest_parse(hest_parse_ghes, &ghes_arr);
         if (rc)
                 goto err;
+
+        rc = ghes_estatus_pool_init(ghes_count);
+        if (rc)
+                goto err;
+
 out:
         kfree(ghes_arr.ghes_devs);
         return rc;
@@ -251,7 +263,9 @@ void __init acpi_hest_init(void)
                 rc = apei_hest_parse(hest_parse_ghes_count, &ghes_count);
                 if (rc)
                         goto err;
-                rc = hest_ghes_dev_register(ghes_count);
+
+                if (ghes_count)
+                        rc = hest_ghes_dev_register(ghes_count);
                 if (rc)
                         goto err;
         }
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 147f6c7ea59c..6ecbbabf1233 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -799,10 +799,24 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
 }
 EXPORT_SYMBOL_GPL(acpi_match_device);
 
+static const void *acpi_of_device_get_match_data(const struct device *dev)
+{
+        struct acpi_device *adev = ACPI_COMPANION(dev);
+        const struct of_device_id *match = NULL;
+
+        if (!acpi_of_match_device(adev, dev->driver->of_match_table, &match))
+                return NULL;
+
+        return match->data;
+}
+
 const void *acpi_device_get_match_data(const struct device *dev)
 {
         const struct acpi_device_id *match;
 
+        if (!dev->driver->acpi_match_table)
+                return acpi_of_device_get_match_data(dev);
+
         match = acpi_match_device(dev->driver->acpi_match_table, dev);
         if (!match)
                 return NULL;
diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
index 4451877f83b6..aa972dc5cb7e 100644
--- a/drivers/acpi/custom_method.c
+++ b/drivers/acpi/custom_method.c
@@ -79,14 +79,8 @@ static const struct file_operations cm_fops = {
 
 static int __init acpi_custom_method_init(void)
 {
-        if (acpi_debugfs_dir == NULL)
-                return -ENOENT;
-
         cm_dentry = debugfs_create_file("custom_method", S_IWUSR,
                                         acpi_debugfs_dir, NULL, &cm_fops);
-        if (cm_dentry == NULL)
-                return -ENODEV;
-
         return 0;
 }
 
diff --git a/drivers/acpi/dptf/Makefile b/drivers/acpi/dptf/Makefile
index 06ea8809583d..e6032e47e83f 100644
--- a/drivers/acpi/dptf/Makefile
+++ b/drivers/acpi/dptf/Makefile
@@ -1,4 +1,2 @@
 obj-$(CONFIG_ACPI)             += int340x_thermal.o
 obj-$(CONFIG_DPTF_POWER)        += dptf_power.o
-
-ccflags-y += -Idrivers/acpi
diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c
index 86364097e236..0aa7c2e62e95 100644
--- a/drivers/acpi/dptf/int340x_thermal.c
+++ b/drivers/acpi/dptf/int340x_thermal.c
@@ -12,7 +12,7 @@
 #include <linux/acpi.h>
 #include <linux/module.h>
 
-#include "internal.h"
+#include "../internal.h"
 
 #define INT3401_DEVICE 0X01
 static const struct acpi_device_id int340x_thermal_device_ids[] = {
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 9d66a47d32fb..48d4815603e5 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -186,14 +186,17 @@ static void advance_transaction(struct acpi_ec *ec);
 static void acpi_ec_event_handler(struct work_struct *work);
 static void acpi_ec_event_processor(struct work_struct *work);
 
-struct acpi_ec *boot_ec, *first_ec;
+struct acpi_ec *first_ec;
 EXPORT_SYMBOL(first_ec);
+
+static struct acpi_ec *boot_ec;
 static bool boot_ec_is_ecdt = false;
 static struct workqueue_struct *ec_query_wq;
 
 static int EC_FLAGS_QUERY_HANDSHAKE; /* Needs QR_EC issued when SCI_EVT set */
 static int EC_FLAGS_CORRECT_ECDT; /* Needs ECDT port address correction */
 static int EC_FLAGS_IGNORE_DSDT_GPE; /* Needs ECDT GPE as correction setting */
+static int EC_FLAGS_CLEAR_ON_RESUME; /* Needs acpi_ec_clear() on boot/resume */
 
 /* --------------------------------------------------------------------------
  *                           Logging/Debugging
@@ -499,6 +502,26 @@ static inline void __acpi_ec_disable_event(struct acpi_ec *ec)
                 ec_log_drv("event blocked");
 }
 
+/*
+ * Process _Q events that might have accumulated in the EC.
+ * Run with locked ec mutex.
+ */
+static void acpi_ec_clear(struct acpi_ec *ec)
+{
+        int i, status;
+        u8 value = 0;
+
+        for (i = 0; i < ACPI_EC_CLEAR_MAX; i++) {
+                status = acpi_ec_query(ec, &value);
+                if (status || !value)
+                        break;
+        }
+        if (unlikely(i == ACPI_EC_CLEAR_MAX))
+                pr_warn("Warning: Maximum of %d stale EC events cleared\n", i);
+        else
+                pr_info("%d stale EC events cleared\n", i);
+}
+
 static void acpi_ec_enable_event(struct acpi_ec *ec)
 {
         unsigned long flags;
@@ -507,6 +530,10 @@ static void acpi_ec_enable_event(struct acpi_ec *ec)
         if (acpi_ec_started(ec))
                 __acpi_ec_enable_event(ec);
         spin_unlock_irqrestore(&ec->lock, flags);
+
+        /* Drain additional events if hardware requires that */
+        if (EC_FLAGS_CLEAR_ON_RESUME)
+                acpi_ec_clear(ec);
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -1539,49 +1566,6 @@ static int acpi_ec_setup(struct acpi_ec *ec, bool handle_events)
         return ret;
 }
 
-static int acpi_config_boot_ec(struct acpi_ec *ec, acpi_handle handle,
-                               bool handle_events, bool is_ecdt)
-{
-        int ret;
-
-        /*
-         * Changing the ACPI handle results in a re-configuration of the
-         * boot EC. And if it happens after the namespace initialization,
-         * it causes _REG evaluations.
-         */
-        if (boot_ec && boot_ec->handle != handle)
-                ec_remove_handlers(boot_ec);
-
-        /* Unset old boot EC */
-        if (boot_ec != ec)
-                acpi_ec_free(boot_ec);
-
-        /*
-         * ECDT device creation is split into acpi_ec_ecdt_probe() and
-         * acpi_ec_ecdt_start(). This function takes care of completing the
-         * ECDT parsing logic as the handle update should be performed
-         * between the installation/uninstallation of the handlers.
-         */
-        if (ec->handle != handle)
-                ec->handle = handle;
-
-        ret = acpi_ec_setup(ec, handle_events);
-        if (ret)
-                return ret;
-
-        /* Set new boot EC */
-        if (!boot_ec) {
-                boot_ec = ec;
-                boot_ec_is_ecdt = is_ecdt;
-        }
-
-        acpi_handle_info(boot_ec->handle,
-                         "Used as boot %s EC to handle transactions%s\n",
-                         is_ecdt ? "ECDT" : "DSDT",
-                         handle_events ? " and events" : "");
-        return ret;
-}
-
 static bool acpi_ec_ecdt_get_handle(acpi_handle *phandle)
 {
         struct acpi_table_ecdt *ecdt_ptr;
@@ -1601,43 +1585,34 @@ static bool acpi_ec_ecdt_get_handle(acpi_handle *phandle)
         return true;
 }
 
-static bool acpi_is_boot_ec(struct acpi_ec *ec)
-{
-        if (!boot_ec)
-                return false;
-        if (ec->command_addr == boot_ec->command_addr &&
-            ec->data_addr == boot_ec->data_addr)
-                return true;
-        return false;
-}
-
 static int acpi_ec_add(struct acpi_device *device)
 {
         struct acpi_ec *ec = NULL;
-        int ret;
-        bool is_ecdt = false;
+        bool dep_update = true;
         acpi_status status;
+        int ret;
 
         strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_EC_CLASS);
 
         if (!strcmp(acpi_device_hid(device), ACPI_ECDT_HID)) {
-                is_ecdt = true;
+                boot_ec_is_ecdt = true;
                 ec = boot_ec;
+                dep_update = false;
         } else {
                 ec = acpi_ec_alloc();
                 if (!ec)
                         return -ENOMEM;
+
                 status = ec_parse_device(device->handle, 0, ec, NULL);
                 if (status != AE_CTRL_TERMINATE) {
                         ret = -EINVAL;
                         goto err_alloc;
                 }
-        }
 
-        if (acpi_is_boot_ec(ec)) {
-                boot_ec_is_ecdt = is_ecdt;
-                if (!is_ecdt) {
+                if (boot_ec && ec->command_addr == boot_ec->command_addr &&
+                    ec->data_addr == boot_ec->data_addr) {
+                        boot_ec_is_ecdt = false;
                         /*
                          * Trust PNP0C09 namespace location rather than
                          * ECDT ID. But trust ECDT GPE rather than _GPE
@@ -1649,12 +1624,17 @@ static int acpi_ec_add(struct acpi_device *device)
                         acpi_ec_free(ec);
                         ec = boot_ec;
                 }
-                ret = acpi_config_boot_ec(ec, ec->handle, true, is_ecdt);
-        } else
-                ret = acpi_ec_setup(ec, true);
+        }
+
+        ret = acpi_ec_setup(ec, true);
         if (ret)
                 goto err_query;
 
+        if (ec == boot_ec)
+                acpi_handle_info(boot_ec->handle,
+                                 "Boot %s EC used to handle transactions and events\n",
+                                 boot_ec_is_ecdt ? "ECDT" : "DSDT");
+
         device->driver_data = ec;
 
         ret = !!request_region(ec->data_addr, 1, "EC data");
@@ -1662,7 +1642,7 @@ static int acpi_ec_add(struct acpi_device *device)
         ret = !!request_region(ec->command_addr, 1, "EC cmd");
         WARN(!ret, "Could not request EC cmd io port 0x%lx", ec->command_addr);
 
-        if (!is_ecdt) {
+        if (dep_update) {
                 /* Reprobe devices depending on the EC */
                 acpi_walk_dep_device_list(ec->handle);
         }
@@ -1730,10 +1710,10 @@ static const struct acpi_device_id ec_device_ids[] = {
  * namespace EC before the main ACPI device enumeration process. It is
  * retained for historical reason and will be deprecated in the future.
  */
-int __init acpi_ec_dsdt_probe(void)
+void __init acpi_ec_dsdt_probe(void)
 {
-        acpi_status status;
         struct acpi_ec *ec;
+        acpi_status status;
         int ret;
 
         /*
@@ -1743,21 +1723,22 @@ int __init acpi_ec_dsdt_probe(void)
          * picking up an invalid EC device.
          */
         if (boot_ec)
-                return -ENODEV;
+                return;
 
         ec = acpi_ec_alloc();
         if (!ec)
-                return -ENOMEM;
+                return;
+
         /*
          * At this point, the namespace is initialized, so start to find
          * the namespace objects.
          */
-        status = acpi_get_devices(ec_device_ids[0].id,
-                                  ec_parse_device, ec, NULL);
+        status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device, ec, NULL);
         if (ACPI_FAILURE(status) || !ec->handle) {
-                ret = -ENODEV;
-                goto error;
+                acpi_ec_free(ec);
+                return;
         }
+
         /*
          * When the DSDT EC is available, always re-configure boot EC to
          * have _REG evaluated. _REG can only be evaluated after the
@@ -1765,11 +1746,16 @@ int __init acpi_ec_dsdt_probe(void)
          * At this point, the GPE is not fully initialized, so do not to
          * handle the events.
          */
-        ret = acpi_config_boot_ec(ec, ec->handle, false, false);
-error:
-        if (ret)
+        ret = acpi_ec_setup(ec, false);
+        if (ret) {
                 acpi_ec_free(ec);
-        return ret;
+                return;
+        }
+
+        boot_ec = ec;
+
+        acpi_handle_info(ec->handle,
+                         "Boot DSDT EC used to handle transactions\n");
 }
 
 /*
@@ -1821,6 +1807,31 @@ static int ec_flag_query_handshake(const struct dmi_system_id *id)
 #endif
 
 /*
+ * On some hardware it is necessary to clear events accumulated by the EC during
+ * sleep. These ECs stop reporting GPEs until they are manually polled, if too
+ * many events are accumulated. (e.g. Samsung Series 5/9 notebooks)
+ *
+ * https://bugzilla.kernel.org/show_bug.cgi?id=44161
+ *
+ * Ideally, the EC should also be instructed NOT to accumulate events during
+ * sleep (which Windows seems to do somehow), but the interface to control this
+ * behaviour is not known at this time.
+ *
+ * Models known to be affected are Samsung 530Uxx/535Uxx/540Uxx/550Pxx/900Xxx,
+ * however it is very likely that other Samsung models are affected.
+ *
+ * On systems which don't accumulate _Q events during sleep, this extra check
+ * should be harmless.
+ */
+static int ec_clear_on_resume(const struct dmi_system_id *id)
+{
+        pr_debug("Detected system needing EC poll on resume.\n");
+        EC_FLAGS_CLEAR_ON_RESUME = 1;
+        ec_event_clearing = ACPI_EC_EVT_TIMING_STATUS;
+        return 0;
+}
+
+/*
  * Some ECDTs contain wrong register addresses.
  * MSI MS-171F
  * https://bugzilla.kernel.org/show_bug.cgi?id=12461
@@ -1869,39 +1880,38 @@ static const struct dmi_system_id ec_dmi_table[] __initconst = {
         ec_honor_ecdt_gpe, "ASUS X580VD", {
         DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
         DMI_MATCH(DMI_PRODUCT_NAME, "X580VD"),}, NULL},
+        {
+        ec_clear_on_resume, "Samsung hardware", {
+        DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD.")}, NULL},
         {},
 };
 
-int __init acpi_ec_ecdt_probe(void)
+void __init acpi_ec_ecdt_probe(void)
 {
-        int ret;
-        acpi_status status;
         struct acpi_table_ecdt *ecdt_ptr;
         struct acpi_ec *ec;
+        acpi_status status;
+        int ret;
 
-        ec = acpi_ec_alloc();
-        if (!ec)
-                return -ENOMEM;
-        /*
-         * Generate a boot ec context
-         */
+        /* Generate a boot ec context. */
         dmi_check_system(ec_dmi_table);
         status = acpi_get_table(ACPI_SIG_ECDT, 1,
                                 (struct acpi_table_header **)&ecdt_ptr);
-        if (ACPI_FAILURE(status)) {
-                ret = -ENODEV;
-                goto error;
-        }
+        if (ACPI_FAILURE(status))
+                return;
 
         if (!ecdt_ptr->control.address || !ecdt_ptr->data.address) {
                 /*
                  * Asus X50GL:
                  * https://bugzilla.kernel.org/show_bug.cgi?id=11880
                  */
-                ret = -ENODEV;
-                goto error;
+                return;
         }
 
+        ec = acpi_ec_alloc();
+        if (!ec)
+                return;
+
         if (EC_FLAGS_CORRECT_ECDT) {
                 ec->command_addr = ecdt_ptr->data.address;
                 ec->data_addr = ecdt_ptr->control.address;
@@ -1910,16 +1920,22 @@ int __init acpi_ec_ecdt_probe(void)
                 ec->data_addr = ecdt_ptr->data.address;
         }
         ec->gpe = ecdt_ptr->gpe;
+        ec->handle = ACPI_ROOT_OBJECT;
 
         /*
          * At this point, the namespace is not initialized, so do not find
          * the namespace objects, or handle the events.
          */
-        ret = acpi_config_boot_ec(ec, ACPI_ROOT_OBJECT, false, true);
-error:
-        if (ret)
+        ret = acpi_ec_setup(ec, false);
+        if (ret) {
                 acpi_ec_free(ec);
-        return ret;
+                return;
+        }
+
+        boot_ec = ec;
+        boot_ec_is_ecdt = true;
+
+        pr_info("Boot ECDT EC used to handle transactions\n");
 }
 
 #ifdef CONFIG_PM_SLEEP
diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
index dd70d6c2bca0..23faa66ea772 100644
--- a/drivers/acpi/ec_sys.c
+++ b/drivers/acpi/ec_sys.c
@@ -108,52 +108,32 @@ static const struct file_operations acpi_ec_io_ops = {
         .llseek = default_llseek,
 };
 
-static int acpi_ec_add_debugfs(struct acpi_ec *ec, unsigned int ec_device_count)
+static void acpi_ec_add_debugfs(struct acpi_ec *ec, unsigned int ec_device_count)
 {
         struct dentry *dev_dir;
         char name[64];
         umode_t mode = 0400;
 
-        if (ec_device_count == 0) {
+        if (ec_device_count == 0)
                 acpi_ec_debugfs_dir = debugfs_create_dir("ec", NULL);
-                if (!acpi_ec_debugfs_dir)
-                        return -ENOMEM;
-        }
 
         sprintf(name, "ec%u", ec_device_count);
         dev_dir = debugfs_create_dir(name, acpi_ec_debugfs_dir);
-        if (!dev_dir) {
-                if (ec_device_count != 0)
-                        goto error;
-                return -ENOMEM;
-        }
 
-        if (!debugfs_create_x32("gpe", 0444, dev_dir, &first_ec->gpe))
-                goto error;
-        if (!debugfs_create_bool("use_global_lock", 0444, dev_dir,
-                                 &first_ec->global_lock))
-                goto error;
+        debugfs_create_x32("gpe", 0444, dev_dir, &first_ec->gpe);
+        debugfs_create_bool("use_global_lock", 0444, dev_dir,
+                            &first_ec->global_lock);
 
         if (write_support)
                 mode = 0600;
-        if (!debugfs_create_file("io", mode, dev_dir, ec, &acpi_ec_io_ops))
-                goto error;
-
-        return 0;
-
-error:
-        debugfs_remove_recursive(acpi_ec_debugfs_dir);
-        return -ENOMEM;
+        debugfs_create_file("io", mode, dev_dir, ec, &acpi_ec_io_ops);
 }
 
 static int __init acpi_ec_sys_init(void)
 {
-        int err = 0;
         if (first_ec)
-                err = acpi_ec_add_debugfs(first_ec, 0);
-        else
-                err = -ENODEV;
-        return err;
+                acpi_ec_add_debugfs(first_ec, 0);
+        return 0;
 }
 
 static void __exit acpi_ec_sys_exit(void)
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 6a9e1fb8913a..6eaf06db7752 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -192,8 +192,8 @@ extern struct acpi_ec *first_ec;
 typedef int (*acpi_ec_query_func) (void *data);
 
 int acpi_ec_init(void);
-int acpi_ec_ecdt_probe(void);
-int acpi_ec_dsdt_probe(void);
+void acpi_ec_ecdt_probe(void);
+void acpi_ec_dsdt_probe(void);
 void acpi_ec_block_transactions(void);
 void acpi_ec_unblock_transactions(void);
 void acpi_ec_mark_gpe_for_wake(void);
diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
index 7c352cba0528..c3b2222e2129 100644
--- a/drivers/acpi/irq.c
+++ b/drivers/acpi/irq.c
@@ -196,7 +196,7 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
                 fwnode = acpi_gsi_domain_id;
                 acpi_irq_parse_one_match(fwnode, irq->interrupts[ctx->index],
                                          irq->triggering, irq->polarity,
-                                         irq->sharable, ctx);
+                                         irq->shareable, ctx);
                 return AE_CTRL_TERMINATE;
         case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
                 eirq = &ares->data.extended_irq;
@@ -209,7 +209,7 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
                 fwnode = acpi_get_irq_source_fwhandle(&eirq->resource_source);
                 acpi_irq_parse_one_match(fwnode, eirq->interrupts[ctx->index],
                                          eirq->triggering, eirq->polarity,
-                                         eirq->sharable, ctx);
+                                         eirq->shareable, ctx);
                 return AE_CTRL_TERMINATE;
         }
 
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index d5eec352a6e1..df70b1eaef58 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -317,10 +317,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
                 resource->res.data.irq.polarity =
                     link->irq.polarity;
                 if (link->irq.triggering == ACPI_EDGE_SENSITIVE)
-                        resource->res.data.irq.sharable =
+                        resource->res.data.irq.shareable =
                             ACPI_EXCLUSIVE;
                 else
-                        resource->res.data.irq.sharable = ACPI_SHARED;
+                        resource->res.data.irq.shareable = ACPI_SHARED;
                 resource->res.data.irq.interrupt_count = 1;
                 resource->res.data.irq.interrupts[0] = irq;
                 break;
@@ -335,10 +335,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
                 resource->res.data.extended_irq.polarity =
                     link->irq.polarity;
                 if (link->irq.triggering == ACPI_EDGE_SENSITIVE)
-                        resource->res.data.irq.sharable =
+                        resource->res.data.irq.shareable =
                             ACPI_EXCLUSIVE;
                 else
-                        resource->res.data.irq.sharable = ACPI_SHARED;
+                        resource->res.data.irq.shareable = ACPI_SHARED;
                 resource->res.data.extended_irq.interrupt_count = 1;
                 resource->res.data.extended_irq.interrupts[0] = irq;
                 /* ignore resource_source, it's optional */
diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c
index da031b1df6f5..ad31c50de3be 100644
--- a/drivers/acpi/pptt.c
+++ b/drivers/acpi/pptt.c
@@ -451,6 +451,11 @@ static struct acpi_pptt_processor *acpi_find_processor_package_id(struct acpi_ta
         return cpu;
 }
 
+static void acpi_pptt_warn_missing(void)
+{
+        pr_warn_once("No PPTT table found, cpu and cache topology may be inaccurate\n");
+}
+
 /**
  * topology_get_acpi_cpu_tag() - Find a unique topology value for a feature
  * @table: Pointer to the head of the PPTT table
@@ -498,7 +503,7 @@ static int find_acpi_cpu_topology_tag(unsigned int cpu, int level, int flag)
 
         status = acpi_get_table(ACPI_SIG_PPTT, 0, &table);
         if (ACPI_FAILURE(status)) {
-                pr_warn_once("No PPTT table found, cpu topology may be inaccurate\n");
+                acpi_pptt_warn_missing();
                 return -ENOENT;
         }
         retval = topology_get_acpi_cpu_tag(table, cpu, level, flag);
@@ -531,7 +536,7 @@ int acpi_find_last_cache_level(unsigned int cpu)
         acpi_cpu_id = get_acpi_id_for_cpu(cpu);
         status = acpi_get_table(ACPI_SIG_PPTT, 0, &table);
         if (ACPI_FAILURE(status)) {
-                pr_warn_once("No PPTT table found, cache topology may be inaccurate\n");
+                acpi_pptt_warn_missing();
         } else {
                 number_of_levels = acpi_find_cache_levels(table, acpi_cpu_id);
                 acpi_put_table(table);
@@ -563,7 +568,7 @@ int cache_setup_acpi(unsigned int cpu)
 
         status = acpi_get_table(ACPI_SIG_PPTT, 0, &table);
         if (ACPI_FAILURE(status)) {
-                pr_warn_once("No PPTT table found, cache topology may be inaccurate\n");
+                acpi_pptt_warn_missing();
                 return -ENOENT;
         }
 
@@ -617,7 +622,7 @@ int find_acpi_cpu_cache_topology(unsigned int cpu, int level)
 
         status = acpi_get_table(ACPI_SIG_PPTT, 0, &table);
         if (ACPI_FAILURE(status)) {
-                pr_warn_once("No PPTT table found, topology may be inaccurate\n");
+                acpi_pptt_warn_missing();
                 return -ENOENT;
         }
 
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 316a0fc785e3..d556f2144de8 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -476,7 +476,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
                 }
                 acpi_dev_get_irqresource(res, irq->interrupts[index],
                                          irq->triggering, irq->polarity,
-                                         irq->sharable, true);
+                                         irq->shareable, true);
                 break;
         case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
                 ext_irq = &ares->data.extended_irq;
@@ -487,7 +487,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
                 if (is_gsi(ext_irq))
                         acpi_dev_get_irqresource(res, ext_irq->interrupts[index],
                                          ext_irq->triggering, ext_irq->polarity,
-                                         ext_irq->sharable, false);
+                                         ext_irq->shareable, false);
                 else
                         acpi_dev_irqresource_disabled(res, 0);
                 break;
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 48eabb6c2d4f..8fccbe49612a 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -473,14 +473,22 @@ static DECLARE_BITMAP(acpi_initrd_installed, NR_ACPI_INITRD_TABLES);
 
 void __init acpi_table_upgrade(void)
 {
-        void *data = (void *)initrd_start;
-        size_t size = initrd_end - initrd_start;
+        void *data;
+        size_t size;
         int sig, no, table_nr = 0, total_offset = 0;
         long offset = 0;
         struct acpi_table_header *table;
         char cpio_path[32] = "kernel/firmware/acpi/";
         struct cpio_data file;
 
+        if (IS_ENABLED(CONFIG_ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD)) {
+                data = __initramfs_start;
+                size = __initramfs_size;
+        } else {
+                data = (void *)initrd_start;
+                size = initrd_end - initrd_start;
+        }
+
         if (data == NULL || size == 0)
                 return;
 
diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c
index 9a8e286dd86f..c6df14802741 100644
--- a/drivers/acpi/x86/utils.c
+++ b/drivers/acpi/x86/utils.c
@@ -56,6 +56,11 @@ static const struct always_present_id always_present_ids[] = {
          */
         ENTRY("80860F09", "1", ICPU(INTEL_FAM6_ATOM_SILVERMONT), {}),
         ENTRY("80862288", "1", ICPU(INTEL_FAM6_ATOM_AIRMONT), {}),
+
+        /* Lenovo Yoga Book uses PWM2 for keyboard backlight control */
+        ENTRY("80862289", "2", ICPU(INTEL_FAM6_ATOM_AIRMONT), {
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X9"),
+                }),
         /*
          * The INT0002 device is necessary to clear wakeup interrupt sources
          * on Cherry Trail devices, without it we get nobody cared IRQ msgs.
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index c64c7da73829..e6376f985ef7 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -2,6 +2,7 @@
 // Copyright (C) 2017 Arm Ltd.
 #define pr_fmt(fmt) "sdei: " fmt
 
+#include <acpi/ghes.h>
 #include <linux/acpi.h>
 #include <linux/arm_sdei.h>
 #include <linux/arm-smccc.h>
@@ -887,6 +888,73 @@ static void sdei_smccc_hvc(unsigned long function_id,
         arm_smccc_hvc(function_id, arg0, arg1, arg2, arg3, arg4, 0, 0, res);
 }
 
+int sdei_register_ghes(struct ghes *ghes, sdei_event_callback *normal_cb,
+                       sdei_event_callback *critical_cb)
+{
+        int err;
+        u64 result;
+        u32 event_num;
+        sdei_event_callback *cb;
+
+        if (!IS_ENABLED(CONFIG_ACPI_APEI_GHES))
+                return -EOPNOTSUPP;
+
+        event_num = ghes->generic->notify.vector;
+        if (event_num == 0) {
+                /*
+                 * Event 0 is reserved by the specification for
+                 * SDEI_EVENT_SIGNAL.
+                 */
+                return -EINVAL;
+        }
+
+        err = sdei_api_event_get_info(event_num, SDEI_EVENT_INFO_EV_PRIORITY,
+                                      &result);
+        if (err)
+                return err;
+
+        if (result == SDEI_EVENT_PRIORITY_CRITICAL)
+                cb = critical_cb;
+        else
+                cb = normal_cb;
+
+        err = sdei_event_register(event_num, cb, ghes);
+        if (!err)
+                err = sdei_event_enable(event_num);
+
+        return err;
+}
+
+int sdei_unregister_ghes(struct ghes *ghes)
+{
+        int i;
+        int err;
+        u32 event_num = ghes->generic->notify.vector;
+
+        might_sleep();
+
+        if (!IS_ENABLED(CONFIG_ACPI_APEI_GHES))
+                return -EOPNOTSUPP;
+
+        /*
+         * The event may be running on another CPU. Disable it
+         * to stop new events, then try to unregister a few times.
+         */
+        err = sdei_event_disable(event_num);
+        if (err)
+                return err;
+
+        for (i = 0; i < 3; i++) {
+                err = sdei_event_unregister(event_num);
+                if (err != -EINPROGRESS)
+                        break;
+
+                schedule();
+        }
+
+        return err;
+}
+
 static int sdei_get_conduit(struct platform_device *pdev)
 {
         const char *method;
diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
index 6a966ecdd80a..8fa977c7861f 100644
--- a/drivers/firmware/efi/cper.c
+++ b/drivers/firmware/efi/cper.c
@@ -534,19 +534,24 @@ EXPORT_SYMBOL_GPL(cper_estatus_check_header);
 int cper_estatus_check(const struct acpi_hest_generic_status *estatus)
 {
         struct acpi_hest_generic_data *gdata;
-        unsigned int data_len, gedata_len;
+        unsigned int data_len, record_size;
         int rc;
 
         rc = cper_estatus_check_header(estatus);
         if (rc)
                 return rc;
+
         data_len = estatus->data_length;
 
         apei_estatus_for_each_section(estatus, gdata) {
-                gedata_len = acpi_hest_get_error_length(gdata);
-                if (gedata_len > data_len - acpi_hest_get_size(gdata))
+                if (sizeof(struct acpi_hest_generic_data) > data_len)
+                        return -EINVAL;
+
+                record_size = acpi_hest_get_record_size(gdata);
+                if (record_size > data_len)
                         return -EINVAL;
-                data_len -= acpi_hest_get_record_size(gdata);
+
+                data_len -= record_size;
         }
         if (data_len)
                 return -EINVAL;
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 259cf6ab969b..667f472fdbbd 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -892,7 +892,7 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
                  * event but only if the access here is ACPI_READ. In that
                  * case we "borrow" the event GPIO instead.
                  */
-                if (!found && agpio->sharable == ACPI_SHARED &&
+                if (!found && agpio->shareable == ACPI_SHARED &&
                      function == ACPI_READ) {
                         struct acpi_gpio_event *event;
 
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index b205b037fd61..4bfbfa3f78e6 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -4392,7 +4392,7 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
                                 list_add(&interrupt->list, &dev->interrupts);
                                 interrupt->irq.triggering = p->triggering;
                                 interrupt->irq.polarity = p->polarity;
-                                interrupt->irq.sharable = p->sharable;
+                                interrupt->irq.shareable = p->shareable;
                                 interrupt->irq.interrupt_count = 1;
                                 interrupt->irq.interrupts[0] = p->interrupts[i];
                         }
@@ -4546,7 +4546,7 @@ static int sony_pic_enable(struct acpi_device *device,
                 memcpy(&resource->res3.data.irq, &irq->irq,
                                 sizeof(struct acpi_resource_irq));
                 /* we requested a shared irq */
-                resource->res3.data.irq.sharable = ACPI_SHARED;
+                resource->res3.data.irq.shareable = ACPI_SHARED;
 
                 resource->res4.type = ACPI_RESOURCE_TYPE_END_TAG;
                 resource->res4.length = sizeof(struct acpi_resource);
@@ -4565,7 +4565,7 @@ static int sony_pic_enable(struct acpi_device *device,
                 memcpy(&resource->res2.data.irq, &irq->irq,
                                 sizeof(struct acpi_resource_irq));
                 /* we requested a shared irq */
-                resource->res2.data.irq.sharable = ACPI_SHARED;
+                resource->res2.data.irq.shareable = ACPI_SHARED;
 
                 resource->res3.type = ACPI_RESOURCE_TYPE_END_TAG;
                 resource->res3.length = sizeof(struct acpi_resource);
@@ -4779,7 +4779,7 @@ static int sony_pic_add(struct acpi_device *device)
                                         irq->irq.interrupts[0],
                                         irq->irq.triggering,
                                         irq->irq.polarity,
-                                        irq->irq.sharable);
+                                        irq->irq.shareable);
                         spic_dev.cur_irq = irq;
                         break;
                 }
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 43d8ed577e70..c79417ca1b3c 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -215,7 +215,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                 if (i >= 0) {
                         flags = acpi_dev_irq_flags(gpio->triggering,
                                                    gpio->polarity,
-                                                   gpio->sharable);
+                                                   gpio->shareable);
                 } else {
                         flags = IORESOURCE_DISABLED;
                 }
@@ -324,7 +324,7 @@ static __init void pnpacpi_parse_irq_option(struct pnp_dev *dev,
                 if (p->interrupts[i])
                         __set_bit(p->interrupts[i], map.bits);
 
-        flags = acpi_dev_irq_flags(p->triggering, p->polarity, p->sharable);
+        flags = acpi_dev_irq_flags(p->triggering, p->polarity, p->shareable);
         pnp_register_irq_resource(dev, option_flags, &map, flags);
 }
 
@@ -348,7 +348,7 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev,
                 }
         }
 
-        flags = acpi_dev_irq_flags(p->triggering, p->polarity, p->sharable);
+        flags = acpi_dev_irq_flags(p->triggering, p->polarity, p->shareable);
         pnp_register_irq_resource(dev, option_flags, &map, flags);
 }
 
@@ -681,7 +681,7 @@ static void pnpacpi_encode_irq(struct pnp_dev *dev,
         decode_irq_flags(dev, p->flags, &triggering, &polarity, &shareable);
         irq->triggering = triggering;
         irq->polarity = polarity;
-        irq->sharable = shareable;
+        irq->shareable = shareable;
         irq->interrupt_count = 1;
         irq->interrupts[0] = p->start;
 
@@ -689,7 +689,7 @@ static void pnpacpi_encode_irq(struct pnp_dev *dev,
                 (int) p->start,
                 triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge",
                 polarity == ACPI_ACTIVE_LOW ? "low" : "high",
-                irq->sharable == ACPI_SHARED ? "shared" : "exclusive",
+                irq->shareable == ACPI_SHARED ? "shared" : "exclusive",
                 irq->descriptor_length);
 }
 
@@ -711,14 +711,14 @@ static void pnpacpi_encode_ext_irq(struct pnp_dev *dev,
         extended_irq->producer_consumer = ACPI_CONSUMER;
         extended_irq->triggering = triggering;
         extended_irq->polarity = polarity;
-        extended_irq->sharable = shareable;
+        extended_irq->shareable = shareable;
         extended_irq->interrupt_count = 1;
         extended_irq->interrupts[0] = p->start;
 
         pnp_dbg(&dev->dev, "  encode irq %d %s %s %s\n", (int) p->start,
                 triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge",
                 polarity == ACPI_ACTIVE_LOW ? "low" : "high",
-                extended_irq->sharable == ACPI_SHARED ? "shared" : "exclusive");
+                extended_irq->shareable == ACPI_SHARED ? "shared" : "exclusive");
 }
 
 static void pnpacpi_encode_dma(struct pnp_dev *dev,