JMR-dev/ReLibreHardwareMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

"CPU Core" voltage sensor for intel CPU's (#682)

Browse Source 
* first attempt

* review updates
This commit is contained in:
Bjarni Ivarsson
2022-03-01 09:59:41 +01:00
committed by GitHub
parent 1bffd6fe90
commit e68fd4e8ef
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibreHardwareMonitorLib/Hardware/Cpu/IntelCpu.cs
+21 -6
View File
@@ -18,6 +18,7 @@ namespace LibreHardwareMonitor.Hardware.CPU
private readonly Sensor[] _coreClocks;
private readonly Sensor _coreMax;
private readonly Sensor[] _coreTemperatures;
private readonly Sensor _coreVoltage;
private readonly Sensor[] _distToTjMaxTemperatures;
private readonly uint[] _energyStatusMsrs = { MSR_PKG_ENERY_STATUS, MSR_PP0_ENERY_STATUS, MSR_PP1_ENERY_STATUS, MSR_DRAM_ENERGY_STATUS };
@@ -34,6 +35,8 @@ namespace LibreHardwareMonitor.Hardware.CPU
public IntelCpu(int processorIndex, CpuId[][] cpuId, ISettings settings) : base(processorIndex, cpuId, settings)
{
uint eax;
// set tjMax
float[] tjMax;
switch (_family)
@@ -264,7 +267,7 @@ namespace LibreHardwareMonitor.Hardware.CPU
case MicroArchitecture.TigerLake:
case MicroArchitecture.Tremont:
{
if (Ring0.ReadMsr(MSR_PLATFORM_INFO, out uint eax, out uint _))
if (Ring0.ReadMsr(MSR_PLATFORM_INFO, out eax, out uint _))
{
_timeStampCounterMultiplier = (eax >> 8) & 0xff;
}
@@ -382,7 +385,7 @@ namespace LibreHardwareMonitor.Hardware.CPU
_lastEnergyTime = new DateTime[_energyStatusMsrs.Length];
_lastEnergyConsumed = new uint[_energyStatusMsrs.Length];
if (Ring0.ReadMsr(MSR_RAPL_POWER_UNIT, out uint eax, out uint _))
if (Ring0.ReadMsr(MSR_RAPL_POWER_UNIT, out eax, out uint _))
switch (_microArchitecture)
{
case MicroArchitecture.Silvermont:
@@ -420,6 +423,12 @@ namespace LibreHardwareMonitor.Hardware.CPU
}
}
if (Ring0.ReadMsr(IA32_PERF_STATUS, out eax, out uint _) && ((eax >> 32) & 0xFFFF) > 0)
{
_coreVoltage = new Sensor("CPU Core", 0, SensorType.Voltage, this, settings);
ActivateSensor(_coreVoltage);
}
Update();
}
@@ -481,11 +490,12 @@ namespace LibreHardwareMonitor.Hardware.CPU
float coreMax = float.MinValue;
float coreAvg = 0;
uint eax = 0;
for (int i = 0; i < _coreTemperatures.Length; i++)
{
// if reading is valid
if (Ring0.ReadMsr(IA32_THERM_STATUS_MSR, out uint eax, out uint _, _cpuId[i][0].Affinity) && (eax & 0x80000000) != 0)
if (Ring0.ReadMsr(IA32_THERM_STATUS_MSR, out eax, out uint _, _cpuId[i][0].Affinity) && (eax & 0x80000000) != 0)
{
// get the dist from tjMax from bits 22:16
float deltaT = (eax & 0x007F0000) >> 16;
@@ -517,7 +527,7 @@ namespace LibreHardwareMonitor.Hardware.CPU
if (_packageTemperature != null)
{
// if reading is valid
if (Ring0.ReadMsr(IA32_PACKAGE_THERM_STATUS, out uint eax, out uint _, _cpuId[0][0].Affinity) && (eax & 0x80000000) != 0)
if (Ring0.ReadMsr(IA32_PACKAGE_THERM_STATUS, out eax, out uint _, _cpuId[0][0].Affinity) && (eax & 0x80000000) != 0)
{
// get the dist from tjMax from bits 22:16
float deltaT = (eax & 0x007F0000) >> 16;
@@ -537,7 +547,7 @@ namespace LibreHardwareMonitor.Hardware.CPU
for (int i = 0; i < _coreClocks.Length; i++)
{
System.Threading.Thread.Sleep(1);
if (Ring0.ReadMsr(IA32_PERF_STATUS, out uint eax, out uint _, _cpuId[i][0].Affinity))
if (Ring0.ReadMsr(IA32_PERF_STATUS, out eax, out uint _, _cpuId[i][0].Affinity))
{
newBusClock = TimeStampCounterFrequency / _timeStampCounterMultiplier;
switch (_microArchitecture)
@@ -600,7 +610,7 @@ namespace LibreHardwareMonitor.Hardware.CPU
if (sensor == null)
continue;
if (!Ring0.ReadMsr(_energyStatusMsrs[sensor.Index], out uint eax, out uint _))
if (!Ring0.ReadMsr(_energyStatusMsrs[sensor.Index], out eax, out uint _))
continue;
@@ -616,6 +626,11 @@ namespace LibreHardwareMonitor.Hardware.CPU
_lastEnergyConsumed[sensor.Index] = energyConsumed;
}
}
if (_coreVoltage != null && Ring0.ReadMsr(IA32_PERF_STATUS, out eax, out uint _))
{
_coreVoltage.Value = ((eax >> 32) & 0xFFFF) / (float)(1 << 13);
}
}
[SuppressMessage("ReSharper", "IdentifierTypo")]