Changeset 94093 in vbox for trunk/src/VBox/Runtime/r3/darwin

Timestamp:

Mar 4, 2022 10:50:45 PM (3 years ago)

Author:

vboxsync

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

150339

Message:

IPRT: Use same approach in RTMpGetMaxFrequency for getting at the a CPU in the I/O registry as we use in RTMpGetDescription. If intel is anything to go by, the cpu number in the name is hex not decimal. bugref:9898

Location:

trunk/src/VBox/Runtime/r3/darwin

Files:

• RTMpGetDescription-generic.cpp (modified) (1 diff)
• mp-darwin.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/darwin/RTMpGetDescription-generic.cpp

@@ -60 +60 @@
 #if defined(RT_ARCH_ARM64)
     char szArmCpuPath[64];
-    RTStrPrintf(szArmCpuPath, sizeof(szArmCpuPath), "IODeviceTree:/cpus/cpu%u", idCpu);
+    RTStrPrintf(szArmCpuPath, sizeof(szArmCpuPath), "IODeviceTree:/cpus/cpu%x", idCpu); /** @todo Hex? M1 Max only has 10 cores... */
     io_registry_entry_t hIoRegEntry = IORegistryEntryFromPath(kIOMasterPortDefault, szArmCpuPath);
     if (hIoRegEntry != MACH_PORT_NULL)

trunk/src/VBox/Runtime/r3/darwin/mp-darwin.cpp

@@ -351 +351 @@
      */
 
+#if 1 /* simpler way to get at it inspired by powermetrics, this is also used
+         in the arm version of RTMpGetDescription. */
+    /* Assume names on the form "cpu<N>" are only for CPUs. */
+    char szCpuPath[64];
+# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+    RTStrPrintf(szCpuPath, sizeof(szCpuPath), "IODeviceTree:/cpus/CPU%X", idCpu);
+# else
+    RTStrPrintf(szCpuPath, sizeof(szCpuPath), "IODeviceTree:/cpus/cpu%x", idCpu); /** @todo Hex? M1 Max only has 10 cores... */
+# endif
+    io_registry_entry_t hIoRegEntry = IORegistryEntryFromPath(kIOMasterPortDefault, szCpuPath);
+    if (hIoRegEntry != MACH_PORT_NULL)
+    {
+        uint32_t uCpuFrequency = rtMpDarwinGetMaxFrequencyFromIOService(hIoRegEntry);
+        IOObjectRelease(hIoRegEntry);
+        if (uCpuFrequency)
+            return uCpuFrequency;
+    }
+
+#else
     /* Assume names on the form "cpu<N>" are only for CPUs. */
     char szCpuName[32];
@@ -367 +386 @@
     }
 
-#if 1 /* Just in case... */
+# if 1 /* Just in case... */
     /* Create a matching dictionary for searching for CPU services in the IOKit. */
-# if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+#  if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
     hMatchingDict = IOServiceMatching("AppleARMCPU");
-# elif defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+#  elif defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     hMatchingDict = IOServiceMatching("AppleACPICPU");
-# else
-#  error "Port me!"
-# endif
+#  else
+#   error "Port me!"
+#  endif
     AssertReturn(hMatchingDict, 0);
 
@@ -399 +418 @@
     }
     IOObjectRelease(hCpuServices);
+# endif
 #endif
-
     AssertFailed();
     return 0;