[coreboot-gerrit] Patch set updated for coreboot: nb/x4x/nortbridge.c: Fix resource allocation when IGD is disabled

[Arthur Heymans (arthur@aheymans.xyz)]

Arthur Heymans (arthur at aheymans.xyz) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18511

-gerrit

commit 28302dabb1caffe320e39b786254bfa7b1c81178
Author: Arthur Heymans <arthur at aheymans.xyz>
Date:   Mon Feb 27 13:46:11 2017 +0100

    nb/x4x/nortbridge.c: Fix resource allocation when IGD is disabled
    
    Computes TSEG size dynamically.
    Changes the size of legacy hole.
    
    Change-Id: I0e6898c06a2bc1016eeaa3f002ff6c39657018ae
    Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
 src/northbridge/intel/x4x/northbridge.c | 47 ++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/northbridge/intel/x4x/northbridge.c b/src/northbridge/intel/x4x/northbridge.c
index 1c220b2..8f2068d 100644
--- a/src/northbridge/intel/x4x/northbridge.c
+++ b/src/northbridge/intel/x4x/northbridge.c
@@ -29,20 +29,20 @@
 #include <northbridge/intel/x4x/chip.h>
 #include <northbridge/intel/x4x/x4x.h>
 
+static const int legacy_hole_base_k = 0xa0000 / 1024;
+static const int legacy_hole_size_k = 128;
+
 static void mch_domain_read_resources(device_t dev)
 {
 	u8 index;
 	u64 tom, touud;
-	u32 tomk, tseg_sizek, tolud, usable_tomk;
+	u32 tomk, tseg_sizek, tolud;
 	u32 pcie_config_base, pcie_config_size;
-	u32 uma_sizek = 0;
+	u32 uma_sizek = 0, tseg_base;
 
 	const u32 top32memk = 4 * (GiB / KiB);
 	index = 3;
 
-	/* 1024KiB TSEG */
-	tseg_sizek = 1024;
-
 	pci_domain_read_resources(dev);
 
 	/* Top of Upper Usable DRAM, including remap */
@@ -64,24 +64,33 @@ static void mch_domain_read_resources(device_t dev)
 
 	/* Graphics memory comes next */
 	const u16 ggc = pci_read_config16(dev, D0F0_GGC);
-	printk(BIOS_DEBUG, "IGD decoded, subtracting ");
+	if (!(ggc & 2)) {
+		printk(BIOS_DEBUG, "IGD decoded, subtracting ");
 
-	/* Graphics memory */
-	const u32 gms_sizek = decode_igd_memory_size((ggc >> 4) & 0xf);
-	printk(BIOS_DEBUG, "%uM UMA", gms_sizek >> 10);
+		/* Graphics memory */
+		const u32 gms_sizek = decode_igd_memory_size((ggc >> 4) & 0xf);
+		printk(BIOS_DEBUG, "%uM UMA", gms_sizek >> 10);
+		tomk -= gms_sizek;
 
-	/* GTT Graphics Stolen Memory Size (GGMS) */
-	const u32 gsm_sizek = decode_igd_gtt_size((ggc >> 8) & 0xf);
-	printk(BIOS_DEBUG, " and %uM GTT\n", gsm_sizek >> 10);
+		/* GTT Graphics Stolen Memory Size (GGMS) */
+		const u32 gsm_sizek = decode_igd_gtt_size((ggc >> 8) & 0xf);
+		printk(BIOS_DEBUG, " and %uM GTT\n", gsm_sizek >> 10);
+		tomk -= gms_sizek;
+
+		uma_sizek = gms_sizek + gsm_sizek;
+	}
 
-	uma_sizek = gms_sizek + gsm_sizek + tseg_sizek;
-	usable_tomk = tomk - uma_sizek;
+	tseg_base = pci_read_config32(dev, D0F0_TSEG);
+	tseg_sizek = ((tomk * 1024ULL) - tseg_base) >> 10;
+	uma_sizek += tseg_sizek;
+	tomk -= tseg_sizek;
 
-	printk(BIOS_INFO, "Available memory below 4GB: %uM\n", usable_tomk >> 10);
+	printk(BIOS_INFO, "Available memory below 4GB: %uM\n", tomk >> 10);
 
 	/* Report the memory regions */
-	ram_resource(dev, index++, 0, 0xa0000 >> 10);
-	ram_resource(dev, index++, 1*MiB >> 10, (usable_tomk - (1*MiB >> 10)));
+	ram_resource(dev, index++, 0, legacy_hole_base_k);
+	ram_resource(dev, index++, legacy_hole_base_k + legacy_hole_size_k,
+		(tomk - (legacy_hole_base_k + legacy_hole_size_k)));
 
 	/*
 	 * If >= 4GB installed then memory from TOLUD to 4GB
@@ -95,8 +104,8 @@ static void mch_domain_read_resources(device_t dev)
 	}
 
 	printk(BIOS_DEBUG, "Adding UMA memory area base=0x%08x "
-			"size=0x%08x\n", usable_tomk << 10, uma_sizek << 10);
-	fixed_mem_resource(dev, index++, usable_tomk, uma_sizek,
+			"size=0x%08x\n", tomk << 10, uma_sizek << 10);
+	fixed_mem_resource(dev, index++, tomk, uma_sizek,
 			IORESOURCE_RESERVE);
 
 	/* Reserve high memory where the NB BARs are up to 4GiB */