2 files changed, 4 insertions, 37 deletions

diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 26a835b545..bcb6e3f936 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -174,10 +174,7 @@ static void ht_route_link(struct bus *link, scan_state mode)
 
 static u32 amdfam10_scan_chain(struct bus *link, u32 max)
 {
-		int i;
 		unsigned int next_unitid;
-		u32 ht_unitid_base[4]; // here assume only 4 HT device on chain
-		u32 max_devfn;
 
 		/* See if there is an available configuration space mapping
 		 * register in function 1.
@@ -208,17 +205,8 @@ static u32 amdfam10_scan_chain(struct bus *link, u32 max)
 		/* Now we can scan all of the subordinate busses i.e. the
 		 * chain on the hypertranport link
 		 */
-		for(i=0;i<4;i++) {
-			ht_unitid_base[i] = 0x20;
-		}
 
-		//if ext conf is enabled, only need use 0x1f
-		if (link->secondary == 0)
-			max_devfn = (0x17<<3) | 7;
-		else
-			max_devfn = (0x1f<<3) | 7;
-
-		next_unitid = hypertransport_scan_chain(link, 0, max_devfn, ht_unitid_base, offset_unit_id(link->secondary == 0));
+		next_unitid = hypertransport_scan_chain(link);
 
 		/* Now that nothing is overlapping it is safe to scan the children. */
 		pci_scan_bus(link, 0x00, ((next_unitid - 1) << 3) | 7);
@@ -235,11 +223,6 @@ static u32 amdfam10_scan_chain(struct bus *link, u32 max)
 
 		set_config_map_reg(link);
 
-		/* Use ht_unitid_base to update hcdn_reg. */
-		link->hcdn_reg = 0;
-		for (i = 0; i < 4;i++)
-			link->hcdn_reg |= (ht_unitid_base[i] & 0xff) << (i*8);
-
 		store_ht_c_conf_bus(link);
 
 		return link->subordinate;
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 2783ad1302..1c62647eb3 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -118,12 +118,10 @@ static u32 amdk8_nodeid(device_t dev)
 
 static u32 amdk8_scan_chain(struct bus *link, u32 max)
 {
-		int i;
 		unsigned int next_unitid;
+		int index;
 		u32 config_busses;
 		u32 free_reg, config_reg;
-		u32 ht_unitid_base[4]; // here assume only 4 HT device on chain
-		u32 max_devfn;
 		u32 nodeid = amdk8_nodeid(link->dev);
 
 		/* See if there is an available configuration space mapping
@@ -183,16 +181,8 @@ static u32 amdk8_scan_chain(struct bus *link, u32 max)
 		/* Now we can scan all of the subordinate busses i.e. the
 		 * chain on the hypertranport link
 		 */
-		for(i=0;i<4;i++) {
-			ht_unitid_base[i] = 0x20;
-		}
-
-		if (link->secondary == 0)
-			max_devfn = (0x17<<3) | 7;
-		else
-			max_devfn = (0x1f<<3) | 7;
 
-		next_unitid = hypertransport_scan_chain(link, 0, max_devfn, ht_unitid_base, offset_unit_id(link->secondary == 0));
+		next_unitid = hypertransport_scan_chain(link);
 
 		/* Now that nothing is overlapping it is safe to scan the children. */
 		pci_scan_bus(link, 0x00, ((next_unitid - 1) << 3) | 7);
@@ -207,13 +197,7 @@ static u32 amdk8_scan_chain(struct bus *link, u32 max)
 			(link->subordinate << 24);
 		f1_write_config32(config_reg, config_busses);
 
-
-		// use config_reg and ht_unitid_base to update hcdn_reg
-		link->hcdn_reg = 0;
-		for (i = 0; i < 4; i++)
-			link->hcdn_reg |= (ht_unitid_base[i] & 0xff) << (i*8);
-
-		int index = (config_reg-0xe0) >> 2;
+		index = (config_reg-0xe0) >> 2;
 		sysconf.hcdn_reg[index] = link->hcdn_reg;
 
 		return link->subordinate;