summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarch import user (historical) <svn@openbios.org>2005-07-06 18:17:28 +0000
committerarch import user (historical) <svn@openbios.org>2005-07-06 18:17:28 +0000
commitb9a0e03a6827560e565079b36c63c371c68fb7f6 (patch)
treed72b599fde4ce9765a06cd930ad92d792eb7d755
parenta4b26d77e2088924a3eb81cf9e3f16f6ade4578b (diff)
downloadcoreboot-b9a0e03a6827560e565079b36c63c371c68fb7f6.tar.xz
Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-58
Creator: Li-Ta Lo <ollie@lanl.gov> auto.c and failover.c convert mainboard auto.c and failover.c to post DOM era git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1976 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/mainboard/Iwill/DK8S2/auto.c6
-rw-r--r--src/mainboard/Iwill/DK8S2/failover.c4
-rw-r--r--src/mainboard/Iwill/DK8X/auto.c6
-rw-r--r--src/mainboard/Iwill/DK8X/failover.c4
-rw-r--r--src/mainboard/newisys/khepri/auto.c9
-rw-r--r--src/mainboard/newisys/khepri/failover.c3
6 files changed, 23 insertions, 9 deletions
diff --git a/src/mainboard/Iwill/DK8S2/auto.c b/src/mainboard/Iwill/DK8S2/auto.c
index 9b40059e43..6c4e8373e5 100644
--- a/src/mainboard/Iwill/DK8S2/auto.c
+++ b/src/mainboard/Iwill/DK8S2/auto.c
@@ -158,17 +158,19 @@ 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();
+
/* Has this cpu already booted? */
- if (cpu_init_detected()) {
+ if (cpu_init_detected(nodeid)) {
asm volatile ("jmp __cpu_reset");
}
- distinguish_cpu_resets();
+ distinguish_cpu_resets(nodeid);
if (!boot_cpu()) {
stop_this_cpu();
}
diff --git a/src/mainboard/Iwill/DK8S2/failover.c b/src/mainboard/Iwill/DK8S2/failover.c
index e351cae83d..63fa9346e1 100644
--- a/src/mainboard/Iwill/DK8S2/failover.c
+++ b/src/mainboard/Iwill/DK8S2/failover.c
@@ -13,11 +13,13 @@
static unsigned long main(unsigned long bist)
{
+ unsigned nodeid;
+
/* Make cerain my local apic is useable */
enable_lapic();
/* Is this a cpu only reset? */
- if (cpu_init_detected()) {
+ if (cpu_init_detected(nodeid)) {
if (last_boot_normal()) {
goto normal_image;
} else {
diff --git a/src/mainboard/Iwill/DK8X/auto.c b/src/mainboard/Iwill/DK8X/auto.c
index b8ca3c82ba..8e83c3093d 100644
--- a/src/mainboard/Iwill/DK8X/auto.c
+++ b/src/mainboard/Iwill/DK8X/auto.c
@@ -160,16 +160,18 @@ 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();
/* Has this cpu already booted? */
- if (cpu_init_detected()) {
+ if (cpu_init_detected(nodeid)) {
asm volatile ("jmp __cpu_reset");
}
- distinguish_cpu_resets();
+ distinguish_cpu_resets(nodeid);
if (!boot_cpu()) {
stop_this_cpu();
}
diff --git a/src/mainboard/Iwill/DK8X/failover.c b/src/mainboard/Iwill/DK8X/failover.c
index e351cae83d..63fa9346e1 100644
--- a/src/mainboard/Iwill/DK8X/failover.c
+++ b/src/mainboard/Iwill/DK8X/failover.c
@@ -13,11 +13,13 @@
static unsigned long main(unsigned long bist)
{
+ unsigned nodeid;
+
/* Make cerain my local apic is useable */
enable_lapic();
/* Is this a cpu only reset? */
- if (cpu_init_detected()) {
+ if (cpu_init_detected(nodeid)) {
if (last_boot_normal()) {
goto normal_image;
} else {
diff --git a/src/mainboard/newisys/khepri/auto.c b/src/mainboard/newisys/khepri/auto.c
index 82d9bac85a..b17d22da5c 100644
--- a/src/mainboard/newisys/khepri/auto.c
+++ b/src/mainboard/newisys/khepri/auto.c
@@ -153,16 +153,21 @@ 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;
+
/* Has this cpu already booted? */
- if (cpu_init_detected()) {
+ if (cpu_init_detected(nodeid)) {
asm volatile ("jmp __cpu_reset");
}
- distinguish_cpu_resets();
+ distinguish_cpu_resets(nodeid);
if (!boot_cpu()) {
stop_this_cpu();
}
diff --git a/src/mainboard/newisys/khepri/failover.c b/src/mainboard/newisys/khepri/failover.c
index e351cae83d..6b959fc738 100644
--- a/src/mainboard/newisys/khepri/failover.c
+++ b/src/mainboard/newisys/khepri/failover.c
@@ -13,11 +13,12 @@
static unsigned long main(unsigned long bist)
{
+ unsigned nodeid;
/* Make cerain my local apic is useable */
enable_lapic();
/* Is this a cpu only reset? */
- if (cpu_init_detected()) {
+ if (cpu_init_detected(nodeid)) {
if (last_boot_normal()) {
goto normal_image;
} else {