mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-09-01 06:45:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed the max CCD count for AMD family 17h CPUs.

Browse Source
This commit is contained in:
Michael Möller
2020-02-25 22:24:34 +01:00
parent 59bd626aef
commit 56ee2f5c0d
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Hardware/CPU/AMD17CPU.cs
View File

@@ -32,7 +32,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
private const uint FAMILY_17H_M01H_THM_TCON_TEMP_RANGE_SEL = 0x80000; private const uint FAMILY_17H_M01H_THM_TCON_TEMP_RANGE_SEL = 0x80000;
private uint FAMILY_17H_M70H_CCD_TEMP(uint i) { return 0x00059954 + i * 4; } private uint FAMILY_17H_M70H_CCD_TEMP(uint i) { return 0x00059954 + i * 4; }
private const uint FAMILY_17H_M70H_CCD_TEMP_VALID = 0x800; private const uint FAMILY_17H_M70H_CCD_TEMP_VALID = 0x800;
private const uint MAX_CCD_COUNT = 8; private uint maxCcdCount;
private const uint MSR_RAPL_PWR_UNIT = 0xC0010299; private const uint MSR_RAPL_PWR_UNIT = 0xC0010299;
private const uint MSR_CORE_ENERGY_STAT = 0xC001029A; private const uint MSR_CORE_ENERGY_STAT = 0xC001029A;
@@ -90,8 +90,16 @@ namespace OpenHardwareMonitor.Hardware.CPU {
ccdAvgTemperature = new Sensor( ccdAvgTemperature = new Sensor(
"CPU CCD Average", 3, SensorType.Temperature, this, this.settings); "CPU CCD Average", 3, SensorType.Temperature, this, this.settings);
ccdTemperatures = new Sensor[MAX_CCD_COUNT]; switch (model & 0xf0) {
for (int i = 0; i < MAX_CCD_COUNT; i++) { case 0x30:
case 0x70:
maxCcdCount = 8; break;
default:
maxCcdCount = 4; break;
}
ccdTemperatures = new Sensor[maxCcdCount];
for (int i = 0; i < ccdTemperatures.Length; i++) {
ccdTemperatures[i] = new Sensor( ccdTemperatures[i] = new Sensor(
"CPU CCD #" + (i + 1), i + 4, SensorType.Temperature, this, "CPU CCD #" + (i + 1), i + 4, SensorType.Temperature, this,
new[] { new[] {
@@ -137,7 +145,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
private IList<uint> GetSmnRegisters() { private IList<uint> GetSmnRegisters() {
var registers = new List<uint>(); var registers = new List<uint>();
registers.Add(FAMILY_17H_M01H_THM_TCON_TEMP); registers.Add(FAMILY_17H_M01H_THM_TCON_TEMP);
for (uint i = 0; i < MAX_CCD_COUNT; i++) { for (uint i = 0; i < maxCcdCount; i++) {
registers.Add(FAMILY_17H_M70H_CCD_TEMP(i)); registers.Add(FAMILY_17H_M70H_CCD_TEMP(i));
} }
return registers; return registers;
@@ -209,7 +217,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
float maxTemperature = float.MinValue; float maxTemperature = float.MinValue;
int ccdCount = 0; int ccdCount = 0;
float ccdTemperatureSum = 0; float ccdTemperatureSum = 0;
for (uint i = 0; i < MAX_CCD_COUNT; i++) { for (uint i = 0; i < ccdTemperatures.Length; i++) {
if (ReadSmnRegister(FAMILY_17H_M70H_CCD_TEMP(i), out value)) { if (ReadSmnRegister(FAMILY_17H_M70H_CCD_TEMP(i), out value)) {
if ((value & FAMILY_17H_M70H_CCD_TEMP_VALID) == 0) if ((value & FAMILY_17H_M70H_CCD_TEMP_VALID) == 0)
continue; continue;