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

soc/intel/common/block/cpu: Fix boot failure 

This fixes commit 1b89f5e "Guard options with if-blocks".

The code no longer returns if SGX is disabled, but as the PRMRR
configuration is missing it runs into die().

Tested on Prodrive Hermes: Boots again into Linux.

Change-Id: I6d32ca32b1b53767b2db91305103cd532823a5ca
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45344
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Christian Walter <christian.walter@9elements.com>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Patrick Rudolph 2020-09-14 16:37:33 +02:00 committed by Nico Huber
parent 186250f68e
commit 11c1b94d03
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/soc/intel/common/block/cpu/cpulib.c
View File

@ -346,10 +346,8 @@ int get_prmrr_size(void)
int i;
int valid_size;
if (CONFIG(SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_DISABLED)) {
printk(BIOS_DEBUG, "PRMRR disabled by config.\n");
if (!CONFIG(SOC_INTEL_COMMON_BLOCK_SGX))
return 0;
}
msr = rdmsr(MSR_PRMRR_VALID_CONFIG);
if (!msr.lo) {