Changeset 47988 in vbox

Timestamp:

Aug 22, 2013 1:01:54 PM (12 years ago)

Author:

vboxsync

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

88312

Message:

Solaris reads MSR_RAPL_POWER_UNIT, give it some fake values.

Location:

trunk

Files:

• include/VBox/com/defs.h (modified) (2 diffs)
• include/iprt/x86.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (modified) (1 diff)

trunk/include/VBox/com/defs.h

@@ -97 +97 @@
  *      0x800706be - RPC_S_CALL_FAILED.         Killed after call was made.
  *      0x800706bf - RPC_S_CALL_FAILED_DNE.     Not observed, but should be matter of timing.
+ *      0x80010108 - RPC_E_DISCONNECTED.        Observed deregistering
+ *                                              python event listener.
  */
 #define FAILED_DEAD_INTERFACE(rc) \
@@ -102 +104 @@
      || (rc) == HRESULT_FROM_WIN32(RPC_S_CALL_FAILED) \
      || (rc) == HRESULT_FROM_WIN32(RPC_S_CALL_FAILED_DNE) \
+     || (rc) == RPC_E_DISCONNECTED \
     )
 

trunk/include/iprt/x86.h

@@ -1093 +1093 @@
 /** DS Save Area (R/W). */
 #define MSR_IA32_DS_AREA                    0x600
+/** Running Average Power Limit (RAPL) power units. */
+#define MSR_RAPL_POWER_UNIT                 0x606
 /** X2APIC MSR ranges. */
 #define MSR_IA32_X2APIC_START               0x800

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -1103 +1103 @@
         case MSR_IA32_MC0_CTL:
         case MSR_IA32_MC0_STATUS:
+        case MSR_RAPL_POWER_UNIT:
             *puValue = 0;
             if (CPUMGetGuestCpuVendor(pVCpu->CTX_SUFF(pVM)) != CPUMCPUVENDOR_INTEL)
@@ -1108 +1109 @@
                 Log(("MSR %#x is Intel, the virtual CPU isn't an Intel one -> #GP\n", idMsr));
                 rc = VERR_CPUM_RAISE_GP_0;
+                break;
+            }
+
+            /* Provide more plausive values for some of them. */
+            switch (idMsr)
+            {
+                case MSR_RAPL_POWER_UNIT:
+                    *puValue = RT_MAKE_U32_FROM_U8(3 /* power units (1/8 W)*/,
+                                                   16 /* 15.3 micro-Joules */,
+                                                   10 /* 976 microseconds increments */,
+                                                   0);
+                    break;
             }
             break;

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -4668 +4668 @@
     if (rc != VINF_SUCCESS)
     {
+#ifdef IN_RING3
+        static uint32_t s_cTimes = 0;
+        if (s_cTimes++ < 10)
+            LogRel(("IEM: rdmsr(%#x) -> GP(0)\n", pCtx->ecx));
+#endif
         Log(("IEM: rdmsr(%#x) -> GP(0)\n", pCtx->ecx));
         AssertMsgReturn(rc == VERR_CPUM_RAISE_GP_0, ("%Rrc\n", rc), VERR_IPE_UNEXPECTED_STATUS);