Changeset 61054 in vbox for trunk/src/VBox/Devices

Timestamp:

May 19, 2016 4:42:47 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

107321

Message:

BIOS: Enable x2APIC mode when asked.

Location:

trunk/src/VBox/Devices/PC

Files:

• BIOS/inlines.h (modified) (1 diff)
• BIOS/orgs.asm (modified) (2 diffs)
• BIOS/post.c (modified) (1 diff)
• DevPcBios.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/PC/BIOS/inlines.h

@@ -143 +143 @@
 
 #endif
+
+#if VBOX_BIOS_CPU >= 80386
+
+/* Warning: msr_read/msr_write destroy high bits of 32-bit registers. */
+
+uint64_t msr_read(uint32_t msr);
+#pragma aux msr_read =  \
+    ".586"              \
+    "shl    ecx, 16"    \
+    "mov    cx, ax"     \
+    "rdmsr"             \
+    "xchg   eax, edx"   \
+    "mov    bx, ax"     \
+    "shr    eax, 16"    \
+    "mov    cx, dx"     \
+    "shr    edx, 16"    \
+    "xchg   dx, cx"     \
+    parm [cx ax] value [ax bx cx dx] modify [] nomemory;
+
+void msr_write(uint64_t val, uint32_t msr);
+#pragma aux msr_write =  \
+    ".586"              \
+    "shl    eax, 16"    \
+    "mov    ax, bx"     \
+    "xchg   dx, cx"     \
+    "shl    edx, 16"    \
+    "mov    dx, cx"     \
+    "xchg   eax, edx"   \
+    "mov    cx, di"     \
+    "shl    ecx, 16"    \
+    "mov    cx, si"     \
+    "wrmsr"             \
+    parm [ax bx cx dx] [di si] modify [] nomemory;
+
+#endif

trunk/src/VBox/Devices/PC/BIOS/orgs.asm

@@ -144 +144 @@
 extrn           _int15_blkmove:near
 endif
+if VBOX_BIOS_CPU ge 80386
+extrn           _apic_setup:near
+endif
 
 
@@ -599 +602 @@
 
                 C_SETUP
+
+if VBOX_BIOS_CPU ge 80386
+                ;; Set up local APIC
+                .386
+                pushad
+                call    _apic_setup
+                popad
+                SET_DEFAULT_CPU_286
+endif
+
                 ;; ATA/ATAPI driver setup
                 call    _ata_init

trunk/src/VBox/Devices/PC/BIOS/post.c

@@ -101 +101 @@
     }
 }
+
+#if VBOX_BIOS_CPU >= 80386
+
+#define APICMODE_DISABLED   0
+#define APICMODE_APIC       1
+#define APICMODE_X2APIC     2
+
+#define APIC_BASE_MSR       0x1B
+#define APICBASE_X2APIC     0x400   /* bit 10 */
+#define APICBASE_DISABLE    0x800   /* bit 11 */
+
+/*
+ * Set up APIC/x2APIC. See also DevPcBios.cpp.
+ *
+ * NB: Virtual wire compatibility is set up earlier in 32-bit protected
+ * mode assembler (because it needs to access MMIO just under 4GB).
+ * Switching to x2APIC mode or disabling the APIC is done through an MSR
+ * and needs no 32-bit addressing. Going to x2APIC mode does not lose the
+ * existing virtual wire setup.
+ *
+ * NB: This code assumes that there *is* a local APIC.
+ *
+ * NB: Destroys high bits of 32-bit registers.
+ */
+void BIOSCALL apic_setup(void)
+{
+    uint64_t    base_msr;
+    uint16_t    mask;
+    uint8_t     apic_mode;
+
+    /* APIC mode at offset 78h in CMOS NVRAM. */
+    apic_mode = inb_cmos(0x78);
+
+    if (apic_mode == APICMODE_X2APIC)
+        mask = APICBASE_X2APIC;
+    else if (apic_mode == APICMODE_DISABLED)
+        mask = APICBASE_DISABLE;
+    else
+        mask = 0;   /* Any other setting leaves things alone. */
+
+    if (mask) {
+        base_msr = msr_read(APIC_BASE_MSR);
+        base_msr |= mask;
+        msr_write(base_msr, APIC_BASE_MSR);
+    }
+}
+
+#endif

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

@@ -103 +103 @@
     Fourth IDE HDD:
          0x70 - 0x77
+    APIC/x2APIC settings:
+         0x78
 
   Second CMOS bank (offsets 0x80 to 0xff):
@@ -194 +196 @@
     uint8_t         u8IOAPIC;
     /** APIC mode to be set up by BIOS */
-    uint8_t         u8APIC;
+    uint8_t         u8APICMode;
     /** PXE debug logging enabled? */
     uint8_t         u8PXEDebug;
@@ -665 +667 @@
      */
     pcbiosCmosWrite(pDevIns, 0x60, pThis->cCpus & 0xff);
+
+    /*
+     * APIC mode.
+     */
+    pcbiosCmosWrite(pDevIns, 0x78, pThis->u8APICMode);
 
     /*
@@ -1181 +1188 @@
                                 N_("Configuration error: Failed to read \"IOAPIC\""));
 
-    rc = CFGMR3QueryU8Def(pCfg, "APIC", &pThis->u8APIC, 1);
+    rc = CFGMR3QueryU8Def(pCfg, "APIC", &pThis->u8APICMode, 1);
     if (RT_FAILURE (rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,