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

diff --git a/src/mainboard/Iwill/DK8S2/auto.c b/src/mainboard/Iwill/DK8S2/auto.c
index 9b40059e4386a75e0e88547ab919153ad8b894e3..6c4e8373e52e7b9b24cee729d39667d888584bc1 100644 (file)
--- 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 e351cae83d04f60ce4e447345c648e5e3d5b6cb5..63fa9346e1e1039a2e830185db6f1f24ff4095c8 100644 (file)
--- 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 b8ca3c82ba71bf8634f15601e321d41f277d9b06..8e83c3093dd462ae5dc55d67a79a619ce5fe39b8 100644 (file)
--- 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 e351cae83d04f60ce4e447345c648e5e3d5b6cb5..63fa9346e1e1039a2e830185db6f1f24ff4095c8 100644 (file)
--- 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 82d9bac85a8ef0f77c751c4564f014c9536e6605..b17d22da5c1ef7042af890b02b9366811f4c81eb 100644 (file)
--- 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 e351cae83d04f60ce4e447345c648e5e3d5b6cb5..6b959fc7384a0631bac11d5128a6f482392de409 100644 (file)
--- 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 {