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

nb/intel/haswell/nri: Only do CPU replacement check on cold boots 

CPU replacement check should only be done on cold boots.

Original-Change-Id: I98efa105f4df755b23febe12dd7b356787847852
Original-Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Signed-off-by: Bill XIE <persmule@hardenedlinux.org>
Change-Id: I3c79f4e55e23c0b98da7661988e3ff8b50d6300d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/77048
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2022-06-26 10:32:12 +02:00 committed by Matt DeVillier
parent f5d159675a
commit ba7ab73900
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/northbridge/intel/haswell/native_raminit/raminit_native.c
View File

@ -40,15 +40,14 @@ static enum raminit_boot_mode get_boot_mode(void)
return (pmcon_2 & bitmask) == bitmask ? BOOTMODE_WARM : BOOTMODE_COLD; return (pmcon_2 & bitmask) == bitmask ? BOOTMODE_WARM : BOOTMODE_COLD;
} }
static bool early_init_native(int s3resume) static bool early_init_native(enum raminit_boot_mode bootmode)
{ {
printk(BIOS_DEBUG, "Starting native platform initialisation\n"); printk(BIOS_DEBUG, "Starting native platform initialisation\n");
intel_early_me_init(); intel_early_me_init();
/** TODO: CPU replacement check must be skipped in warm boots and S3 resumes **/ bool cpu_replaced = bootmode == BOOTMODE_COLD && intel_early_me_cpu_replacement_check();
const bool cpu_replaced = !s3resume && intel_early_me_cpu_replacement_check();
early_pch_init_native(s3resume); early_pch_init_native(bootmode == BOOTMODE_S3);
if (!CONFIG(INTEL_LYNXPOINT_LP)) if (!CONFIG(INTEL_LYNXPOINT_LP))
dmi_early_init(); dmi_early_init();
@ -176,13 +175,13 @@ void perform_raminit(const int s3resume)
* See, this function's name is a lie. There are more things to * See, this function's name is a lie. There are more things to
* do that memory initialisation, but they are relatively easy. * do that memory initialisation, but they are relatively easy.
*/ */
const bool cpu_replaced = early_init_native(s3resume); const enum raminit_boot_mode orig_bootmode = get_boot_mode();
const bool cpu_replaced = early_init_native(s3resume ? BOOTMODE_S3 : orig_bootmode);
wait_txt_clear(); wait_txt_clear();
wrmsr(0x2e6, (msr_t) {.lo = 0, .hi = 0}); wrmsr(0x2e6, (msr_t) {.lo = 0, .hi = 0});
const enum raminit_boot_mode orig_bootmode = get_boot_mode();
struct mrc_data md = prepare_mrc_cache(); struct mrc_data md = prepare_mrc_cache();
const enum raminit_boot_mode bootmode = const enum raminit_boot_mode bootmode =