soc/intel: skl,cnl,icl: rely on TOLUM as cbmem_top returned by FSP

Instead of doing our own calculations, rely on TOLUM returned by FSP
for cbmem_top. This (hopefully) saves us from making mistakes in weird
calculations of offsets and alignments.

Further this makes it easier to implement e.g. SGX PRMRR size selection
via Kconfig as we do not have to make any assumptions about alignments
but can simply pass (valid) values to FSP.

Tested successfully on X11SSM-F

Change-Id: If66a00d1320917bc68afb32c19db0e24c6732812
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36136
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

2 files changed, 11 insertions, 164 deletions

diff --git a/src/soc/intel/skylake/include/soc/ebda.h b/src/soc/intel/skylake/include/soc/ebda.h
index ad62394588..4ed6566838 100644
--- a/src/soc/intel/skylake/include/soc/ebda.h
+++ b/src/soc/intel/skylake/include/soc/ebda.h
@@ -19,9 +19,8 @@
 #include <stdint.h>
 
 struct ebda_config {
-	uint32_t signature; /* 0x00 - EBDA signature */
-	uint32_t tolum_base; /* 0x04 - coreboot memory start */
-	uint32_t reserved_mem_size; /* 0x08 - chipset reserved memory size */
+	uint32_t signature; /* EBDA signature */
+	uint32_t cbmem_top; /* coreboot memory start */
 };
 
 #endif
diff --git a/src/soc/intel/skylake/memmap.c b/src/soc/intel/skylake/memmap.c
index 09dc6e9f0d..63e7acdb85 100644
--- a/src/soc/intel/skylake/memmap.c
+++ b/src/soc/intel/skylake/memmap.c
@@ -15,148 +15,15 @@
  */
 
 #include <arch/romstage.h>
-#include <arch/ebda.h>
-#include <device/mmio.h>
 #include <cbmem.h>
-#include <console/console.h>
-#include <cpu/x86/mtrr.h>
-#include <cpu/x86/smm.h>
-#include <device/device.h>
-#include <device/pci.h>
+#include <fsp/util.h>
 #include <intelblocks/ebda.h>
 #include <intelblocks/systemagent.h>
-#include <soc/msr.h>
-#include <soc/pci_devs.h>
-#include <soc/systemagent.h>
 #include <stdlib.h>
 
-#include "chip.h"
-
-static bool is_ptt_enable(void)
-{
-	if ((read32((void *)PTT_TXT_BASE_ADDRESS) & PTT_PRESENT) ==
-			PTT_PRESENT)
-		return true;
-
-	return false;
-}
-
-/* Calculate PTT size */
-static size_t get_ptt_size(void)
-{
-	/* Allocate 4KB for PTT if enabled */
-	return is_ptt_enable() ? 4*KiB : 0;
-}
-
-/* Calculate Trace Hub size */
-static size_t get_tracehub_size(uintptr_t dram_base,
-		const struct soc_intel_skylake_config *config)
-{
-	uintptr_t tracehub_base = dram_base;
-	size_t tracehub_size = 0;
-
-	if (!config->ProbelessTrace)
-		return 0;
-
-	/* GDXC MOT */
-	tracehub_base -= GDXC_MOT_MEMORY_SIZE;
-	/* Round down to natural boundary according to PSMI size */
-	tracehub_base = ALIGN_DOWN(tracehub_base, PSMI_BUFFER_AREA_SIZE);
-	/* GDXC IOT */
-	tracehub_base -= GDXC_IOT_MEMORY_SIZE;
-	/* PSMI buffer area */
-	tracehub_base -= PSMI_BUFFER_AREA_SIZE;
-
-	/* Tracehub Area Size */
-	tracehub_size = dram_base - tracehub_base;
-
-	return tracehub_size;
-}
-
-/* Calculate PRMRR size based on user input PRMRR size and alignment */
-static size_t get_prmrr_size(uintptr_t dram_base,
-		const struct soc_intel_skylake_config *config)
-{
-	uintptr_t prmrr_base = dram_base;
-	size_t prmrr_size = config->PrmrrSize;
-
-	if (!prmrr_size)
-		return 0;
-
-	/*
-	 * PRMRR Sizes that are > 1MB and < 32MB are
-	 * not supported and will fail out.
-	 */
-	if ((prmrr_size > 1*MiB) && (prmrr_size < 32*MiB))
-		die("PRMRR Sizes that are > 1MB and < 32MB are not"
-				"supported!\n");
-
-	prmrr_base -= prmrr_size;
-	if (prmrr_size >= 32*MiB)
-		prmrr_base = ALIGN_DOWN(prmrr_base, 128*MiB);
-
-	/* PRMRR Area Size */
-	prmrr_size = dram_base - prmrr_base;
-
-	return prmrr_size;
-}
-
-/* Calculate Intel Traditional Memory size based on GSM, DSM, TSEG and DPR. */
-static size_t calculate_traditional_mem_size(uintptr_t dram_base)
-{
-	const struct device *igd_dev = pcidev_path_on_root(SA_DEVFN_IGD);
-	uintptr_t traditional_mem_base = dram_base;
-	size_t traditional_mem_size;
-
-	if (igd_dev && igd_dev->enabled) {
-		/* Read BDSM from Host Bridge */
-		traditional_mem_base -= sa_get_dsm_size();
-
-		/* Read BGSM from Host Bridge */
-		traditional_mem_base -= sa_get_gsm_size();
-	}
-	/* Get TSEG size */
-	traditional_mem_base -= sa_get_tseg_size();
-
-	/* Get DPR size */
-	if (CONFIG(SA_ENABLE_DPR))
-		traditional_mem_base -= sa_get_dpr_size();
-
-	/* Traditional Area Size */
-	traditional_mem_size = dram_base - traditional_mem_base;
-
-	return traditional_mem_size;
-}
-
-/*
- * Calculate Intel Reserved Memory size based on
- * PRMRR size, Trace Hub config and PTT selection.
- */
-static size_t calculate_reserved_mem_size(uintptr_t dram_base)
-{
-	const struct device *dev = pcidev_path_on_root(SA_DEVFN_ROOT);
-	uintptr_t reserve_mem_base = dram_base;
-	size_t reserve_mem_size;
-	const struct soc_intel_skylake_config *config;
-
-	config = config_of(dev);
-
-	/* Get PRMRR size */
-	reserve_mem_base -= get_prmrr_size(reserve_mem_base, config);
-
-	/* Get Tracehub size */
-	reserve_mem_base -= get_tracehub_size(reserve_mem_base, config);
-
-	/* Get PTT size */
-	reserve_mem_base -= get_ptt_size();
-
-	/* Traditional Area Size */
-	reserve_mem_size = dram_base - reserve_mem_base;
-
-	return reserve_mem_size;
-}
-
 /*
+ * Fill up memory layout information
+ *
  * Host Memory Map:
  *
  * +--------------------------+ TOUUD
@@ -174,8 +41,8 @@ static size_t calculate_reserved_mem_size(uintptr_t dram_base)
  * +--------------------------+ DPR
  * |    PRM (C6DRAM/SGX)      |
  * +--------------------------+ PRMRR
- * |     Trace Memory         |
- * +--------------------------+ Probless Trace
+ * |     ME Stolen Memory     |
+ * +--------------------------+ ME Stolen
  * |     PTT                  |
  * +--------------------------+ top_of_ram
  * |     Reserved - FSP/CBMEM |
@@ -188,31 +55,12 @@ static size_t calculate_reserved_mem_size(uintptr_t dram_base)
  * the base registers from each other to determine sizes of the regions. In
  * other words, the memory map is in a fixed order no matter what.
  */
-static uintptr_t calculate_dram_base(size_t *reserved_mem_size)
-{
-	uintptr_t dram_base;
-
-	/* Read TOLUD from Host Bridge offset */
-	dram_base = sa_get_tolud_base();
-
-	/* Get Intel Traditional Memory Range Size */
-	dram_base -= calculate_traditional_mem_size(dram_base);
-
-	/* Get Intel Reserved Memory Range Size */
-	*reserved_mem_size = calculate_reserved_mem_size(dram_base);
-
-	dram_base -= *reserved_mem_size;
-
-	return dram_base;
-}
-
-/* Fill up memory layout information */
 void fill_soc_memmap_ebda(struct ebda_config *cfg)
 {
-	size_t chipset_mem_size;
+	struct range_entry tolum;
 
-	cfg->tolum_base = calculate_dram_base(&chipset_mem_size);
-	cfg->reserved_mem_size = chipset_mem_size;
+	fsp_find_bootloader_tolum(&tolum);
+	cfg->cbmem_top = range_entry_end(&tolum);
 }
 
 void cbmem_top_init(void)
@@ -254,5 +102,5 @@ void *cbmem_top_chipset(void)
 
 	retrieve_ebda_object(&ebda_cfg);
 
-	return (void *)(uintptr_t)ebda_cfg.tolum_base;
+	return (void *)(uintptr_t)ebda_cfg.cbmem_top;
 }