[coreboot-gerrit] New patch to review for coreboot: 5c5fc54 AMD K8 fam10: Drop link_num from scan_chain parameters
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Wed Feb 4 20:15:00 CET 2015
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8347
-gerrit
commit 5c5fc541855bcc040a46856f5d51236a8093fa07
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Wed Feb 4 11:09:52 2015 +0200
AMD K8 fam10: Drop link_num from scan_chain parameters
Change-Id: Id8fc1d7d8a23238e6848cd2cf4270d782e90a7d3
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/northbridge/amd/amdfam10/northbridge.c | 24 ++++++++++++------------
src/northbridge/amd/amdk8/northbridge.c | 14 +++++++-------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index ce97f62..40de13d 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -140,7 +140,7 @@ static void set_vga_enable_reg(u32 nodeid, u32 linkn)
}
-static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 link_num, u32 sblink,
+static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 sblink,
u32 max, u32 offset_unitid)
{
// I want to put sb chain in bus 0 can I?
@@ -152,7 +152,7 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 l
u32 ht_unitid_base[4]; // here assume only 4 HT device on chain
u32 max_bus;
u32 min_bus;
- u32 is_sublink1 = (link_num>3);
+ u32 is_sublink1 = (link->link_num > 3);
device_t devx;
u32 busses;
u32 segn = max>>8;
@@ -165,7 +165,7 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 l
if(is_sublink1) {
u32 regpos;
u32 reg;
- regpos = 0x170 + 4 * (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);
if(reg & 1) return max; // already ganged no sblink1
devx = get_node_pci(nodeid, 4);
@@ -174,7 +174,7 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 l
devx = dev;
- link->cap = 0x80 + ((link_num&3) *0x20);
+ link->cap = 0x80 + ((link->link_num & 3) * 0x20);
do {
link_type = pci_read_config32(devx, link->cap + 0x18);
} while(link_type & ConnectionPending);
@@ -190,7 +190,7 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 l
/* See if there is an available configuration space mapping
* register in function 1.
*/
- ht_c_index = get_ht_c_index(nodeid, link_num, &sysconf);
+ ht_c_index = get_ht_c_index(nodeid, link->link_num, &sysconf);
if(ht_c_index>=4) return max;
@@ -200,7 +200,7 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 l
*/
#if CONFIG_SB_HT_CHAIN_ON_BUS0 > 0
// first chain will on bus 0
- if((nodeid == 0) && (sblink==link_num)) { // actually max is 0 here
+ if((nodeid == 0) && (sblink==link->link_num)) { // actually max is 0 here
min_bus = max;
}
#if CONFIG_SB_HT_CHAIN_ON_BUS0 > 1
@@ -241,7 +241,7 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 l
/* set the config map space */
- set_config_map_reg(nodeid, link_num, ht_c_index, link->secondary, link->subordinate, sysconf.segbit, sysconf.nodes);
+ set_config_map_reg(nodeid, link->link_num, ht_c_index, link->secondary, link->subordinate, sysconf.segbit, sysconf.nodes);
/* Now we can scan all of the subordinate busses i.e. the
* chain on the hypertranport link
@@ -262,11 +262,11 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 l
* subordinate bus number to it's real value
*/
if(ht_c_index>3) { // clear the extend reg
- clear_config_map_reg(nodeid, link_num, ht_c_index, (max+1)>>sysconf.segbit, (link->subordinate)>>sysconf.segbit, sysconf.nodes);
+ clear_config_map_reg(nodeid, link->link_num, ht_c_index, (max+1)>>sysconf.segbit, (link->subordinate)>>sysconf.segbit, sysconf.nodes);
}
link->subordinate = max;
- set_config_map_reg(nodeid, link_num, ht_c_index, link->secondary, link->subordinate, sysconf.segbit, sysconf.nodes);
+ set_config_map_reg(nodeid, link->link_num, ht_c_index, link->secondary, link->subordinate, sysconf.segbit, sysconf.nodes);
sysconf.ht_c_num++;
{
@@ -279,7 +279,7 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 l
sysconf.hcdn_reg[ht_c_index] = temp;
}
- store_ht_c_conf_bus(nodeid, link_num, ht_c_index, link->secondary, link->subordinate, &sysconf);
+ store_ht_c_conf_bus(nodeid, link->link_num, ht_c_index, link->secondary, link->subordinate, &sysconf);
return max;
}
@@ -295,7 +295,7 @@ static unsigned amdfam10_scan_chains(device_t dev, unsigned max)
for (link = dev->link_list; link; link = link->next) {
unsigned offset_unitid = (CONFIG_HT_CHAIN_UNITID_BASE != 1) || (CONFIG_HT_CHAIN_END_UNITID_BASE != 0x20);
if ((CONFIG_SB_HT_CHAIN_ON_BUS0 > 0) && (nodeid == 0) && (link->link_num == sblink))
- max = amdfam10_scan_chain(dev, nodeid, link, link->link_num, sblink, max, offset_unitid);
+ max = amdfam10_scan_chain(dev, nodeid, link, sblink, max, offset_unitid);
}
#if CONFIG_PCI_BUS_SEGN_BITS
@@ -310,7 +310,7 @@ static unsigned amdfam10_scan_chains(device_t dev, unsigned max)
offset_unitid = offset_unitid &&
(((nodeid == 0) && (sblink == link->link_num)) || !CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY);
- max = amdfam10_scan_chain(dev, nodeid, link, link->link_num, sblink, max, offset_unitid);
+ max = amdfam10_scan_chain(dev, nodeid, link, sblink, max, offset_unitid);
}
return max;
}
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index ea7bdc0..6785659 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -84,7 +84,7 @@ static u32 amdk8_nodeid(device_t dev)
return (dev->path.pci.devfn >> 3) - 0x18;
}
-static u32 amdk8_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 link_num, u32 sblink,
+static u32 amdk8_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 sblink,
u32 max, u32 offset_unitid)
{
@@ -97,7 +97,7 @@ static u32 amdk8_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 link
u32 min_bus;
u32 max_devfn;
- link->cap = 0x80 + (link_num *0x20);
+ link->cap = 0x80 + (link->link_num * 0x20);
do {
link_type = pci_read_config32(dev, link->cap + 0x18);
} while(link_type & ConnectionPending);
@@ -123,7 +123,7 @@ static u32 amdk8_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 link
}
if (((config & 3) == 3) &&
(((config >> 4) & 7) == nodeid) &&
- (((config >> 8) & 3) == link_num)) {
+ (((config >> 8) & 3) == link->link_num)) {
break;
}
}
@@ -143,7 +143,7 @@ static u32 amdk8_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 link
*/
#if CONFIG_SB_HT_CHAIN_ON_BUS0 > 0
// first chain will on bus 0
- if((nodeid == 0) && (sblink==link_num)) { // actually max is 0 here
+ if((nodeid == 0) && (sblink==link->link_num)) { // actually max is 0 here
min_bus = max;
}
#if CONFIG_SB_HT_CHAIN_ON_BUS0 > 1
@@ -186,7 +186,7 @@ static u32 amdk8_scan_chain(device_t dev, u32 nodeid, struct bus *link, u32 link
config_busses |=
(3 << 0) | /* rw enable, no device compare */
(( nodeid & 7) << 4) |
- (( link_num & 3 ) << 8) |
+ ((link->link_num & 3) << 8) |
((link->secondary) << 16) |
((link->subordinate) << 24);
f1_write_config32(config_reg, config_busses);
@@ -247,7 +247,7 @@ static unsigned amdk8_scan_chains(device_t dev, unsigned max)
unsigned offset_unitid = (CONFIG_HT_CHAIN_UNITID_BASE != 1) || (CONFIG_HT_CHAIN_END_UNITID_BASE != 0x20);
if ((CONFIG_SB_HT_CHAIN_ON_BUS0 > 0) && (nodeid == 0) && (link->link_num == sblink))
- max = amdk8_scan_chain(dev, nodeid, link, link->link_num, sblink, max, offset_unitid);
+ max = amdk8_scan_chain(dev, nodeid, link, sblink, max, offset_unitid);
}
for (link = dev->link_list; link; link = link->next) {
@@ -258,7 +258,7 @@ static unsigned amdk8_scan_chains(device_t dev, unsigned max)
offset_unitid = offset_unitid &&
(((nodeid == 0) && (sblink == link->link_num)) || !CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY);
- max = amdk8_scan_chain(dev, nodeid, link, link->link_num, sblink, max, offset_unitid);
+ max = amdk8_scan_chain(dev, nodeid, link, sblink, max, offset_unitid);
}
return max;
}
More information about the coreboot-gerrit
mailing list