soc/amd: fully commonize clear_tvalid
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I90526a566a5fbc19a7368f90421067a6c716614e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50466
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/soc/amd/common/block/cpu/noncar/memmap.c b/src/soc/amd/common/block/cpu/noncar/memmap.c
index 470b517..7a7f8ef 100644
--- a/src/soc/amd/common/block/cpu/noncar/memmap.c
+++ b/src/soc/amd/common/block/cpu/noncar/memmap.c
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <amdblocks/memmap.h>
+#include <amdblocks/smm.h>
#include <console/console.h>
#include <cbmem.h>
#include <cpu/amd/msr.h>
@@ -33,28 +34,6 @@
return e;
}
-/*
- * For data stored in TSEG, ensure TValid is clear so R/W access can reach
- * the DRAM when not in SMM.
- */
-static void clear_tvalid(void)
-{
- msr_t hwcr = rdmsr(HWCR_MSR);
- msr_t mask = rdmsr(SMM_MASK_MSR);
- int tvalid = !!(mask.lo & SMM_TSEG_VALID);
-
- if (hwcr.lo & SMM_LOCK) {
- if (!tvalid) /* not valid but locked means still accessible */
- return;
-
- printk(BIOS_ERR, "Error: can't clear TValid, already locked\n");
- return;
- }
-
- mask.lo &= ~SMM_TSEG_VALID;
- wrmsr(SMM_MASK_MSR, mask);
-}
-
void smm_region(uintptr_t *start, size_t *size)
{
static int once;