[coreboot-gerrit] New patch to review for coreboot: 22cd33c HyperTransport: Substitute the obscure max variable

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8688

-gerrit

commit 22cd33cceae08612cedc21d95ea65c06c41094b5
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Thu Mar 12 05:56:22 2015 +0200

    HyperTransport: Substitute the obscure max variable
    
    For amdfam10, (ht_c_index > 3) never evaluates true as the code
    already has a return for this case above.
    
    Change-Id: Ie90941671e1b2b4f42e2b1b0641ca59334fcf0f1
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/device/hypertransport.c                |  4 ++--
 src/northbridge/amd/amdfam10/northbridge.c | 10 +++++-----
 src/northbridge/amd/amdk8/northbridge.c    |  5 ++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/device/hypertransport.c b/src/device/hypertransport.c
index 1f73047..2c975de 100644
--- a/src/device/hypertransport.c
+++ b/src/device/hypertransport.c
@@ -501,8 +501,8 @@ static unsigned int hypertransport_scan_chain_x(struct bus *bus,
 					 ht_unitid_base, offset_unitid);
 
 	/* Now that nothing is overlapping it is safe to scan the children. */
-	max = pci_scan_bus(bus, 0x00, ((next_unitid - 1) << 3) | 7, max);
-	return max;
+	bus->subordinate = pci_scan_bus(bus, 0x00, ((next_unitid - 1) << 3) | 7, bus->secondary);
+	return bus->subordinate;
 }
 
 unsigned int ht_scan_bridge(struct device *dev, unsigned int max)
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 1d0df5b..f0527fb 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -260,16 +260,16 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
 		next_unitid = hypertransport_scan_chain(link, 0, max_devfn, ht_unitid_base, offset_unit_id(is_sblink));
 
 		/* Now that nothing is overlapping it is safe to scan the children. */
-		max = pci_scan_bus(link, 0x00, ((next_unitid - 1) << 3) | 7, max);
+		link->subordinate = pci_scan_bus(link, 0x00, ((next_unitid - 1) << 3) | 7, link->secondary);
 
 		/* We know the number of busses behind this bridge.  Set the
 		 * subordinate bus number to it's real value
 		 */
-		if(ht_c_index>3) { // clear the extend reg
+		if (0) {
+			/* Clear the extend reg. */
 			clear_config_map_reg(nodeid, link->link_num, ht_c_index, (max+1)>>sysconf.segbit, (link->subordinate)>>sysconf.segbit, sysconf.nodes);
 		}
 
-		link->subordinate = max;
 		set_config_map_reg(nodeid, link->link_num, ht_c_index, link->secondary, link->subordinate, sysconf.segbit, sysconf.nodes);
 		sysconf.ht_c_num++;
 
@@ -283,8 +283,8 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
 			sysconf.hcdn_reg[ht_c_index] = temp;
 
 		}
-	store_ht_c_conf_bus(nodeid, link->link_num, ht_c_index, link->secondary, link->subordinate, &sysconf);
-	return max;
+		store_ht_c_conf_bus(nodeid, link->link_num, ht_c_index, link->secondary, link->subordinate, &sysconf);
+		return link->subordinate;
 }
 
 static unsigned amdfam10_scan_chains(device_t dev, unsigned max)
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 77eedb5..d2fb495 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -213,12 +213,11 @@ static u32 amdk8_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool is_
 		next_unitid = hypertransport_scan_chain(link, 0, max_devfn, ht_unitid_base, offset_unit_id(is_sblink));
 
 		/* Now that nothing is overlapping it is safe to scan the children. */
-		max = pci_scan_bus(link, 0x00, ((next_unitid - 1) << 3) | 7, max);
+		link->subordinate = pci_scan_bus(link, 0x00, ((next_unitid - 1) << 3) | 7, link->secondary);
 
 		/* We know the number of busses behind this bridge.  Set the
 		 * subordinate bus number to it's real value
 		 */
-		link->subordinate = max;
 		busses = (busses & 0xff00ffff) |
 			((unsigned int) (link->subordinate) << 16);
 		pci_write_config32(dev, link->cap + 0x14, busses);
@@ -239,7 +238,7 @@ static u32 amdk8_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool is_
 			sysconf.hcdn_reg[index] = temp;
 
 		}
-	return max;
+		return link->subordinate;
 }
 
 static unsigned amdk8_scan_chains(device_t dev, unsigned max)