*** empty log message ***

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1736 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Yinghai Lu 2004-11-03 00:47:40 +00:00
parent e507c85fe3
commit 4403f60823
3 changed files with 8 additions and 14 deletions

View File

@ -206,13 +206,9 @@ static void main(void)
static const struct ht_chain ht_c[] = { static const struct ht_chain ht_c[] = {
{ /* Link 2 of CPU0 */ { /* Link 2 of CPU0 */
.udev = PCI_DEV(0, 0x18, 0),
.upos = 0xc0,
.devreg = 0xe0, /* Preset bus num in resource map */ .devreg = 0xe0, /* Preset bus num in resource map */
}, },
{ /* Link 1 of CPU1 */ { /* Link 1 of CPU1 */
.udev = PCI_DEV(0, 0x19, 0),
.upos = 0xa0,
.devreg = 0xe4, /* Preset bus num in resource map */ .devreg = 0xe4, /* Preset bus num in resource map */
}, },
}; };

View File

@ -180,13 +180,9 @@ static void main(unsigned long bist)
#if 1 #if 1
static const struct ht_chain ht_c[] = { static const struct ht_chain ht_c[] = {
{ /* Link 2 of CPU0 */ { /* Link 2 of CPU0 */
.udev = PCI_DEV(0, 0x18, 0),
.upos = 0xc0,
.devreg = 0xe0, /* Preset bus num in resource map */ .devreg = 0xe0, /* Preset bus num in resource map */
}, },
{ /* Link 0 of CPU0 */ { /* Link 0 of CPU0 */
.udev = PCI_DEV(0, 0x18, 0),
.upos = 0x80,
.devreg = 0xe4, /* Preset bus num in resource map */ .devreg = 0xe4, /* Preset bus num in resource map */
}, },
}; };

View File

@ -246,8 +246,6 @@ static int ht_setup_chain(device_t udev, unsigned upos)
} }
struct ht_chain { struct ht_chain {
device_t udev;
unsigned upos;
unsigned devreg; unsigned devreg;
}; };
static int ht_setup_chainx(device_t udev, unsigned upos, unsigned bus) static int ht_setup_chainx(device_t udev, unsigned upos, unsigned bus)
@ -344,20 +342,24 @@ static int ht_setup_chains(const struct ht_chain *ht_c, int ht_c_num)
dword |= (reg & 0xffff0000)>>8; dword |= (reg & 0xffff0000)>>8;
pci_write_config32( PCI_DEV(0, devpos,0), regpos , dword); pci_write_config32( PCI_DEV(0, devpos,0), regpos , dword);
#if 0 #if 0
print_debug("PCI_DEV=(0,0x"); print_debug("udev=(0,0x");
print_debug_hex8(devpos); print_debug_hex8(devpos);
print_debug(",0) 0x"); print_debug(",0) 0x");
print_debug_hex8(regpos); print_debug_hex8(regpos);
print_debug("="); print_debug("=");
print_debug_hex32(dword); print_debug_hex32(dword);
print_debug("\r\n");
#endif #endif
/* Make certain the HT bus is not enumerated */ /* Make certain the HT bus is not enumerated */
ht_collapse_previous_enumeration(busn); ht_collapse_previous_enumeration(busn);
upos = ht_c[i].upos; upos = ((reg & 0xf00)>>8) * 0x20 + 0x80;
udev = ht_c[i].udev; udev = PCI_DEV(0, devpos, 0);
#if 0
print_debug("\tupos=0x");
print_debug_hex32(upos);
print_debug("\r\n");
#endif
reset_needed |= ht_setup_chainx(udev,upos,busn ); reset_needed |= ht_setup_chainx(udev,upos,busn );