Attention is currently required from: Patrick Rudolph. Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50238 )
Change subject: soc/intel/xeon_sp: Skip Locking down TXT related registers ......................................................................
soc/intel/xeon_sp: Skip Locking down TXT related registers
When Locking down TXT is skipped, e.g. to do error injection, Locking down DMI3 and IIO DFX related TXT registers should also be skipped.
Change-Id: Ieef25c02ec103eaef65d8b44467ccb9e6917bb6c Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/xeon_sp/uncore.c 1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/38/50238/1
diff --git a/src/soc/intel/xeon_sp/uncore.c b/src/soc/intel/xeon_sp/uncore.c index dede931..7fddb13 100644 --- a/src/soc/intel/xeon_sp/uncore.c +++ b/src/soc/intel/xeon_sp/uncore.c @@ -12,6 +12,7 @@ #include <soc/util.h> #include <fsp/util.h> #include <security/intel/txt/txt_platform.h> +#include <security/intel/txt/txt.h>
struct map_entry { uint32_t reg; @@ -350,6 +351,8 @@
static void dmi3_init(struct device *dev) { + if (skip_intel_txt()) + return; /* Disable error injection */ pci_or_config16(dev, ERRINJCON, 1 << 0);
@@ -376,6 +379,9 @@
static void iio_dfx_global_init(struct device *dev) { + if (skip_intel_txt()) + return; + uint16_t reg16; pci_or_config16(dev, IIO_DFX_LCK_CTL, 0x3ff); reg16 = pci_read_config16(dev, IIO_DFX_TSWCTL0);