Skip to content

Commit 8a2e45b

Browse files
committed
Fix Missing CPU Values for Ryzen 9 9950X3D (issue #13)
1 parent c87c737 commit 8a2e45b

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

OpenHardwareMonitorLib/Hardware/Cpu/Amd17Cpu.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ public void UpdateSensors()
205205
break;
206206

207207
case 0x61: //Zen 4
208+
case 0x40:
208209
case 0x44: //Zen 5
209210
sviPlane0Offset = F17H_M01H_SVI + 0x10;
210211
sviPlane1Offset = F17H_M01H_SVI + 0xC;
@@ -303,7 +304,7 @@ public void UpdateSensors()
303304
{
304305
for (uint i = 0; i < _ccdTemperatures.Length; i++)
305306
{
306-
if (cpuId.Model is 0x61 or 0x44) // Raphael or GraniteRidge
307+
if (cpuId.Model is 0x61 or 0x40 or 0x44) // Raphael or GraniteRidge
307308
Ring0.WritePciConfig(0x00, FAMILY_17H_PCI_CONTROL_REGISTER, F17H_M61H_CCD1_TEMP + (i * 0x4));
308309
else
309310
Ring0.WritePciConfig(0x00, FAMILY_17H_PCI_CONTROL_REGISTER, F17H_M70H_CCD1_TEMP + (i * 0x4));
@@ -362,7 +363,7 @@ public void UpdateSensors()
362363
double vcc;
363364
uint svi0PlaneXVddCor;
364365

365-
if (cpuId.Model is 0x61 or 0x44) // Readout not working for Ryzen 7000/9000.
366+
if (cpuId.Model is 0x61 or 0x40 or 0x44) // Readout not working for Ryzen 7000/9000.
366367
smuSvi0Tfn |= 0x01 | 0x02;
367368

368369
// Core (0x01).

OpenHardwareMonitorLib/Hardware/RyzenSMU.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ private static CpuCodeName GetCpuCodeName(uint family, uint model, uint packageT
195195
},
196196
0x1A => model switch
197197
{
198-
0x44 => CpuCodeName.GraniteRidge,
198+
>= 0x40 and <= 0x4F => CpuCodeName.GraniteRidge,
199199
_ => CpuCodeName.Undefined
200200
},
201201
_ => CpuCodeName.Undefined
@@ -436,13 +436,20 @@ private void SetupPmTableSize()
436436
switch (_pmTableVersion)
437437
{
438438
case 0x00540004:
439+
case 0x00540005:
439440
_pmTableSize = 0x948;
440441
break;
441442

442443
case 0x00540104:
444+
case 0x00540105:
443445
_pmTableSize = 0x950;
444446
break;
445447

448+
case 0x00540204:
449+
case 0x00540205:
450+
_pmTableSize = 0x958;
451+
break;
452+
446453
default:
447454
return;
448455
}

0 commit comments

Comments
 (0)