Changeset 107800 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jan 16, 2025 12:21:46 AM (5 weeks ago)

Author:

vboxsync

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

166942

Message:

SUPLib: Implemented fallback for SUPR3QueryMicrocodeRev in driverless mode on darwin (todo: linux). jiraref:VBP-947

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPLib.cpp (modified) (2 diffs)
• SUPLibInternal.h (modified) (1 diff)
• darwin/SUPLib-darwin.cpp (modified) (2 diffs)

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

@@ -1785 +1785 @@
 
 
-SUPR3DECL(int) SUPR3QueryMicrocodeRev(uint32_t *uMicrocodeRev)
-{
-    AssertPtrReturn(uMicrocodeRev, VERR_INVALID_POINTER);
-
-    *uMicrocodeRev = 0;
+SUPR3DECL(int) SUPR3QueryMicrocodeRev(uint32_t *puMicrocodeRev)
+{
+    AssertPtrReturn(puMicrocodeRev, VERR_INVALID_POINTER);
+
+    *puMicrocodeRev = 0;
 
     int rc;
@@ -1810 +1810 @@
             rc = Req.Hdr.rc;
             if (RT_SUCCESS(rc))
-                *uMicrocodeRev = Req.u.Out.MicrocodeRev;
+                *puMicrocodeRev = Req.u.Out.MicrocodeRev;
         }
     }
     /*
-     * Just fail the call in driverless mode.
+     * Just fail the call in driverless mode if there is a host specific way of
+     * getting the information.
      */
     else
+#if defined(RT_OS_DARWIN) && defined(RT_ARCH_AMD64)
+        rc = suplibOsQueryMicrocodeRev(puMicrocodeRev);
+#else
         rc = VERR_SUP_DRIVERLESS;
+#endif
     return rc;
 }

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

@@ -381 +381 @@
 DECLHIDDEN(int)     suplibOsPageFree(PSUPLIBDATA pThis, void *pvPages, size_t cPages);
 DECLHIDDEN(int)     suplibOsQueryVTxSupported(const char **ppszWhy);
+DECLHIDDEN(int)     suplibOsQueryMicrocodeRev(uint32_t *puMicrocodeRev);
 DECLHIDDEN(bool)    suplibOsIsNemSupportedWhenNoVtxOrAmdV(void);
 

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

@@ -335 +335 @@
 
 
+# ifdef RT_ARCH_AMD64
+DECLHIDDEN(int)  suplibOsQueryMicrocodeRev(uint32_t *puMicrocodeRev)
+{
+    size_t cb = sizeof(*puMicrocodeRev);
+    int rc = sysctlbyname("machdep.cpu.microcode_version", puMicrocodeRev, &cb, NULL, 0);
+    if (!rc)
+    {
+        if (cb == sizeof(uint32_t))
+            return VINF_SUCCESS;
+        AssertMsgFailed(("cb=%d\n", cb));
+        rc = VERR_INTERNAL_ERROR_3;
+    }
+    else
+        rc = RTErrConvertFromErrno(errno);
+    *puMicrocodeRev = 0;
+    return rc;
+}
+# endif
+
+
 DECLHIDDEN(bool) suplibOsIsNemSupportedWhenNoVtxOrAmdV(void)
 {
@@ -348 +368 @@
 # else
     return false;
-#endif
+# endif
 }