Patch set updated for coreboot: 5c7a7f7 AMD K8 fam10: Drop local is_sblink in scan_chains

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8564

-gerrit

commit 5c7a7f79db2651d67db5011c32c557409c20446e
Author: Kyösti Mälkki 
Date:   Sun Feb 22 08:54:45 2015 +0200

AMD K8 fam10: Drop local is_sblink in scan_chains

We can define is_sblink = (max == 0) as sblink is always the
    very first chain we scan.

Change-Id: Ibd6b3ea23954ca919ae148604bca2495e9f8753b
    Signed-off-by: Kyösti Mälkki 
---
 src/northbridge/amd/amdfam10/northbridge.c | 9 +++------
 src/northbridge/amd/amdk8/northbridge.c    | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 7f1bdec..2dfb8d7 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -179,9 +179,6 @@ static u32 amdfam10_scan_chain(struct bus *link, u32 max)
    	u32 ht_unitid_base[4]; // here assume only 4 HT device on chain
    	u32 max_devfn;

-		u32 nodeid = amdfam10_nodeid(link->dev);
-		bool is_sblink = (nodeid == 0) && (link->link_num == sysconf.sblk);
-
    	/* See if there is an available configuration space mapping
    	 * register in function 1.
    	 */
@@ -193,11 +190,11 @@ static u32 amdfam10_scan_chain(struct bus *link, u32 max)
    	 * so we set the subordinate bus number to 0xff for the moment.
    	 */

-		if (!is_sblink)
+		if (max != 0)
    		max++;

/* One node can have 8 link and segn is the same. */
-		if (CONFIG_HT_CHAIN_DISTRIBUTE && !is_sblink)
+		if (CONFIG_HT_CHAIN_DISTRIBUTE)
    		max = ALIGN_UP(max, 8);

link->secondary = min_bus;
@@ -221,7 +218,7 @@ static u32 amdfam10_scan_chain(struct bus *link, u32 max)
    	else
    		max_devfn = (0x1f<<3) | 7;

-		next_unitid = hypertransport_scan_chain(link, 0, max_devfn, ht_unitid_base, offset_unit_id(is_sblink));
+		next_unitid = hypertransport_scan_chain(link, 0, max_devfn, ht_unitid_base, offset_unit_id(link->secondary == 0));

/* Now that nothing is overlapping it is safe to scan the children. */
    	pci_scan_bus(link, 0x00, ((next_unitid - 1) << 3) | 7);
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 8f5b7f9..8db4668 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -124,10 +124,7 @@ static u32 amdk8_scan_chain(struct bus *link, u32 max)
    	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);
-		unsigned int sblink = (pci_read_config32(link->dev, 0x64)>>8) & 3;
-		bool is_sblink = (nodeid == 0) && (link->link_num == sblink);

/* See if there is an available configuration space mapping
    	 * register in function 1.
@@ -161,11 +158,11 @@ static u32 amdk8_scan_chain(struct bus *link, u32 max)
    	 * so we set the subordinate bus number to 0xff for the moment.
    	 */

-		if (!is_sblink)
+		if (max != 0)
    		max++;

/* Second chain will be on 0x40, third 0x80, forth 0xc0. */
-		if (CONFIG_HT_CHAIN_DISTRIBUTE && !is_sblink)
+		if (CONFIG_HT_CHAIN_DISTRIBUTE)
    		max = ALIGN_UP(max, 0x40);

link->secondary = min_bus;
@@ -195,7 +192,7 @@ static u32 amdk8_scan_chain(struct bus *link, u32 max)
    	else
    		max_devfn = (0x1f<<3) | 7;

-		next_unitid = hypertransport_scan_chain(link, 0, max_devfn, ht_unitid_base, offset_unit_id(is_sblink));
+		next_unitid = hypertransport_scan_chain(link, 0, max_devfn, ht_unitid_base, offset_unit_id(link->secondary == 0));

/* Now that nothing is overlapping it is safe to scan the children. */
    	pci_scan_bus(link, 0x00, ((next_unitid - 1) << 3) | 7);