soc/intel/cannonlake: skip CPU replacement check on CML#32
Conversation
|
I'll need to hook it up to the platform config and set it at the mainboard level in order to upstream, but thanks for identifying the root cause |
fdee1c6 to
9787831
Compare
|
Reworked this to go through platform config and enable it at the google/puff baseboard level. The SoC code now passes \config->SkipCpuReplacementCheck\ into FSP-M instead of hardcoding it. Rebuilt KAISA successfully; updated the PR description with the new build log/hash. |
|
I actually rework this locally to align more closely with alder lake, so that the default is to skip the check and that boards can enable the check as needed. this way we're not setting something for every board that should be disabled by default |
|
the patch above has been merged upstream and picked back into 2603 |
|
closing as improved fix has been merged/cherry-picked |
Summary
Add a Cannonlake/Comet Lake platform config knob for the FSP-M
SkipCpuReplacementChecktest UPD, then enable it at the Google Puff baseboard level.On KAISA, cold boots were spending about 30 seconds inside
FspMemoryIniteven thoughRW_MRC_CACHEexisted and both DIMMs matched the cached SPD data. Warm reboots reused the cache and completed memory init in roughly 40 ms. Enabling this option at the mainboard level keeps FSP-M on the no-configuration-change path for this case.Implementation
SkipCpuReplacementChecktosoc_intel_cannonlake_config.FspmTestConfig.SkipCpuReplacementCheck.google/puffbaseboarddevicetree.cb.Validation
Tested on Acer Chromebox CXI4 / KAISA with a Comet Lake build based on
MrChromebox-2603.Before this change:
FspMemoryInittook about 30.5 s.FspMemoryInittook about 40 ms.SPD_CACHE: DIMM0 is the same,DIMM1 is the same, but the MRC cache was updated after the slow cold boot.With this change:
FspMemoryInittook about 46 ms.FspMemoryInittook about 41 ms.SPD_CACHE: DIMM0 is the same,DIMM1 is the same, andMRC: 'RW_MRC_CACHE' does not need update.Build verification after moving this to platform/mainboard config:
coreboot/coreboot-sdk./home/jack/coreboot_build/out/logs/build-kaisa-2603-release-ipxe-only-skipcpu-platformcfg-20260601-155458.log214ebe3926b0727c9e37060b5acdf71f7a6fd26342458bb305d74ede6cfa73ba