erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mb/google/brox: Do not select HAVE_ACPI_RESUME

Browse source 
Brox mainboard does not reliably support S3 entry/exit. Hence do not
select HAVE_ACPI_RESUME config option. Also trigger a fail-safe board
reset if the system resumes from S3.

BUG=b:337274309
TEST=Build Brox BIOS image and boot to OS. Ensure that the _S3 name
variable is not advertised in the DSDT. Trigger a S3 entry and ensure
that on S3 exit, the board reset is triggered.

Change-Id: Ief0936fbcd9e5e34ef175736a858f98edf840719
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/85038
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Bob Moragues <moragues@google.com>
Reviewed-by: Subrata Banik <subratabanik@google.com>
This commit is contained in:
Karthikeyan Ramasubramanian 2024-11-08 04:22:00 +00:00 • committed by Karthik Ramasubramanian
commit 11ff6e22b3
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/mainboard/google/brox/Kconfig
View file

@ -23,7 +23,6 @@ config BOARD_GOOGLE_BROX_COMMON
select FW_CONFIG
select FW_CONFIG_SOURCE_CHROMEEC_CBI
select GOOGLE_SMBIOS_MAINBOARD_VERSION
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select HAVE_FSP_LOGO_SUPPORT if RUN_FSP_GOP
select I2C_TPM

11
src/mainboard/google/brox/bootblock.c
View file

@ -1,7 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <acpi/acpi.h>
#include <baseboard/variants.h>
#include <bootblock_common.h>
#include <bootmode.h>
#include <reset.h>
#include <security/vboot/vboot_common.h>
void bootblock_mainboard_early_init(void)
{
@ -13,6 +17,13 @@ void bootblock_mainboard_early_init(void)
void bootblock_mainboard_init(void)
{
if (platform_is_resuming()) {
printk(BIOS_EMERG, "ACPI S3 resume is not supported on this platform\n");
/* Prepare for reboot to clear the sleep state such that the board
is not stuck in reboot loop. */
vboot_platform_prepare_reboot();
board_reset();
}
variant_update_descriptor();
}