Currently the decision of whether or not to use mrc_cache in recovery mode is made within the individual platforms' drivers (ie: fsp2.0, fsp1.1, etc.). As this is not platform specific, but uses common vboot infrastructure, the code can be unified and moved into mrc_cache. The conditions are as follows: 1. If HAS_RECOVERY_MRC_CACHE, use mrc_cache data (unless retrain switch is true) 2. If !HAS_RECOVERY_MRC_CACHE && VBOOT_STARTS_IN_BOOTBLOCK, this means that memory training will occur after verified boot, meaning that mrc_cache will be filled with data from executing RW code. So in this case, we never want to use the training data in the mrc_cache for recovery mode. 3. If !HAS_RECOVERY_MRC_CACHE && VBOOT_STARTS_IN_ROMSTAGE, this means that memory training happens before verfied boot, meaning that the mrc_cache data is generated by RO code, so it is safe to use for a recovery boot. 4. Any platform that does not use vboot should be unaffected. Additionally, we have removed the MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN config because the mrc_cache driver takes care of invalidating the mrc_cache data for normal mode. If the platform: 1. !HAS_RECOVERY_MRC_CACHE, always invalidate mrc_cache data 2. HAS_RECOVERY_MRC_CACHE, only invalidate if retrain switch is set BUG=b:150502246 BRANCH=None TEST=1. run dut-control power_state:rec_force_mrc twice on lazor ensure that memory retraining happens both times run dut-control power_state:rec twice on lazor ensure that memory retraining happens only first time 2. remove HAS_RECOVERY_MRC_CACHE from lazor Kconfig boot twice to ensure caching of memory training occurred on each boot. Change-Id: I3875a7b4a4ba3c1aa8a3c1507b3993036a7155fc Signed-off-by: Shelley Chen <shchen@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/46855 Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
76 lines
1.6 KiB
Plaintext
76 lines
1.6 KiB
Plaintext
if BOARD_INTEL_JASPERLAKE_RVP || BOARD_INTEL_JASPERLAKE_RVP_EXT_EC
|
|
|
|
config BOARD_SPECIFIC_OPTIONS
|
|
def_bool y
|
|
select BOARD_ROMSIZE_KB_16384
|
|
select DPTF_USE_EISA_HID
|
|
select DRIVERS_I2C_DA7219
|
|
select DRIVERS_I2C_HID
|
|
select DRIVERS_INTEL_DPTF
|
|
select DRIVERS_I2C_GENERIC
|
|
select DRIVERS_I2C_MAX98373
|
|
select DRIVERS_INTEL_MIPI_CAMERA
|
|
select DRIVERS_SPI_ACPI
|
|
select DRIVERS_USB_ACPI
|
|
select EC_ACPI
|
|
select HAVE_SPD_IN_CBFS
|
|
select HAVE_ACPI_RESUME
|
|
select HAVE_ACPI_TABLES
|
|
select MAINBOARD_HAS_CHROMEOS
|
|
select SOC_INTEL_COMMON_BLOCK_IPU
|
|
select SOC_INTEL_JASPERLAKE
|
|
select SOC_INTEL_COMMON_BLOCK_DTT
|
|
select SOC_INTEL_CSE_LITE_SKU
|
|
|
|
config MAINBOARD_DIR
|
|
string
|
|
default "intel/jasperlake_rvp"
|
|
|
|
config VARIANT_DIR
|
|
string
|
|
default "jslrvp" if BOARD_INTEL_JASPERLAKE_RVP || BOARD_INTEL_JASPERLAKE_RVP_EXT_EC
|
|
|
|
config MAINBOARD_PART_NUMBER
|
|
string
|
|
default "jslrvp"
|
|
|
|
config MAINBOARD_FAMILY
|
|
string
|
|
default "Intel_jslrvp"
|
|
|
|
config MAX_CPUS
|
|
int
|
|
default 8
|
|
|
|
config DEVICETREE
|
|
string
|
|
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
|
|
|
|
config DIMM_SPD_SIZE
|
|
int
|
|
default 512
|
|
|
|
config CHROMEOS
|
|
bool
|
|
default y
|
|
select GBB_FLAG_FORCE_DEV_SWITCH_ON
|
|
select GBB_FLAG_FORCE_DEV_BOOT_USB
|
|
select GBB_FLAG_FORCE_DEV_BOOT_LEGACY
|
|
select GBB_FLAG_FORCE_MANUAL_RECOVERY
|
|
select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC
|
|
select HAS_RECOVERY_MRC_CACHE
|
|
|
|
config VBOOT
|
|
select VBOOT_LID_SWITCH
|
|
select VBOOT_MOCK_SECDATA if !MAINBOARD_HAS_TPM2
|
|
|
|
config UART_FOR_CONSOLE
|
|
int
|
|
default 2 if INTEL_LPSS_UART_FOR_CONSOLE
|
|
default 0
|
|
|
|
config TPM_TIS_ACPI_INTERRUPT
|
|
int
|
|
default 45 # GPE0_DW1_13 (GPP_H13)
|
|
endif
|