GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86: Fix S3 resume without stage cache 

It was possible to have NO_STAGE_CACHE=n and at the same time have
TSEG_STAGE_CACHE=n and CBMEM_STAGE_CACHE=n. This resulted with a
failing attempt to load STAGE_POSTCAR from the stage cache, but not
loading it from CBFS either.

Make it a three-way choice between different STAGE_CACHE options.
For AGESA disable CBMEM_STAGE_CACHE by default, as it is no longer
needed to have functional ACPI S3 resume and it is not allowed
se use keyword select for symbols inside choice blocks.

Change-Id: I0da3e1cf4c92817ffabbb02eda3476ecdfdfa278
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37683
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2019-12-18 00:19:06 +02:00
parent 23c1c4e153
commit 6766f4fd04
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Kconfig
View File

@ -274,18 +274,28 @@ config RELOCATABLE_RAMSTAGE
wake. When selecting this option the romstage is responsible for wake. When selecting this option the romstage is responsible for
determing a stack location to use for loading the ramstage. determing a stack location to use for loading the ramstage.
choice
prompt "Stage Cache for ACPI S3 resume"
default NO_STAGE_CACHE if !HAVE_ACPI_RESUME || !RELOCATABLE_RAMSTAGE
default TSEG_STAGE_CACHE if SMM_TSEG
config NO_STAGE_CACHE
bool "Disabled"
help
Do not save any component in stage cache for resume path. On resume,
all components would be read back from CBFS again.
config TSEG_STAGE_CACHE config TSEG_STAGE_CACHE
bool bool "TSEG"
default y depends on SMM_TSEG
depends on !NO_STAGE_CACHE && SMM_TSEG
help help
The option enables stage cache support for platform. Platform The option enables stage cache support for platform. Platform
can stash copies of postcar, ramstage and raw runtime data can stash copies of postcar, ramstage and raw runtime data
inside SMM TSEG, to be restored on S3 resume path. inside SMM TSEG, to be restored on S3 resume path.
config CBMEM_STAGE_CACHE config CBMEM_STAGE_CACHE
bool "Cache stages in CBMEM" bool "CBMEM"
depends on !NO_STAGE_CACHE && !TSEG_STAGE_CACHE depends on !SMM_TSEG
help help
The option enables stage cache support for platform. Platform The option enables stage cache support for platform. Platform
can stash copies of postcar, ramstage and raw runtime data can stash copies of postcar, ramstage and raw runtime data
@ -297,6 +307,8 @@ config CBMEM_STAGE_CACHE
If unsure, select 'N' If unsure, select 'N'
endchoice
config UPDATE_IMAGE config UPDATE_IMAGE
bool "Update existing coreboot.rom image" bool "Update existing coreboot.rom image"
help help
@ -1153,13 +1165,6 @@ config RELOCATABLE_MODULES
building relocatable modules in the RAM stage. Those modules can be building relocatable modules in the RAM stage. Those modules can be
loaded anywhere and all the relocations are handled automatically. loaded anywhere and all the relocations are handled automatically.
config NO_STAGE_CACHE
bool
default y if !HAVE_ACPI_RESUME || !RELOCATABLE_RAMSTAGE
help
Do not save any component in stage cache for resume path. On resume,
all components would be read back from CBFS again.
config GENERIC_GPIO_LIB config GENERIC_GPIO_LIB
bool bool
help help

1
src/cpu/amd/agesa/Kconfig
View File

@ -26,7 +26,6 @@ config CPU_AMD_AGESA
select UDELAY_LAPIC select UDELAY_LAPIC
select LAPIC_MONOTONIC_TIMER select LAPIC_MONOTONIC_TIMER
select SPI_FLASH if HAVE_ACPI_RESUME select SPI_FLASH if HAVE_ACPI_RESUME
select CBMEM_STAGE_CACHE if HAVE_ACPI_RESUME
select SMM_ASEG select SMM_ASEG
select NO_FIXED_XIP_ROM_SIZE select NO_FIXED_XIP_ROM_SIZE
select SSE2 select SSE2