[coreboot-gerrit] Patch set updated for coreboot: effd389 northbridge/amd/amdfam10: Unify CBMEM location across UMA and non-UMA

[Timothy Pearson (tpearson@raptorengineeringinc.com)]

Timothy Pearson (tpearson at raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8664

-gerrit

commit effd389e68049d9cf53fa192ef5391e49d8313ca
Author: Timothy Pearson <tpearson at raptorengineeringinc.com>
Date:   Fri Mar 13 13:10:29 2015 -0500

    northbridge/amd/amdfam10: Unify CBMEM location across UMA and non-UMA
    
    The CBMEM memory segment is always placed at TOM - UMASIZE when GFXUMA
    is enabled, however when GFXUMA is disabled an attempt was made to locate
    the CBMEM memory segment above the I/O hole in certain rare cases.
    
    Removing this special case does not impact functionality, and paves
    the way for early CBMEM support.
    
    Change-Id: I98d29ab9d601a4e20f58e2cd0a66abb13b494e74
    Signed-off-by: Timothy Pearson <tpearson at raptorengineeringinc.com>
---
 src/northbridge/amd/amdfam10/northbridge.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index e2b1441..68c6e35 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -756,7 +756,6 @@ static void amdfam10_domain_set_resources(device_t dev)
 #endif
 	unsigned long mmio_basek;
 	u32 pci_tolm;
-	u64 ramtop = 0;
 	int i, idx;
 	struct bus *link;
 #if CONFIG_HW_MEM_HOLE_SIZEK != 0
@@ -879,8 +878,6 @@ static void amdfam10_domain_set_resources(device_t dev)
 					ram_resource(dev, (idx | i), basek, pre_sizek);
 					idx += 0x10;
 					sizek -= pre_sizek;
-					if (!ramtop)
-						ramtop = mmio_basek * 1024;
 				}
 				basek = mmio_basek;
 			}
@@ -897,15 +894,13 @@ static void amdfam10_domain_set_resources(device_t dev)
 		idx += 0x10;
 		printk(BIOS_DEBUG, "%d: mmio_basek=%08lx, basek=%08llx, limitk=%08llx\n",
 			     i, mmio_basek, basek, limitk);
-		if (!ramtop)
-			ramtop = limitk * 1024;
 	}
 
 #if CONFIG_GFXUMA
 	set_top_of_ram(uma_memory_base);
 	uma_resource(dev, 7, uma_memory_base >> 10, uma_memory_size >> 10);
 #else
-	set_top_of_ram(ramtop);
+	set_top_of_ram(bsp_topmem());
 #endif
 
 	for(link = dev->link_list; link; link = link->next) {