Changeset 96912 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Sep 28, 2022 9:03:23 AM (2 years ago)

Author:

vboxsync

Message:

ValKit/bs3-apic-1: Extended it with some TPR writes & read-back testing and checking the version. bugref:10092

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• Makefile.kmk (modified) (1 diff)
• bs3-apic-1-32.c32 (added)
• bs3-apic-1.c (modified) (4 diffs)

trunk/src/VBox/ValidationKit/bootsectors/Makefile.kmk

@@ -249 +249 @@
         bs3kit/bs3-first-rm.asm \
         bs3-apic-1.c \
+        bs3-apic-1-32.c32
 
 

trunk/src/VBox/ValidationKit/bootsectors/bs3-apic-1.c

@@ -44 +44 @@
 
 
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+BS3_DECL_CALLBACK(void)     ProtModeApicTests(void);
+
+
 BS3_DECL(void) Main_rm()
 {
@@ -49 +55 @@
     Bs3TestInit("bs3-apic-1");
     Bs3TestPrintf("g_uBs3CpuDetected=%#x\n", g_uBs3CpuDetected);
+    Bs3TestSub("real-mode");
 
     /*
@@ -66 +73 @@
                       uApicBase,
                       uApicBase & MSR_IA32_APICBASE_EN ? "enabled" : "disabled",
-                      uApicBase & MSR_IA32_APICBASE_EXTD ? "bootstrap" : "slave",
+                      uApicBase & MSR_IA32_APICBASE_BSP ? "bootstrap" : "slave",
                       uApicBase & MSR_IA32_APICBASE_EXTD ? ", x2apic" : "",
                       (uApicBase & X86_PAGE_4K_BASE_MASK) == MSR_IA32_APICBASE_ADDR ? ", !non-default address!" : "");
@@ -83 +90 @@
         uApicBase2 = ASMRdMsr(MSR_IA32_APICBASE);
         if (uApicBase2 == (uApicBase | MSR_IA32_APICBASE_EN))
+        {
             Bs3TestPrintf("Enabling worked.\n");
+
+            /*
+             * Do the rest of the testing in protected mode since we cannot
+             * (easily) access the APIC address from real mode.
+             */
+            Bs3SwitchTo32BitAndCallC_rm(ProtModeApicTests, 0);
+        }
         else
             Bs3TestFailedF("Enabling the APIC did not work (%#RX64)", uApicBase2);