Changeset 85450 in vbox

Timestamp:

Jul 24, 2020 7:51:14 AM (5 years ago)

Author:

vboxsync

Message:

HostDrivers/Support: Added reading the SMM address/mask MSRs while reading the rest of the AMD-V MSRs from the host.

Location:

trunk

Files:

• include/VBox/sup.h (modified) (1 diff)
• include/iprt/x86.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrv.cpp (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (1 diff)

trunk/include/VBox/sup.h

@@ -144 +144 @@
         {
             uint64_t        u64MsrHwcr;
-            uint64_t        u64Padding[27];
-        }svm;
+            uint64_t        u64MsrSmmAddr;
+            uint64_t        u64MsrSmmMask;
+            uint64_t        u64Padding[25];
+        } svm;
     } u;
 } SUPHWVIRTMSRS;

trunk/include/iprt/x86.h

@@ -1828 +1828 @@
 #define MSR_K8_TOP_MEM1                     UINT32_C(0xc001001a)
 #define MSR_K8_TOP_MEM2                     UINT32_C(0xc001001d)
+
+/** SMM MSRs. */
+#define MSR_K7_SMBASE                       UINT32_C(0xc0010111)
+#define MSR_K7_SMM_ADDR                     UINT32_C(0xc0010112)
+#define MSR_K7_SMM_MASK                     UINT32_C(0xc0010113)
+
 /** North bridge config? See BIOS & Kernel dev guides for
  * details. */

trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp

@@ -4642 +4642 @@
         }
         else if (fCaps & SUPVTCAPS_AMD_V)
-            Msrs.u.svm.u64MsrHwcr = ASMRdMsr(MSR_K8_HWCR);
+        {
+            Msrs.u.svm.u64MsrHwcr    = ASMRdMsr(MSR_K8_HWCR);
+            Msrs.u.svm.u64MsrSmmAddr = ASMRdMsr(MSR_K7_SMM_ADDR);
+            Msrs.u.svm.u64MsrSmmMask = ASMRdMsr(MSR_K7_SMM_MASK);
+        }
         else
         {

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -223 +223 @@
  *          - Move SUP_IOCTL_FAST_DO_NOP and SUP_VMMR0_DO_NEM_RUN after NEM.
  */
-#define SUPDRV_IOC_VERSION                              0x002d0001
+#define SUPDRV_IOC_VERSION                              0x002d0002
 
 /** SUP_IOCTL_COOKIE. */

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -277 +277 @@
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
         const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x002d0000
-                                   ? 0x002d0001
+                                   ? 0x002d0002
                                    : SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = uMinVersion;