Skip to content

Commit 10e7382

Browse files
committed
Revert "Fix Missing CPU Values for Ryzen 9 9950X3D (issue #13)"
This reverts commit 8a2e45b.
1 parent 47dd194 commit 10e7382

2 files changed

Lines changed: 3 additions & 11 deletions

File tree

OpenHardwareMonitorLib/Hardware/Cpu/Amd17Cpu.cs

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

207207
case 0x61: //Zen 4
208-
case 0x40:
209208
case 0x44: //Zen 5
210209
sviPlane0Offset = F17H_M01H_SVI + 0x10;
211210
sviPlane1Offset = F17H_M01H_SVI + 0xC;
@@ -304,7 +303,7 @@ public void UpdateSensors()
304303
{
305304
for (uint i = 0; i < _ccdTemperatures.Length; i++)
306305
{
307-
if (cpuId.Model is 0x61 or 0x40 or 0x44) // Raphael or GraniteRidge
306+
if (cpuId.Model is 0x61 or 0x44) // Raphael or GraniteRidge
308307
Ring0.WritePciConfig(0x00, FAMILY_17H_PCI_CONTROL_REGISTER, F17H_M61H_CCD1_TEMP + (i * 0x4));
309308
else
310309
Ring0.WritePciConfig(0x00, FAMILY_17H_PCI_CONTROL_REGISTER, F17H_M70H_CCD1_TEMP + (i * 0x4));
@@ -363,7 +362,7 @@ public void UpdateSensors()
363362
double vcc;
364363
uint svi0PlaneXVddCor;
365364

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

369368
// Core (0x01).

OpenHardwareMonitorLib/Hardware/RyzenSMU.cs

Lines changed: 1 addition & 8 deletions
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-
>= 0x40 and <= 0x4F => CpuCodeName.GraniteRidge,
198+
0x44 => CpuCodeName.GraniteRidge,
199199
_ => CpuCodeName.Undefined
200200
},
201201
_ => CpuCodeName.Undefined
@@ -436,20 +436,13 @@ private void SetupPmTableSize()
436436
switch (_pmTableVersion)
437437
{
438438
case 0x00540004:
439-
case 0x00540005:
440439
_pmTableSize = 0x948;
441440
break;
442441

443442
case 0x00540104:
444-
case 0x00540105:
445443
_pmTableSize = 0x950;
446444
break;
447445

448-
case 0x00540204:
449-
case 0x00540205:
450-
_pmTableSize = 0x958;
451-
break;
452-
453446
default:
454447
return;
455448
}

0 commit comments

Comments
 (0)