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

Added experimental support for Intel Haswell CPUs.

Browse Source
This commit is contained in:
Michael Möller
2013-06-09 16:10:43 +00:00
parent ea68316dc7
commit e72ae00be8
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Hardware/CPU/IntelCPU.cs
View File

@@ -4,7 +4,7 @@
License, v. 2.0. If a copy of the MPL was not distributed with this License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/. file, You can obtain one at http://mozilla.org/MPL/2.0/.
Copyright (C) 2009-2012 Michael Möller <mmoeller@openhardwaremonitor.org> Copyright (C) 2009-2013 Michael Möller <mmoeller@openhardwaremonitor.org>
*/ */
@@ -22,7 +22,8 @@ namespace OpenHardwareMonitor.Hardware.CPU {
Atom, Atom,
Nehalem, Nehalem,
SandyBridge, SandyBridge,
IvyBridge IvyBridge,
Haswell
} }
private readonly Sensor[] coreTemperatures; private readonly Sensor[] coreTemperatures;
@@ -134,6 +135,12 @@ namespace OpenHardwareMonitor.Hardware.CPU {
microarchitecture = Microarchitecture.IvyBridge; microarchitecture = Microarchitecture.IvyBridge;
tjMax = GetTjMaxFromMSR(); tjMax = GetTjMaxFromMSR();
break; break;
case 0x3C: // Intel Core i5, i7 4xxx LGA1150 (22nm)
case 0x45:
case 0x46:
microarchitecture = Microarchitecture.Haswell;
tjMax = GetTjMaxFromMSR();
break;
default: default:
microarchitecture = Microarchitecture.Unknown; microarchitecture = Microarchitecture.Unknown;
tjMax = Floats(100); tjMax = Floats(100);
@@ -176,7 +183,8 @@ namespace OpenHardwareMonitor.Hardware.CPU {
} break; } break;
case Microarchitecture.Nehalem: case Microarchitecture.Nehalem:
case Microarchitecture.SandyBridge: case Microarchitecture.SandyBridge:
case Microarchitecture.IvyBridge: { case Microarchitecture.IvyBridge:
case Microarchitecture.Haswell: {
uint eax, edx; uint eax, edx;
if (Ring0.Rdmsr(MSR_PLATFORM_INFO, out eax, out edx)) { if (Ring0.Rdmsr(MSR_PLATFORM_INFO, out eax, out edx)) {
timeStampCounterMultiplier = (eax >> 8) & 0xff; timeStampCounterMultiplier = (eax >> 8) & 0xff;
@@ -234,7 +242,8 @@ namespace OpenHardwareMonitor.Hardware.CPU {
} }
if (microarchitecture == Microarchitecture.SandyBridge || if (microarchitecture == Microarchitecture.SandyBridge ||
microarchitecture == Microarchitecture.IvyBridge) microarchitecture == Microarchitecture.IvyBridge ||
microarchitecture == Microarchitecture.Haswell)
{ {
powerSensors = new Sensor[energyStatusMSRs.Length]; powerSensors = new Sensor[energyStatusMSRs.Length];
lastEnergyTime = new DateTime[energyStatusMSRs.Length]; lastEnergyTime = new DateTime[energyStatusMSRs.Length];
@@ -341,7 +350,8 @@ namespace OpenHardwareMonitor.Hardware.CPU {
coreClocks[i].Value = (float)(multiplier * newBusClock); coreClocks[i].Value = (float)(multiplier * newBusClock);
} break; } break;
case Microarchitecture.SandyBridge: case Microarchitecture.SandyBridge:
case Microarchitecture.IvyBridge: { case Microarchitecture.IvyBridge:
case Microarchitecture.Haswell: {
uint multiplier = (eax >> 8) & 0xff; uint multiplier = (eax >> 8) & 0xff;
coreClocks[i].Value = (float)(multiplier * newBusClock); coreClocks[i].Value = (float)(multiplier * newBusClock);
} break; } break;