nb/e7505: Rework nb resource reading
- Use newer functions and avoid the * / KiB dance
- Use existing functions for figuring out TSEG and UMA
- Don't have resources overlap
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Change-Id: Ia8562660cf69d188b0cab4869aa3190f014dbfdc
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76276
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index a353759..b51b2ab 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -6,13 +6,13 @@
#include <device/device.h>
#include <device/pci.h>
#include <cpu/cpu.h>
+#include <cpu/x86/smm.h>
#include "e7505.h"
static void mch_domain_read_resources(struct device *dev)
{
int idx;
- unsigned long tolmk;
uint64_t tom, remapbase, remaplimit;
struct device *mc_dev;
@@ -22,9 +22,6 @@
if (!mc_dev)
die("Could not find MCH device\n");
- tolmk = pci_read_config16(mc_dev, TOLM) >> 11;
- tolmk <<= 17;
-
tom = pci_read_config8(mc_dev, DRB_ROW_7);
tom <<= 26;
@@ -39,12 +36,15 @@
/* Report the memory regions */
idx = 10;
- ram_resource_kb(dev, idx++, 0, tolmk);
- mmio_resource_kb(dev, idx++, 0xa0000 / KiB, (0xc0000 - 0xa0000) / KiB);
+ ram_range(dev, idx++, 0, 0xa0000);
+ mmio_from_to(dev, idx++, 0xa0000, 0xc0000);
+ ram_from_to(dev, idx++, 0xc0000, 1 * MiB);
- uintptr_t tseg_memory_base = northbridge_get_tseg_base();
- size_t tseg_memory_size = northbridge_get_tseg_size();
- mmio_resource_kb(dev, idx++, tseg_memory_base / KiB, tseg_memory_size / KiB);
+ uintptr_t tseg_base;
+ size_t tseg_size;
+ smm_region(&tseg_base, &tseg_size);
+ ram_from_to(dev, idx++, 1 * MiB, tseg_base);
+ mmio_range(dev, idx++, tseg_base, tseg_size);
ASSERT(tom == remapbase);
upper_ram_end(dev, idx++, remaplimit);