summaryrefslogtreecommitdiffstats
path: root/kernel/include/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/include/acpi')
-rw-r--r--kernel/include/acpi/acpixf.h13
-rw-r--r--kernel/include/acpi/actypes.h1
2 files changed, 12 insertions, 2 deletions
diff --git a/kernel/include/acpi/acpixf.h b/kernel/include/acpi/acpixf.h
index 08ef57bc8..f5ed1f17f 100644
--- a/kernel/include/acpi/acpixf.h
+++ b/kernel/include/acpi/acpixf.h
@@ -195,9 +195,18 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_do_not_use_xsdt, FALSE);
* address. Although ACPICA adheres to the ACPI specification which
* requires the use of the corresponding 64-bit address if it is non-zero,
* some machines have been found to have a corrupted non-zero 64-bit
- * address. Default is TRUE, favor the 32-bit addresses.
+ * address. Default is FALSE, do not favor the 32-bit addresses.
*/
-ACPI_INIT_GLOBAL(u8, acpi_gbl_use32_bit_fadt_addresses, TRUE);
+ACPI_INIT_GLOBAL(u8, acpi_gbl_use32_bit_fadt_addresses, FALSE);
+
+/*
+ * Optionally use 32-bit FACS table addresses.
+ * It is reported that some platforms fail to resume from system suspending
+ * if 64-bit FACS table address is selected:
+ * https://bugzilla.kernel.org/show_bug.cgi?id=74021
+ * Default is TRUE, favor the 32-bit addresses.
+ */
+ACPI_INIT_GLOBAL(u8, acpi_gbl_use32_bit_facs_addresses, TRUE);
/*
* Optionally truncate I/O addresses to 16 bits. Provides compatibility
diff --git a/kernel/include/acpi/actypes.h b/kernel/include/acpi/actypes.h
index 1c3002e1d..181427ef3 100644
--- a/kernel/include/acpi/actypes.h
+++ b/kernel/include/acpi/actypes.h
@@ -572,6 +572,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