From d4acee887edb1282f2e15bccba24d11ec7f2a6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Wed, 3 Jun 2020 07:20:55 +0300 Subject: ACPI: Move redundant FADT reserved entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I35f66cdad6b8bedf4337aa8e5af7b0f1b53fe674 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/42033 Reviewed-by: HAOUAS Elyes Tested-by: build bot (Jenkins) --- src/acpi/acpi.c | 7 +++++-- src/southbridge/intel/bd82x6x/lpc.c | 1 - src/southbridge/intel/i82801gx/lpc.c | 1 - src/southbridge/intel/i82801jx/lpc.c | 1 - src/southbridge/intel/ibexpeak/lpc.c | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index fefa7bf7ec..a69cdb6219 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -1242,13 +1242,16 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; - fadt->dsdt = (unsigned long) dsdt; - fadt->x_firmware_ctl_l = (unsigned long)facs; fadt->x_firmware_ctl_h = 0; + + fadt->dsdt = (unsigned long) dsdt; fadt->x_dsdt_l = (unsigned long)dsdt; fadt->x_dsdt_h = 0; + /* should be 0 ACPI 3.0 */ + fadt->reserved = 0; + if (CONFIG(SYSTEM_TYPE_CONVERTIBLE) || CONFIG(SYSTEM_TYPE_LAPTOP)) fadt->preferred_pm_profile = PM_MOBILE; diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index 691db62cbe..bdaca57829 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -694,7 +694,6 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) u16 pmbase = pci_read_config16(dev, 0x40) & 0xfffe; int c2_latency; - fadt->reserved = 0; fadt->sci_int = 0x9; diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index 0bfe8eb52f..58f93bdadd 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -519,7 +519,6 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) fadt->mon_alrm = 0x00; fadt->century = 0x32; - fadt->reserved = 0; fadt->sci_int = 0x9; if (permanent_smi_handler()) { diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c index f2c9afa7fa..3be492df21 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -530,7 +530,6 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) fadt->mon_alrm = 0x00; fadt->century = 0x32; - fadt->reserved = 0; fadt->sci_int = 0x9; if (permanent_smi_handler()) { diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c index f8926dc302..e741fcf305 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -588,7 +588,6 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) u16 pmbase = pci_read_config16(dev, 0x40) & 0xfffe; int c2_latency; - fadt->reserved = 0; fadt->sci_int = 0x9; -- cgit v1.2.3