[coreboot-gerrit] Change in coreboot[master]: soc/intel/common/block/cpu: Fix boot failure

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45344 )

Change subject: soc/intel/common/block/cpu: Fix boot failure
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45344
Tested-by: build bot (Jenkins) 
Reviewed-by: Christian Walter 
Reviewed-by: Michael Niewöhner 
Reviewed-by: Nico Huber 
---
M src/soc/intel/common/block/cpu/cpulib.c
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved
  Christian Walter: Looks good to me, approved
  Michael Niewöhner: Looks good to me, approved

diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c
index 5b703cf..31f160a 100644
--- a/src/soc/intel/common/block/cpu/cpulib.c
+++ b/src/soc/intel/common/block/cpu/cpulib.c
@@ -346,10 +346,8 @@
    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) {