adjust the check and fix OSX code

l3CacheMaskShift < 0 is never true

Change-Id: I4c3b30912a4c9896dad7e0f164c731037d4b5337

Author: rdementi

src/MacMSRDriver/PcmMsr/PcmMsr.cpp

@@ -64,10 +64,13 @@ void cpuGetTopoData(void* pTopos){
     uint32 smtMaskWidth = 0;
     uint32 coreMaskWidth = 0;
     uint32 l2CacheMaskShift = 0;
-    initCoreMasks(smtMaskWidth, coreMaskWidth, l2CacheMaskShift);
+    uint32 l3CacheMaskShift = 0;
+    initCoreMasks(smtMaskWidth, coreMaskWidth, l2CacheMaskShift, l3CacheMaskShift);
     PCM_CPUID_INFO cpuid_args;
     pcm_cpuid(0xb, 0x0, cpuid_args);
-    fillEntry(entry, smtMaskWidth, coreMaskWidth, l2CacheMaskShift, cpuid_args.array[3]);
+    const auto apic_id = cpuid_args.array[3];
+    fillEntry(entry, smtMaskWidth, coreMaskWidth, l2CacheMaskShift, apic_id);
+    entry.l3_cache_id = extract_bits_32(apic_id, l3CacheMaskShift, 31);
 }
 
 OSDefineMetaClassAndStructors(com_intel_driver_PcmMsr, IOService)

src/cpucounters.cpp

@@ -1217,15 +1217,6 @@ bool PCM::discoverSystemTopology()
         {
             fillEntry(entry, smtMaskWidth, coreMaskWidth, l2CacheMaskShift, getAPICID(0xb));
         }
-        // Validate l3CacheMaskShift and ensure the bit range is correct
-        if (l3CacheMaskShift < 0 || l3CacheMaskShift > 31)
-        {
-            throw std::runtime_error("Invalid l3CacheMaskShift: must be between 0 and 31");
-        }
-        if (l3CacheMaskShift > 31)
-        {
-            throw std::runtime_error("Invalid bit range for L3 cache ID extraction");
-        }
         entry.l3_cache_id = extract_bits_32(getAPICID(0xb), l3CacheMaskShift, 31);
     };
 #endif

src/topologyentry.h

@@ -183,6 +183,11 @@ inline bool initCoreMasks(uint32 & smtMaskWidth, uint32 & coreMaskWidth, uint32
             l3CacheMaskShift++;
         }
         DBG(1, "Number of threads sharing L3 cache = " , threadsSharingL3, " [the most significant bit = " , l3CacheMaskShift , "]");
+        // Validate l3CacheMaskShift and ensure the bit range is correct
+        if (l3CacheMaskShift > 31)
+        {
+            throw std::runtime_error("Invalid bit range for L3 cache ID extraction");
+        }
 
         uint32 it = 0;