ACPICA: Tables: Fix an issue that FACS initialization is performed twice

ACPICA commit 90f5332a15e9d9ba83831ca700b2b9f708274658

This patch adds a new FACS initialization flag for acpi_tb_initialize().
acpi_enable_subsystem() might be invoked several times in OS bootup process,
and we don't want FACS initialization to be invoked twice. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/90f5332a
Cc: All applicable <stable@vger.kernel.org> # All applicable
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>

2 files changed, 7 insertions, 4 deletions

diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c
index 083a76891889..42a32a66ef22 100644
--- a/drivers/acpi/acpica/utxfinit.c
+++ b/drivers/acpi/acpica/utxfinit.c
@@ -179,10 +179,12 @@ acpi_status __init acpi_enable_subsystem(u32 flags)
          * Obtain a permanent mapping for the FACS. This is required for the
          * Global Lock and the Firmware Waking Vector
          */
-        status = acpi_tb_initialize_facs();
-        if (ACPI_FAILURE(status)) {
-                ACPI_WARNING((AE_INFO, "Could not map the FACS table"));
-                return_ACPI_STATUS(status);
+        if (!(flags & ACPI_NO_FACS_INIT)) {
+                status = acpi_tb_initialize_facs();
+                if (ACPI_FAILURE(status)) {
+                        ACPI_WARNING((AE_INFO, "Could not map the FACS table"));
+                        return_ACPI_STATUS(status);
+                }
         }
 #endif                          /* !ACPI_REDUCED_HARDWARE */
 
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 63fd7f5e9fb3..ff0b53e128ee 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -568,6 +568,7 @@ typedef u64 acpi_integer;
 #define ACPI_NO_ACPI_ENABLE             0x10
 #define ACPI_NO_DEVICE_INIT             0x20
 #define ACPI_NO_OBJECT_INIT             0x40
+#define ACPI_NO_FACS_INIT               0x80
 
 /*
  * Initialization state