Changeset 24813 in vbox

Timestamp:

Nov 20, 2009 8:44:56 AM (15 years ago)

Author:

vboxsync

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

55033

Message:

Write MSR_K8_HWCR value to release log (AMD-V diagnostics).

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWACCMR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1193 +1193 @@
             LogRel(("HWACCM: AMD-V max ASID                    = %d\n", pVM->hwaccm.s.uMaxASID));
             LogRel(("HWACCM: AMD-V features                    = %X\n", pVM->hwaccm.s.svm.u32Features));
+            LogRel(("HWACCM: AMD HWCR MSR                      = %RX64\n", pVM->hwaccm.s.svm.msrHWCR));
 
             if (pVM->hwaccm.s.svm.u32Features & AMD_CPUID_SVM_FEATURE_EDX_NESTED_PAGING)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -414 +414 @@
         /** Virtual address of the IO bitmap. */
         R0PTRTYPE(void *)           pIOBitmap;
+
+        /* HWCR msr (for diagnostics) */
+        uint64_t                    msrHWCR;
 
         /** SVM revision. */

trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

@@ -113 +113 @@
     struct
     {
+        /* HWCR msr (for diagnostics) */
+        uint64_t                    msrHWCR;
+
+        /** SVM revision. */
+        uint32_t                    u32Rev;
+
+        /** SVM feature bits from cpuid 0x8000000a */
+        uint32_t                    u32Features;
+
         /** Set by the ring-0 driver to indicate SVM is supported by the CPU. */
         bool                        fSupported;
-
-        /** SVM revision. */
-        uint32_t                    u32Rev;
-
-        /** SVM feature bits from cpuid 0x8000000a */
-        uint32_t                    u32Features;
     } svm;
     /** Saved error from detection */
@@ -367 +370 @@
                     /* Query AMD features. */
                     ASMCpuId(0x8000000A, &HWACCMR0Globals.svm.u32Rev, &HWACCMR0Globals.uMaxASID, &u32Dummy, &HWACCMR0Globals.svm.u32Features);
-
+                    /* Read the HWCR msr for diagnostics. */
+                    HWACCMR0Globals.svm.msrHWCR    = ASMRdMsr(MSR_K8_HWCR);
                     HWACCMR0Globals.svm.fSupported = true;
                 }
@@ -908 +912 @@
     pVM->hwaccm.s.vmx.msr.vmx_vmcs_enum     = HWACCMR0Globals.vmx.msr.vmx_vmcs_enum;
     pVM->hwaccm.s.vmx.msr.vmx_eptcaps       = HWACCMR0Globals.vmx.msr.vmx_eptcaps;
+    pVM->hwaccm.s.svm.msrHWCR               = HWACCMR0Globals.svm.msrHWCR;
     pVM->hwaccm.s.svm.u32Rev                = HWACCMR0Globals.svm.u32Rev;
     pVM->hwaccm.s.svm.u32Features           = HWACCMR0Globals.svm.u32Features;