[PATCH 3.2 059/110] ACPICA: Tables: Fix an issue that FACS initialization is performed twice
From: Ben Hutchings <hidden>
Date: 2015-08-10 10:18:25
Also in:
lkml
3.2.71-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Lv Zheng <redacted> commit c04be18448355441a0c424362df65b6422e27bda upstream. 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 Signed-off-by: Lv Zheng <redacted> Signed-off-by: Bob Moore <redacted> Signed-off-by: Rafael J. Wysocki <redacted> [bwh: Backported to 3.2: adjust filename] Signed-off-by: Ben Hutchings <redacted> --- drivers/acpi/acpica/utxface.c | 10 ++++++---- include/acpi/actypes.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-)
--- a/drivers/acpi/acpica/utxface.c
+++ b/drivers/acpi/acpica/utxface.c@@ -163,10 +163,12 @@ acpi_status acpi_enable_subsystem(u32 fl * 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); + } } /* --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h
@@ -495,6 +495,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