From 9b4336cf418d22551bea09d93e1cee79281b110e Mon Sep 17 00:00:00 2001 From: Eric Biederman Date: Sat, 19 Jul 2003 04:28:22 +0000 Subject: - Major cleanup of the bootpath - Changes to allow more code to be compiled both ways - Working SMP support git-svn-id: svn://svn.coreboot.org/coreboot/trunk@987 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/northbridge/amd/amdk8/coherent_ht.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'src/northbridge/amd/amdk8/coherent_ht.c') diff --git a/src/northbridge/amd/amdk8/coherent_ht.c b/src/northbridge/amd/amdk8/coherent_ht.c index 460284bc82..23ebd60e81 100644 --- a/src/northbridge/amd/amdk8/coherent_ht.c +++ b/src/northbridge/amd/amdk8/coherent_ht.c @@ -440,13 +440,7 @@ 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); -#if 0 val &= ~((1<<1)|(1<<0)); -#else - /* Don't enable requests here as the indicated processor starts booting */ - val &= ~(1<<0); -#endif pci_write_config32(NODE_HT(node), 0x6c, val); print_debug(" done.\r\n"); @@ -456,7 +450,7 @@ static void enable_routing(u8 node) static void rename_temp_node(u8 node) { - u32 val; + uint32_t val; print_debug("Renaming current temp node to "); print_debug_hex32(node); @@ -678,8 +672,8 @@ 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 */ - enable_routing(7); /* 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 */ @@ -716,14 +710,14 @@ static u8 setup_smp(void) setup_temp_row(0,2,cpus); setup_temp_node(2,cpus); - enable_routing(7); rename_temp_node(2); + enable_routing(2); setup_temp_row(0,1,cpus); setup_temp_row(1,3,cpus); setup_temp_node(3,cpus); - enable_routing(7); /* 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); @@ -820,13 +814,14 @@ static void coherent_ht_finalize(unsigned cpus) } #if 1 - print_debug("done\n"); + print_debug("done\r\n"); #endif } -static void setup_coherent_ht_domain(void) +static int setup_coherent_ht_domain(void) { unsigned cpus; + int reset_needed = 0; enable_bsp_routing(); @@ -837,6 +832,8 @@ static void setup_coherent_ht_domain(void) cpus=detect_mp_capabilities(cpus); #endif coherent_ht_finalize(cpus); + + return reset_needed; } #endif -- cgit v1.2.3