57 files changed, 424 insertions, 169 deletions

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index ea2ab0330e3a..bcb6262044d8 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -5,7 +5,7 @@ config ARM64
         select ACPI_GTDT if ACPI
         select ACPI_IORT if ACPI
         select ACPI_REDUCED_HARDWARE_ONLY if ACPI
-        select ACPI_MCFG if ACPI
+        select ACPI_MCFG if (ACPI && PCI)
         select ACPI_SPCR_TABLE if ACPI
         select ACPI_PPTT if ACPI
         select ARCH_CLOCKSOURCE_DATA
@@ -163,7 +163,7 @@ config ARM64
         select OF
         select OF_EARLY_FLATTREE
         select OF_RESERVED_MEM
-        select PCI_ECAM if ACPI
+        select PCI_ECAM if (ACPI && PCI)
         select POWER_RESET
         select POWER_SUPPLY
         select REFCOUNT_FULL
diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
index 959d618dbb17..73bb404f4d2a 100644
--- a/arch/x86/include/asm/pci_x86.h
+++ b/arch/x86/include/asm/pci_x86.h
@@ -121,7 +121,14 @@ extern void __init dmi_check_pciprobe(void);
 extern void __init dmi_check_skip_isa_align(void);
 
 /* some common used subsys_initcalls */
+#ifdef CONFIG_PCI
 extern int __init pci_acpi_init(void);
+#else
+static inline int  __init pci_acpi_init(void)
+{
+        return -EINVAL;
+}
+#endif
 extern void __init pcibios_irq_init(void);
 extern int __init pcibios_init(void);
 extern int pci_legacy_init(void);
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 7cea769c37df..7b65a807b3dd 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -9,7 +9,6 @@ config ARCH_SUPPORTS_ACPI
 menuconfig ACPI
         bool "ACPI (Advanced Configuration and Power Interface) Support"
         depends on ARCH_SUPPORTS_ACPI
-        depends on PCI
         select PNP
         default y if X86
         help
@@ -336,7 +335,7 @@ config ACPI_CUSTOM_DSDT_FILE
           See Documentation/acpi/dsdt-override.txt
 
           Enter the full path name to the file which includes the AmlCode
-          declaration.
+          or dsdt_aml_code declaration.
 
           If unsure, don't enter a file name.
 
@@ -370,7 +369,7 @@ config ACPI_DEBUG
 
 config ACPI_PCI_SLOT
         bool "PCI slot detection driver"
-        depends on SYSFS
+        depends on SYSFS && PCI
         help
           This driver creates entries in /sys/bus/pci/slots/ for all PCI
           slots in the system.  This can help correlate PCI bus addresses,
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index edc039313cd6..7c6afc111d76 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -39,7 +39,7 @@ acpi-y				+= processor_core.o
 acpi-$(CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC) += processor_pdc.o
 acpi-y                          += ec.o
 acpi-$(CONFIG_ACPI_DOCK)        += dock.o
-acpi-y                          += pci_root.o pci_link.o pci_irq.o
+acpi-$(CONFIG_PCI)              += pci_root.o pci_link.o pci_irq.o
 obj-$(CONFIG_ACPI_MCFG)         += pci_mcfg.o
 acpi-y                          += acpi_lpss.o acpi_apd.o
 acpi-y                          += acpi_platform.o
diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
index 2664452fa112..ddf598ae8b6b 100644
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@ -166,6 +166,11 @@ static const struct apd_device_desc thunderx2_i2c_desc = {
         .setup = acpi_apd_setup,
         .fixed_clk_rate = 125000000,
 };
+
+static const struct apd_device_desc hip08_spi_desc = {
+        .setup = acpi_apd_setup,
+        .fixed_clk_rate = 250000000,
+};
 #endif
 
 #else
@@ -234,6 +239,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = {
         { "CAV9007",  APD_ADDR(thunderx2_i2c_desc) },
         { "HISI02A1", APD_ADDR(hip07_i2c_desc) },
         { "HISI02A2", APD_ADDR(hip08_i2c_desc) },
+        { "HISI0173", APD_ADDR(hip08_spi_desc) },
 #endif
         { }
 };
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index b9bda06d344d..5f94c35d165f 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -673,12 +673,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
          * have _PS0 and _PS3 without _PSC (and no power resources), so
          * acpi_bus_init_power() will assume that the BIOS has put them into D0.
          */
-        ret = acpi_device_fix_up_power(adev);
-        if (ret) {
-                /* Skip the device, but continue the namespace scan. */
-                ret = 0;
-                goto err_out;
-        }
+        acpi_device_fix_up_power(adev);
 
         adev->driver_data = pdata;
         pdev = acpi_create_platform_device(adev, dev_desc->properties);
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index b14621da5413..59700433a96e 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -77,13 +77,13 @@ acpi-y +=		\
         hwacpi.o        \
         hwesleep.o      \
         hwgpe.o         \
-        hwpci.o         \
         hwregs.o        \
         hwsleep.o       \
         hwvalid.o       \
         hwxface.o       \
         hwxfsleep.o
 
+acpi-$(CONFIG_PCI) += hwpci.o
 acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
 
 acpi-y +=               \
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 1e6204518496..87d6eb01beaf 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -172,11 +172,7 @@ ACPI_GLOBAL(u8, acpi_gbl_disable_mem_tracking);
  *
  ****************************************************************************/
 
-#if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY)
 #define NUM_PREDEFINED_NAMES            10
-#else
-#define NUM_PREDEFINED_NAMES            9
-#endif
 
 ACPI_GLOBAL(struct acpi_namespace_node, acpi_gbl_root_node_struct);
 ACPI_GLOBAL(struct acpi_namespace_node *, acpi_gbl_root_node);
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index 43ce67a9da1f..ef99e2fc37f8 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -106,11 +106,20 @@ acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                                  struct acpi_gpe_block_info *gpe_block,
                                  void *context);
 
+#ifdef ACPI_PCI_CONFIGURED
 /*
  * hwpci - PCI configuration support
  */
 acpi_status
 acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,
                       acpi_handle root_pci_device, acpi_handle pci_region);
+#else
+static inline acpi_status
+acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id, acpi_handle root_pci_device,
+                      acpi_handle pci_region)
+{
+        return AE_SUPPORT;
+}
+#endif
 
 #endif                          /* __ACHWARE_H__ */
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index bbb3b4d1e796..9bd25f36c608 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -34,6 +34,7 @@
 #define ACPI_NS_TEMPORARY           0x0040
 #define ACPI_NS_OVERRIDE_IF_FOUND   0x0080
 #define ACPI_NS_EARLY_INIT          0x0100
+#define ACPI_NS_PREFIX_MUST_EXIST   0x0200
 
 /* Flags for acpi_ns_walk_namespace */
 
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index acf27156dbd4..14be32961b4c 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -60,6 +60,8 @@ struct acpi_walk_state {
         struct acpi_parse_state parser_state;   /* Current state of parser */
         u32 prev_arg_types;
         u32 arg_count;          /* push for fixed or var args */
+        u16 method_nesting_depth;
+        u8 method_is_nested;
 
         struct acpi_namespace_node arguments[ACPI_METHOD_NUM_ARGS];     /* Control method arguments */
         struct acpi_namespace_node local_variables[ACPI_METHOD_NUM_LOCALS];     /* Control method locals */
@@ -74,7 +76,8 @@ struct acpi_walk_state {
         struct acpi_namespace_node *method_call_node;   /* Called method Node */
         union acpi_parse_object *method_call_op;        /* method_call Op if running a method */
         union acpi_operand_object *method_desc; /* Method descriptor if running a method */
-        struct acpi_namespace_node *method_node;        /* Method node if running a method. */
+        struct acpi_namespace_node *method_node;        /* Method node if running a method */
+        char *method_pathname;  /* Full pathname of running method */
         union acpi_parse_object *op;    /* Current parser op */
         const struct acpi_opcode_info *op_info; /* Info on current opcode */
         union acpi_parse_object *origin;        /* Start of walk [Obsolete] */
diff --git a/drivers/acpi/acpica/dbxface.c b/drivers/acpi/acpica/dbxface.c
index f2526726daf6..3eb45ea93e5e 100644
--- a/drivers/acpi/acpica/dbxface.c
+++ b/drivers/acpi/acpica/dbxface.c
@@ -24,6 +24,13 @@ acpi_db_start_command(struct acpi_walk_state *walk_state,
 void acpi_db_method_end(struct acpi_walk_state *walk_state);
 #endif
 
+#ifdef ACPI_DISASSEMBLER
+static union acpi_parse_object *acpi_db_get_display_op(struct acpi_walk_state
+                                                       *walk_state,
+                                                       union acpi_parse_object
+                                                       *op);
+#endif
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_db_start_command
@@ -113,6 +120,70 @@ void acpi_db_signal_break_point(struct acpi_walk_state *walk_state)
         acpi_os_printf("**break** Executed AML BreakPoint opcode\n");
 }
 
+#ifdef ACPI_DISASSEMBLER
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_db_get_display_op
+ *
+ * PARAMETERS:  walk_state      - Current walk
+ *              op              - Current executing op (from aml interpreter)
+ *
+ * RETURN:      Opcode to display
+ *
+ * DESCRIPTION: Find the opcode to display during single stepping
+ *
+ ******************************************************************************/
+
+static union acpi_parse_object *acpi_db_get_display_op(struct acpi_walk_state
+                                                       *walk_state,
+                                                       union acpi_parse_object
+                                                       *op)
+{
+        union acpi_parse_object *display_op;
+        union acpi_parse_object *parent_op;
+
+        display_op = op;
+        parent_op = op->common.parent;
+        if (parent_op) {
+                if ((walk_state->control_state) &&
+                    (walk_state->control_state->common.state ==
+                     ACPI_CONTROL_PREDICATE_EXECUTING)) {
+                        /*
+                         * We are executing the predicate of an IF or WHILE statement
+                         * Search upwards for the containing IF or WHILE so that the
+                         * entire predicate can be displayed.
+                         */
+                        while (parent_op) {
+                                if ((parent_op->common.aml_opcode == AML_IF_OP)
+                                    || (parent_op->common.aml_opcode ==
+                                        AML_WHILE_OP)) {
+                                        display_op = parent_op;
+                                        break;
+                                }
+                                parent_op = parent_op->common.parent;
+                        }
+                } else {
+                        while (parent_op) {
+                                if ((parent_op->common.aml_opcode == AML_IF_OP)
+                                    || (parent_op->common.aml_opcode ==
+                                        AML_ELSE_OP)
+                                    || (parent_op->common.aml_opcode ==
+                                        AML_SCOPE_OP)
+                                    || (parent_op->common.aml_opcode ==
+                                        AML_METHOD_OP)
+                                    || (parent_op->common.aml_opcode ==
+                                        AML_WHILE_OP)) {
+                                        break;
+                                }
+                                display_op = parent_op;
+                                parent_op = parent_op->common.parent;
+                        }
+                }
+        }
+        return display_op;
+}
+#endif
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_db_single_step
@@ -134,8 +205,6 @@ acpi_db_single_step(struct acpi_walk_state *walk_state,
         union acpi_parse_object *next;
         acpi_status status = AE_OK;
         u32 original_debug_level;
-        union acpi_parse_object *display_op;
-        union acpi_parse_object *parent_op;
         u32 aml_offset;
 
         ACPI_FUNCTION_ENTRY();
@@ -222,51 +291,12 @@ acpi_db_single_step(struct acpi_walk_state *walk_state,
                 next = op->common.next;
                 op->common.next = NULL;
 
-                display_op = op;
-                parent_op = op->common.parent;
-                if (parent_op) {
-                        if ((walk_state->control_state) &&
-                            (walk_state->control_state->common.state ==
-                             ACPI_CONTROL_PREDICATE_EXECUTING)) {
-                                /*
-                                 * We are executing the predicate of an IF or WHILE statement
-                                 * Search upwards for the containing IF or WHILE so that the
-                                 * entire predicate can be displayed.
-                                 */
-                                while (parent_op) {
-                                        if ((parent_op->common.aml_opcode ==
-                                             AML_IF_OP)
-                                            || (parent_op->common.aml_opcode ==
-                                                AML_WHILE_OP)) {
-                                                display_op = parent_op;
-                                                break;
-                                        }
-                                        parent_op = parent_op->common.parent;
-                                }
-                        } else {
-                                while (parent_op) {
-                                        if ((parent_op->common.aml_opcode ==
-                                             AML_IF_OP)
-                                            || (parent_op->common.aml_opcode ==
-                                                AML_ELSE_OP)
-                                            || (parent_op->common.aml_opcode ==
-                                                AML_SCOPE_OP)
-                                            || (parent_op->common.aml_opcode ==
-                                                AML_METHOD_OP)
-                                            || (parent_op->common.aml_opcode ==
-                                                AML_WHILE_OP)) {
-                                                break;
-                                        }
-                                        display_op = parent_op;
-                                        parent_op = parent_op->common.parent;
-                                }
-                        }
-                }
-
                 /* Now we can disassemble and display it */
 
 #ifdef ACPI_DISASSEMBLER
-                acpi_dm_disassemble(walk_state, display_op, ACPI_UINT32_MAX);
+                acpi_dm_disassemble(walk_state,
+                                    acpi_db_get_display_op(walk_state, op),
+                                    ACPI_UINT32_MAX);
 #else
                 /*
                  * The AML Disassembler is not configured - at least we can
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index dd4deb678d13..c1a4d02fafd5 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -532,6 +532,9 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
                 goto cleanup;
         }
 
+        next_walk_state->method_nesting_depth =
+            this_walk_state->method_nesting_depth + 1;
+
         /*
          * Delete the operands on the previous walkstate operand stack
          * (they were copied to new objects)
@@ -549,6 +552,17 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
                           "**** Begin nested execution of [%4.4s] **** WalkState=%p\n",
                           method_node->name.ascii, next_walk_state));
 
+        this_walk_state->method_pathname =
+            acpi_ns_get_normalized_pathname(method_node, TRUE);
+        this_walk_state->method_is_nested = TRUE;
+
+        /* Optional object evaluation log */
+
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_EVALUATION,
+                              "%-26s:  %*s%s\n", "   Nested method call",
+                              next_walk_state->method_nesting_depth * 3, " ",
+                              &this_walk_state->method_pathname[1]));
+
         /* Invoke an internal method if necessary */
 
         if (obj_desc->method.info_flags & ACPI_METHOD_INTERNAL_ONLY) {
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index 6992c8d5ab43..6a9cc613adaa 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -18,7 +18,6 @@
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsobject")
 
-#ifndef ACPI_NO_METHOD_EXECUTION
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ds_build_internal_object
@@ -299,8 +298,6 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,
         return_ACPI_STATUS(status);
 }
 
-#endif                          /* ACPI_NO_METHOD_EXECUTION */
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ds_init_object_from_op
@@ -404,9 +401,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
 
                                 /* Truncate value if we are executing from a 32-bit ACPI table */
 
-#ifndef ACPI_NO_METHOD_EXECUTION
                                 (void)acpi_ex_truncate_for32bit_table(obj_desc);
-#endif
                                 break;
 
                         case AML_REVISION_OP:
@@ -428,7 +423,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
 
                         obj_desc->integer.value = op->common.value.integer;
 
-#ifndef ACPI_NO_METHOD_EXECUTION
                         if (acpi_ex_truncate_for32bit_table(obj_desc)) {
 
                                 /* Warn if we found a 64-bit constant in a 32-bit table */
@@ -439,7 +433,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                                                                  value.integer),
                                               (u32)obj_desc->integer.value));
                         }
-#endif
                         break;
 
                 default:
@@ -477,7 +470,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                             ((u32)opcode) - AML_FIRST_LOCAL_OP;
                         obj_desc->reference.class = ACPI_REFCLASS_LOCAL;
 
-#ifndef ACPI_NO_METHOD_EXECUTION
                         status =
                             acpi_ds_method_data_get_node(ACPI_REFCLASS_LOCAL,
                                                          obj_desc->reference.
@@ -487,7 +479,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                                                           acpi_namespace_node,
                                                           &obj_desc->reference.
                                                           object));
-#endif
                         break;
 
                 case AML_TYPE_METHOD_ARGUMENT:
@@ -498,7 +489,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                             ((u32)opcode) - AML_FIRST_ARG_OP;
                         obj_desc->reference.class = ACPI_REFCLASS_ARG;
 
-#ifndef ACPI_NO_METHOD_EXECUTION
                         status = acpi_ds_method_data_get_node(ACPI_REFCLASS_ARG,
                                                               obj_desc->
                                                               reference.value,
@@ -509,7 +499,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                                                                &obj_desc->
                                                                reference.
                                                                object));
-#endif
                         break;
 
                 default:        /* Object name or Debug object */
diff --git a/drivers/acpi/acpica/dspkginit.c b/drivers/acpi/acpica/dspkginit.c
index d703a5594a02..584853385268 100644
--- a/drivers/acpi/acpica/dspkginit.c
+++ b/drivers/acpi/acpica/dspkginit.c
@@ -152,6 +152,32 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
          */
         for (i = 0; arg && (i < element_count); i++) {
                 if (arg->common.aml_opcode == AML_INT_RETURN_VALUE_OP) {
+                        if (!arg->common.node) {
+                                /*
+                                 * This is the case where an expression has returned a value.
+                                 * The use of expressions (term_args) within individual
+                                 * package elements is not supported by the AML interpreter,
+                                 * even though the ASL grammar supports it. Example:
+                                 *
+                                 *      Name (INT1, 0x1234)
+                                 *
+                                 *      Name (PKG3, Package () {
+                                 *          Add (INT1, 0xAAAA0000)
+                                 *      })
+                                 *
+                                 *  1) No known AML interpreter supports this type of construct
+                                 *  2) This fixes a fault if the construct is encountered
+                                 */
+                                ACPI_EXCEPTION((AE_INFO, AE_SUPPORT,
+                                                "Expressions within package elements are not supported"));
+
+                                /* Cleanup the return object, it is not needed */
+
+                                acpi_ut_remove_reference(walk_state->results->
+                                                         results.obj_desc[0]);
+                                return_ACPI_STATUS(AE_SUPPORT);
+                        }
+
                         if (arg->common.node->type == ACPI_TYPE_METHOD) {
                                 /*
                                  * A method reference "looks" to the parser to be a method
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index 8d1b75400515..fb9ed5e1da89 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -57,7 +57,6 @@ void acpi_ds_clear_implicit_return(struct acpi_walk_state *walk_state)
         }
 }
 
-#ifndef ACPI_NO_METHOD_EXECUTION
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ds_do_implicit_return
@@ -401,7 +400,6 @@ void acpi_ds_clear_operands(struct acpi_walk_state *walk_state)
         walk_state->num_operands = 0;
         return_VOID;
 }
-#endif
 
 /*******************************************************************************
  *
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index d06c41446282..e2ef09643d50 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -73,12 +73,10 @@ acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number)
 
                 /* Execution pass */
 
-#ifndef ACPI_NO_METHOD_EXECUTION
                 walk_state->parse_flags |= ACPI_PARSE_EXECUTE |
                     ACPI_PARSE_DELETE_TREE;
                 walk_state->descending_callback = acpi_ds_exec_begin_op;
                 walk_state->ascending_callback = acpi_ds_exec_end_op;
-#endif
                 break;
 
         default:
@@ -364,7 +362,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state *walk_state,
 
         /* Initialize the op */
 
-#if (defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY))
+#ifdef ACPI_CONSTANT_EVAL_ONLY
         op->named.path = path;
 #endif
 
@@ -422,7 +420,6 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)
 
         object_type = walk_state->op_info->object_type;
 
-#ifndef ACPI_NO_METHOD_EXECUTION
         if (walk_state->op_info->flags & AML_FIELD) {
                 /*
                  * If we are executing a method, do not create any namespace objects
@@ -466,7 +463,6 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)
                         }
                 }
         }
-#endif
 
         if (op->common.aml_opcode == AML_NAME_OP) {
 
diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c
index b4685bb5f071..9a309f5c4de8 100644
--- a/drivers/acpi/acpica/dswload2.c
+++ b/drivers/acpi/acpica/dswload2.c
@@ -296,6 +296,14 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                 }
 #endif
 
+                /*
+                 * For name creation opcodes, the full namepath prefix must
+                 * exist, except for the final (new) nameseg.
+                 */
+                if (walk_state->op_info->flags & AML_NAMED) {
+                        flags |= ACPI_NS_PREFIX_MUST_EXIST;
+                }
+
                 /* Add new entry or lookup existing entry */
 
                 status =
@@ -363,10 +371,8 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
         struct acpi_namespace_node *node;
         union acpi_parse_object *arg;
         struct acpi_namespace_node *new_node;
-#ifndef ACPI_NO_METHOD_EXECUTION
         u32 i;
         u8 region_space;
-#endif
 
         ACPI_FUNCTION_TRACE(ds_load2_end_op);
 
@@ -453,7 +459,6 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
         arg = op->common.value.arg;
 
         switch (walk_state->op_info->type) {
-#ifndef ACPI_NO_METHOD_EXECUTION
 
         case AML_TYPE_CREATE_FIELD:
                 /*
@@ -550,12 +555,10 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                 }
 
                 break;
-#endif                          /* ACPI_NO_METHOD_EXECUTION */
 
         case AML_TYPE_NAMED_COMPLEX:
 
                 switch (op->common.aml_opcode) {
-#ifndef ACPI_NO_METHOD_EXECUTION
                 case AML_REGION_OP:
                 case AML_DATA_REGION_OP:
 
@@ -643,8 +646,6 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                         }
                         break;
 
-#endif                          /* ACPI_NO_METHOD_EXECUTION */
-
                 default:
 
                         /* All NAMED_COMPLEX opcodes must be handled above */
diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
index c879380e5ce1..4c1ec202d5ab 100644
--- a/drivers/acpi/acpica/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -530,7 +530,7 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
 
         /* Init the method args/local */
 
-#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY))
+#ifndef ACPI_CONSTANT_EVAL_ONLY
         acpi_ds_method_data_init(walk_state);
 #endif
 
diff --git a/drivers/acpi/acpica/evhandler.c b/drivers/acpi/acpica/evhandler.c
index d319ee33d040..4ed1e67db6be 100644
--- a/drivers/acpi/acpica/evhandler.c
+++ b/drivers/acpi/acpica/evhandler.c
@@ -364,25 +364,25 @@ acpi_ev_install_space_handler(struct acpi_namespace_node *node,
                         handler = acpi_ex_system_io_space_handler;
                         setup = acpi_ev_io_space_region_setup;
                         break;
-
+#ifdef ACPI_PCI_CONFIGURED
                 case ACPI_ADR_SPACE_PCI_CONFIG:
 
                         handler = acpi_ex_pci_config_space_handler;
                         setup = acpi_ev_pci_config_region_setup;
                         break;
-
+#endif
                 case ACPI_ADR_SPACE_CMOS:
 
                         handler = acpi_ex_cmos_space_handler;
                         setup = acpi_ev_cmos_region_setup;
                         break;
-
+#ifdef ACPI_PCI_CONFIGURED
                 case ACPI_ADR_SPACE_PCI_BAR_TARGET:
 
                         handler = acpi_ex_pci_bar_space_handler;
                         setup = acpi_ev_pci_bar_region_setup;
                         break;
-
+#endif
                 case ACPI_ADR_SPACE_DATA_TABLE:
 
                         handler = acpi_ex_data_table_space_handler;
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index 98de48481776..1a70b80cc406 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -323,7 +323,7 @@ acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 data_width)
 
                 /* hex_length: 2 ascii hex chars per data byte */
 
-                hex_length = ACPI_MUL_2(data_width);
+                hex_length = (data_width * 2);
                 for (i = 0, j = (hex_length - 1); i < hex_length; i++, j--) {
 
                         /* Get one hex digit, most significant digits first */
@@ -364,7 +364,8 @@ acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 data_width)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Convert an ACPI Object to a string
+ * DESCRIPTION: Convert an ACPI Object to a string. Supports both implicit
+ *              and explicit conversions and related rules.
  *
  ******************************************************************************/
 
@@ -393,9 +394,11 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
 
                 switch (type) {
                 case ACPI_EXPLICIT_CONVERT_DECIMAL:
-
-                        /* Make room for maximum decimal number */
-
+                        /*
+                         * From to_decimal_string, integer source.
+                         *
+                         * Make room for the maximum decimal number size
+                         */
                         string_length = ACPI_MAX_DECIMAL_DIGITS;
                         base = 10;
                         break;
@@ -440,8 +443,10 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                 switch (type) {
                 case ACPI_EXPLICIT_CONVERT_DECIMAL:     /* Used by to_decimal_string */
                         /*
-                         * From ACPI: "If Data is a buffer, it is converted to a string of
-                         * decimal values separated by commas."
+                         * Explicit conversion from the to_decimal_string ASL operator.
+                         *
+                         * From ACPI: "If the input is a buffer, it is converted to a
+                         * a string of decimal values separated by commas."
                          */
                         base = 10;
 
@@ -462,20 +467,29 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
 
                 case ACPI_IMPLICIT_CONVERT_HEX:
                         /*
+                         * Implicit buffer-to-string conversion
+                         *
                          * From the ACPI spec:
-                         *"The entire contents of the buffer are converted to a string of
+                         * "The entire contents of the buffer are converted to a string of
                          * two-character hexadecimal numbers, each separated by a space."
+                         *
+                         * Each hex number is prefixed with 0x (11/2018)
                          */
                         separator = ' ';
-                        string_length = (obj_desc->buffer.length * 3);
+                        string_length = (obj_desc->buffer.length * 5);
                         break;
 
-                case ACPI_EXPLICIT_CONVERT_HEX: /* Used by to_hex_string */
+                case ACPI_EXPLICIT_CONVERT_HEX:
                         /*
+                         * Explicit conversion from the to_hex_string ASL operator.
+                         *
                          * From ACPI: "If Data is a buffer, it is converted to a string of
                          * hexadecimal values separated by commas."
+                         *
+                         * Each hex number is prefixed with 0x (11/2018)
                          */
-                        string_length = (obj_desc->buffer.length * 3);
+                        separator = ',';
+                        string_length = (obj_desc->buffer.length * 5);
                         break;
 
                 default:
@@ -504,10 +518,21 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                  * (separated by commas or spaces)
                  */
                 for (i = 0; i < obj_desc->buffer.length; i++) {
+                        if (base == 16) {
+
+                                /* Emit 0x prefix for explict/implicit hex conversion */
+
+                                *new_buf++ = '0';
+                                *new_buf++ = 'x';
+                        }
+
                         new_buf += acpi_ex_convert_to_ascii((u64) obj_desc->
                                                             buffer.pointer[i],
                                                             base, new_buf, 1);
-                        *new_buf++ = separator; /* each separated by a comma or space */
+
+                        /* Each digit is separated by either a comma or space */
+
+                        *new_buf++ = separator;
                 }
 
                 /*
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index e49fa3c1321a..3304c6b1e8a7 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -15,7 +15,6 @@
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("excreate")
-#ifndef ACPI_NO_METHOD_EXECUTION
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_create_alias
@@ -390,7 +389,6 @@ acpi_status acpi_ex_create_power_resource(struct acpi_walk_state *walk_state)
         acpi_ut_remove_reference(obj_desc);
         return_ACPI_STATUS(status);
 }
-#endif
 
 /*******************************************************************************
  *
diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index d5b3efd35a5b..3a477566ba1b 100644
--- a/drivers/acpi/acpica/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -287,9 +287,9 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                  * NOTE: A length of zero is ok, and will create a zero-length, null
                  *       terminated string.
                  */
-                while ((length < operand[0]->buffer.length) &&
-                       (length < operand[1]->integer.value) &&
-                       (operand[0]->buffer.pointer[length])) {
+                while ((length < operand[0]->buffer.length) &&  /* Length of input buffer */
+                       (length < operand[1]->integer.value) &&  /* Length operand */
+                       (operand[0]->buffer.pointer[length])) {  /* Null terminator */
                         length++;
                 }
 
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 97bbfd07fcf7..2c58f5e00b1a 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -311,6 +311,7 @@ acpi_ex_system_io_space_handler(u32 function,
         return_ACPI_STATUS(status);
 }
 
+#ifdef ACPI_PCI_CONFIGURED
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_pci_config_space_handler
@@ -387,6 +388,7 @@ acpi_ex_pci_config_space_handler(u32 function,
 
         return_ACPI_STATUS(status);
 }
+#endif
 
 /*******************************************************************************
  *
@@ -420,6 +422,7 @@ acpi_ex_cmos_space_handler(u32 function,
         return_ACPI_STATUS(status);
 }
 
+#ifdef ACPI_PCI_CONFIGURED
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_pci_bar_space_handler
@@ -451,6 +454,7 @@ acpi_ex_pci_bar_space_handler(u32 function,
 
         return_ACPI_STATUS(status);
 }
+#endif
 
 /*******************************************************************************
  *
diff --git a/drivers/acpi/acpica/exserial.c b/drivers/acpi/acpica/exserial.c
index 9920fac6413f..ec61553c4483 100644
--- a/drivers/acpi/acpica/exserial.c
+++ b/drivers/acpi/acpica/exserial.c
@@ -244,6 +244,7 @@ acpi_ex_write_serial_bus(union acpi_operand_object *source_desc,
 {
         acpi_status status;
         u32 buffer_length;
+        u32 data_length;
         void *buffer;
         union acpi_operand_object *buffer_desc;
         u32 function;
@@ -324,8 +325,9 @@ acpi_ex_write_serial_bus(union acpi_operand_object *source_desc,
         /* Copy the input buffer data to the transfer buffer */
 
         buffer = buffer_desc->buffer.pointer;
-        memcpy(buffer, source_desc->buffer.pointer,
-               min(buffer_length, source_desc->buffer.length));
+        data_length = (buffer_length < source_desc->buffer.length ?
+                       buffer_length : source_desc->buffer.length);
+        memcpy(buffer, source_desc->buffer.pointer, data_length);
 
         /* Lock entire transaction if requested */
 
diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c
index 6ce307d5ce2a..bd22e27adf9b 100644
--- a/drivers/acpi/acpica/exutils.c
+++ b/drivers/acpi/acpica/exutils.c
@@ -34,7 +34,6 @@ ACPI_MODULE_NAME("exutils")
 /* Local prototypes */
 static u32 acpi_ex_digits_needed(u64 value, u32 base);
 
-#ifndef ACPI_NO_METHOD_EXECUTION
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_enter_interpreter
@@ -409,5 +408,3 @@ u8 acpi_is_valid_space_id(u8 space_id)
 
         return (TRUE);
 }
-
-#endif
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index e3f10afde5ff..75192b958544 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -267,6 +267,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
         acpi_object_type this_search_type;
         u32 search_parent_flag = ACPI_NS_SEARCH_PARENT;
         u32 local_flags;
+        acpi_interpreter_mode local_interpreter_mode;
 
         ACPI_FUNCTION_TRACE(ns_lookup);
 
@@ -506,6 +507,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
          */
         this_search_type = ACPI_TYPE_ANY;
         current_node = this_node;
+
         while (num_segments && current_node) {
                 num_segments--;
                 if (!num_segments) {
@@ -536,6 +538,16 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                         }
                 }
 
+                /* Handle opcodes that create a new name_seg via a full name_path */
+
+                local_interpreter_mode = interpreter_mode;
+                if ((flags & ACPI_NS_PREFIX_MUST_EXIST) && (num_segments > 0)) {
+
+                        /* Every element of the path must exist (except for the final name_seg) */
+
+                        local_interpreter_mode = ACPI_IMODE_EXECUTE;
+                }
+
                 /* Extract one ACPI name from the front of the pathname */
 
                 ACPI_MOVE_32_TO_32(&simple_name, path);
@@ -544,12 +556,19 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
 
                 status =
                     acpi_ns_search_and_enter(simple_name, walk_state,
-                                             current_node, interpreter_mode,
+                                             current_node,
+                                             local_interpreter_mode,
                                              this_search_type, local_flags,
                                              &this_node);
                 if (ACPI_FAILURE(status)) {
                         if (status == AE_NOT_FOUND) {
-
+#if !defined ACPI_ASL_COMPILER  /* Note: iASL reports this error by itself, not needed here */
+                                if (flags & ACPI_NS_PREFIX_MUST_EXIST) {
+                                        acpi_os_printf(ACPI_MSG_BIOS_ERROR
+                                                       "Object does not exist: %4.4s\n",
+                                                       &simple_name);
+                                }
+#endif
                                 /* Name not found in ACPI namespace */
 
                                 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c
index 64ba80ede0ad..6390b7951ebf 100644
--- a/drivers/acpi/acpica/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -104,6 +104,13 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
+        /* Optional object evaluation log */
+
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_EVALUATION,
+                              "%-26s:  %s (%s)\n", "   Enter evaluation",
+                              &info->full_pathname[1],
+                              acpi_ut_get_type_name(info->node->type)));
+
         /* Count the number of arguments being passed in */
 
         info->param_count = 0;
@@ -289,6 +296,12 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
                           info->relative_pathname));
 
 cleanup:
+        /* Optional object evaluation log */
+
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_EVALUATION,
+                              "%-26s:  %s\n", "   Exit evaluation",
+                              &info->full_pathname[1]));
+
         /*
          * Namespace was unlocked by the handling acpi_ns* function, so we
          * just free the pathname and return
diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index e291bb8cd369..04bc73e82aed 100644
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -24,7 +24,6 @@ acpi_status acpi_ns_unload_namespace(acpi_handle handle);
 static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle);
 #endif
 
-#ifndef ACPI_NO_METHOD_EXECUTION
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_load_table
@@ -297,4 +296,3 @@ acpi_status acpi_ns_unload_namespace(acpi_handle handle)
         return_ACPI_STATUS(status);
 }
 #endif
-#endif
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index c9ef4949869f..488ff39d86f7 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -107,8 +107,20 @@ acpi_ns_execute_table(u32 table_index, struct acpi_namespace_node *start_node)
                 goto cleanup;
         }
 
+        /* Optional object evaluation log */
+
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_EVALUATION,
+                              "%-26s:  (Definition Block level)\n",
+                              "Module-level evaluation"));
+
         status = acpi_ps_execute_table(info);
 
+        /* Optional object evaluation log */
+
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_EVALUATION,
+                              "%-26s:  (Definition Block level)\n",
+                              "Module-level complete"));
+
 cleanup:
         if (info) {
                 ACPI_FREE(info->full_pathname);
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 0fa01c9e353e..e00d1af6fa80 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -428,7 +428,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
         parser_state = &walk_state->parser_state;
         walk_state->arg_types = 0;
 
-#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY))
+#ifndef ACPI_CONSTANT_EVAL_ONLY
 
         if (walk_state->walk_type & ACPI_WALK_METHOD_RESTART) {
 
@@ -508,7 +508,8 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                  */
                                 if ((walk_state->
                                      parse_flags & ACPI_PARSE_MODULE_LEVEL)
-                                    && status == AE_ALREADY_EXISTS) {
+                                    && ((status == AE_ALREADY_EXISTS)
+                                        || (status == AE_NOT_FOUND))) {
                                         status = AE_OK;
                                 }
                                 if (status == AE_CTRL_PARSE_CONTINUE) {
@@ -537,10 +538,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                          * the scope op because the parse failure indicates that
                                          * the device may not exist.
                                          */
-                                        ACPI_ERROR((AE_INFO,
-                                                    "Skip parsing opcode %s",
-                                                    acpi_ps_get_opcode_name
-                                                    (walk_state->opcode)));
+                                        ACPI_INFO(("Skipping parse of AML opcode: %s (0x%4.4X)", acpi_ps_get_opcode_name(walk_state->opcode), walk_state->opcode));
 
                                         /*
                                          * Determine the opcode length before skipping the opcode.
diff --git a/drivers/acpi/acpica/psobject.c b/drivers/acpi/acpica/psobject.c
index 3138e7a00da8..e1fd819a2955 100644
--- a/drivers/acpi/acpica/psobject.c
+++ b/drivers/acpi/acpica/psobject.c
@@ -600,8 +600,7 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
                          * because there could be correct AML beyond the parts that caused
                          * the runtime error.
                          */
-                        ACPI_ERROR((AE_INFO,
-                                    "Ignore error and continue table load"));
+                        ACPI_INFO(("Ignoring error and continuing table load"));
                         return_ACPI_STATUS(AE_OK);
                 }
                 return_ACPI_STATUS(status);
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index a16a6ea5ae02..65603473b6cb 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -479,6 +479,21 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                                   "Completed one call to walk loop, %s State=%p\n",
                                   acpi_format_exception(status), walk_state));
 
+                if (walk_state->method_pathname && walk_state->method_is_nested) {
+
+                        /* Optional object evaluation log */
+
+                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_EVALUATION,
+                                              "%-26s:  %*s%s\n",
+                                              "   Exit nested method",
+                                              (walk_state->
+                                               method_nesting_depth + 1) * 3,
+                                              " ",
+                                              &walk_state->method_pathname[1]));
+
+                        ACPI_FREE(walk_state->method_pathname);
+                        walk_state->method_is_nested = FALSE;
+                }
                 if (status == AE_CTRL_TRANSFER) {
                         /*
                          * A method call was detected.
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index f26bcbbc2c27..5743b22399a0 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -147,6 +147,9 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
                 goto cleanup;
         }
 
+        walk_state->method_pathname = info->full_pathname;
+        walk_state->method_is_nested = FALSE;
+
         if (info->obj_desc->method.info_flags & ACPI_METHOD_MODULE_LEVEL) {
                 walk_state->parse_flags |= ACPI_PARSE_MODULE_LEVEL;
         }
@@ -267,6 +270,9 @@ acpi_status acpi_ps_execute_table(struct acpi_evaluate_info *info)
                 goto cleanup;
         }
 
+        walk_state->method_pathname = info->full_pathname;
+        walk_state->method_is_nested = FALSE;
+
         if (info->obj_desc->method.info_flags & ACPI_METHOD_MODULE_LEVEL) {
                 walk_state->parse_flags |= ACPI_PARSE_MODULE_LEVEL;
         }
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index fa674e9b0e62..f8c5b49344df 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -83,10 +83,7 @@ const struct acpi_predefined_names acpi_gbl_pre_defined_names[] = {
         {"_REV", ACPI_TYPE_INTEGER, ACPI_CAST_PTR(char, 2)},
         {"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME},
         {"_GL_", ACPI_TYPE_MUTEX, ACPI_CAST_PTR(char, 1)},
-
-#if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY)
         {"_OSI", ACPI_TYPE_METHOD, ACPI_CAST_PTR(char, 1)},
-#endif
 
         /* Table terminator */
 
diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c
index ed73d79b500e..afaadc73196b 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -62,7 +62,8 @@ u8 acpi_ut_is_aml_table(struct acpi_table_header *table)
         if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_DSDT) ||
             ACPI_COMPARE_NAME(table->signature, ACPI_SIG_PSDT) ||
             ACPI_COMPARE_NAME(table->signature, ACPI_SIG_SSDT) ||
-            ACPI_COMPARE_NAME(table->signature, ACPI_SIG_OSDT)) {
+            ACPI_COMPARE_NAME(table->signature, ACPI_SIG_OSDT) ||
+            ACPI_IS_OEM_SIG(table->signature)) {
                 return (TRUE);
         }
 
diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c
index 64b63c81994b..902a47463abf 100644
--- a/drivers/acpi/acpica/utosi.c
+++ b/drivers/acpi/acpica/utosi.c
@@ -70,6 +70,8 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = {
         {"Windows 2016", NULL, 0, ACPI_OSI_WIN_10_RS1}, /* Windows 10 version 1607 - Added 12/2017 */
         {"Windows 2017", NULL, 0, ACPI_OSI_WIN_10_RS2}, /* Windows 10 version 1703 - Added 12/2017 */
         {"Windows 2017.2", NULL, 0, ACPI_OSI_WIN_10_RS3},       /* Windows 10 version 1709 - Added 02/2018 */
+        {"Windows 2018", NULL, 0, ACPI_OSI_WIN_10_RS4}, /* Windows 10 version 1803 - Added 11/2018 */
+        {"Windows 2018.2", NULL, 0, ACPI_OSI_WIN_10_RS5},       /* Windows 10 version 1809 - Added 11/2018 */
 
         /* Feature Group Strings */
 
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index b38737c83a24..fcccbfdbdd1a 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -607,17 +607,7 @@ static int available_error_type_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int available_error_type_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, available_error_type_show, NULL);
-}
-
-static const struct file_operations available_error_type_fops = {
-        .open           = available_error_type_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(available_error_type);
 
 static int error_type_get(void *data, u64 *val)
 {
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 02c6fd9caff7..f008ba7c9ced 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -691,6 +691,8 @@ static void __ghes_panic(struct ghes *ghes)
 {
         __ghes_print_estatus(KERN_EMERG, ghes->generic, ghes->estatus);
 
+        ghes_clear_estatus(ghes);
+
         /* reboot to log the error! */
         if (!panic_timeout)
                 panic_timeout = ghes_panic_timeout;
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index 70f4e80b9246..2159ad9bf9ed 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -1435,8 +1435,14 @@ dev_put:
         return ret;
 }
 
-static bool __init iort_enable_acs(struct acpi_iort_node *iort_node)
+#ifdef CONFIG_PCI
+static void __init iort_enable_acs(struct acpi_iort_node *iort_node)
 {
+        static bool acs_enabled __initdata;
+
+        if (acs_enabled)
+                return;
+
         if (iort_node->type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX) {
                 struct acpi_iort_node *parent;
                 struct acpi_iort_id_mapping *map;
@@ -1458,13 +1464,15 @@ static bool __init iort_enable_acs(struct acpi_iort_node *iort_node)
                         if ((parent->type == ACPI_IORT_NODE_SMMU) ||
                                 (parent->type == ACPI_IORT_NODE_SMMU_V3)) {
                                 pci_request_acs();
-                                return true;
+                                acs_enabled = true;
+                                return;
                         }
                 }
         }
-
-        return false;
 }
+#else
+static inline void iort_enable_acs(struct acpi_iort_node *iort_node) { }
+#endif
 
 static void __init iort_init_platform_devices(void)
 {
@@ -1472,7 +1480,6 @@ static void __init iort_init_platform_devices(void)
         struct acpi_table_iort *iort;
         struct fwnode_handle *fwnode;
         int i, ret;
-        bool acs_enabled = false;
         const struct iort_dev_config *ops;
 
         /*
@@ -1493,8 +1500,7 @@ static void __init iort_init_platform_devices(void)
                         return;
                 }
 
-                if (!acs_enabled)
-                        acs_enabled = iort_enable_acs(iort_node);
+                iort_enable_acs(iort_node);
 
                 ops = iort_get_dev_cfg(iort_node);
                 if (ops) {
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index f59d0b9e2683..c112dccc76b5 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -25,8 +25,13 @@ int acpi_osi_init(void);
 acpi_status acpi_os_initialize1(void);
 void init_acpi_device_notify(void);
 int acpi_scan_init(void);
+#ifdef CONFIG_PCI
 void acpi_pci_root_init(void);
 void acpi_pci_link_init(void);
+#else
+static inline void acpi_pci_root_init(void) {}
+static inline void acpi_pci_link_init(void) {}
+#endif
 void acpi_processor_init(void);
 void acpi_platform_init(void);
 void acpi_pnp_init(void);
diff --git a/drivers/acpi/osi.c b/drivers/acpi/osi.c
index b2a16ed7e81a..efd2ce099893 100644
--- a/drivers/acpi/osi.c
+++ b/drivers/acpi/osi.c
@@ -74,6 +74,13 @@ osi_setup_entries[OSI_STRING_ENTRIES_MAX] __initdata = {
          * a BIOS workaround.
          */
         {"Linux-Lenovo-NV-HDMI-Audio", true},
+        /*
+         * Linux-HPI-Hybrid-Graphics is used by BIOS to enable dGPU to
+         * output video directly to external monitors on HP Inc. mobile
+         * workstations as Nvidia and AMD VGA drivers provide limited
+         * hybrid graphics supports.
+         */
+        {"Linux-HPI-Hybrid-Graphics", true},
 };
 
 static u32 acpi_osi_handler(acpi_string interface, u32 supported)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index b48874b8e1ea..f29e427d0d1d 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -769,6 +769,7 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u64 value, u32 width)
         return AE_OK;
 }
 
+#ifdef CONFIG_PCI
 acpi_status
 acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
                                u64 *value, u32 width)
@@ -827,6 +828,7 @@ acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
 
         return (result ? AE_ERROR : AE_OK);
 }
+#endif
 
 static void acpi_os_execute_deferred(struct work_struct *work)
 {
diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c
index 6fa9c2a4cfe9..ca707f5b521d 100644
--- a/drivers/acpi/reboot.c
+++ b/drivers/acpi/reboot.c
@@ -4,11 +4,35 @@
 #include <linux/acpi.h>
 #include <acpi/reboot.h>
 
+#ifdef CONFIG_PCI
+static void acpi_pci_reboot(struct acpi_generic_address *rr, u8 reset_value)
+{
+        unsigned int devfn;
+        struct pci_bus *bus0;
+
+        /* The reset register can only live on bus 0. */
+        bus0 = pci_find_bus(0, 0);
+        if (!bus0)
+                return;
+        /* Form PCI device/function pair. */
+        devfn = PCI_DEVFN((rr->address >> 32) & 0xffff,
+                          (rr->address >> 16) & 0xffff);
+        pr_debug("Resetting with ACPI PCI RESET_REG.\n");
+        /* Write the value that resets us. */
+        pci_bus_write_config_byte(bus0, devfn,
+                        (rr->address & 0xffff), reset_value);
+}
+#else
+static inline void acpi_pci_reboot(struct acpi_generic_address *rr,
+                                   u8 reset_value)
+{
+        pr_warn_once("PCI configuration space access is not supported\n");
+}
+#endif
+
 void acpi_reboot(void)
 {
         struct acpi_generic_address *rr;
-        struct pci_bus *bus0;
-        unsigned int devfn;
         u8 reset_value;
 
         if (acpi_disabled)
@@ -33,17 +57,7 @@ void acpi_reboot(void)
          * on a device on bus 0. */
         switch (rr->space_id) {
         case ACPI_ADR_SPACE_PCI_CONFIG:
-                /* The reset register can only live on bus 0. */
-                bus0 = pci_find_bus(0, 0);
-                if (!bus0)
-                        return;
-                /* Form PCI device/function pair. */
-                devfn = PCI_DEVFN((rr->address >> 32) & 0xffff,
-                                  (rr->address >> 16) & 0xffff);
-                printk(KERN_DEBUG "Resetting with ACPI PCI RESET_REG.\n");
-                /* Write the value that resets us. */
-                pci_bus_write_config_byte(bus0, devfn,
-                                (rr->address & 0xffff), reset_value);
+                acpi_pci_reboot(rr, reset_value);
                 break;
 
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c
index 9d52743080a4..c336784d0bcb 100644
--- a/drivers/acpi/spcr.c
+++ b/drivers/acpi/spcr.c
@@ -148,6 +148,13 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)
         }
 
         switch (table->baud_rate) {
+        case 0:
+                /*
+                 * SPCR 1.04 defines 0 as a preconfigured state of UART.
+                 * Assume firmware or bootloader configures console correctly.
+                 */
+                baud_rate = 0;
+                break;
         case 3:
                 baud_rate = 9600;
                 break;
@@ -196,6 +203,10 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)
                  * UART so don't attempt to change to the baud rate state
                  * in the table because driver cannot calculate the dividers
                  */
+                baud_rate = 0;
+        }
+
+        if (!baud_rate) {
                 snprintf(opts, sizeof(opts), "%s,%s,0x%llx", uart, iotype,
                          table->serial_port.address);
         } else {
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 61203eebf3a1..48eabb6c2d4f 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -712,6 +712,11 @@ acpi_os_physical_table_override(struct acpi_table_header *existing_table,
                                           table_length);
 }
 
+#ifdef CONFIG_ACPI_CUSTOM_DSDT
+static void *amlcode __attribute__ ((weakref("AmlCode")));
+static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code")));
+#endif
+
 acpi_status
 acpi_os_table_override(struct acpi_table_header *existing_table,
                        struct acpi_table_header **new_table)
@@ -722,8 +727,11 @@ acpi_os_table_override(struct acpi_table_header *existing_table,
         *new_table = NULL;
 
 #ifdef CONFIG_ACPI_CUSTOM_DSDT
-        if (strncmp(existing_table->signature, "DSDT", 4) == 0)
-                *new_table = (struct acpi_table_header *)AmlCode;
+        if (!strncmp(existing_table->signature, "DSDT", 4)) {
+                *new_table = (struct acpi_table_header *)&amlcode;
+                if (!(*new_table))
+                        *new_table = (struct acpi_table_header *)&dsdt_amlcode;
+        }
 #endif
         if (*new_table != NULL)
                 acpi_table_taint(existing_table);
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index f2bda77a2df1..657d642fcc67 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -11,6 +11,7 @@ ifdef CONFIG_PCI
 obj-$(CONFIG_PROC_FS)           += proc.o
 obj-$(CONFIG_SYSFS)             += slot.o
 obj-$(CONFIG_OF)                += of.o
+obj-$(CONFIG_ACPI)              += pci-acpi.o
 endif
 
 obj-$(CONFIG_PCI_QUIRKS)        += quirks.o
@@ -20,7 +21,6 @@ obj-$(CONFIG_PCI_MSI)		+= msi.o
 obj-$(CONFIG_PCI_ATS)           += ats.o
 obj-$(CONFIG_PCI_IOV)           += iov.o
 obj-$(CONFIG_PCI_BRIDGE_EMUL)   += pci-bridge-emul.o
-obj-$(CONFIG_ACPI)              += pci-acpi.o
 obj-$(CONFIG_PCI_LABEL)         += pci-label.o
 obj-$(CONFIG_X86_INTEL_MID)     += pci-mid.o
 obj-$(CONFIG_PCI_SYSCALL)       += syscall.o
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index 3a26aa7ead23..6db9a6d40c85 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -73,7 +73,8 @@
 #define ACPI_LV_RESOURCES           0x00010000
 #define ACPI_LV_USER_REQUESTS       0x00020000
 #define ACPI_LV_PACKAGE             0x00040000
-#define ACPI_LV_VERBOSITY1          0x0007FF40 | ACPI_LV_ALL_EXCEPTIONS
+#define ACPI_LV_EVALUATION          0x00080000
+#define ACPI_LV_VERBOSITY1          0x000FFF40 | ACPI_LV_ALL_EXCEPTIONS
 
 /* Trace verbosity level 2 [Function tracing and memory allocation] */
 
@@ -141,6 +142,7 @@
 #define ACPI_DB_INTERRUPTS          ACPI_DEBUG_LEVEL (ACPI_LV_INTERRUPTS)
 #define ACPI_DB_USER_REQUESTS       ACPI_DEBUG_LEVEL (ACPI_LV_USER_REQUESTS)
 #define ACPI_DB_PACKAGE             ACPI_DEBUG_LEVEL (ACPI_LV_PACKAGE)
+#define ACPI_DB_EVALUATION          ACPI_DEBUG_LEVEL (ACPI_LV_EVALUATION)
 #define ACPI_DB_MUTEX               ACPI_DEBUG_LEVEL (ACPI_LV_MUTEX)
 #define ACPI_DB_EVENTS              ACPI_DEBUG_LEVEL (ACPI_LV_EVENTS)
 
@@ -148,7 +150,7 @@
 
 /* Defaults for debug_level, debug and normal */
 
-#define ACPI_DEBUG_DEFAULT          (ACPI_LV_INFO | ACPI_LV_REPAIR)
+#define ACPI_DEBUG_DEFAULT          (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_EVALUATION | ACPI_LV_REPAIR)
 #define ACPI_NORMAL_DEFAULT         (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_REPAIR)
 #define ACPI_DEBUG_ALL              (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL)
 
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 14499757338f..de1804aeaf69 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -88,7 +88,14 @@ int acpi_pci_link_free_irq(acpi_handle handle);
 
 struct pci_bus;
 
+#ifdef CONFIG_PCI
 struct pci_dev *acpi_get_pci_dev(acpi_handle);
+#else
+static inline struct pci_dev *acpi_get_pci_dev(acpi_handle handle)
+{
+        return NULL;
+}
+#endif
 
 /* Arch-defined function to add a bus to the system */
 
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 0c19b68bf060..7aa38b648564 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -12,7 +12,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20181003
+#define ACPI_CA_VERSION                 0x20181213
 
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 517addd6b11d..0a977eca0a74 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -38,6 +38,7 @@
 #define ACPI_SIG_XSDT           "XSDT"  /* Extended  System Description Table */
 #define ACPI_SIG_SSDT           "SSDT"  /* Secondary System Description Table */
 #define ACPI_RSDP_NAME          "RSDP"  /* Short name for RSDP, not signature */
+#define ACPI_OEM_NAME           "OEM"   /* Short name for OEM, not signature */
 
 /*
  * All tables and structures must be byte-packed to match the ACPI
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h
index 501f341d1d92..ea1ca49c9c1b 100644
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
@@ -365,6 +365,29 @@ struct acpi_table_tcpa_server {
  *
  ******************************************************************************/
 
+/* Revision 3 */
+
+struct acpi_table_tpm23 {
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u32 reserved;
+        u64 control_address;
+        u32 start_method;
+};
+
+/* Value for start_method above */
+
+#define ACPI_TPM23_ACPI_START_METHOD                 2
+
+/*
+ * Optional trailer for revision 3. If start method is 2, there is a 4 byte
+ * reserved area of all zeros.
+ */
+struct acpi_tmp23_trailer {
+        u32 reserved;
+};
+
+/* Revision 4 */
+
 struct acpi_table_tpm2 {
         struct acpi_table_header header;        /* Common ACPI table header */
         u16 platform_class;
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 66ceb12ebc63..2590627dbfcc 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -527,6 +527,10 @@ typedef u64 acpi_integer;
 #define ACPI_VALIDATE_RSDP_SIG(a)       (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_SIG_RSDP, 8))
 #define ACPI_MAKE_RSDP_SIG(dest)        (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_SIG_RSDP, 8))
 
+/* Support for OEMx signature (x can be any character) */
+#define ACPI_IS_OEM_SIG(a)        (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_OEM_NAME, 3) &&\
+         strnlen (a, ACPI_NAME_SIZE) == ACPI_NAME_SIZE)
+
 /*
  * Algorithm to obtain access bit width.
  * Can be used with access_width of struct acpi_generic_address and access_size of
@@ -1273,6 +1277,8 @@ typedef enum {
 #define ACPI_OSI_WIN_10_RS1             0x0E
 #define ACPI_OSI_WIN_10_RS2             0x0F
 #define ACPI_OSI_WIN_10_RS3             0x10
+#define ACPI_OSI_WIN_10_RS4             0x11
+#define ACPI_OSI_WIN_10_RS5             0x12
 
 /* Definitions of getopt */
 
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 7451b3bca83a..e3d21d014fcc 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -33,6 +33,10 @@
 
 /* Kernel specific ACPICA configuration */
 
+#ifdef CONFIG_PCI
+#define ACPI_PCI_CONFIGURED
+#endif
+
 #ifdef CONFIG_ACPI_REDUCED_HARDWARE_ONLY
 #define ACPI_REDUCED_HARDWARE 1
 #endif
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 6afc6e3c4c5c..4b3283cb09ab 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -101,7 +101,7 @@ static inline bool has_acpi_companion(struct device *dev)
 static inline void acpi_preset_companion(struct device *dev,
                                          struct acpi_device *parent, u64 addr)
 {
-        ACPI_COMPANION_SET(dev, acpi_find_child_device(parent, addr, NULL));
+        ACPI_COMPANION_SET(dev, acpi_find_child_device(parent, addr, false));
 }
 
 static inline const char *acpi_dev_name(struct acpi_device *adev)
@@ -340,7 +340,14 @@ struct pci_dev;
 int acpi_pci_irq_enable (struct pci_dev *dev);
 void acpi_penalize_isa_irq(int irq, int active);
 bool acpi_isa_irq_available(int irq);
+#ifdef CONFIG_PCI
 void acpi_penalize_sci_irq(int irq, int trigger, int polarity);
+#else
+static inline void acpi_penalize_sci_irq(int irq, int trigger,
+                                        int polarity)
+{
+}
+#endif
 void acpi_pci_irq_disable (struct pci_dev *dev);
 
 extern int ec_read(u8 addr, u8 *val);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 11c71c4ecf75..51a5a5217667 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1960,7 +1960,11 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev,
                                  enum pcie_reset_state state);
 int pcibios_add_device(struct pci_dev *dev);
 void pcibios_release_device(struct pci_dev *dev);
+#ifdef CONFIG_PCI
 void pcibios_penalize_isa_irq(int irq, int active);
+#else
+static inline void pcibios_penalize_isa_irq(int irq, int active) {}
+#endif
 int pcibios_alloc_irq(struct pci_dev *dev);
 void pcibios_free_irq(struct pci_dev *dev);
 resource_size_t pcibios_default_alignment(void);
diff --git a/tools/power/acpi/tools/acpidump/apmain.c b/tools/power/acpi/tools/acpidump/apmain.c
index db213171f8d9..2d9b94b631cb 100644
--- a/tools/power/acpi/tools/acpidump/apmain.c
+++ b/tools/power/acpi/tools/acpidump/apmain.c
@@ -106,7 +106,7 @@ static int ap_insert_action(char *argument, u32 to_be_done)
 
         current_action++;
         if (current_action > AP_MAX_ACTIONS) {
-                fprintf(stderr, "Too many table options (max %u)\n",
+                fprintf(stderr, "Too many table options (max %d)\n",
                         AP_MAX_ACTIONS);
                 return (-1);
         }