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

AMD fam10: Refactor variables in scan_chain 

We only need one of devx and dev. This function should be called
with dev already adjusted if link_num > 3.

Change-Id: I7166bbb88143bc28802c9530c4da16db67868d8e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/8351
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Kyösti Mälkki 2015-02-04 15:37:45 +02:00
parent e40beb1f79
commit 7255062ea7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,6 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
u32 ht_unitid_base[4]; // here assume only 4 HT device on chain u32 ht_unitid_base[4]; // here assume only 4 HT device on chain
u32 max_bus; u32 max_bus;
u32 min_bus; u32 min_bus;
device_t devx;
u32 busses; u32 busses;
u32 segn = max>>8; u32 segn = max>>8;
#if CONFIG_SB_HT_CHAIN_ON_BUS0 > 1 #if CONFIG_SB_HT_CHAIN_ON_BUS0 > 1
@ -182,14 +181,13 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
regpos = 0x170 + 4 * (link->link_num & 3); // it is only on sublink0 regpos = 0x170 + 4 * (link->link_num & 3); // it is only on sublink0
reg = pci_read_config32(dev, regpos); reg = pci_read_config32(dev, regpos);
if(reg & 1) return max; // already ganged no sblink1 if(reg & 1) return max; // already ganged no sblink1
devx = get_node_pci(nodeid, 4);
} else { dev = get_node_pci(nodeid, 4);
devx = dev;
} }
/* Check for connected link. */ /* Check for connected link. */
link->cap = 0x80 + ((link->link_num & 3) * 0x20); link->cap = 0x80 + ((link->link_num & 3) * 0x20);
if (!is_non_coherent_link(devx, link)) if (!is_non_coherent_link(dev, link))
return max; return max;
/* See if there is an available configuration space mapping /* See if there is an available configuration space mapping
@ -233,7 +231,7 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
/* Read the existing primary/secondary/subordinate bus /* Read the existing primary/secondary/subordinate bus
* number configuration. * number configuration.
*/ */
busses = pci_read_config32(devx, link->cap + 0x14); busses = pci_read_config32(dev, link->cap + 0x14);
/* Configure the bus numbers for this bridge: the configuration /* Configure the bus numbers for this bridge: the configuration
* transactions will not be propagates by the bridge if it is * transactions will not be propagates by the bridge if it is
@ -241,7 +239,7 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
*/ */
busses &= 0xffff00ff; busses &= 0xffff00ff;
busses |= ((u32)(link->secondary) << 8); busses |= ((u32)(link->secondary) << 8);
pci_write_config32(devx, link->cap + 0x14, busses); pci_write_config32(dev, link->cap + 0x14, busses);
/* set the config map space */ /* set the config map space */