GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AMD K8 fam10: Fix preprocessor use with SB_HT_CHAIN_ON_BUS0 

Change-Id: I6bbd1b5eaa66a640e0a2e132c8d67f38f103caf5
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/8352
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <edward.ocallaghan@koparo.com>
Reviewed-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
This commit is contained in:
Kyösti Mälkki 2015-02-22 09:24:59 +02:00
parent 6326255caa
commit a9f4327d0f
2 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/northbridge/amd/amdfam10/northbridge.c
View File

@ -218,29 +218,25 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
* We have no idea how many busses are behind this bridge yet, * We have no idea how many busses are behind this bridge yet,
* so we set the subordinate bus number to 0xff for the moment. * 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) {
min_bus = ++max;
} else if (is_sblink) {
// first chain will on bus 0 // first chain will on bus 0
if (is_sblink) { // actually max is 0 here min_bus = max; /* actually max is 0 here */
min_bus = max; } else if (CONFIG_SB_HT_CHAIN_ON_BUS0 == 1) {
} min_bus = ++max;
#if CONFIG_SB_HT_CHAIN_ON_BUS0 > 1 } else if (CONFIG_SB_HT_CHAIN_ON_BUS0 > 1) {
// second chain will be on 0x40, third 0x80, forth 0xc0 // second chain will be on 0x40, third 0x80, forth 0xc0
// i would refined that to 2, 3, 4 ==> 0, 0x, 40, 0x80, 0xc0 // 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. // >4 will use more segments,
else { // 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. */ /* One node can have 8 link and segn is the same. */
min_bus = (((max & 0xff) >> 3) + 1) << 3; min_bus = (((max & 0xff) >> 3) + 1) << 3;
}
max = min_bus; max = min_bus;
#else
//other ...
else {
min_bus = ++max;
} }
#endif
#else
min_bus = ++max;
#endif
link->secondary = min_bus; link->secondary = min_bus;
link->subordinate = link->secondary; link->subordinate = link->secondary;

26
src/northbridge/amd/amdk8/northbridge.c
View File

@ -179,26 +179,18 @@ 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, * We have no idea how many busses are behind this bridge yet,
* so we set the subordinate bus number to 0xff for the moment. * 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) {
min_bus = ++max;
} else if (is_sblink) {
// first chain will on bus 0 // first chain will on bus 0
if(is_sblink) { // actually max is 0 here min_bus = max; /* actually max is 0 here */
min_bus = max; } else if (CONFIG_SB_HT_CHAIN_ON_BUS0 == 1) {
} min_bus = ++max;
#if CONFIG_SB_HT_CHAIN_ON_BUS0 > 1 } else if (CONFIG_SB_HT_CHAIN_ON_BUS0 > 1) {
// second chain will be on 0x40, third 0x80, forth 0xc0 /* Second chain will be on 0x40, third 0x80, forth 0xc0. */
else { min_bus = (max & ~0x3f) + 0x40;
min_bus = ((max>>6) + 1) * 0x40;
}
max = min_bus; max = min_bus;
#else
//other ...
else {
min_bus = ++max;
} }
#endif
#else
min_bus = ++max;
#endif
link->secondary = min_bus; link->secondary = min_bus;
link->subordinate = link->secondary; link->subordinate = link->secondary;