diff options
| author | Patrick Rudolph <patrick.rudolph@9elements.com> | 2020-09-14 16:37:33 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2020-09-15 09:17:58 +0000 |
| commit | 11c1b94d033d1a9009c8a4270118b83abdf9cee8 (patch) | |
| tree | dbb23167095221597c322e435f1a949ea867550b | |
| parent | 186250f68e432f0c32b0c9909be6008cbc6aca47 (diff) | |
| download | coreboot-11c1b94d033d1a9009c8a4270118b83abdf9cee8.tar.xz | |
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>
| -rw-r--r-- | src/soc/intel/common/block/cpu/cpulib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c index 5b703cfcb4..31f160a7bb 100644 --- a/src/soc/intel/common/block/cpu/cpulib.c +++ b/src/soc/intel/common/block/cpu/cpulib.c @@ -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) { |