soc/amd/genoa_poc/domain: refactor read_soc_memmap_resources

To bring genoa_poc more in line with the other AMD SoCs, move the
reporting of the memory map up to cbmem_top from the openSIL-specific
add_opensil_memmap function to read_soc_memmap_resources. This is a
preparation for making this code common for all newer AMD SoCs.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ic06282baa3bb9a65d297b5717697a12d08605d2f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81388
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

2 files changed, 26 insertions, 23 deletions

diff --git a/src/soc/amd/genoa_poc/domain.c b/src/soc/amd/genoa_poc/domain.c
index 5672f65ce6..61549082e8 100644
--- a/src/soc/amd/genoa_poc/domain.c
+++ b/src/soc/amd/genoa_poc/domain.c
@@ -3,9 +3,11 @@
 #include <acpi/acpigen_pci.h>
 #include <amdblocks/ioapic.h>
 #include <amdblocks/data_fabric.h>
+#include <amdblocks/memmap.h>
 #include <amdblocks/root_complex.h>
 #include <amdblocks/smn.h>
 #include <arch/ioapic.h>
+#include <cbmem.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <types.h>
@@ -16,6 +18,29 @@
 
 void read_soc_memmap_resources(struct device *domain, unsigned long *idx)
 {
+	ram_from_to(domain, (*idx)++, 0, 0xa0000);
+	mmio_from_to(domain, (*idx)++, 0xa0000, 0xc0000); // legacy VGA
+	reserved_ram_from_to(domain, (*idx)++, 0xc0000, 1 * MiB); // Option ROM
+
+	uint32_t mem_usable = (uintptr_t)cbmem_top();
+	uintptr_t early_reserved_dram_start, early_reserved_dram_end;
+	const struct memmap_early_dram *e = memmap_get_early_dram_usage();
+
+	early_reserved_dram_start = e->base;
+	early_reserved_dram_end = e->base + e->size;
+
+	// 1MB - bottom of DRAM reserved for early coreboot usage
+	ram_from_to(domain, (*idx)++, 1 * MiB, early_reserved_dram_start);
+
+	// DRAM reserved for early coreboot usage
+	reserved_ram_from_to(domain, (*idx)++, early_reserved_dram_start,
+			     early_reserved_dram_end);
+
+	// top of DRAM consumed early - low top usable RAM
+	// cbmem_top() accounts for low UMA and TSEG if they are used.
+	ram_from_to(domain, (*idx)++, early_reserved_dram_end,
+		    mem_usable);
+
 	add_opensil_memmap(domain, idx);
 }
 
diff --git a/src/vendorcode/amd/opensil/genoa_poc/memmap.c b/src/vendorcode/amd/opensil/genoa_poc/memmap.c
index b1d4b93a31..bdf58e989e 100644
--- a/src/vendorcode/amd/opensil/genoa_poc/memmap.c
+++ b/src/vendorcode/amd/opensil/genoa_poc/memmap.c
@@ -86,30 +86,8 @@ BOOT_STATE_INIT_ENTRY(BS_DEV_RESOURCES, BS_ON_ENTRY, print_memory_holes, NULL);
 // This assumes holes are allocated
 void add_opensil_memmap(struct device *dev, unsigned long *idx)
 {
-	ram_from_to(dev, (*idx)++, 0, 0xa0000);
-	mmio_from_to(dev, (*idx)++, 0xa0000, 0xc0000); // legacy VGA
-	reserved_ram_from_to(dev, (*idx)++, 0xc0000, 1 * MiB); // Option ROM
-
-	uint32_t mem_usable = (uintptr_t)cbmem_top();
-	uintptr_t early_reserved_dram_start, early_reserved_dram_end;
-	const struct memmap_early_dram *e = memmap_get_early_dram_usage();
-
-	early_reserved_dram_start = e->base;
-	early_reserved_dram_end = e->base + e->size;
-
-	// 1MB - bottom of DRAM reserved for early coreboot usage
-	ram_from_to(dev, (*idx)++, 1 * MiB, early_reserved_dram_start);
-
-	// DRAM reserved for early coreboot usage
-	reserved_ram_from_to(dev, (*idx)++, early_reserved_dram_start,
-			     early_reserved_dram_end);
-
-	// top of DRAM consumed early - low top usable RAM
-	// cbmem_top() accounts for low UMA and TSEG if they are used.
-	ram_from_to(dev, (*idx)++, early_reserved_dram_end,
-		    mem_usable);
-
 	// Account for UMA and TSEG
+	const uint32_t mem_usable = (uintptr_t)cbmem_top();
 	const uint32_t top_mem = ALIGN_DOWN(get_top_of_mem_below_4gb(), 1 * MiB);
 	if (mem_usable != top_mem)
 		reserved_ram_from_to(dev, (*idx)++, mem_usable, top_mem);