X86: Implement the INIT IPI.

diff --git a/src/arch/x86/faults.cc b/src/arch/x86/faults.cc
index b81400cc392446e56f5cc28d4269c3d518bcd1ea..e2a4d8ca2b7d326fef116ca03a0db4bd5c45ff37 100644 (file)
--- a/src/arch/x86/faults.cc
+++ b/src/arch/x86/faults.cc
@@ -185,6 +185,103 @@ namespace X86ISA
         return ss.str();
     }
 
+    void
+    InitInterrupt::invoke(ThreadContext *tc)
+    {
+        DPRINTF(Faults, "Init interrupt.\n");
+        // The otherwise unmodified integer registers should be set to 0.
+        for (int index = 0; index < NUM_INTREGS; index++) {
+            tc->setIntReg(index, 0);
+        }
+
+        CR0 cr0 = tc->readMiscReg(MISCREG_CR0);
+        CR0 newCR0 = 1 << 4;
+        newCR0.cd = cr0.cd;
+        newCR0.nw = cr0.nw;
+        tc->setMiscReg(MISCREG_CR0, newCR0);
+        tc->setMiscReg(MISCREG_CR2, 0);
+        tc->setMiscReg(MISCREG_CR3, 0);
+        tc->setMiscReg(MISCREG_CR4, 0);
+
+        tc->setMiscReg(MISCREG_RFLAGS, 0x0000000000000002ULL);
+
+        tc->setMiscReg(MISCREG_EFER, 0);
+
+        SegAttr dataAttr = 0;
+        dataAttr.writable = 1;
+        dataAttr.readable = 1;
+        dataAttr.expandDown = 0;
+        dataAttr.dpl = 0;
+        dataAttr.defaultSize = 0;
+
+        for (int seg = 0; seg != NUM_SEGMENTREGS; seg++) {
+            tc->setMiscReg(MISCREG_SEG_SEL(seg), 0);
+            tc->setMiscReg(MISCREG_SEG_BASE(seg), 0);
+            tc->setMiscReg(MISCREG_SEG_EFF_BASE(seg), 0);
+            tc->setMiscReg(MISCREG_SEG_LIMIT(seg), 0xffff);
+            tc->setMiscReg(MISCREG_SEG_ATTR(seg), dataAttr);
+        }
+
+        SegAttr codeAttr = 0;
+        codeAttr.writable = 0;
+        codeAttr.readable = 1;
+        codeAttr.expandDown = 0;
+        codeAttr.dpl = 0;
+        codeAttr.defaultSize = 0;
+
+        tc->setMiscReg(MISCREG_CS, 0xf000);
+        tc->setMiscReg(MISCREG_CS_BASE,
+                0x00000000ffff0000ULL);
+        tc->setMiscReg(MISCREG_CS_EFF_BASE,
+                0x00000000ffff0000ULL);
+        // This has the base value pre-added.
+        tc->setMiscReg(MISCREG_CS_LIMIT, 0xffffffff);
+        tc->setMiscReg(MISCREG_CS_ATTR, codeAttr);
+
+        tc->setPC(0x000000000000fff0ULL +
+                tc->readMiscReg(MISCREG_CS_BASE));
+        tc->setNextPC(tc->readPC() + sizeof(MachInst));
+
+        tc->setMiscReg(MISCREG_TSG_BASE, 0);
+        tc->setMiscReg(MISCREG_TSG_LIMIT, 0xffff);
+
+        tc->setMiscReg(MISCREG_IDTR_BASE, 0);
+        tc->setMiscReg(MISCREG_IDTR_LIMIT, 0xffff);
+
+        tc->setMiscReg(MISCREG_TSL, 0);
+        tc->setMiscReg(MISCREG_TSL_BASE, 0);
+        tc->setMiscReg(MISCREG_TSL_LIMIT, 0xffff);
+        tc->setMiscReg(MISCREG_TSL_ATTR, 0);
+
+        tc->setMiscReg(MISCREG_TR, 0);
+        tc->setMiscReg(MISCREG_TR_BASE, 0);
+        tc->setMiscReg(MISCREG_TR_LIMIT, 0xffff);
+        tc->setMiscReg(MISCREG_TR_ATTR, 0);
+
+        // This value should be the family/model/stepping of the processor.
+        // (page 418). It should be consistent with the value from CPUID, but
+        // the actual value probably doesn't matter much.
+        tc->setIntReg(INTREG_RDX, 0);
+
+        tc->setMiscReg(MISCREG_DR0, 0);
+        tc->setMiscReg(MISCREG_DR1, 0);
+        tc->setMiscReg(MISCREG_DR2, 0);
+        tc->setMiscReg(MISCREG_DR3, 0);
+
+        tc->setMiscReg(MISCREG_DR6, 0x00000000ffff0ff0ULL);
+        tc->setMiscReg(MISCREG_DR7, 0x0000000000000400ULL);
+
+        // We're now in real mode, effectively at CPL 0
+        HandyM5Reg m5Reg = 0;
+        m5Reg.mode = LegacyMode;
+        m5Reg.submode = RealMode;
+        m5Reg.cpl = 0;
+        tc->setMiscReg(MISCREG_M5_REG, m5Reg);
+        MicroPC entry = X86ISAInst::RomLabels::extern_label_initIntHalt;
+        tc->setMicroPC(romMicroPC(entry));
+        tc->setNextMicroPC(romMicroPC(entry) + 1);
+    }
+
 #endif
 } // namespace X86ISA
 

diff --git a/src/arch/x86/faults.hh b/src/arch/x86/faults.hh
index dbfb8d4d03b5c9e704b8ee877bd88070b3948382..54b92bd472386383b8bdbef67546483b4c37d9f4 100644 (file)
--- a/src/arch/x86/faults.hh
+++ b/src/arch/x86/faults.hh
@@ -410,11 +410,12 @@ namespace X86ISA
 
     class InitInterrupt : public X86Interrupt
     {
-        uint8_t vector;
       public:
         InitInterrupt(uint8_t _vector) :
             X86Interrupt("INIT Interrupt", "#INIT", _vector)
         {}
+
+        void invoke(ThreadContext * tc);
     };
 
     class SoftwareInterrupt : public X86Interrupt

diff --git a/src/arch/x86/isa/insts/romutil.py b/src/arch/x86/isa/insts/romutil.py
index e47259eb3bc4902d88a1c2f8c130994700f5ef4c..17034fd498289721a8d1f07728f8df867fce09ac 100644 (file)
--- a/src/arch/x86/isa/insts/romutil.py
+++ b/src/arch/x86/isa/insts/romutil.py
@@ -209,4 +209,15 @@ def rom
     panic "Legacy mode interrupts not implemented (in microcode)"
     eret
 };
+
+def rom
+{
+    extern initIntHalt:
+    rflags t1
+    limm t2, "~IFBit"
+    and t1, t1, t2
+    wrflags t1, t0
+    halt
+    eret
+};
 '''

diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc
index 18680165b3bb23f54ac8d2bc463acd576a68bc6f..9e96b654d80c2fe75650b85c2d900a24866cfd25 100644 (file)
--- a/src/arch/x86/utility.cc
+++ b/src/arch/x86/utility.cc
@@ -82,10 +82,14 @@ uint64_t getArgument(ThreadContext *tc, int number, bool fp) {
 # if FULL_SYSTEM
 void initCPU(ThreadContext *tc, int cpuId)
 {
-    // The otherwise unmodified integer registers should be set to 0.
-    for (int index = 0; index < NUM_INTREGS; index++) {
-        tc->setIntReg(index, 0);
-    }
+    // This function is essentially performing a reset. The actual INIT
+    // interrupt does a subset of this, so we'll piggyback on some of its
+    // functionality.
+    InitInterrupt init(0);
+    init.invoke(tc);
+
+    tc->setMicroPC(0);
+    tc->setNextMicroPC(1);
 
     // These next two loops zero internal microcode and implicit registers.
     // They aren't specified by the ISA but are used internally by M5's
@@ -103,73 +107,9 @@ void initCPU(ThreadContext *tc, int cpuId)
     // register for errors.
     tc->setIntReg(INTREG_RAX, 0);
 
-    //The following values are dictated by the architecture for after a RESET#
     tc->setMiscReg(MISCREG_CR0, 0x0000000060000010ULL);
-    tc->setMiscReg(MISCREG_CR2, 0);
-    tc->setMiscReg(MISCREG_CR3, 0);
-    tc->setMiscReg(MISCREG_CR4, 0);
     tc->setMiscReg(MISCREG_CR8, 0);
 
-    tc->setMiscReg(MISCREG_RFLAGS, 0x0000000000000002ULL);
-
-    tc->setMiscReg(MISCREG_EFER, 0);
-
-    SegAttr dataAttr = 0;
-    dataAttr.writable = 1;
-    dataAttr.readable = 1;
-    dataAttr.expandDown = 0;
-    dataAttr.dpl = 0;
-    dataAttr.defaultSize = 0;
-
-    for (int seg = 0; seg != NUM_SEGMENTREGS; seg++) {
-        tc->setMiscReg(MISCREG_SEG_SEL(seg), 0);
-        tc->setMiscReg(MISCREG_SEG_BASE(seg), 0);
-        tc->setMiscReg(MISCREG_SEG_EFF_BASE(seg), 0);
-        tc->setMiscReg(MISCREG_SEG_LIMIT(seg), 0xffff);
-        tc->setMiscReg(MISCREG_SEG_ATTR(seg), dataAttr);
-    }
-
-    SegAttr codeAttr = 0;
-    codeAttr.writable = 0;
-    codeAttr.readable = 1;
-    codeAttr.expandDown = 0;
-    codeAttr.dpl = 0;
-    codeAttr.defaultSize = 0;
-
-    tc->setMiscReg(MISCREG_CS, 0xf000);
-    tc->setMiscReg(MISCREG_CS_BASE,
-            0x00000000ffff0000ULL);
-    tc->setMiscReg(MISCREG_CS_EFF_BASE,
-            0x00000000ffff0000ULL);
-    // This has the base value pre-added.
-    tc->setMiscReg(MISCREG_CS_LIMIT, 0xffffffff);
-    tc->setMiscReg(MISCREG_CS_ATTR, codeAttr);
-
-    tc->setPC(0x000000000000fff0ULL +
-            tc->readMiscReg(MISCREG_CS_BASE));
-    tc->setNextPC(tc->readPC() + sizeof(MachInst));
-
-    tc->setMiscReg(MISCREG_TSG_BASE, 0);
-    tc->setMiscReg(MISCREG_TSG_LIMIT, 0xffff);
-
-    tc->setMiscReg(MISCREG_IDTR_BASE, 0);
-    tc->setMiscReg(MISCREG_IDTR_LIMIT, 0xffff);
-
-    tc->setMiscReg(MISCREG_TSL, 0);
-    tc->setMiscReg(MISCREG_TSL_BASE, 0);
-    tc->setMiscReg(MISCREG_TSL_LIMIT, 0xffff);
-    tc->setMiscReg(MISCREG_TSL_ATTR, 0);
-
-    tc->setMiscReg(MISCREG_TR, 0);
-    tc->setMiscReg(MISCREG_TR_BASE, 0);
-    tc->setMiscReg(MISCREG_TR_LIMIT, 0xffff);
-    tc->setMiscReg(MISCREG_TR_ATTR, 0);
-
-    // This value should be the family/model/stepping of the processor.
-    // (page 418). It should be consistent with the value from CPUID, but the
-    // actual value probably doesn't matter much.
-    tc->setIntReg(INTREG_RDX, 0);
-
     // TODO initialize x87, 64 bit, and 128 bit media state
 
     tc->setMiscReg(MISCREG_MTRRCAP, 0x0508);
@@ -202,14 +142,6 @@ void initCPU(ThreadContext *tc, int cpuId)
         tc->setMiscReg(MISCREG_MC_MISC(i), 0);
     }
 
-    tc->setMiscReg(MISCREG_DR0, 0);
-    tc->setMiscReg(MISCREG_DR1, 0);
-    tc->setMiscReg(MISCREG_DR2, 0);
-    tc->setMiscReg(MISCREG_DR3, 0);
-
-    tc->setMiscReg(MISCREG_DR6, 0x00000000ffff0ff0ULL);
-    tc->setMiscReg(MISCREG_DR7, 0x0000000000000400ULL);
-
     tc->setMiscReg(MISCREG_TSC, 0);
     tc->setMiscReg(MISCREG_TSC_AUX, 0);
 
@@ -251,9 +183,6 @@ void initCPU(ThreadContext *tc, int cpuId)
 
     // Invalidate the caches (this should already be done for us)
 
-    // TODO Turn on the APIC. This should be handled elsewhere but it isn't
-    // currently being handled at all.
-
     LocalApicBase lApicBase = 0;
     lApicBase.base = 0xFEE00000 >> 12;
     lApicBase.enable = 1;