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

Timestamp:

Nov 11, 2019 3:23:46 PM (5 years ago)

Author:

vboxsync

Message:

SUPDrv,tstRTInlineAsm: Fixed assertion/failure when trying to use the 0x0b leaf for APIC ID on AMD boxes. bugref:9501

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp (modified) (2 diffs)

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

@@ -200 +200 @@
     if (uOther >= UINT32_C(0xb) && ASMIsValidStdRange(uOther))
     {
-        uOther = ASMGetApicIdExt0B();
-        if ((uOther & 0xff) == idApic)
-            return uOther;
-        AssertMsgFailed(("ASMGetApicIdExt0B=>%#x idApic=%#x\n", uOther, idApic));
+        uint32_t uEax = 0;
+        uint32_t uEbx = 0;
+        uint32_t uEcx = 0;
+        uint32_t uEdx = 0;
+#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
+        ASMCpuId_Idx_ECX(0xb, 0, &uEax, &uEbx, &uEcx, &uEdx);
+#else
+        ASMCpuIdExSlow(0xb, 0, 0, 0, &uEax, &uEbx, &uEcx, &uEdx);
+#endif
+        if ((uEcx >> 8) != 0) /* level type != invalid */
+        {
+            if ((uEdx & 0xff) == idApic)
+                return uEdx;
+            AssertMsgFailed(("ASMGetApicIdExt0B=>%#x idApic=%#x\n", uEdx, idApic));
+        }
     }
 
@@ -401 +412 @@
         ASMCpuIdExSlow(0xb, 0, 0, 0, &uEax, &uEbx, &uEcx, &uEdx);
 #endif
-        if (uEax || uEbx || uEcx || uEdx)
+        if ((uEcx >> 8) != 0) /* level type != invalid */
         {
             if (RT_LIKELY(   uEdx < RT_ELEMENTS(pGip->aiCpuFromApicId)