Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c04be184 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

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: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f06147f9

drivers/acpi/acpica/utxfinit.c

+6 −4
Original line number Diff line number Diff line
@@ -179,11 +179,13 @@ 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

	 */

	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 */



	/*

include/acpi/actypes.h

+1 −0
Original line number Diff line number Diff line
@@ -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