Patch set updated for coreboot: 49898c2 AMD K8 fam10: Eliminate local variables busn and max_bus

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

-gerrit

commit 49898c236a85f955a16f6963ea08c0b1d4dde962
Author: Kyösti Mälkki 
Date:   Sun Feb 22 09:22:55 2015 +0200

AMD K8 fam10: Eliminate local variables busn and max_bus

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

diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 3aa99c4..9fcd720 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -180,11 +180,7 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
    	unsigned int next_unitid;
    	u32 ht_c_index;
    	u32 ht_unitid_base[4]; // here assume only 4 HT device on chain
-		u32 max_bus;
    	u32 min_bus;
-#if CONFIG_SB_HT_CHAIN_ON_BUS0 > 1
-		u32 busn = max&0xff;
-#endif
    	u32 max_devfn;

/* Check for connected link. */
@@ -213,7 +209,8 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
    	// i would refined that to  2, 3, 4 ==> 0, 0x, 40, 0x80, 0xc0
    	//			    >4 will use	 more segments, We can have 16 segmment and every segment have 256 bus, For that case need the kernel support mmio pci config.
    	else {
-			min_bus = ((busn>>3) + 1) << 3; // one node can have 8 link and segn is the same
+			/* One node can have 8 link and segn is the same. */
+			min_bus = (((max & 0xff) >> 3) + 1) << 3;
    	}
    	max = min_bus;
    #else
@@ -225,10 +222,9 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
 #else
    	min_bus = ++max;
 #endif
-		max_bus = 0xfc;

link->secondary = min_bus;
-		link->subordinate = max_bus;
+		link->subordinate = 0xfc;

ht_route_link(link);

diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index d279cc2..34b9566 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -125,7 +125,6 @@ static u32 amdk8_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool is_
    	u32 config_busses;
    	u32 free_reg, config_reg;
    	u32 ht_unitid_base[4]; // here assume only 4 HT device on chain
-		u32 max_bus;
    	u32 min_bus;
    	u32 max_devfn;

@@ -184,10 +183,9 @@ static u32 amdk8_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool is_
 #else
    	min_bus = ++max;
 #endif
-		max_bus = 0xff;

link->secondary = min_bus;
-		link->subordinate = max_bus;
+		link->subordinate = 0xff;

ht_route_link(link);