ACPICA: Tables: Fix the issues in handling virtual addressed tables.

When table is overridden or reloaded, acpi_tb_delete_table() is called where
struct acpi_table_desc.Pointer will be NULL.  It thus is impossible for virtual
addressed tables to obtain the .Pointer again in acpi_tb_verify_table().

This patch stores virtual table addresses  (ACPI_TABLE_ORIGIN_ALLOCATED,
ACPI_TABLE_ORIGIN_UNKNOWN, ACPI_TABLE_ORIGIN_OVERRIDE) in the
struct acpi_table_desc.Address field and refills the struct acpi_table_desc.Pointer
using these addresses in acpi_tb_verify_table(). Note that if a table with
ACPI_TABLE_ORIGIN_ALLOCATED set is actually freed, the .Address field
should be invalidated and thus must be replaced with NULL to avoid wrong
future validations occuring in acpi_tb_verify_table().

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 1b734eb7c0c085112a06f92bc0b4a37532d01aaf..649a8efef0f51c8ccae8918e5943d27122ea7682 100644 (file)
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -435,7 +435,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                        return_ACPI_STATUS(status);
                }
 
-               table_desc.address = obj_desc->region.address;
+               table_desc.address = ACPI_PTR_TO_PHYSADDR(table_desc.pointer);
                break;
 
        case ACPI_TYPE_BUFFER:  /* Buffer or resolved region_field */
@@ -476,7 +476,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                }
 
                ACPI_MEMCPY(table_desc.pointer, table, length);
-               table_desc.address = ACPI_TO_INTEGER(table_desc.pointer);
+               table_desc.address = ACPI_PTR_TO_PHYSADDR(table_desc.pointer);
                break;
 
        default:

diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 73fffb0f3dd3798e8e16096e7665e73d06f31d25..144076ac21f02a0fc2592cfb5a587b2e7105e65b 100644 (file)
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -69,11 +69,26 @@ acpi_status acpi_tb_verify_table(struct acpi_table_desc *table_desc)
        /* Map the table if necessary */
 
        if (!table_desc->pointer) {
-               if ((table_desc->flags & ACPI_TABLE_ORIGIN_MASK) ==
-                   ACPI_TABLE_ORIGIN_MAPPED) {
+               switch (table_desc->flags & ACPI_TABLE_ORIGIN_MASK) {
+               case ACPI_TABLE_ORIGIN_MAPPED:
+
                        table_desc->pointer =
                            acpi_os_map_memory(table_desc->address,
                                               table_desc->length);
+                       break;
+
+               case ACPI_TABLE_ORIGIN_ALLOCATED:
+               case ACPI_TABLE_ORIGIN_UNKNOWN:
+               case ACPI_TABLE_ORIGIN_OVERRIDE:
+
+                       table_desc->pointer =
+                           ACPI_CAST_PTR(struct acpi_table_header,
+                                         table_desc->address);
+                       break;
+
+               default:
+
+                       break;
                }
 
                if (!table_desc->pointer) {
@@ -476,6 +491,7 @@ void acpi_tb_delete_table(struct acpi_table_desc *table_desc)
        case ACPI_TABLE_ORIGIN_ALLOCATED:
 
                ACPI_FREE(table_desc->pointer);
+               table_desc->address = ACPI_PTR_TO_PHYSADDR(NULL);
                break;
 
                /* Not mapped or allocated, there is nothing we can do */

diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 3f1afca87aeb912a2d83edf01ff28fa65c20764f..9b6992d8578f55f79ec1dd81e0d9946593782307 100644 (file)
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -179,6 +179,7 @@ struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index)
 
        ACPI_MEMCPY(new_table, table_desc->pointer, table_desc->length);
        acpi_tb_delete_table(table_desc);
+       table_desc->address = ACPI_PTR_TO_PHYSADDR(new_table);
        table_desc->pointer = new_table;
        table_desc->flags = ACPI_TABLE_ORIGIN_ALLOCATED;