summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2020-02-28 10:19:41 +0100
committerPatrick Georgi <pgeorgi@google.com>2020-03-02 11:48:11 +0000
commitc8b0f31ca1b6cae993736d47d919080b6c186c6f (patch)
tree33a0fbe498c1cb58ea18a3b8ed9f2d688a5a676e /src/arch/x86
parentd778b3bc9098a03cf955918e3e3b33a4e4c5e99f (diff)
downloadcoreboot-c8b0f31ca1b6cae993736d47d919080b6c186c6f.tar.xz
acpi: Bump FADT to revision 6
Some of the revision 4 FADT fields were already updated to ACPI spec revision 6, but not all of them. In addition the advertised FADT revision was 3. Implement all fields as defined in version 6 and bump the advertised FADT revision to 6. Change-Id: I10c1e2517df41159ab9b04f763d3805ecba50ffa Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39157 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/acpi.c2
-rw-r--r--src/arch/x86/include/arch/acpi.h9
2 files changed, 8 insertions, 3 deletions
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index 6dab3733cc..b9e896f7de 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -1563,7 +1563,7 @@ int get_acpi_table_revision(enum acpi_tables table)
{
switch (table) {
case FADT:
- return ACPI_FADT_REV_ACPI_3_0;
+ return ACPI_FADT_REV_ACPI_6_0;
case MADT: /* ACPI 3.0: 2, ACPI 4.0/5.0: 3, ACPI 6.2b/6.3: 5 */
return 2;
case MCFG:
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 68475c157e..67f4be2d53 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -529,8 +529,8 @@ typedef struct acpi_fadt {
u32 flags;
acpi_addr_t reset_reg;
u8 reset_value;
- u16 ARM_boot_arch;
- u8 FADT_MinorVersion;
+ u16 ARM_boot_arch; /* Revision 6 only, Revision 5: Must be zero */
+ u8 FADT_MinorVersion; /* Revision 6 only, Revision 5: Must be zero */
u32 x_firmware_ctl_l;
u32 x_firmware_ctl_h;
u32 x_dsdt_l;
@@ -543,6 +543,11 @@ typedef struct acpi_fadt {
acpi_addr_t x_pm_tmr_blk;
acpi_addr_t x_gpe0_blk;
acpi_addr_t x_gpe1_blk;
+ /* Revision 5 */
+ acpi_addr_t sleep_control_reg;
+ acpi_addr_t sleep_status_reg;
+ /* Revision 6 */
+ u64 hypervisor_vendor_identity;
} __packed acpi_fadt_t;
/* FADT TABLE Revision values */