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

AMD fam10: Fix add_more_links 

One PCI function may contain upto 4 links, further links must
be added to PCI function 4 on the same device.

There is no requirement that in dev->link_list the last element
would have the highest link->link_num.

Also fix off-by-one error when allocating for more links.

Change-Id: If7ebdd1ad52653d3757b5930bd0a83e2cf2fcac6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/8555
Tested-by: build bot (Jenkins)
Reviewed-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
This commit is contained in:
Kyösti Mälkki 2015-02-21 23:56:07 +02:00
parent 34de29aeb3
commit 59d609217b
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,18 +176,8 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
#endif #endif
u32 max_devfn; u32 max_devfn;
if (link->link_num > 3) {
u32 regpos;
u32 reg;
regpos = 0x170 + 4 * (link->link_num & 3); // it is only on sublink0
reg = pci_read_config32(dev, regpos);
if(reg & 1) return max; // already ganged no sblink1
dev = get_node_pci(nodeid, 4);
}
/* Check for connected link. */ /* Check for connected link. */
link->cap = 0x80 + ((link->link_num & 3) * 0x20); link->cap = 0x80 + (link->link_num * 0x20);
if (!is_non_coherent_link(dev, link)) if (!is_non_coherent_link(dev, link))
return max; return max;
@ -1178,14 +1168,16 @@ static void sysconf_init(device_t dev) // first node
static void add_more_links(device_t dev, unsigned total_links) static void add_more_links(device_t dev, unsigned total_links)
{ {
struct bus *link, *last = NULL; struct bus *link, *last = NULL;
int link_num; int link_num = -1;
for (link = dev->link_list; link; link = link->next) for (link = dev->link_list; link; link = link->next) {
if (link_num < link->link_num)
link_num = link->link_num;
last = link; last = link;
}
if (last) { if (last) {
int links = total_links - last->link_num; int links = total_links - (link_num + 1);
link_num = last->link_num;
if (links > 0) { if (links > 0) {
link = malloc(links*sizeof(*link)); link = malloc(links*sizeof(*link));
if (!link) if (!link)
@ -1195,7 +1187,6 @@ static void add_more_links(device_t dev, unsigned total_links)
} }
} }
else { else {
link_num = -1;
link = malloc(total_links*sizeof(*link)); link = malloc(total_links*sizeof(*link));
memset(link, 0, total_links*sizeof(*link)); memset(link, 0, total_links*sizeof(*link));
dev->link_list = link; dev->link_list = link;
@ -1337,14 +1328,18 @@ static void cpu_bus_scan(device_t dev)
cdb_dev = pci_probe_dev(NULL, pbus, cdb_dev = pci_probe_dev(NULL, pbus,
PCI_DEVFN(devn, fn)); PCI_DEVFN(devn, fn));
} }
cdb_dev = dev_find_slot(busn, PCI_DEVFN(devn, 0));
} }
if (cdb_dev) {
/* Ok, We need to set the links for that device. /* Ok, We need to set the links for that device.
* otherwise the device under it will not be scanned * otherwise the device under it will not be scanned
*/ */
add_more_links(cdb_dev, 8); cdb_dev = dev_find_slot(busn, PCI_DEVFN(devn, 0));
} if (cdb_dev)
add_more_links(cdb_dev, 4);
cdb_dev = dev_find_slot(busn, PCI_DEVFN(devn, 4));
if (cdb_dev)
add_more_links(cdb_dev, 4);
cores_found = 0; // one core cores_found = 0; // one core
cdb_dev = dev_find_slot(busn, PCI_DEVFN(devn, 3)); cdb_dev = dev_find_slot(busn, PCI_DEVFN(devn, 3));