/home/lenb/src/to-akpm branch 'acpi-2.6.12'

6 files changed, 202 insertions, 103 deletions

diff --git a/drivers/acpi/tables/tbconvrt.c b/drivers/acpi/tables/tbconvrt.c
index 92e0c31539be..d4ff71f5fe5d 100644
--- a/drivers/acpi/tables/tbconvrt.c
+++ b/drivers/acpi/tables/tbconvrt.c
@@ -97,7 +97,9 @@ acpi_tb_get_table_count (
         ACPI_FUNCTION_ENTRY ();
 
 
-        if (RSDP->revision < 2) {
+        /* RSDT pointers are 32 bits, XSDT pointers are 64 bits */
+
+        if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
                 pointer_size = sizeof (u32);
         }
         else {
@@ -158,7 +160,9 @@ acpi_tb_convert_to_xsdt (
         /* Copy the table pointers */
 
         for (i = 0; i < acpi_gbl_rsdt_table_count; i++) {
-                if (acpi_gbl_RSDP->revision < 2) {
+                /* RSDT pointers are 32 bits, XSDT pointers are 64 bits */
+
+                if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
                         ACPI_STORE_ADDRESS (new_table->table_offset_entry[i],
                                 (ACPI_CAST_PTR (struct rsdt_descriptor_rev1,
                                         table_info->pointer))->table_offset_entry[i]);
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c
index 629b64c8193d..698799901f55 100644
--- a/drivers/acpi/tables/tbinstal.c
+++ b/drivers/acpi/tables/tbinstal.c
@@ -124,9 +124,7 @@ acpi_tb_match_signature (
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Load and validate all tables other than the RSDT.  The RSDT must
- *              already be loaded and validated.
- *              Install the table into the global data structs.
+ * DESCRIPTION: Install the table into the global data structures.
  *
  ******************************************************************************/
 
@@ -136,6 +134,7 @@ acpi_tb_install_table (
 {
         acpi_status                     status;
 
+
         ACPI_FUNCTION_TRACE ("tb_install_table");
 
 
@@ -143,22 +142,33 @@ acpi_tb_install_table (
 
         status = acpi_ut_acquire_mutex (ACPI_MTX_TABLES);
         if (ACPI_FAILURE (status)) {
-                ACPI_REPORT_ERROR (("Could not acquire table mutex for [%4.4s], %s\n",
-                        table_info->pointer->signature, acpi_format_exception (status)));
+                ACPI_REPORT_ERROR (("Could not acquire table mutex, %s\n",
+                        acpi_format_exception (status)));
                 return_ACPI_STATUS (status);
         }
 
+        /*
+         * Ignore a table that is already installed. For example, some BIOS
+         * ASL code will repeatedly attempt to load the same SSDT.
+         */
+        status = acpi_tb_is_table_installed (table_info);
+        if (ACPI_FAILURE (status)) {
+                goto unlock_and_exit;
+        }
+
         /* Install the table into the global data structure */
 
         status = acpi_tb_init_table_descriptor (table_info->type, table_info);
         if (ACPI_FAILURE (status)) {
-                ACPI_REPORT_ERROR (("Could not install ACPI table [%4.4s], %s\n",
+                ACPI_REPORT_ERROR (("Could not install table [%4.4s], %s\n",
                         table_info->pointer->signature, acpi_format_exception (status)));
         }
 
         ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "%s located at %p\n",
                 acpi_gbl_table_data[table_info->type].name, table_info->pointer));
 
+
+unlock_and_exit:
         (void) acpi_ut_release_mutex (ACPI_MTX_TABLES);
         return_ACPI_STATUS (status);
 }
@@ -251,6 +261,7 @@ acpi_tb_init_table_descriptor (
 {
         struct acpi_table_list          *list_head;
         struct acpi_table_desc          *table_desc;
+        acpi_status                     status;
 
 
         ACPI_FUNCTION_TRACE_U32 ("tb_init_table_descriptor", table_type);
@@ -263,6 +274,13 @@ acpi_tb_init_table_descriptor (
                 return_ACPI_STATUS (AE_NO_MEMORY);
         }
 
+        /* Get a new owner ID for the table */
+
+        status = acpi_ut_allocate_owner_id (&table_desc->owner_id);
+        if (ACPI_FAILURE (status)) {
+                return_ACPI_STATUS (status);
+        }
+
         /* Install the table into the global data structure */
 
         list_head = &acpi_gbl_table_lists[table_type];
@@ -325,8 +343,6 @@ acpi_tb_init_table_descriptor (
         table_desc->aml_start           = (u8 *) (table_desc->pointer + 1),
         table_desc->aml_length          = (u32) (table_desc->length -
                          (u32) sizeof (struct acpi_table_header));
-        table_desc->table_id            = acpi_ut_allocate_owner_id (
-                         ACPI_OWNER_TYPE_TABLE);
         table_desc->loaded_into_namespace = FALSE;
 
         /*
@@ -339,7 +355,7 @@ acpi_tb_init_table_descriptor (
 
         /* Return Data */
 
-        table_info->table_id        = table_desc->table_id;
+        table_info->owner_id        = table_desc->owner_id;
         table_info->installed_desc  = table_desc;
 
         return_ACPI_STATUS (AE_OK);
diff --git a/drivers/acpi/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c
index b7ffe39c3626..069d498465d0 100644
--- a/drivers/acpi/tables/tbrsdt.c
+++ b/drivers/acpi/tables/tbrsdt.c
@@ -96,32 +96,13 @@ acpi_tb_verify_rsdp (
                 return_ACPI_STATUS (AE_BAD_PARAMETER);
         }
 
-        /*
-         *  The signature and checksum must both be correct
-         */
-        if (ACPI_STRNCMP ((char *) rsdp, RSDP_SIG, sizeof (RSDP_SIG)-1) != 0) {
-                /* Nope, BAD Signature */
-
-                status = AE_BAD_SIGNATURE;
-                goto cleanup;
-        }
-
-        /* Check the standard checksum */
+        /* Verify RSDP signature and checksum */
 
-        if (acpi_tb_checksum (rsdp, ACPI_RSDP_CHECKSUM_LENGTH) != 0) {
-                status = AE_BAD_CHECKSUM;
+        status = acpi_tb_validate_rsdp (rsdp);
+        if (ACPI_FAILURE (status)) {
                 goto cleanup;
         }
 
-        /* Check extended checksum if table version >= 2 */
-
-        if (rsdp->revision >= 2) {
-                if (acpi_tb_checksum (rsdp, ACPI_RSDP_XCHECKSUM_LENGTH) != 0) {
-                        status = AE_BAD_CHECKSUM;
-                        goto cleanup;
-                }
-        }
-
         /* The RSDP supplied is OK */
 
         table_info.pointer     = ACPI_CAST_PTR (struct acpi_table_header, rsdp);
@@ -159,8 +140,8 @@ cleanup:
  *
  * RETURN:      None, Address
  *
- * DESCRIPTION: Extract the address of the RSDT or XSDT, depending on the
- *              version of the RSDP
+ * DESCRIPTION: Extract the address of either the RSDT or XSDT, depending on the
+ *              version of the RSDP and whether the XSDT pointer is valid
  *
  ******************************************************************************/
 
@@ -174,16 +155,19 @@ acpi_tb_get_rsdt_address (
 
         out_address->pointer_type = acpi_gbl_table_flags | ACPI_LOGICAL_ADDRESSING;
 
-        /*
-         * For RSDP revision 0 or 1, we use the RSDT.
-         * For RSDP revision 2 (and above), we use the XSDT
-         */
-        if (acpi_gbl_RSDP->revision < 2) {
-                out_address->pointer.value = acpi_gbl_RSDP->rsdt_physical_address;
-        }
-        else {
+        /* Use XSDT if it is present */
+
+        if ((acpi_gbl_RSDP->revision >= 2) &&
+                acpi_gbl_RSDP->xsdt_physical_address) {
                 out_address->pointer.value =
                         acpi_gbl_RSDP->xsdt_physical_address;
+                acpi_gbl_root_table_type = ACPI_TABLE_TYPE_XSDT;
+        }
+        else {
+                /* No XSDT, use the RSDT */
+
+                out_address->pointer.value = acpi_gbl_RSDP->rsdt_physical_address;
+                acpi_gbl_root_table_type = ACPI_TABLE_TYPE_RSDT;
         }
 }
 
@@ -211,10 +195,9 @@ acpi_tb_validate_rsdt (
 
 
         /*
-         * For RSDP revision 0 or 1, we use the RSDT.
-         * For RSDP revision 2 and above, we use the XSDT
+         * Search for appropriate signature, RSDT or XSDT
          */
-        if (acpi_gbl_RSDP->revision < 2) {
+        if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
                 no_match = ACPI_STRNCMP ((char *) table_ptr, RSDT_SIG,
                                   sizeof (RSDT_SIG) -1);
         }
@@ -236,11 +219,11 @@ acpi_tb_validate_rsdt (
                         acpi_gbl_RSDP->rsdt_physical_address,
                         (void *) (acpi_native_uint) acpi_gbl_RSDP->rsdt_physical_address));
 
-                if (acpi_gbl_RSDP->revision < 2) {
-                        ACPI_REPORT_ERROR (("Looking for RSDT (RSDP->Rev < 2)\n"))
+                if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
+                        ACPI_REPORT_ERROR (("Looking for RSDT\n"))
                 }
                 else {
-                        ACPI_REPORT_ERROR (("Looking for XSDT (RSDP->Rev >= 2)\n"))
+                        ACPI_REPORT_ERROR (("Looking for XSDT\n"))
                 }
 
                 ACPI_DUMP_BUFFER ((char *) table_ptr, 48);
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index e69d01d443d2..6fc1e36e6042 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -61,6 +61,67 @@ acpi_tb_handle_to_object (
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_tb_is_table_installed
+ *
+ * PARAMETERS:  new_table_desc      - Descriptor for new table being installed
+ *
+ * RETURN:      Status - AE_ALREADY_EXISTS if the table is already installed
+ *
+ * DESCRIPTION: Determine if an ACPI table is already installed
+ *
+ * MUTEX:       Table data structures should be locked
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_tb_is_table_installed (
+        struct acpi_table_desc          *new_table_desc)
+{
+        struct acpi_table_desc          *table_desc;
+
+
+        ACPI_FUNCTION_TRACE ("tb_is_table_installed");
+
+
+        /* Get the list descriptor and first table descriptor */
+
+        table_desc = acpi_gbl_table_lists[new_table_desc->type].next;
+
+        /* Examine all installed tables of this type */
+
+        while (table_desc) {
+                /* Compare Revision and oem_table_id */
+
+                if ((table_desc->loaded_into_namespace) &&
+                        (table_desc->pointer->revision ==
+                                        new_table_desc->pointer->revision) &&
+                        (!ACPI_MEMCMP (table_desc->pointer->oem_table_id,
+                                        new_table_desc->pointer->oem_table_id, 8))) {
+                        /* This table is already installed */
+
+                        ACPI_DEBUG_PRINT ((ACPI_DB_TABLES,
+                                "Table [%4.4s] already installed: Rev %X oem_table_id [%8.8s]\n",
+                                new_table_desc->pointer->signature,
+                                new_table_desc->pointer->revision,
+                                new_table_desc->pointer->oem_table_id));
+
+                        new_table_desc->owner_id    = table_desc->owner_id;
+                        new_table_desc->installed_desc = table_desc;
+
+                        return_ACPI_STATUS (AE_ALREADY_EXISTS);
+                }
+
+                /* Get next table on the list */
+
+                table_desc = table_desc->next;
+        }
+
+        return_ACPI_STATUS (AE_OK);
+}
+
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_tb_validate_table_header
  *
  * PARAMETERS:  table_header        - Logical pointer to the table
@@ -157,7 +218,7 @@ acpi_tb_verify_table_checksum (
 
         /* Compute the checksum on the table */
 
-        checksum = acpi_tb_checksum (table_header, table_header->length);
+        checksum = acpi_tb_generate_checksum (table_header, table_header->length);
 
         /* Return the appropriate exception */
 
@@ -175,7 +236,7 @@ acpi_tb_verify_table_checksum (
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_tb_checksum
+ * FUNCTION:    acpi_tb_generate_checksum
  *
  * PARAMETERS:  Buffer              - Buffer to checksum
  *              Length              - Size of the buffer
@@ -187,7 +248,7 @@ acpi_tb_verify_table_checksum (
  ******************************************************************************/
 
 u8
-acpi_tb_checksum (
+acpi_tb_generate_checksum (
         void                            *buffer,
         u32                             length)
 {
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 0c0b9085dbeb..e18a05d1b9b3 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -182,10 +182,23 @@ acpi_load_table (
                 return_ACPI_STATUS (status);
         }
 
+        /* Check signature for a valid table type */
+
+        status = acpi_tb_recognize_table (&table_info, ACPI_TABLE_ALL);
+        if (ACPI_FAILURE (status)) {
+                return_ACPI_STATUS (status);
+        }
+
         /* Install the new table into the local data structures */
 
         status = acpi_tb_install_table (&table_info);
         if (ACPI_FAILURE (status)) {
+                if (status == AE_ALREADY_EXISTS) {
+                        /* Table already exists, no error */
+
+                        status = AE_OK;
+                }
+
                 /* Free table allocated by acpi_tb_get_table_body */
 
                 acpi_tb_delete_single_table (&table_info);
@@ -260,8 +273,8 @@ acpi_unload_table (
                  * "Scope" operator.  Thus, we need to track ownership by an ID, not
                  * simply a position within the hierarchy
                  */
-                acpi_ns_delete_namespace_by_owner (table_desc->table_id);
-
+                acpi_ns_delete_namespace_by_owner (table_desc->owner_id);
+                acpi_ut_release_owner_id (&table_desc->owner_id);
                 table_desc = table_desc->next;
         }
 
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index dc3c3f6a9f62..87dccdda9ae2 100644
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/tables/tbxfroot.c
@@ -65,6 +65,51 @@ acpi_tb_scan_memory_for_rsdp (
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_tb_validate_rsdp
+ *
+ * PARAMETERS:  Rsdp        - Pointer to unvalidated RSDP
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Validate the RSDP (ptr)
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_tb_validate_rsdp (
+        struct rsdp_descriptor          *rsdp)
+{
+        ACPI_FUNCTION_ENTRY ();
+
+
+        /*
+         *  The signature and checksum must both be correct
+         */
+        if (ACPI_STRNCMP ((char *) rsdp, RSDP_SIG, sizeof (RSDP_SIG)-1) != 0) {
+                /* Nope, BAD Signature */
+
+                return (AE_BAD_SIGNATURE);
+        }
+
+        /* Check the standard checksum */
+
+        if (acpi_tb_generate_checksum (rsdp, ACPI_RSDP_CHECKSUM_LENGTH) != 0) {
+                return (AE_BAD_CHECKSUM);
+        }
+
+        /* Check extended checksum if table version >= 2 */
+
+        if ((rsdp->revision >= 2) &&
+                (acpi_tb_generate_checksum (rsdp, ACPI_RSDP_XCHECKSUM_LENGTH) != 0)) {
+                return (AE_BAD_CHECKSUM);
+        }
+
+        return (AE_OK);
+}
+
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_tb_find_table
  *
  * PARAMETERS:  Signature           - String with ACPI table signature
@@ -218,19 +263,11 @@ acpi_get_firmware_table (
                         acpi_gbl_RSDP = address.pointer.logical;
                 }
 
-                /* The signature and checksum must both be correct */
-
-                if (ACPI_STRNCMP ((char *) acpi_gbl_RSDP, RSDP_SIG,
-                                sizeof (RSDP_SIG)-1) != 0) {
-                        /* Nope, BAD Signature */
-
-                        return_ACPI_STATUS (AE_BAD_SIGNATURE);
-                }
-
-                if (acpi_tb_checksum (acpi_gbl_RSDP, ACPI_RSDP_CHECKSUM_LENGTH) != 0) {
-                        /* Nope, BAD Checksum */
+                /* The RDSP signature and checksum must both be correct */
 
-                        return_ACPI_STATUS (AE_BAD_CHECKSUM);
+                status = acpi_tb_validate_rsdp (acpi_gbl_RSDP);
+                if (ACPI_FAILURE (status)) {
+                        return_ACPI_STATUS (status);
                 }
         }
 
@@ -287,9 +324,11 @@ acpi_get_firmware_table (
          * requested table
          */
         for (i = 0, j = 0; i < table_count; i++) {
-                /* Get the next table pointer, handle RSDT vs. XSDT */
-
-                if (acpi_gbl_RSDP->revision < 2) {
+                /*
+                 * Get the next table pointer, handle RSDT vs. XSDT
+                 * RSDT pointers are 32 bits, XSDT pointers are 64 bits
+                 */
+                if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
                         address.pointer.value = (ACPI_CAST_PTR (
                                 RSDT_DESCRIPTOR, rsdt_info->pointer))->table_offset_entry[i];
                 }
@@ -331,8 +370,10 @@ acpi_get_firmware_table (
 
 
 cleanup:
-        acpi_os_unmap_memory (rsdt_info->pointer,
-                (acpi_size) rsdt_info->pointer->length);
+        if (rsdt_info->pointer) {
+                acpi_os_unmap_memory (rsdt_info->pointer,
+                        (acpi_size) rsdt_info->pointer->length);
+        }
         ACPI_MEM_FREE (rsdt_info);
 
         if (header) {
@@ -410,9 +451,9 @@ acpi_tb_scan_memory_for_rsdp (
         u8                              *start_address,
         u32                             length)
 {
+        acpi_status                     status;
         u8                              *mem_rover;
         u8                              *end_address;
-        u8                              checksum;
 
 
         ACPI_FUNCTION_TRACE ("tb_scan_memory_for_rsdp");
@@ -424,45 +465,25 @@ acpi_tb_scan_memory_for_rsdp (
 
         for (mem_rover = start_address; mem_rover < end_address;
                  mem_rover += ACPI_RSDP_SCAN_STEP) {
-                /* The signature and checksum must both be correct */
-
-                if (ACPI_STRNCMP ((char *) mem_rover,
-                                RSDP_SIG, sizeof (RSDP_SIG) - 1) != 0) {
-                        /* No signature match, keep looking */
-
-                        continue;
-                }
-
-                /* Signature matches, check the appropriate checksum */
-
-                if ((ACPI_CAST_PTR (struct rsdp_descriptor, mem_rover))->revision < 2) {
-                        /* ACPI version 1.0 */
+                /* The RSDP signature and checksum must both be correct */
 
-                        checksum = acpi_tb_checksum (mem_rover, ACPI_RSDP_CHECKSUM_LENGTH);
-                }
-                else {
-                        /* Post ACPI 1.0, use extended_checksum */
-
-                        checksum = acpi_tb_checksum (mem_rover, ACPI_RSDP_XCHECKSUM_LENGTH);
-                }
-
-                if (checksum == 0) {
-                        /* Checksum valid, we have found a valid RSDP */
+                status = acpi_tb_validate_rsdp (ACPI_CAST_PTR (struct rsdp_descriptor, mem_rover));
+                if (ACPI_SUCCESS (status)) {
+                        /* Sig and checksum valid, we have found a real RSDP */
 
                         ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
                                 "RSDP located at physical address %p\n", mem_rover));
                         return_PTR (mem_rover);
                 }
 
-                ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-                        "Found an RSDP at physical address %p, but it has a bad checksum\n",
-                        mem_rover));
+                /* No sig match or bad checksum, keep searching */
         }
 
         /* Searched entire block, no RSDP was found */
 
         ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-                "Searched entire block, no valid RSDP was found.\n"));
+                "Searched entire block from %p, valid RSDP was not found\n",
+                start_address));
         return_PTR (NULL);
 }
 
@@ -550,7 +571,7 @@ acpi_tb_find_rsdp (
                         acpi_os_unmap_memory (table_ptr, ACPI_EBDA_WINDOW_SIZE);
 
                         if (mem_rover) {
-                                /* Found it, return the physical address */
+                                /* Return the physical address */
 
                                 physical_address += ACPI_PTR_DIFF (mem_rover, table_ptr);
 
@@ -579,7 +600,7 @@ acpi_tb_find_rsdp (
                 acpi_os_unmap_memory (table_ptr, ACPI_HI_RSDP_WINDOW_SIZE);
 
                 if (mem_rover) {
-                        /* Found it, return the physical address */
+                        /* Return the physical address */
 
                         physical_address =
                                 ACPI_HI_RSDP_WINDOW_BASE + ACPI_PTR_DIFF (mem_rover, table_ptr);
@@ -610,7 +631,7 @@ acpi_tb_find_rsdp (
                                           ACPI_PHYSADDR_TO_PTR (physical_address),
                                           ACPI_EBDA_WINDOW_SIZE);
                         if (mem_rover) {
-                                /* Found it, return the physical address */
+                                /* Return the physical address */
 
                                 table_info->physical_address = ACPI_TO_INTEGER (mem_rover);
                                 return_ACPI_STATUS (AE_OK);
@@ -630,8 +651,9 @@ acpi_tb_find_rsdp (
                 }
         }
 
-        /* RSDP signature was not found */
+        /* A valid RSDP was not found */
 
+        ACPI_REPORT_ERROR (("No valid RSDP was found\n"));
         return_ACPI_STATUS (AE_NOT_FOUND);
 }