From 4812cf96c2d099c58e779a0859d3a2c47ae27804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sat, 30 May 2020 17:49:58 +0300 Subject: [PATCH] acpi,mb/*: Use motherboard_fill_fadt() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By vendor choice override fadt->preferred_pm_profile here. Change-Id: I0453c0edc9aeb86cf4f5d912613b8fa8beb63ab4 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/41917 Reviewed-by: Wim Vervoorn Reviewed-by: Frans Hendriks Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/mainboard/facebook/fbg1701/acpi_tables.c | 6 ++++++ src/mainboard/facebook/fbg1701/fadt.c | 4 +--- src/mainboard/portwell/m107/acpi_tables.c | 6 ++++++ src/mainboard/portwell/m107/fadt.c | 4 +--- src/mainboard/protectli/vault_bsw/acpi_tables.c | 6 ++++++ src/mainboard/protectli/vault_bsw/fadt.c | 4 +--- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/mainboard/facebook/fbg1701/acpi_tables.c b/src/mainboard/facebook/fbg1701/acpi_tables.c index 539a74e8a8..8492704b74 100644 --- a/src/mainboard/facebook/fbg1701/acpi_tables.c +++ b/src/mainboard/facebook/fbg1701/acpi_tables.c @@ -37,3 +37,9 @@ unsigned long acpi_fill_madt(unsigned long current) return current; } + +void motherboard_fill_fadt(acpi_fadt_t *fadt) +{ + fadt->preferred_pm_profile = PM_MOBILE; + fadt->iapc_boot_arch &= ~ACPI_FADT_8042; +} diff --git a/src/mainboard/facebook/fbg1701/fadt.c b/src/mainboard/facebook/fbg1701/fadt.c index 3785f15d8f..cd15725a98 100644 --- a/src/mainboard/facebook/fbg1701/fadt.c +++ b/src/mainboard/facebook/fbg1701/fadt.c @@ -18,7 +18,6 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; - fadt->preferred_pm_profile = PM_MOBILE; fadt->x_firmware_ctl_l = (unsigned long)facs; fadt->x_firmware_ctl_h = 0; @@ -26,8 +25,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) fadt->x_dsdt_h = 0; acpi_fill_in_fadt(fadt); - - fadt->iapc_boot_arch &= ~ACPI_FADT_8042; + motherboard_fill_fadt(fadt); header->checksum = acpi_checksum((void *) fadt, header->length); diff --git a/src/mainboard/portwell/m107/acpi_tables.c b/src/mainboard/portwell/m107/acpi_tables.c index 539a74e8a8..8492704b74 100644 --- a/src/mainboard/portwell/m107/acpi_tables.c +++ b/src/mainboard/portwell/m107/acpi_tables.c @@ -37,3 +37,9 @@ unsigned long acpi_fill_madt(unsigned long current) return current; } + +void motherboard_fill_fadt(acpi_fadt_t *fadt) +{ + fadt->preferred_pm_profile = PM_MOBILE; + fadt->iapc_boot_arch &= ~ACPI_FADT_8042; +} diff --git a/src/mainboard/portwell/m107/fadt.c b/src/mainboard/portwell/m107/fadt.c index 3785f15d8f..cd15725a98 100644 --- a/src/mainboard/portwell/m107/fadt.c +++ b/src/mainboard/portwell/m107/fadt.c @@ -18,7 +18,6 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; - fadt->preferred_pm_profile = PM_MOBILE; fadt->x_firmware_ctl_l = (unsigned long)facs; fadt->x_firmware_ctl_h = 0; @@ -26,8 +25,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) fadt->x_dsdt_h = 0; acpi_fill_in_fadt(fadt); - - fadt->iapc_boot_arch &= ~ACPI_FADT_8042; + motherboard_fill_fadt(fadt); header->checksum = acpi_checksum((void *) fadt, header->length); diff --git a/src/mainboard/protectli/vault_bsw/acpi_tables.c b/src/mainboard/protectli/vault_bsw/acpi_tables.c index f502741f5c..9ecb5ac0b0 100644 --- a/src/mainboard/protectli/vault_bsw/acpi_tables.c +++ b/src/mainboard/protectli/vault_bsw/acpi_tables.c @@ -27,3 +27,9 @@ unsigned long acpi_fill_madt(unsigned long current) return current; } + +void motherboard_fill_fadt(acpi_fadt_t *fadt) +{ + fadt->preferred_pm_profile = PM_MOBILE; + fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES; +} diff --git a/src/mainboard/protectli/vault_bsw/fadt.c b/src/mainboard/protectli/vault_bsw/fadt.c index 755ac6e919..2a32c7956c 100644 --- a/src/mainboard/protectli/vault_bsw/fadt.c +++ b/src/mainboard/protectli/vault_bsw/fadt.c @@ -19,7 +19,6 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) fadt->firmware_ctrl = (unsigned long)facs; fadt->dsdt = (unsigned long) dsdt; - fadt->preferred_pm_profile = PM_MOBILE; fadt->x_firmware_ctl_l = (unsigned long)facs; fadt->x_firmware_ctl_h = 0; @@ -27,8 +26,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) fadt->x_dsdt_h = 0; acpi_fill_in_fadt(fadt); - - fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES; + motherboard_fill_fadt(fadt); header->checksum = acpi_checksum((void *)fadt, header->length); }