diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2020-03-04 18:14:54 -0600 |
|---|---|---|
| committer | Patrick Rudolph <siro@das-labor.org> | 2020-03-05 07:48:05 +0000 |
| commit | 8bee86ef2334e60e90ecc829f6a55279cbf20b3d (patch) | |
| tree | af74d9affa26ba0482e2115f84d44ca6baece5a3 /src/arch | |
| parent | e0b74a142c34c9eebbdfd3d96dc8b9076f8c7740 (diff) | |
Revert "acpi: Bump FADT to revision 6"
This reverts commit c8b0f31ca1b6cae993736d47d919080b6c186c6f.
Bumping the FADT table version from 3 to 6 causes
Windows 10 to BSOD with an ACPI BIOS error or simply
fail to boot on multiple platforms (Haswell, Broadwell,
Braswell, Skylake). Revert until the issue can be properly
identified and corrected.
Change-Id: I261d953321df2616a3f1c3460a535b57a8848315
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39307
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/x86/acpi.c | 2 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/acpi.h | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c index b9e896f7de..6dab3733cc 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_6_0; + return ACPI_FADT_REV_ACPI_3_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 67f4be2d53..68475c157e 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; /* Revision 6 only, Revision 5: Must be zero */ - u8 FADT_MinorVersion; /* Revision 6 only, Revision 5: Must be zero */ + u16 ARM_boot_arch; + u8 FADT_MinorVersion; u32 x_firmware_ctl_l; u32 x_firmware_ctl_h; u32 x_dsdt_l; @@ -543,11 +543,6 @@ 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 */ |