Changeset 24484 in vbox for trunk/src

Timestamp:

Nov 9, 2009 10:21:11 AM (15 years ago)

Author:

vboxsync

Message:

Must reinit VT-x and AMD-V after a suspend as some BIOSes don't do their job properly.

File:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (5 diffs)

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

@@ -732 +732 @@
     int            *paRc = (int *)pvUser2;
 
+    if (!HWACCMR0Globals.fGlobalInit)
+    {
+        paRc[idCpu] = VINF_SUCCESS;
+        AssertFailed();
+        return;
+    }
+
     paRc[idCpu] = hwaccmR0EnableCpu(pVM, idCpu);
 }
@@ -785 +792 @@
 {
     int            *paRc = (int *)pvUser1;
+
+    if (!HWACCMR0Globals.fGlobalInit)
+    {
+        paRc[idCpu] = VINF_SUCCESS;
+        AssertFailed();
+        return;
+    }
 
     paRc[idCpu] = hwaccmR0DisableCpu(idCpu);
@@ -810 +824 @@
         ASMAtomicWriteBool(&HWACCMR0Globals.fSuspended, true);
 
-    if (    HWACCMR0Globals.enmHwAccmState == HWACCMSTATE_ENABLED
-        &&  HWACCMR0Globals.fGlobalInit)
+    if (HWACCMR0Globals.enmHwAccmState == HWACCMSTATE_ENABLED)
     {
         int     aRc[RTCPUSET_MAX_CPUS];
@@ -820 +833 @@
         if (enmEvent == RTPOWEREVENT_SUSPEND)
         {
-            /* Turn off VT-x or AMD-V on all CPUs. */
-            rc = RTMpOnAll(hwaccmR0DisableCpuCallback, aRc, NULL);
-            Assert(RT_SUCCESS(rc) || rc == VERR_NOT_SUPPORTED);
+            if (HWACCMR0Globals.fGlobalInit)
+            {
+                /* Turn off VT-x or AMD-V on all CPUs. */
+                rc = RTMpOnAll(hwaccmR0DisableCpuCallback, aRc, NULL);
+                Assert(RT_SUCCESS(rc) || rc == VERR_NOT_SUPPORTED);
+            }
+            /* else nothing to do here for the local init case */
         }
         else
         {
-            /* Reinit the CPUs from scratch as the suspend state has messed with the MSRs. */
+            /* Reinit the CPUs from scratch as the suspend state might have messed with the MSRs. (lousy BIOSes as usual) */
             rc = RTMpOnAll(HWACCMR0InitCPU, (void *)((HWACCMR0Globals.vmx.fSupported) ? X86_CPUID_VENDOR_INTEL_EBX : X86_CPUID_VENDOR_AMD_EBX), aRc);
             Assert(RT_SUCCESS(rc) || rc == VERR_NOT_SUPPORTED);
@@ -837 +854 @@
 #endif
 
-            /* Turn VT-x or AMD-V back on on all CPUs. */
-            rc = RTMpOnAll(hwaccmR0EnableCpuCallback, NULL, aRc);
-            Assert(RT_SUCCESS(rc) || rc == VERR_NOT_SUPPORTED);
+            if (HWACCMR0Globals.fGlobalInit)
+            {
+                /* Turn VT-x or AMD-V back on on all CPUs. */
+                rc = RTMpOnAll(hwaccmR0EnableCpuCallback, NULL, aRc);
+                Assert(RT_SUCCESS(rc) || rc == VERR_NOT_SUPPORTED);
+            }
+            /* else nothing to do here for the local init case */
         }
     }