From ebb645a9fb5d81a8ea701fd53a2bf63bb899d51c Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Fri, 25 Jul 2003 03:05:54 +0000 Subject: YhLu's changes to resolve several memory and other problems. git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1036 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/northbridge/amd/amdk8/coherent_ht.c | 122 +++++++++++++++++++++++++++++--- src/northbridge/amd/amdk8/raminit.c | 23 ++++-- 2 files changed, 130 insertions(+), 15 deletions(-) (limited to 'src/northbridge') diff --git a/src/northbridge/amd/amdk8/coherent_ht.c b/src/northbridge/amd/amdk8/coherent_ht.c index 6828294ead..8bf8d15dd9 100644 --- a/src/northbridge/amd/amdk8/coherent_ht.c +++ b/src/northbridge/amd/amdk8/coherent_ht.c @@ -77,6 +77,41 @@ static void disable_probes(void) print_debug("done.\r\n"); } +//BY LYH +#define WAIT_TIMES 1000 +static void wait_ap_stop(u8 node) +{ + unsigned long reg; + unsigned long i; + for(i=0;i>= 24; +/* print_debug("applicaton cpu apic_id: "); + print_debug_hex32(apic_id); + print_debug("\r\n"); + }*/ + if(apic_id!=0) { //AP apic_id == node_id ?? +// set the ColdResetbit to notify BSP that AP is stopped + reg = pci_read_config32(NODE_HT(apic_id), 0x6C); + reg |= 1<<4; + pci_write_config32(NODE_HT(apic_id), 0x6C, reg); + } + +} +//BY LYH END static void enable_routing(u8 node) { @@ -109,8 +144,15 @@ static void enable_routing(u8 node) print_debug_hex32(node); val=pci_read_config32(NODE_HT(node), 0x6c); - val &= ~((1<<6)|(1<<5)|(1<<4)|(1<<1)|(1<<0)); - pci_write_config32(NODE_HT(node), 0x6c, val); + val &= ~((1<<6)|(1<<5)|(1<<4)|(1<<1)|(1<<0)); + pci_write_config32(NODE_HT(node), 0x6c, val); +//BY LYH +#if 1 + if(node!=0) { + wait_ap_stop(node); + } +#endif +//BY LYH END print_debug(" done.\r\n"); } @@ -285,9 +327,9 @@ static u8 setup_smp(void) /* We found 2 nodes so far */ setup_node(0, cpus); /* Node 1 is there. Setup Node 0 correctly */ setup_remote_node(1, cpus); /* Setup the routes on the remote node */ - rename_temp_node(1); /* Rename Node 7 to Node 1 */ - enable_routing(1); /* Enable routing on Node 1 */ - + rename_temp_node(1); /* Rename Node 7 to Node 1 */ + enable_routing(1); /* Enable routing on Node 1 */ + clear_temp_row(0); /* delete temporary connection */ #if MAX_CPUS > 2 @@ -323,14 +365,14 @@ static u8 setup_smp(void) setup_temp_row(0,2,cpus); setup_temp_node(2,cpus); - rename_temp_node(2); - enable_routing(2); - + rename_temp_node(2); + enable_routing(2); + setup_temp_row(0,1,cpus); setup_temp_row(1,3,cpus); setup_temp_node(3,cpus); - rename_temp_node(3); - enable_routing(3); /* enable routing on node 3 (temp.) */ + rename_temp_node(3); + enable_routing(3); /* enable routing on node 3 (temp.) */ clear_temp_row(0); clear_temp_row(1); @@ -394,6 +436,42 @@ static unsigned int cpuid(unsigned int op) static void coherent_ht_finalize(unsigned cpus) { +//BY LYH +#if 1 + static const unsigned int register_values[] = { + PCI_ADDR(0, 0x18, 0, 0x84), 0x88ff9c05, 0x11000020, + PCI_ADDR(0, 0x18, 0, 0xa4), 0x88ff9c05, 0x11000020, + PCI_ADDR(0, 0x18, 0, 0xc4), 0x88ff9c05, 0x770000d0, + PCI_ADDR(0, 0x19, 0, 0x84), 0x88ff9c05, 0x770000d0, + PCI_ADDR(0, 0x19, 0, 0xa4), 0x88ff9c05, 0x11000020, + PCI_ADDR(0, 0x19, 0, 0xc4), 0x88ff9c05, 0x770000d0, + + + PCI_ADDR(0, 0x18, 0, 0x88), 0xfffff0ff, 0x00000400, + PCI_ADDR(0, 0x18, 0, 0xa8), 0xfffff0ff, 0x00000500, + PCI_ADDR(0, 0x18, 0, 0xc8), 0xfffff0ff, 0x00000000, + PCI_ADDR(0, 0x19, 0, 0x88), 0xfffff0ff, 0x00000000, + PCI_ADDR(0, 0x19, 0, 0xa8), 0xfffff0ff, 0x00000500, + PCI_ADDR(0, 0x19, 0, 0xc8), 0xfffff0ff, 0x00000000, + + PCI_ADDR(0, 0x18, 0, 0x94), 0xff0000ff, 0x00ff0000, + PCI_ADDR(0, 0x18, 0, 0xb4), 0xff0000ff, 0x00000000, + PCI_ADDR(0, 0x18, 0, 0xd4), 0xff0000ff, 0x00000000, + PCI_ADDR(0, 0x19, 0, 0x94), 0xff0000ff, 0x00000000, + PCI_ADDR(0, 0x19, 0, 0xb4), 0xff0000ff, 0x00000000, + PCI_ADDR(0, 0x19, 0, 0xd4), 0xff0000ff, 0x00000000, + + }; + int i; + int max; + + + device_t dev; + unsigned where; + unsigned long reg; +#endif +//BY LYH END + int node; bool rev_a0; @@ -416,7 +494,7 @@ static void coherent_ht_finalize(unsigned cpus) pci_write_config32(NODE_HT(node),0x60,val); val=pci_read_config32(NODE_HT(node), 0x68); - val |= 0x00008000; + val |= 0x0f00c800; // 0x00008000->0f00c800 BY LYH pci_write_config32(NODE_HT(node),0x68,val); if (rev_a0) { @@ -425,6 +503,28 @@ static void coherent_ht_finalize(unsigned cpus) pci_write_config32(NODE_HT(node),0xd4,0); } } +//BY LYH +#if 1 + print_debug("setting up coherent ht domain....\r\n"); + max = sizeof(register_values)/sizeof(register_values[0]); + for(i = 0; i < max; i += 3) { +#if 0 + print_debug_hex32(i); + print_debug(": "); + print_debug_hex32(register_values[i]); + print_debug(" <-"); + print_debug_hex32(register_values[i+2]); + print_debug("\r\n"); +#endif + dev = register_values[i] & ~0xff; + where = register_values[i] & 0xff; + reg = pci_read_config32(dev, where); + reg &= register_values[i+1]; + reg |= register_values[i+2]; + pci_write_config32(dev, where, reg); + } +#endif +//BY LYH END #if 1 print_debug("done\r\n"); diff --git a/src/northbridge/amd/amdk8/raminit.c b/src/northbridge/amd/amdk8/raminit.c index 1b258c62ce..6659641a1f 100644 --- a/src/northbridge/amd/amdk8/raminit.c +++ b/src/northbridge/amd/amdk8/raminit.c @@ -1249,7 +1249,14 @@ static void order_dimms(const struct mem_controller *ctrl) tom |= (1 << (canidate + 24)); /* Recompute the cs base register value */ - csbase = (tom << 21) | 1; +#if 1 // BY LYH Need to count from 0 for every memory controller + csbase = ((tom - (base_k>>15))<< 21) | 1; + print_debug("csbase="); + print_debug_hex32(csbase); + print_debug("\r\n"); +#else //BY LYH END + csbase = (tom << 21) | 1; +#endif /* Increment the top of memory */ tom += size; @@ -1276,6 +1283,14 @@ static void order_dimms(const struct mem_controller *ctrl) print_debug("\r\n"); #endif route_dram_accesses(ctrl, base_k, tom_k); + +#if 0 //BY LYH + if(ctrl->node_id==1) { + pci_write_config32(ctrl->f2, DRAM_CSBASE, 0x00000001); + + } +#endif + set_top_mem(tom_k); } @@ -2224,12 +2239,12 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl) print_debug_hex32(dcl); print_debug("\r\n"); #endif -#if 1 +#if 0 dcl &= ~DCL_DimmEccEn; #endif #warning "FIXME set the ECC type to perform" #warning "FIXME initialize the scrub registers" -#if 0 +#if 1 if (dcl & DCL_DimmEccEn) { print_debug("ECC enabled\r\n"); } @@ -2260,7 +2275,7 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl) } else { print_debug(" done\r\n"); } -#if 0 +#if 1 if (dcl & DCL_DimmEccEn) { print_debug("Clearing memory: "); loops = 0; -- cgit v1.2.3