ACPI: ACPICA 20060331

Implemented header file support for the following
additional ACPI tables: ASF!, BOOT, CPEP, DBGP, MCFG, SPCR,
SPMI, TCPA, and WDRT. With this support, all current and
known ACPI tables are now defined in the ACPICA headers and
are available for use by device drivers and other software.

Implemented support to allow tables that contain ACPI
names with invalid characters to be loaded. Previously,
this would cause the table load to fail, but since
there are several known cases of such tables on
existing machines, this change was made to enable
ACPI support for them. Also, this matches the
behavior of the Microsoft ACPI implementation.
https://bugzilla.novell.com/show_bug.cgi?id=147621

Fixed a couple regressions introduced during the memory
optimization in the 20060317 release. The namespace
node definition required additional reorganization and
an internal datatype that had been changed to 8-bit was
restored to 32-bit. (Valery Podrezov)

Fixed a problem where a null pointer passed to
acpi_ut_delete_generic_state() could be passed through
to acpi_os_release_object which is unexpected. Such
null pointers are now trapped and ignored, matching
the behavior of the previous implementation before the
deployment of acpi_os_release_object().  (Valery Podrezov,
Fiodor Suietov)

Fixed a memory mapping leak during the deletion of
a SystemMemory operation region where a cached memory
mapping was not deleted. This became a noticeable problem
for operation regions that are defined within frequently
used control methods. (Dana Meyers)

Reorganized the ACPI table header files into two main
files: one for the ACPI tables consumed by the ACPICA core,
and another for the miscellaneous ACPI tables that are
consumed by the drivers and other software. The various
FADT definitions were merged into one common section and
three different tables (ACPI 1.0, 1.0+, and 2.0)

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

3 files changed, 35 insertions, 20 deletions

diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index 8b921c96d6a5..c92c03693a16 100644
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.c
@@ -211,6 +211,8 @@ void acpi_ns_install_node(struct acpi_walk_state *walk_state, struct acpi_namesp
                           acpi_ut_get_node_name(parent_node),
                           acpi_ut_get_type_name(parent_node->type),
                           parent_node));
+
+        return_VOID;
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index e275373b1705..5662d2def62f 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -204,6 +204,9 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                 }
 
                 if (!acpi_ut_valid_acpi_name(this_node->name.integer)) {
+                        this_node->name.integer =
+                            acpi_ut_repair_name(this_node->name.integer);
+
                         ACPI_WARNING((AE_INFO, "Invalid ACPI Name %08X",
                                       this_node->name.integer));
                 }
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index c929f45071c0..51adec5a23d6 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -128,9 +128,8 @@ acpi_ns_search_node(u32 target_name,
                                                   next_node->object);
                         }
 
-                        /*
-                         * Found matching entry.
-                         */
+                        /* Found matching entry */
+
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                           "Name [%4.4s] (%s) %p found in scope [%4.4s] %p\n",
                                           ACPI_CAST_PTR(char, &target_name),
@@ -248,10 +247,8 @@ acpi_ns_search_parent_tree(u32 target_name,
                         return_ACPI_STATUS(status);
                 }
 
-                /*
-                 * Not found here, go up another level
-                 * (until we reach the root)
-                 */
+                /* Not found here, go up another level (until we reach the root) */
+
                 parent_node = acpi_ns_get_parent_node(parent_node);
         }
 
@@ -307,12 +304,29 @@ acpi_ns_search_and_enter(u32 target_name,
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        /* Name must consist of printable characters */
-
+        /*
+         * Name must consist of valid ACPI characters. We will repair the name if
+         * necessary because we don't want to abort because of this, but we want
+         * all namespace names to be printable. A warning message is appropriate.
+         *
+         * This issue came up because there are in fact machines that exhibit
+         * this problem, and we want to be able to enable ACPI support for them,
+         * even though there are a few bad names.
+         */
         if (!acpi_ut_valid_acpi_name(target_name)) {
-                ACPI_ERROR((AE_INFO, "Bad character in ACPI Name: %X",
-                            target_name));
-                return_ACPI_STATUS(AE_BAD_CHARACTER);
+                target_name = acpi_ut_repair_name(target_name);
+
+                /* Report warning only if in strict mode or debug mode */
+
+                if (!acpi_gbl_enable_interpreter_slack) {
+                        ACPI_WARNING((AE_INFO,
+                                      "Found bad character(s) in name, repaired: [%4.4s]\n",
+                                      ACPI_CAST_PTR(char, &target_name)));
+                } else {
+                        ACPI_DEBUG_PRINT((ACPI_DB_WARN,
+                                          "Found bad character(s) in name, repaired: [%4.4s]\n",
+                                          ACPI_CAST_PTR(char, &target_name)));
+                }
         }
 
         /* Try to find the name in the namespace level specified by the caller */
@@ -328,10 +342,8 @@ acpi_ns_search_and_enter(u32 target_name,
                         status = AE_ALREADY_EXISTS;
                 }
 
-                /*
-                 * Either found it or there was an error
-                 * -- finished either way
-                 */
+                /* Either found it or there was an error: finished either way */
+
                 return_ACPI_STATUS(status);
         }
 
@@ -357,9 +369,8 @@ acpi_ns_search_and_enter(u32 target_name,
                 }
         }
 
-        /*
-         * In execute mode, just search, never add names.  Exit now.
-         */
+        /* In execute mode, just search, never add names. Exit now */
+
         if (interpreter_mode == ACPI_IMODE_EXECUTE) {
                 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                   "%4.4s Not found in %p [Not adding]\n",
@@ -379,6 +390,5 @@ acpi_ns_search_and_enter(u32 target_name,
 
         acpi_ns_install_node(walk_state, node, new_node, type);
         *return_node = new_node;
-
         return_ACPI_STATUS(AE_OK);
 }