commit 11334729c9aa3f09b3e01a491a2d007a0aea7201
author Angel Pons <th3fanbus@gmail.com> Mon Oct 05 16:34:03 2020 +0200
committer Philipp Deppenwiese <zaolin.daisuki@gmail.com> Thu Oct 15 08:31:48 2020 +0000
tree 148caff85c45ee443a1ba41a1d9ab24dd135902e
parent adcb870837518283fac6eac24a628d42912fd4a3

security/intel/txt: Use `smm_region()` to get TSEG base

This function is available for all TXT-capable platforms. Use it.
As it also provides the size of TSEG, display it when logging is on.

Change-Id: I4b3dcbc61854fbdd42275bf9456eaa5ce783e8aa
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46055
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

src/security/intel/txt/logging.c

diff --git a/src/security/intel/txt/logging.c b/src/security/intel/txt/logging.c
index 24def33..7d8dcf7 100644
--- a/src/security/intel/txt/logging.c
+++ b/src/security/intel/txt/logging.c
@@ -2,6 +2,7 @@
 
 #include <arch/mmio.h>
 #include <console/console.h>
+#include <cpu/x86/smm.h>
 #include <string.h>
 #include <types.h>
 
@@ -211,7 +212,12 @@
 void txt_dump_regions(void)
 {
 	struct txt_biosdataregion *bdr = NULL;
-	uintptr_t tseg = 0;
+
+	uintptr_t tseg_base;
+	size_t tseg_size;
+
+	smm_region(&tseg_base, &tseg_size);
+
 	uint64_t reg64;
 
 	reg64 = read64((void *)TXT_HEAP_BASE);
@@ -219,7 +225,7 @@
 	    (read64((void *)(uintptr_t)reg64) >= (sizeof(*bdr) + sizeof(uint64_t))))
 		bdr = (void *)((uintptr_t)reg64 + sizeof(uint64_t));
 
-	printk(BIOS_DEBUG, "TEE-TXT: TSEG 0x%lx\n", tseg * MiB);
+	printk(BIOS_DEBUG, "TEE-TXT: TSEG 0x%lx, size %zu MiB\n", tseg_base, tseg_size / MiB);
 	printk(BIOS_DEBUG, "TEE-TXT: TXT.HEAP.BASE  0x%llx\n", read64((void *)TXT_HEAP_BASE));
 	printk(BIOS_DEBUG, "TEE-TXT: TXT.HEAP.SIZE  0x%llx\n", read64((void *)TXT_HEAP_SIZE));
 	printk(BIOS_DEBUG, "TEE-TXT: TXT.SINIT.BASE 0x%llx\n", read64((void *)TXT_SINIT_BASE));