Merge remote-tracking branch 'libre/master' into dev

# Conflicts:
#	OpenHardwareMonitor/OpenHardwareMonitor.csproj
#	OpenHardwareMonitorLib/Hardware/Cpu/IntelCpu.cs
#	OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs
#	OpenHardwareMonitorLib/OpenHardwareMonitorLib.csproj

Author: sergiye

OpenHardwareMonitorLib/Hardware/Cpu/Amd17Cpu.cs

@@ -8,15 +8,16 @@ namespace OpenHardwareMonitor.Hardware.Cpu;
 
 internal class CpuLoad
 {
-    private readonly float[] _threadLoads;
+    private static readonly bool _queryIdleTimeSeparated = QueryIdleTimeSeparated();
 
+    private readonly double[] _threadLoads;
+    private double _totalLoad;
     private long[] _idleTimes;
-    private float _totalLoad;
     private long[] _totalTimes;
 
     public CpuLoad(CpuId[][] cpuid)
     {
-        _threadLoads = new float[cpuid.Sum(x => x.Length)];
+        _threadLoads = new double[cpuid.Sum(x => x.Length)];
         _totalLoad = 0;
 
         try
@@ -45,30 +46,62 @@ private static bool GetWindowsTimes(out long[] idle, out long[] total)
         idle = null;
         total = null;
 
-        //Query processor idle information
+        //use the idle time routine only with a few specific windows 11 versions
+        if (_queryIdleTimeSeparated)
+            return GetWindowsTimesFromIdleTimes(out idle, out total);
+
+        //Query processor performance information
+        Interop.NtDll.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION[] perfInformation = new Interop.NtDll.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION[64];
+        int perfSize = Marshal.SizeOf(typeof(Interop.NtDll.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION));
+        if (Interop.NtDll.NtQuerySystemInformation(Interop.NtDll.SYSTEM_INFORMATION_CLASS.SystemProcessorPerformanceInformation, perfInformation, perfInformation.Length * perfSize, out int perfReturn) != 0)
+            return false;
+
+        idle = new long[perfReturn / perfSize];
+        total = new long[perfReturn / perfSize];
+        for (int i = 0; i < total.Length; i++)
+        {
+            idle[i] = perfInformation[i].IdleTime;
+            total[i] = perfInformation[i].KernelTime + perfInformation[i].UserTime;
+        }
+
+        return true;
+    }
+
+    private static bool GetWindowsTimesFromIdleTimes(out long[] idle, out long[] total)
+    {
+        idle = null;
+        total = null;
+
+        Interop.NtDll.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION[] perfInformation = new Interop.NtDll.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION[64];
+        int perfSize = Marshal.SizeOf(typeof(Interop.NtDll.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION));
         Interop.NtDll.SYSTEM_PROCESSOR_IDLE_INFORMATION[] idleInformation = new Interop.NtDll.SYSTEM_PROCESSOR_IDLE_INFORMATION[64];
         int idleSize = Marshal.SizeOf(typeof(Interop.NtDll.SYSTEM_PROCESSOR_IDLE_INFORMATION));
+
+        //Query processor performance and idle information
+        //these 2 methods must be called as directly as possible one after the other
+
+        //Query processor idle information
         if (Interop.NtDll.NtQuerySystemInformation(Interop.NtDll.SYSTEM_INFORMATION_CLASS.SystemProcessorIdleInformation, idleInformation, idleInformation.Length * idleSize, out int idleReturn) != 0)
             return false;
 
         //Query processor performance information
-        Interop.NtDll.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION[] perfInformation = new Interop.NtDll.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION[64];
-        int perfSize = Marshal.SizeOf(typeof(Interop.NtDll.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION));
-        if (Interop.NtDll.NtQuerySystemInformation(Interop.NtDll.SYSTEM_INFORMATION_CLASS.SystemProcessorPerformanceInformation,
-                                                   perfInformation,
-                                                   perfInformation.Length * perfSize,
-                                                   out int perfReturn) != 0)
-        {
+        if (Interop.NtDll.NtQuerySystemInformation(Interop.NtDll.SYSTEM_INFORMATION_CLASS.SystemProcessorPerformanceInformation, perfInformation, perfInformation.Length * perfSize, out int perfReturn) != 0)
             return false;
-        }
 
-        idle = new long[idleReturn / idleSize];
-        for (int i = 0; i < idle.Length; i++)
-            idle[i] = idleInformation[i].IdleTime;
+        int perfItemsCount = perfReturn / perfSize;
+        int idleItemsCount = idleReturn / idleSize;
 
-        total = new long[perfReturn / perfSize];
-        for (int i = 0; i < total.Length; i++)
+        if (perfItemsCount != idleItemsCount)
+            return false;
+
+        idle = new long[perfItemsCount];
+        total = new long[perfItemsCount];
+
+        for (int i = 0; i < perfItemsCount; i++)
+        {
+            idle[i] = idleInformation[i].IdleTime;
             total[i] = perfInformation[i].KernelTime + perfInformation[i].UserTime;
+        }
 
         return true;
     }
@@ -126,12 +159,12 @@ private static bool GetUnixTimes(out long[] idle, out long[] total)
         return true;
     }
 
-    public float GetTotalLoad()
+    public double GetTotalLoad()
     {
         return _totalLoad;
     }
 
-    public float GetThreadLoad(int thread)
+    public double GetThreadLoad(int thread)
     {
         return _threadLoads[thread];
     }
@@ -151,28 +184,45 @@ public void Update()
         if (newIdleTimes == null)
             return;
 
-        float total = 0;
+        double total = 0;
         int count = 0;
         for (int i = 0; i < _threadLoads.Length && i < _idleTimes.Length && i < newIdleTimes.Length; i++)
         {
-            float idle = (newIdleTimes[i] - _idleTimes[i]) / (float)(newTotalTimes[i] - _totalTimes[i]);
-            _threadLoads[i] = 100f * (1.0f - Math.Min(idle, 1.0f));
+            double idle = (newIdleTimes[i] - _idleTimes[i]) / (double)(newTotalTimes[i] - _totalTimes[i]);
+            idle = idle < 0.0 ? 0.0 : idle;
+            idle = idle > 1.0 ? 1.0 : idle;
+
+            double load = 100.0 * (1.0 - Math.Min(idle, 1.0));
+            _threadLoads[i] = Math.Round(load, 2);
             total += idle;
             count++;
         }
 
         if (count > 0)
         {
-            total = 1.0f - (total / count);
-            total = total < 0 ? 0 : total;
+            total = 1.0 - (total / count);
+            total = total < 0.0 ? 0.0 : total;
+            total = total > 1.0 ? 1.0 : total;
         }
         else
         {
             total = 0;
         }
-
-        _totalLoad = total * 100;
+        
+        _totalLoad = Math.Round(total * 100.0, 2);
         _totalTimes = newTotalTimes;
         _idleTimes = newIdleTimes;
     }
+
+    private static bool QueryIdleTimeSeparated()
+    {
+        if (Software.OperatingSystem.IsUnix)
+            return false;
+
+        // From Windows 11 22H2 the CPU idle time returned by SystemProcessorPerformanceInformation is invalid, this issue has been fixed with 24H2. 
+        OperatingSystem os = Environment.OSVersion;
+        Version win1122H2 = new Version(10, 0, 22621, 0);
+        Version win1124H2 = new Version(10, 0, 26100, 0);
+        return os.Version >= win1122H2 && os.Version < win1124H2;
+    }
 }

OpenHardwareMonitorLib/Hardware/Cpu/CpuLoad.cs

@@ -299,14 +299,14 @@ public override void Update()
                 {
                     if (_threadLoads[i] != null)
                     {
-                        _threadLoads[i].Value = _cpuLoad.GetThreadLoad(i);
+                        _threadLoads[i].Value = (float)_cpuLoad.GetThreadLoad(i);
                         maxLoad = Math.Max(maxLoad, _threadLoads[i].Value ?? 0);
                     }
                 }
             }
 
             if (_totalLoad != null)
-                _totalLoad.Value = _cpuLoad.GetTotalLoad();
+                _totalLoad.Value = (float)_cpuLoad.GetTotalLoad();
 
             if (_maxLoad != null)
                 _maxLoad.Value = maxLoad;

OpenHardwareMonitorLib/Hardware/Cpu/GenericCpu.cs

@@ -216,6 +216,7 @@ public IntelCpu(int processorIndex, CpuId[][] cpuId, ISettings settings) : base(
                             tjMax = GetTjMaxFromMsr();
                             break;
 
+                        case 0xC5: // Intel Core Ultra 9 200 Series ArrowLake
                         case 0xC6: // Intel Core Ultra 7 200 Series ArrowLake
                             _microArchitecture = MicroArchitecture.ArrowLake;
                             tjMax = GetTjMaxFromMsr();
@@ -225,6 +226,14 @@ public IntelCpu(int processorIndex, CpuId[][] cpuId, ISettings settings) : base(
                             _microArchitecture = MicroArchitecture.LunarLake;
                             tjMax = GetTjMaxFromMsr();
                             break;
+                        case 0x8F: // Intel Xeon W5-3435X // SapphireRapids 
+                            _microArchitecture = MicroArchitecture.SapphireRapids;
+                            tjMax = GetTjMaxFromMsr();
+                            break;
+                        case 0x96: // Intel Celeron ElkhartLake 
+                            _microArchitecture = MicroArchitecture.ElkhartLake;
+                            tjMax = GetTjMaxFromMsr();
+                            break;
 
                         default:
                             _microArchitecture = MicroArchitecture.Unknown;
@@ -292,6 +301,8 @@ public IntelCpu(int processorIndex, CpuId[][] cpuId, ISettings settings) : base(
             case MicroArchitecture.Silvermont:
             case MicroArchitecture.Skylake:
             case MicroArchitecture.TigerLake:
+            case MicroArchitecture.SapphireRapids:
+            case MicroArchitecture.ElkhartLake:
             case MicroArchitecture.Tremont:
                 if (Ring0.ReadMsr(MSR_PLATFORM_INFO, out eax, out uint _))
                     _timeStampCounterMultiplier = (eax >> 8) & 0xff;
@@ -408,6 +419,8 @@ MicroArchitecture.SandyBridge or
             MicroArchitecture.Silvermont or
             MicroArchitecture.Skylake or
             MicroArchitecture.TigerLake or
+            MicroArchitecture.SapphireRapids or
+            MicroArchitecture.ElkhartLake or
             MicroArchitecture.Tremont)
         {
             _powerSensors = new Sensor[_energyStatusMsrs.Length];
@@ -612,6 +625,8 @@ public override void Update()
                         case MicroArchitecture.Silvermont:
                         case MicroArchitecture.Skylake:
                         case MicroArchitecture.TigerLake:
+                        case MicroArchitecture.SapphireRapids:
+                        case MicroArchitecture.ElkhartLake:
                         case MicroArchitecture.Tremont:
                             _coreClocks[i].Value = (float)(((eax >> 8) & 0xff) * newBusClock);
                             break;
@@ -704,6 +719,8 @@ private enum MicroArchitecture
         TigerLake,
         Tremont,
         RaptorLake,
+        SapphireRapids,
+        ElkhartLake,
         Unknown
     }
 

OpenHardwareMonitorLib/Hardware/Cpu/IntelCpu.cs

@@ -548,6 +548,8 @@ public static Model GetModel(string name)
                 return Model.ROG_STRIX_X670E_E_GAMING_WIFI;
             case var _ when name.Equals("ROG STRIX X670E-F GAMING WIFI", StringComparison.OrdinalIgnoreCase):
                 return Model.ROG_STRIX_X670E_F_GAMING_WIFI;
+            case var _ when name.Equals("ROG STRIX X870E-E GAMING WIFI", StringComparison.OrdinalIgnoreCase):
+                return Model.ROG_STRIX_X870E_E_GAMING_WIFI;
             case var _ when name.Equals("B660GTN", StringComparison.OrdinalIgnoreCase):
                 return Model.B660GTN;
             case var _ when name.Equals("X670E VALKYRIE", StringComparison.OrdinalIgnoreCase):
@@ -601,6 +603,14 @@ public static Model GetModel(string name)
                 return Model.X870E_AORUS_PRO;
             case var _ when name.Equals("X870E AORUS PRO ICE", StringComparison.OrdinalIgnoreCase):
                 return Model.X870E_AORUS_PRO_ICE;
+            case var _ when name.Equals("PROART X870E-CREATOR WIFI", StringComparison.OrdinalIgnoreCase):
+                return Model.PROART_X870E_CREATOR_WIFI;
+            case var _ when name.Equals("PRIME X870-P", StringComparison.OrdinalIgnoreCase):
+                return Model.PRIME_X870_P;
+            case var _ when name.Equals("ROG CROSSHAIR X870E HERO", StringComparison.OrdinalIgnoreCase):
+                return Model.ROG_CROSSHAIR_X870E_HERO;
+            case var _ when name.Equals("X11SWN-E", StringComparison.OrdinalIgnoreCase):
+                return Model.X11SWN_E;
             case var _ when name.Equals("Base Board Product Name", StringComparison.OrdinalIgnoreCase):
             case var _ when name.Equals("To be filled by O.E.M.", StringComparison.OrdinalIgnoreCase):
                 return Model.Unknown;

OpenHardwareMonitorLib/Hardware/Motherboard/Identification.cs

@@ -63,6 +63,7 @@ internal enum Chip : ushort
     NCT6687D = 0xD592,
     NCT6683D = 0xC732,
     NCT6799D = 0xD802,
+    NCT6701D = 0xD806,
 
     W83627DHG = 0xA020,
     W83627DHGP = 0xB070,
@@ -136,6 +137,7 @@ public static string GetName(Chip chip)
             case Chip.NCT6686D: return "Nuvoton NCT6686D";
             case Chip.NCT6687D: return "Nuvoton NCT6687D";
             case Chip.NCT6683D: return "Nuvoton NCT6683D";
+            case Chip.NCT6701D: return "Nuvoton NCT6701D";
 
             case Chip.W83627DHG: return "Winbond W83627DHG";
             case Chip.W83627DHGP: return "Winbond W83627DHG-P";

OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/Chip.cs

@@ -2,7 +2,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using System.Threading;
 
 // ReSharper disable once InconsistentNaming
 
@@ -161,7 +160,7 @@ Chip.IT8631E or
                 break;
 
             case Chip.IT87952E:
-                Voltages = new float?[10];
+                Voltages = new float?[9];
                 Temperatures = new float?[3];
                 Fans = new float?[3];
                 Controls = new float?[3];
@@ -188,7 +187,7 @@ Chip.IT8631E or
                 Fans = new float?[3];
                 Controls = new float?[3];
                 break;
-            
+
             case Chip.IT8620E:
                 Voltages = new float?[9];
                 Temperatures = new float?[3];
@@ -422,7 +421,7 @@ public void Update()
 
         for (int i = 0; i < Voltages.Length; i++)
         {
-            float value = _voltageGain * ReadByte((byte)(VOLTAGE_BASE_REG + i), out bool valid);
+            float value = _voltageGain * ReadByte(IT87_REG_VIN[i], out bool valid);
 
             if (!valid)
                 continue;
@@ -596,7 +595,9 @@ private void RestoreDefaultFanPwmControl(int index)
 
     private const byte TEMPERATURE_BASE_REG = 0x29;
     private const byte VENDOR_ID_REGISTER = 0x58;
-    private const byte VOLTAGE_BASE_REG = 0x20;
+
+    // https://github.com/torvalds/linux/blob/master/drivers/hwmon/it87.c
+    private readonly byte[] IT87_REG_VIN = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x2f, 0x2c, 0x2d, 0x2e };
 
     private readonly byte[] FAN_PWM_CTRL_REG;
     private readonly byte[] FAN_PWM_CTRL_EXT_REG = { 0x63, 0x6b, 0x73, 0x7b, 0xa3, 0xab };

OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/IT87XX.cs

@@ -397,6 +397,10 @@ private bool DetectWinbondFintek(LpcPort port)
                         chip = Chip.NCT6799D;
                         logicalDeviceNumber = WINBOND_NUVOTON_HARDWARE_MONITOR_LDN;
                         break;
+                    case 0x06:
+                        chip = Chip.NCT6701D;
+                        logicalDeviceNumber = WINBOND_NUVOTON_HARDWARE_MONITOR_LDN;
+                        break;
                 }
 
                 break;
@@ -487,6 +491,7 @@ private bool DetectWinbondFintek(LpcPort port)
                 case Chip.NCT6686D:
                 case Chip.NCT6687D:
                 case Chip.NCT6683D:
+                case Chip.NCT6701D:
                     _superIOs.Add(new Nct677X(chip, revision, address, port));
                     break;
 
@@ -538,7 +543,7 @@ private bool DetectIT87(LpcPort port, Motherboard motherboard)
             port.IT87Enter();
             chipId = port.ReadWord(CHIP_ID_REGISTER);
         }
-        
+
         Chip chip = chipId switch
         {
             0x8613 => Chip.IT8613E,