sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YhLu fix on multi ht and s2885

Browse Source 
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1485 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Li-Ta Lo
2004-03-26 21:34:04 +00:00
parent 2f92e14dd4
commit 4cd79f3f86
4 changed files with 127 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainboard/tyan/s2885/Config.lb
View File

@@ -120,10 +120,6 @@ mainboardinit cpu/i386/bist32_fail.inc
### ###
### Romcc output ### Romcc output
### ###
#makerule ./failover.E dep "$(MAINBOARD)/failover.c" act "$(CPP) -I$(TOP)/src $(CPPFLAGS) $(MAINBOARD)/failover.c > ./failever.E"
#makerule ./failover.inc dep "./romcc ./failover.E" act "./romcc -O ./failover.E > failover.inc"
#mainboardinit .failover.inc
makerule ./failover.E makerule ./failover.E
depends "$(MAINBOARD)/failover.c" depends "$(MAINBOARD)/failover.c"
action "$(CPP) -I$(TOP)/src $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/failover.c > ./failover.E" action "$(CPP) -I$(TOP)/src $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/failover.c > ./failover.E"
@@ -141,8 +137,7 @@ end
makerule ./auto.inc makerule ./auto.inc
depends "./romcc ./auto.E" depends "./romcc ./auto.E"
action "./romcc -O -mcpu=k8 -o auto.inc --label-prefix=auto ./auto.E" action "./romcc -O2 -mcpu=k8 -o auto.inc --label-prefix=auto ./auto.E"
# action "./romcc -mcpu=k8 -O ./auto.E > auto.inc"
end end
mainboardinit cpu/k8/enable_mmx_sse.inc mainboardinit cpu/k8/enable_mmx_sse.inc

7
src/mainboard/tyan/s2885/auto.c
View File

@@ -151,15 +151,12 @@ static void main(void)
{ {
.udev = PCI_DEV(0, 0x18, 0), .udev = PCI_DEV(0, 0x18, 0),
.upos = 0xc0, .upos = 0xc0,
.devreg = 0xe2, .devreg = 0xe0,
.mindev = 1,
}, },
{ {
.udev = PCI_DEV(0, 0x18, 0), .udev = PCI_DEV(0, 0x18, 0),
.upos = 0x80, .upos = 0x80,
.devreg = 0xe6, .devreg = 0xe4,
.mindev = 5,
}, },
}; };
int needs_reset; int needs_reset;

4
src/mainboard/tyan/s2885/resourcemap.c
View File

@@ -252,8 +252,8 @@ static void setup_s2885_resource_map(void)
* [31:24] Bus Number Limit i * [31:24] Bus Number Limit i
* This field defines the highest bus number in configuration regin i * This field defines the highest bus number in configuration regin i
*/ */
PCI_ADDR(0, 0x18, 1, 0xE0), 0x0000FC88, 0x04010207, PCI_ADDR(0, 0x18, 1, 0xE0), 0x0000FC88, 0x06010207,
PCI_ADDR(0, 0x18, 1, 0xE4), 0x0000FC88, 0x06050007, PCI_ADDR(0, 0x18, 1, 0xE4), 0x0000FC88, 0x00000007,
PCI_ADDR(0, 0x18, 1, 0xE8), 0x0000FC88, 0x00000000, PCI_ADDR(0, 0x18, 1, 0xE8), 0x0000FC88, 0x00000000,
PCI_ADDR(0, 0x18, 1, 0xEC), 0x0000FC88, 0x00000000, PCI_ADDR(0, 0x18, 1, 0xEC), 0x0000FC88, 0x00000000,
}; };

122
src/northbridge/amd/amdk8/incoherent_ht.c
View File

@@ -63,7 +63,6 @@ static void ht_collapse_previous_enumeration(unsigned bus)
} }
} }
static unsigned ht_read_freq_cap(device_t dev, unsigned pos) static unsigned ht_read_freq_cap(device_t dev, unsigned pos)
{ {
/* Handle bugs in valid hypertransport frequency reporting */ /* Handle bugs in valid hypertransport frequency reporting */
@@ -242,52 +241,20 @@ static int ht_setup_chain(device_t udev, unsigned upos)
} while((last_unitid != next_unitid) && (next_unitid <= 0x1f)); } while((last_unitid != next_unitid) && (next_unitid <= 0x1f));
return reset_needed; return reset_needed;
} }
struct ht_chain { struct ht_chain {
device_t udev; device_t udev;
unsigned upos; unsigned upos;
unsigned devreg; unsigned devreg;
unsigned mindev;
}; };
static int ht_setup_chains(const struct ht_chain *ht_c, int ht_c_num) static int ht_setup_chainx(device_t udev, unsigned upos, unsigned next_unitid)
{ {
/* Assumption the HT chain that is bus 0 has the HT I/O Hub on it. unsigned last_unitid;
* On most boards this just happens. If a cpu has multiple
* non Coherent links the appropriate bus registers for the
* links needs to be programed to point at bus 0.
*/
unsigned next_unitid, last_unitid;
int reset_needed;
unsigned uoffs; unsigned uoffs;
unsigned upos; int reset_needed=0;
device_t udev;
int i;
/* Make certain the HT bus is not enumerated */
ht_collapse_previous_enumeration(0);
reset_needed = 0;
next_unitid = 1;
for(i=0;i<ht_c_num;i++) {
#if 0
unsigned tmp;
tmp = pci_read_config8(PCI_DEV(0,0x18,1),ht_c[i].devreg);
#endif
pci_write_config8(PCI_DEV(0,0x18,1), ht_c[i].devreg, 0);
#if CONFIG_MAX_CPUS > 1
pci_write_config8(PCI_DEV(0,0x19,1), ht_c[i].devreg, 0);
#endif
#if CONFIG_MAX_CPUS > 2
pci_write_config8(PCI_DEV(0,0x1a,1), ht_c[i].devreg, 0);
pci_write_config8(PCI_DEV(0,0x1b,1), ht_c[i].devreg, 0);
#endif
uoffs = PCI_HT_HOST_OFFS; uoffs = PCI_HT_HOST_OFFS;
upos = ht_c[i].upos;
udev = ht_c[i].udev;
do { do {
uint32_t id; uint32_t id;
uint8_t pos; uint8_t pos;
@@ -326,26 +293,77 @@ static int ht_setup_chains(const struct ht_chain *ht_c, int ht_c_num)
next_unitid += count; next_unitid += count;
} while((last_unitid != next_unitid) && (next_unitid <= 0x1f)); } while((last_unitid != next_unitid) && (next_unitid <= 0x1f));
#if 0 if(reset_needed!=0) next_unitid |= 0xffff0000;
pci_write_config8(PCI_DEV(0,0x18,1), ht_c[i].devreg, tmp); return next_unitid;
}
static int ht_setup_chains(const struct ht_chain *ht_c, int ht_c_num)
{
/* Assumption the HT chain that is bus 0 has the HT I/O Hub on it.
* On most boards this just happens. If a cpu has multiple
* non Coherent links the appropriate bus registers for the
* links needs to be programed to point at bus 0.
*/
unsigned next_unitid;
int reset_needed;
unsigned upos;
device_t udev;
int i;
/* Make certain the HT bus is not enumerated */
ht_collapse_previous_enumeration(0);
reset_needed = 0;
next_unitid = 1;
for(i=0;i<ht_c_num;i++) {
uint32_t reg;
uint8_t reg8;
reg = pci_read_config32(PCI_DEV(0,0x18,1), ht_c[i].devreg);
reg |= (0xff<<24) | 7;
reg &= ~(0xff<<16);
pci_write_config32(PCI_DEV(0,0x18,1), ht_c[i].devreg, reg);
#if CONFIG_MAX_CPUS > 1 #if CONFIG_MAX_CPUS > 1
pci_write_config8(PCI_DEV(0,0x19,1), ht_c[i].devreg, tmp); pci_write_config32(PCI_DEV(0,0x19,1), ht_c[i].devreg, reg);
#endif #endif
#if CONFIG_MAX_CPUS > 2 #if CONFIG_MAX_CPUS > 2
pci_write_config8(PCI_DEV(0,0x1a,1), ht_c[i].devreg, tmp); pci_write_config32(PCI_DEV(0,0x1a,1), ht_c[i].devreg, reg);
pci_write_config8(PCI_DEV(0,0x1b,1), ht_c[i].devreg, tmp); pci_write_config32(PCI_DEV(0,0x1b,1), ht_c[i].devreg, reg);
#endif
#else
pci_write_config8(PCI_DEV(0,0x18,1), ht_c[i].devreg, ht_c[i].mindev);
#if CONFIG_MAX_CPUS > 1
pci_write_config8(PCI_DEV(0,0x19,1), ht_c[i].devreg, ht_c[i].mindev);
#endif
#if CONFIG_MAX_CPUS > 2
pci_write_config8(PCI_DEV(0,0x1a,1), ht_c[i].devreg, ht_c[i].mindev);
pci_write_config8(PCI_DEV(0,0x1b,1), ht_c[i].devreg, ht_c[i].mindev);
#endif
#endif #endif
//Store dev min
reg8 = next_unitid & 0xff ;
upos = ht_c[i].upos;
udev = ht_c[i].udev;
next_unitid = ht_setup_chainx(udev,upos,next_unitid);
if((next_unitid & 0xffff0000) == 0xffff0000) {
reset_needed |= 1;
next_unitid &=0x0000ffff;
}
//set dev min
pci_write_config8(PCI_DEV(0,0x18,1), ht_c[i].devreg+2, reg8);
#if CONFIG_MAX_CPUS > 1
pci_write_config8(PCI_DEV(0,0x19,1), ht_c[i].devreg+2, reg8);
#endif
#if CONFIG_MAX_CPUS > 2
pci_write_config8(PCI_DEV(0,0x1a,1), ht_c[i].devreg+2, reg8);
pci_write_config8(PCI_DEV(0,0x1b,1), ht_c[i].devreg+2, reg8);
#endif
//Set dev max
reg8 = (next_unitid-1) & 0xff ;
pci_write_config8(PCI_DEV(0,0x18,1), ht_c[i].devreg+3, reg8);
#if CONFIG_MAX_CPUS > 1
pci_write_config8(PCI_DEV(0,0x19,1), ht_c[i].devreg+3, reg8);
#endif
#if CONFIG_MAX_CPUS > 2
pci_write_config8(PCI_DEV(0,0x1a,1), ht_c[i].devreg+3, reg8);
pci_write_config8(PCI_DEV(0,0x1b,1), ht_c[i].devreg+3, reg8);
#endif
} }
return reset_needed; return reset_needed;