From 3a23863a3a43c23b8405524406ddff11edb0a407 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghailu@gmail.com>
Date: Mon, 10 Jan 2005 22:20:51 +0000
Subject: nodeid

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1849 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/mainboard/tyan/s2875/auto.c     | 14 +++++---------
 src/mainboard/tyan/s2875/failover.c |  5 ++++-
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/mainboard/tyan/s2875')

diff --git a/src/mainboard/tyan/s2875/auto.c b/src/mainboard/tyan/s2875/auto.c
index ab19338a6e..6bbdaa9a43 100644
--- a/src/mainboard/tyan/s2875/auto.c
+++ b/src/mainboard/tyan/s2875/auto.c
@@ -165,24 +165,20 @@ static void main(unsigned long bist)
 	};
 
         int needs_reset;
+	unsigned nodeid;
 
         if (bist == 0) {
                 /* Skip this if there was a built in self test failure */
                 amd_early_mtrr_init();
                 enable_lapic();
                 init_timer();
+	
+		nodeid = lapicid() & 0xf;
 
-                if (cpu_init_detected()) {
-#if 1
+                if (cpu_init_detected(nodeid)) {
                         asm volatile ("jmp __cpu_reset");
-#else                   
-                /* cpu reset also reset the memtroller ????
-                        need soft_reset to reset all except keep HT link freq and width */
-                        distinguish_cpu_resets();
-                        soft2_reset();
-#endif          
                 }
-                distinguish_cpu_resets();
+                distinguish_cpu_resets(nodeid);
                 if (!boot_cpu()) {
                         stop_this_cpu();
                 }       
diff --git a/src/mainboard/tyan/s2875/failover.c b/src/mainboard/tyan/s2875/failover.c
index 2f63cc85b7..e6ecb65c4d 100644
--- a/src/mainboard/tyan/s2875/failover.c
+++ b/src/mainboard/tyan/s2875/failover.c
@@ -13,11 +13,14 @@
 
 static unsigned long main(unsigned long bist)
 {
+	unsigned nodeid;
 	/* Make cerain my local apic is useable */
 	enable_lapic();
+	
+	nodeid = lapicid() & 0xf;
 
 	/* Is this a cpu only reset? */
-	if (cpu_init_detected()) {
+	if (cpu_init_detected(nodeid)) {
 		if (last_boot_normal()) {
 			goto normal_image;
 		} else {
-- 
cgit v1.2.3