summaryrefslogtreecommitdiff
path: root/src/mainboard/ibm
diff options
context:
space:
mode:
authorarch import user (historical) <svn@openbios.org>2005-07-06 17:16:00 +0000
committerarch import user (historical) <svn@openbios.org>2005-07-06 17:16:00 +0000
commit6c9dbc1a04c8064fcb82ebc1aeb610e9f0cdbd12 (patch)
tree825e1a97da73c00e2db4343d71d95fc49456dd57 /src/mainboard/ibm
parent34120d1b4ffecca74a7ab327987f911308ba1247 (diff)
downloadcoreboot-6c9dbc1a04c8064fcb82ebc1aeb610e9f0cdbd12.tar.xz
Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-40
Creator: Li-Ta Lo <ollie@lanl.gov> ibm e325 Bring imb e325 to post device object model era git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1956 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/ibm')
-rw-r--r--src/mainboard/ibm/e325/auto.c9
-rw-r--r--src/mainboard/ibm/e325/failover.c5
2 files changed, 11 insertions, 3 deletions
diff --git a/src/mainboard/ibm/e325/auto.c b/src/mainboard/ibm/e325/auto.c
index dbbcbf597b..b1c9e772d5 100644
--- a/src/mainboard/ibm/e325/auto.c
+++ b/src/mainboard/ibm/e325/auto.c
@@ -158,16 +158,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/ibm/e325/failover.c b/src/mainboard/ibm/e325/failover.c
index e351cae83d..ed5ce32d81 100644
--- a/src/mainboard/ibm/e325/failover.c
+++ b/src/mainboard/ibm/e325/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 {