ACPICA: Tables: Change table duplication check to be related to acpi_gbl_verify_table_checksum

ACPICA commit 3d837b5d4b1033942b4d91c7d3801a09c3157918

acpi_gbl_verify_table_checksum is used to avoid validating (mapping) an entire
table in OS boot stage. 2nd "Reload" check in acpi_tb_install_standard_table()
is prepared for the same purpose. So this patch combines them together
using a renamed acpi_gbl_enable_table_validation flag. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/3d837b5d
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>

5 files changed, 13 insertions, 8 deletions

diff --git a/drivers/acpi/acpica/tbdata.c b/drivers/acpi/acpica/tbdata.c
index 7056ca01e875..24d99711b2a4 100644
--- a/drivers/acpi/acpica/tbdata.c
+++ b/drivers/acpi/acpica/tbdata.c
@@ -338,7 +338,7 @@ void acpi_tb_invalidate_table(struct acpi_table_desc *table_desc)
 acpi_status acpi_tb_validate_temp_table(struct acpi_table_desc *table_desc)
 {
 
-        if (!table_desc->pointer && !acpi_gbl_verify_table_checksum) {
+        if (!table_desc->pointer && !acpi_gbl_enable_table_validation) {
                 /*
                  * Only validates the header of the table.
                  * Note that Length contains the size of the mapping after invoking
@@ -394,7 +394,7 @@ acpi_tb_verify_temp_table(struct acpi_table_desc *table_desc, char *signature)
 
         /* Verify the checksum */
 
-        if (acpi_gbl_verify_table_checksum) {
+        if (acpi_gbl_enable_table_validation) {
                 status =
                     acpi_tb_verify_checksum(table_desc->pointer,
                                             table_desc->length);
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 9d212967fad8..f7bc362bd3c5 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -221,7 +221,7 @@ acpi_tb_install_standard_table(acpi_physical_address address,
 
         (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
 
-        if (reload) {
+        if (acpi_gbl_enable_table_validation) {
 
                 /* Check if table is already registered */
 
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index 18508b2c0c05..38c01049afd5 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -194,6 +194,14 @@ acpi_status ACPI_INIT_FUNCTION acpi_reallocate_root_table(void)
                 }
         }
 
+        if (!acpi_gbl_enable_table_validation) {
+                /*
+                 * Now it's safe to do full table validation. We can do deferred
+                 * table initilization here once the flag is set.
+                 */
+                acpi_gbl_enable_table_validation = TRUE;
+        }
+
         acpi_gbl_root_table_list.flags |= ACPI_ROOT_ALLOW_RESIZE;
 
         status = acpi_tb_resize_root_table_list();
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index af74b420ec83..59f2f96fdb7e 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -995,9 +995,6 @@ void __init acpi_early_init(void)
 
         printk(KERN_INFO PREFIX "Core revision %08x\n", ACPI_CA_VERSION);
 
-        /* It's safe to verify table checksums during late stage */
-        acpi_gbl_verify_table_checksum = TRUE;
-
         /* enable workarounds, unless strict ACPI spec. compliance */
         if (!acpi_strict)
                 acpi_gbl_enable_interpreter_slack = TRUE;
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index ff425390bfa8..80ce2a7d224b 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -740,10 +740,10 @@ int __init acpi_table_init(void)
 
         if (acpi_verify_table_checksum) {
                 pr_info("Early table checksum verification enabled\n");
-                acpi_gbl_verify_table_checksum = TRUE;
+                acpi_gbl_enable_table_validation = TRUE;
         } else {
                 pr_info("Early table checksum verification disabled\n");
-                acpi_gbl_verify_table_checksum = FALSE;
+                acpi_gbl_enable_table_validation = FALSE;
         }
 
         status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);