4 files changed, 57 insertions, 9 deletions

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index c5367bf5487f..0f28a38a43ea 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -164,6 +164,7 @@ struct acpi_namespace_node {
 #define ANOBJ_SUBTREE_HAS_INI           0x10    /* Used to optimize device initialization */
 #define ANOBJ_EVALUATED                 0x20    /* Set on first evaluation of node */
 #define ANOBJ_ALLOCATED_BUFFER          0x40    /* Method AML buffer is dynamic (install_method) */
+#define ANOBJ_NODE_EARLY_INIT           0x80    /* acpi_exec only: Node was create via init file (-fi) */
 
 #define ANOBJ_IS_EXTERNAL               0x08    /* iASL only: This object created via External() */
 #define ANOBJ_METHOD_NO_RETVAL          0x10    /* iASL only: Method has no return value */
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 3825df923480..bbb3b4d1e796 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -25,14 +25,15 @@
 /* Flags for acpi_ns_lookup, acpi_ns_search_and_enter */
 
 #define ACPI_NS_NO_UPSEARCH         0
-#define ACPI_NS_SEARCH_PARENT       0x01
-#define ACPI_NS_DONT_OPEN_SCOPE     0x02
-#define ACPI_NS_NO_PEER_SEARCH      0x04
-#define ACPI_NS_ERROR_IF_FOUND      0x08
-#define ACPI_NS_PREFIX_IS_SCOPE     0x10
-#define ACPI_NS_EXTERNAL            0x20
-#define ACPI_NS_TEMPORARY           0x40
-#define ACPI_NS_OVERRIDE_IF_FOUND   0x80
+#define ACPI_NS_SEARCH_PARENT       0x0001
+#define ACPI_NS_DONT_OPEN_SCOPE     0x0002
+#define ACPI_NS_NO_PEER_SEARCH      0x0004
+#define ACPI_NS_ERROR_IF_FOUND      0x0008
+#define ACPI_NS_PREFIX_IS_SCOPE     0x0010
+#define ACPI_NS_EXTERNAL            0x0020
+#define ACPI_NS_TEMPORARY           0x0040
+#define ACPI_NS_OVERRIDE_IF_FOUND   0x0080
+#define ACPI_NS_EARLY_INIT          0x0100
 
 /* Flags for acpi_ns_walk_namespace */
 
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index 7c937595dfcb..5581300927de 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -15,6 +15,10 @@
 #include "acnamesp.h"
 #include "acparser.h"
 
+#ifdef ACPI_EXEC_APP
+#include "aecommon.h"
+#endif
+
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsfield")
 
@@ -259,6 +263,13 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
         u64 position;
         union acpi_parse_object *child;
 
+#ifdef ACPI_EXEC_APP
+        u64 value = 0;
+        union acpi_operand_object *result_desc;
+        union acpi_operand_object *obj_desc;
+        char *name_path;
+#endif
+
         ACPI_FUNCTION_TRACE_PTR(ds_get_field_names, info);
 
         /* First field starts at bit zero */
@@ -391,6 +402,26 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                                         if (ACPI_FAILURE(status)) {
                                                 return_ACPI_STATUS(status);
                                         }
+#ifdef ACPI_EXEC_APP
+                                        name_path =
+                                            acpi_ns_get_external_pathname(info->
+                                                                          field_node);
+                                        obj_desc =
+                                            acpi_ut_create_integer_object
+                                            (value);
+                                        if (ACPI_SUCCESS
+                                            (ae_lookup_init_file_entry
+                                             (name_path, &value))) {
+                                                acpi_ex_write_data_to_field
+                                                    (obj_desc,
+                                                     acpi_ns_get_attached_object
+                                                     (info->field_node),
+                                                     &result_desc);
+                                                ACPI_FREE(name_path);
+                                                acpi_ut_remove_reference
+                                                    (obj_desc);
+                                        }
+#endif
                                 }
                         }
 
@@ -573,7 +604,9 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
             !(walk_state->parse_flags & ACPI_PARSE_MODULE_LEVEL)) {
                 flags |= ACPI_NS_TEMPORARY;
         }
-
+#ifdef ACPI_EXEC_APP
+        flags |= ACPI_NS_OVERRIDE_IF_FOUND;
+#endif
         /*
          * Walk the list of entries in the field_list
          * Note: field_list can be of zero length. In this case, Arg will be NULL.
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 83a593e2155d..e3f10afde5ff 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -558,6 +558,14 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                                                   (char *)&current_node->name,
                                                   current_node));
                         }
+#ifdef ACPI_EXEC_APP
+                        if ((status == AE_ALREADY_EXISTS) &&
+                            (this_node->flags & ANOBJ_NODE_EARLY_INIT)) {
+                                this_node->flags &= ~ANOBJ_NODE_EARLY_INIT;
+                                status = AE_OK;
+                        }
+#endif
+
 #ifdef ACPI_ASL_COMPILER
                         /*
                          * If this ACPI name already exists within the namespace as an
@@ -676,6 +684,11 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                         }
                 }
         }
+#ifdef ACPI_EXEC_APP
+        if (flags & ACPI_NS_EARLY_INIT) {
+                this_node->flags |= ANOBJ_NODE_EARLY_INIT;
+        }
+#endif
 
         *return_node = this_node;
         return_ACPI_STATUS(AE_OK);