summaryrefslogtreecommitdiff
path: root/src/northbridge/intel/sandybridge/memmap.c
diff options
context:
space:
mode:
authorMichał Żygowski <michal.zygowski@3mdeb.com>2021-11-21 11:53:42 +0100
committerFelix Held <felix-coreboot@felixheld.de>2021-11-26 11:25:19 +0000
commitede87184f8a3f21926ae3458418ec225052e07a3 (patch)
treea50759c66f30ecedf15f176d905158b0b264c907 /src/northbridge/intel/sandybridge/memmap.c
parentffe50fde1ad295f12a5f4ac69faac7de7bdeb07f (diff)
nb/intel/sandybridge: Add support for DPR
Include DPR in the memory map calculations if enabled. DPR is required for Intel TXT support. TEST=Boot Debian 10 and see the DPR memory being reserved in E820 and cbmem logs: "BIOS-e820: [mem 0x000000007fc09000-0x00000000829fffff] reserved" "TSEG base 0x80000000 size 8M" "DPR base 0x7fd00000 size 3M" Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com> Change-Id: Ia22e49ba58709acfa0afe0921aa71d83cc06c129 Reviewed-on: https://review.coreboot.org/c/coreboot/+/59512 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/northbridge/intel/sandybridge/memmap.c')
-rw-r--r--src/northbridge/intel/sandybridge/memmap.c35
1 files changed, 31 insertions, 4 deletions
diff --git a/src/northbridge/intel/sandybridge/memmap.c b/src/northbridge/intel/sandybridge/memmap.c
index 7f46d6663e..f667544c68 100644
--- a/src/northbridge/intel/sandybridge/memmap.c
+++ b/src/northbridge/intel/sandybridge/memmap.c
@@ -10,6 +10,7 @@
#include <cpu/x86/smm.h>
#include <program_loading.h>
#include "sandybridge.h"
+#include <security/intel/txt/txt_platform.h>
#include <stddef.h>
#include <stdint.h>
@@ -24,12 +25,38 @@ static size_t northbridge_get_tseg_size(void)
return CONFIG_SMM_TSEG_SIZE;
}
-void *cbmem_top_chipset(void)
+union dpr_register txt_get_chipset_dpr(void)
+{
+ return (union dpr_register) { .raw = pci_read_config32(HOST_BRIDGE, DPR) };
+}
+
+/*
+ * Return the topmost memory address below 4 GiB available for general
+ * use, from software's view of memory. Do not confuse this with TOLUD,
+ * which applies to the DRAM as viewed by the memory controller itself.
+ */
+static uintptr_t top_of_low_usable_memory(void)
{
- /* If DPR is disabled, base of TSEG is top of usable DRAM */
- uintptr_t top_of_ram = northbridge_get_tseg_base();
+ /*
+ * Base of DPR is top of usable DRAM below 4 GiB. However, DPR
+ * may not always be enabled. Unlike most memory map registers,
+ * the DPR register stores top of DPR instead of its base address.
+ * Top of DPR is R/O, and mirrored from TSEG base by hardware.
+ */
+ uintptr_t tolum = northbridge_get_tseg_base();
- return (void *)top_of_ram;
+ const union dpr_register dpr = txt_get_chipset_dpr();
+
+ /* Subtract DMA Protected Range size if enabled */
+ if (dpr.epm)
+ tolum -= dpr.size * MiB;
+
+ return tolum;
+}
+
+void *cbmem_top_chipset(void)
+{
+ return (void *)top_of_low_usable_memory();
}
void smm_region(uintptr_t *start, size_t *size)