From 9d8a4558e30845ff9ae421c551b4fa51dcfeec93 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Tue, 2 Feb 2021 19:21:24 +0100 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/50238 Reviewed-by: Jonathan Zhang Reviewed-by: Rocky Phagura Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/soc/intel/xeon_sp/uncore.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/soc/intel/xeon_sp/uncore.c b/src/soc/intel/xeon_sp/uncore.c index dede931fe0..4f509809d7 100644 --- a/src/soc/intel/xeon_sp/uncore.c +++ b/src/soc/intel/xeon_sp/uncore.c @@ -12,6 +12,7 @@ #include #include #include +#include struct map_entry { uint32_t reg; @@ -350,6 +351,8 @@ static const struct pci_driver vtd_driver __pci_driver = { static void dmi3_init(struct device *dev) { + if (CONFIG(INTEL_TXT) && skip_intel_txt_lockdown()) + return; /* Disable error injection */ pci_or_config16(dev, ERRINJCON, 1 << 0); @@ -376,6 +379,9 @@ static const struct pci_driver dmi3_driver __pci_driver = { static void iio_dfx_global_init(struct device *dev) { + if (CONFIG(INTEL_TXT) && skip_intel_txt_lockdown()) + return; + uint16_t reg16; pci_or_config16(dev, IIO_DFX_LCK_CTL, 0x3ff); reg16 = pci_read_config16(dev, IIO_DFX_TSWCTL0); -- cgit v1.2.3