Merge tag '2025-07-24' into push-2025-07-24

Change-Id: Ia46eaf08dd3fe37cc7c9a820dcd3d49d393129d0

Author: rdementi

src/cpucounters.cpp

@@ -7330,7 +7330,14 @@ ServerUncoreCounterState PCM::getServerUncoreCounterState(uint32 socket)
 
         result.UncClocks = getUncoreClocks(socket);
 
-        for (size_t p = 0; p < getNumCXLPorts(socket); ++p)
+        const auto numCXLPorts = getNumCXLPorts(socket);
+
+        assert(numCXLPorts <= result.CXLCMCounter.size() && "Number of CXL ports exceeds CXLCMCounter array size");
+        assert(numCXLPorts <= result.CXLDPCounter.size() && "Number of CXL ports exceeds CXLDPCounter array size");
+
+        const auto maxPorts = (std::min)(numCXLPorts, (std::min)(result.CXLCMCounter.size(), result.CXLDPCounter.size()));
+
+        for (size_t p = 0; p < maxPorts; ++p)
         {
             for (int i = 0; i < ServerUncoreCounterState::maxCounters && socket < cxlPMUs.size() && size_t(i) < cxlPMUs[socket][p].first.size(); ++i)
             {

src/cpucounters.h

@@ -3790,7 +3790,7 @@ class ServerUncoreCounterState : public UncoreCounterState
         maxChannels = 32,
         maxXPILinks = 6,
         maxIIOStacks = 16,
-        maxCXLPorts = 6,
+        maxCXLPorts = 16,
         maxCounters = UncorePMU::maxCounters
     };
     enum EventPosition