pc, pc64: fix grub multiboot

[plan9front.git] / sys / src / 9 / pc64 / squidboy.c

diff --git a/sys/src/9/pc64/squidboy.c b/sys/src/9/pc64/squidboy.c
index 653802955a054d33ecc3eabcf135c31cfc154e08..dda4f257fb459e23002f79a17bb23ef29f66e850 100644 (file)
--- a/sys/src/9/pc64/squidboy.c
+++ b/sys/src/9/pc64/squidboy.c
@@ -8,6 +8,8 @@
 
 #include "mp.h"
 
+extern void _stts(void);
+
 static void
 squidboy(Apic* apic)
 {
@@ -15,21 +17,13 @@ squidboy(Apic* apic)
        mmuinit();
        cpuidentify();
        cpuidprint();
+       syncclock();
+       active.machs[m->machno] = 1;
        apic->online = 1;
-       coherence();
-
        lapicinit(apic);
        lapiconline();
-       syncclock();
        timersinit();
-
-       lock(&active);
-       active.machs |= 1<<m->machno;
-       unlock(&active);
-
-       while(!active.thunderbirdsarego)
-               microdelay(100);
-
+       _stts();
        schedinit();
 }
 
@@ -85,6 +79,7 @@ mpstartap(Apic* apic)
        apbootp[1] = (uintptr)PADDR(pml4);
        apbootp[2] = (uintptr)apic;
        apbootp[3] = (uintptr)mach;
+       apbootp[4] |= (uintptr)m->havenx<<11;   /* EFER */
 
        /*
         * Universal Startup Algorithm.
@@ -102,10 +97,12 @@ mpstartap(Apic* apic)
 
        nvramwrite(0x0F, 0x0A);         /* shutdown code: warm reset upon init ipi */
        lapicstartap(apic, PADDR(APBOOTSTRAP));
-       for(i = 0; i < 1000; i++){
+       for(i = 0; i < 100000; i++){
+               if(arch->fastclock == tscticks)
+                       cycles(&m->tscticks);   /* for ap's syncclock(); */
                if(apic->online)
                        break;
-               delay(10);
+               delay(1);
        }
        nvramwrite(0x0F, 0x00);
 }