Added support for Intel CPUs with Comet Lake (06_A6H) microarchitecture.

This commit is contained in:
Michael Möller 2020-03-01 21:42:09 +01:00
parent 9b4a36942f
commit ced93443b7

View File

@ -33,6 +33,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
GoldmontPlus, GoldmontPlus,
CannonLake, CannonLake,
IceLake, IceLake,
CometLake,
Tremont, Tremont,
TigerLake TigerLake
} }
@ -209,6 +210,10 @@ namespace OpenHardwareMonitor.Hardware.CPU {
microarchitecture = Microarchitecture.IceLake; microarchitecture = Microarchitecture.IceLake;
tjMax = GetTjMaxFromMSR(); tjMax = GetTjMaxFromMSR();
break; break;
case 0xA6: // Intel Core i3, i5, i7 10xxxU (14nm)
microarchitecture = Microarchitecture.CometLake;
tjMax = GetTjMaxFromMSR();
break;
case 0x86: // Intel Atom processors case 0x86: // Intel Atom processors
microarchitecture = Microarchitecture.Tremont; microarchitecture = Microarchitecture.Tremont;
tjMax = GetTjMaxFromMSR(); tjMax = GetTjMaxFromMSR();
@ -271,6 +276,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
case Microarchitecture.GoldmontPlus: case Microarchitecture.GoldmontPlus:
case Microarchitecture.CannonLake: case Microarchitecture.CannonLake:
case Microarchitecture.IceLake: case Microarchitecture.IceLake:
case Microarchitecture.CometLake:
case Microarchitecture.Tremont: case Microarchitecture.Tremont:
case Microarchitecture.TigerLake: { case Microarchitecture.TigerLake: {
uint eax, edx; uint eax, edx;
@ -341,6 +347,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
microarchitecture == Microarchitecture.GoldmontPlus || microarchitecture == Microarchitecture.GoldmontPlus ||
microarchitecture == Microarchitecture.CannonLake || microarchitecture == Microarchitecture.CannonLake ||
microarchitecture == Microarchitecture.IceLake || microarchitecture == Microarchitecture.IceLake ||
microarchitecture == Microarchitecture.CometLake ||
microarchitecture == Microarchitecture.Tremont || microarchitecture == Microarchitecture.Tremont ||
microarchitecture == Microarchitecture.TigerLake) microarchitecture == Microarchitecture.TigerLake)
{ {
@ -465,6 +472,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
case Microarchitecture.GoldmontPlus: case Microarchitecture.GoldmontPlus:
case Microarchitecture.CannonLake: case Microarchitecture.CannonLake:
case Microarchitecture.IceLake: case Microarchitecture.IceLake:
case Microarchitecture.CometLake:
case Microarchitecture.Tremont: case Microarchitecture.Tremont:
case Microarchitecture.TigerLake: { case Microarchitecture.TigerLake: {
uint multiplier = (eax >> 8) & 0xff; uint multiplier = (eax >> 8) & 0xff;