Changeset 27305 in vbox

Timestamp:

Mar 11, 2010 8:34:27 PM (15 years ago)

Author:

vboxsync

Message:

APIC: few todos and cleanups, nothing functional

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -44 +44 @@
 #define MSR_IA32_APICBASE_BSP           (1<<8)
 #define MSR_IA32_APICBASE_ENABLE        (1<<11)
-#ifdef VBOX
 #define MSR_IA32_APICBASE_X2ENABLE      (1<<10)
-#endif
 #define MSR_IA32_APICBASE_BASE          (0xfffff<<12)
 
@@ -65 +63 @@
 #define APIC_SAVED_STATE_VERSION_ANCIENT    1
 
+/* version 0x14: Pentium 4, Xeon; LVT count depends on that */
+#define APIC_HW_VERSION                    0x14
 
 /** @def APIC_LOCK
@@ -882 +882 @@
             break;
         case 0x03: /* version */
-            val = 0x11 | ((APIC_LVT_NB - 1) << 16); /* version 0x11 */
+            val =   APIC_HW_VERSION                                     |
+                    ((APIC_LVT_NB - 1) << 16) /* Max LVT index */       |
+                    (0 << 24) /* Support for EOI broadcast supression */;
             break;
         case 0x08:
@@ -939 +941 @@
             Log(("apicReadMSR: read from write-only register %d ignored\n", index));
             break;
+        case 0x2f:
+            /**
+             * Correctable machine check exception vector, @todo: implement me!
+             */
         default:
             AssertMsgFailed(("apicReadMSR: unknown index %x\n", index));
+            /**
+             * @todo: according to spec when APIC writes to ESR it msut raise error interrupt,
+             *        i.e. LVT[5]
+             */
             apic->esr |= ESR_ILLEGAL_ADDRESS;
             val = 0;
@@ -1709 +1719 @@
         break;
     case 0x03: /* version */
-        val = 0x14 | ((APIC_LVT_NB - 1) << 16); /* version 0x14 */
+        val = APIC_HW_VERSION | ((APIC_LVT_NB - 1) << 16);
         break;
     case 0x08:
@@ -1783 +1793 @@
         val = s->divide_conf;
         break;
+    case 0x2f:
+        /**
+         * Correctable machine check exception vector, @todo: implement me!
+         */
     default:
         AssertMsgFailed(("apic_mem_readl: unknown index %x\n", index));