Patch set updated for coreboot: 0f9f2d3 AMD K8 fam10: Refactor logic around SB_HT_CHAIN_ON_BUS0

[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/8365

-gerrit

commit 0f9f2d3e0c660f669747a1faca52f9b165e3fd3b
Author: Kyösti Mälkki 
Date:   Thu Feb 5 13:36:54 2015 +0200

AMD K8 fam10: Refactor logic around SB_HT_CHAIN_ON_BUS0

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

diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index c3f7856..7fee62a 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -216,20 +216,12 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
    	 * so we set the subordinate bus number to 0xff for the moment.
    	 */

-		if (CONFIG_SB_HT_CHAIN_ON_BUS0 == 0) {
+		if ((CONFIG_SB_HT_CHAIN_ON_BUS0 == 0) || !is_sblink)
    		max++;
-		} else if (is_sblink) {

-		} else if (CONFIG_SB_HT_CHAIN_ON_BUS0 == 1) {
-			max++;
-		} else if (CONFIG_SB_HT_CHAIN_ON_BUS0 > 1) {
-			// We can have 16 segmment and every segment have 256 bus,
-			// For that case need the kernel support mmio pci config.
-
-			/* One node can have 8 link and segn is the same. */
-			max++;
+		/* One node can have 8 link and segn is the same. */
+		if ((CONFIG_SB_HT_CHAIN_ON_BUS0 > 1) && !is_sblink)
    		max = ALIGN_UP(max, 8);
-		}

link->secondary = max;
    	link->subordinate = link->secondary;
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index e087888..7184c38 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -178,17 +178,13 @@ static u32 amdk8_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool is_
    	 * We have no idea how many busses are behind this bridge yet,
    	 * so we set the subordinate bus number to 0xff for the moment.
    	 */
-		if (CONFIG_SB_HT_CHAIN_ON_BUS0 == 0) {
-			max++;
-		} else if (is_sblink) {

-		} else if (CONFIG_SB_HT_CHAIN_ON_BUS0 == 1) {
-			max++;
-		} else if (CONFIG_SB_HT_CHAIN_ON_BUS0 > 1) {
-			/* Second chain will be on 0x40, third 0x80, forth 0xc0. */
+		if ((CONFIG_SB_HT_CHAIN_ON_BUS0 == 0) || !is_sblink)
    		max++;
+
+		/* Second chain will be on 0x40, third 0x80, forth 0xc0. */
+		if ((CONFIG_SB_HT_CHAIN_ON_BUS0 > 1) && !is_sblink)
    		max = ALIGN_UP(max, 0x40);
-		}

link->secondary = max;
    	link->subordinate = link->secondary;