Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35312 )
Change subject: soc/intel/skylake: Fix crash in MP init ......................................................................
soc/intel/skylake: Fix crash in MP init
If CPU supports SGX and Hyper-Threading the later needs to be disabled. This fixes random crashes in MP-Init.
I could not find any relation between those two in any datasheet.
To fully migitate L1TF or E2E attacks, hyperthreading should be disabled anyway if SGX is enabled.
Tested on X11SSH-TF.
Change-Id: I7102da028a449c60ca700b3f9ccda9017aa6d6b5 Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com --- M src/mainboard/supermicro/x11ssh/variants/tf/devicetree.cb M src/soc/intel/skylake/Kconfig 2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/35312/1
diff --git a/src/mainboard/supermicro/x11ssh/variants/tf/devicetree.cb b/src/mainboard/supermicro/x11ssh/variants/tf/devicetree.cb index ce6bfa5..acfac29 100644 --- a/src/mainboard/supermicro/x11ssh/variants/tf/devicetree.cb +++ b/src/mainboard/supermicro/x11ssh/variants/tf/devicetree.cb @@ -31,7 +31,7 @@ register "SaGv" = "SaGv_Disabled"
# Disable SGX - register "sgx_enable" = "0" # SGX is broken in coreboot + register "sgx_enable" = "1" # SGX is broken once Hyper-Threading is enabled register "PrmrrSize" = "128 * MiB"
register "pirqa_routing" = "PCH_IRQ11" diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index 901e5f9..2059618 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -81,6 +81,7 @@ config FSP_HYPERTHREADING bool "Enable Hyper-Threading" depends on MAINBOARD_USES_FSP2_0 + depends on !SOC_INTEL_COMMON_BLOCK_SGX default y
config CPU_INTEL_NUM_FIT_ENTRIES