[coreboot-gerrit] Patch set updated for coreboot: nb/amd/amdfam10: Fix incorrect channel buffer count configuration

[Timothy Pearson (tpearson@raptorengineeringinc.com)]

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

-gerrit

commit 10b09fb49a5bc035ddd95ed179ad62ce961ddc01
Author: Timothy Pearson <tpearson at raptorengineeringinc.com>
Date:   Mon Sep 7 03:39:15 2015 -0500

    nb/amd/amdfam10: Fix incorrect channel buffer count configuration
    
    The secondary bus number set code incorrectly overwrote the link
    buffer settings in F0x[F4,D4,B4,94].  Constrain the secondary
    bus number set to the appropriate bits of the registers.
    
    Change-Id: If70825449f298aa66f7f8b76dbd7367455a6deb1
    Signed-off-by: Timothy Pearson <tpearson at raptorengineeringinc.com>
---
 src/northbridge/amd/amdfam10/northbridge.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 3177a5f..b376171 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -184,17 +184,14 @@ static void ht_route_link(struct bus *link, scan_state mode)
 	 * not correctly configured
 	 */
 	busses = pci_read_config32(link->dev, link->cap + 0x14);
-	busses &= 0xff000000;
+	busses &= ~(0xff << 8);
 	busses |= parent->secondary & 0xff;
-	if (mode == HT_ROUTE_CLOSE) {
-		busses |= 0xfeff << 8;
-	} else if (mode == HT_ROUTE_SCAN) {
+	if (mode == HT_ROUTE_CLOSE)
+		busses |= 0xff << 8;
+	else if (mode == HT_ROUTE_SCAN)
 		busses |= ((u32) link->secondary & 0xff) << 8;
-		busses |= 0xfc << 16;
-	} else if (mode == HT_ROUTE_FINAL) {
+	else if (mode == HT_ROUTE_FINAL)
 		busses |= ((u32) link->secondary & 0xff) << 8;
-		busses |= ((u32) link->subordinate & 0xff) << 16;
-	}
 	pci_write_config32(link->dev, link->cap + 0x14, busses);
 
 	if (mode == HT_ROUTE_FINAL) {