From a3fe5e66bd8d150ef4ac1b3fe35a54abe8adc897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=B6ller?= <mmoeller@openhardwaremonitor.org>
Date: Tue, 12 May 2020 23:48:53 +0200
Subject: [PATCH] Added AMD family 15h model 60h and 70h CPU support.

---
 Hardware/CPU/AMD10CPU.cs      | 60 +++++++++++++++++++----------------
 Properties/AssemblyVersion.cs |  4 +--
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/Hardware/CPU/AMD10CPU.cs b/Hardware/CPU/AMD10CPU.cs
index 8f305c9..d94d523 100644
--- a/Hardware/CPU/AMD10CPU.cs
+++ b/Hardware/CPU/AMD10CPU.cs
@@ -4,7 +4,7 @@
   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/.
  
-  Copyright (C) 2009-2013 Michael Möller <mmoeller@openhardwaremonitor.org>
+  Copyright (C) 2009-2020 Michael Möller <mmoeller@openhardwaremonitor.org>
 	
 */
 
@@ -39,12 +39,15 @@ namespace OpenHardwareMonitor.Hardware.CPU {
     private const ushort FAMILY_15H_MODEL_10_MISC_CONTROL_DEVICE_ID = 0x1403;
     private const ushort FAMILY_15H_MODEL_30_MISC_CONTROL_DEVICE_ID = 0x141D;
     private const ushort FAMILY_15H_MODEL_60_MISC_CONTROL_DEVICE_ID = 0x1573;
+    private const ushort FAMILY_15H_MODEL_70_MISC_CONTROL_DEVICE_ID = 0x15B3;
     private const ushort FAMILY_16H_MODEL_00_MISC_CONTROL_DEVICE_ID = 0x1533;
     private const ushort FAMILY_16H_MODEL_30_MISC_CONTROL_DEVICE_ID = 0x1583;
 
     private const uint REPORTED_TEMPERATURE_CONTROL_REGISTER = 0xA4;
     private const uint CLOCK_POWER_TIMING_CONTROL_0_REGISTER = 0xD4;
-    private const uint F15H_M60H_REPORTED_TEMP_CTRL_OFFSET = 0xD8200CA4;
+    private const uint SMU_REPORTED_TEMP_CONTROL_REGISTER = 0xD8200CA4;
+
+    private readonly bool hasSmuTemperatureRegister = false;
 
     private readonly uint miscellaneousControlAddress;
     private readonly ushort miscellaneousControlDeviceId;
@@ -82,7 +85,13 @@ namespace OpenHardwareMonitor.Hardware.CPU {
             case 0x30: miscellaneousControlDeviceId =
               FAMILY_15H_MODEL_30_MISC_CONTROL_DEVICE_ID; break;
             case 0x60: miscellaneousControlDeviceId =
-              FAMILY_15H_MODEL_60_MISC_CONTROL_DEVICE_ID; break;
+              FAMILY_15H_MODEL_60_MISC_CONTROL_DEVICE_ID;
+              hasSmuTemperatureRegister = true;
+              break;
+            case 0x70: miscellaneousControlDeviceId =
+              FAMILY_15H_MODEL_70_MISC_CONTROL_DEVICE_ID;
+              hasSmuTemperatureRegister = true;
+              break;
             default: miscellaneousControlDeviceId = 0; break;
           } break;
         case 0x16:
@@ -301,37 +310,34 @@ namespace OpenHardwareMonitor.Hardware.CPU {
       return sb.ToString();
     }
 
+    private bool ReadSmuRegister(uint address, out uint value) {
+      if (!Ring0.WritePciConfig(0, 0xB8, address)) {
+        value = 0;
+        return false;
+      }
+      return Ring0.ReadPciConfig(0, 0xBC, out value);
+    }
+
     public override void Update() {
       base.Update();
 
       if (temperatureStream == null) {
         if (miscellaneousControlAddress != Ring0.InvalidPciAddress) {
           uint value;
-        if (miscellaneousControlAddress == FAMILY_15H_MODEL_60_MISC_CONTROL_DEVICE_ID) {
-          value = F15H_M60H_REPORTED_TEMP_CTRL_OFFSET;
-          Ring0.WritePciConfig(Ring0.GetPciAddress(0, 0, 0), 0xB8, value);
-          Ring0.ReadPciConfig(Ring0.GetPciAddress(0, 0, 0), 0xBC, out value);
-          coreTemperature.Value = ((value >> 21) & 0x7FF) * 0.125f +
-              coreTemperature.Parameters[0].Value;
-          ActivateSensor(coreTemperature);
-          return;
-        }
-          if (Ring0.ReadPciConfig(miscellaneousControlAddress,
-            REPORTED_TEMPERATURE_CONTROL_REGISTER, out value)) {
-            if (family == 0x15 && (value & 0x30000) == 0x30000) {
-              if ((model & 0xF0) == 0x00) {
-                coreTemperature.Value = ((value >> 21) & 0x7FC) / 8.0f +
-                  coreTemperature.Parameters[0].Value - 49;
-              } else {
-                coreTemperature.Value = ((value >> 21) & 0x7FF) / 8.0f +
-                  coreTemperature.Parameters[0].Value - 49;
-              }
-            } else if (family == 0x16 && 
-              ((value & 0x30000) == 0x30000 || (value & 0x80000) == 0x80000)) {
-                coreTemperature.Value = ((value >> 21) & 0x7FF) / 8.0f +
-                  coreTemperature.Parameters[0].Value - 49;
+          bool valueValid;
+          if (hasSmuTemperatureRegister) {
+            valueValid =
+              ReadSmuRegister(SMU_REPORTED_TEMP_CONTROL_REGISTER, out value);
+          } else {
+            valueValid = Ring0.ReadPciConfig(miscellaneousControlAddress,
+              REPORTED_TEMPERATURE_CONTROL_REGISTER, out value);
+          }
+          if (valueValid) {
+            if ((family == 0x15 || family == 0x16) && (value & 0x30000) == 0x30000) {        
+              coreTemperature.Value = ((value >> 21) & 0x7FF) * 0.125f +
+                coreTemperature.Parameters[0].Value - 49;
             } else {
-              coreTemperature.Value = ((value >> 21) & 0x7FF) / 8.0f +
+              coreTemperature.Value = ((value >> 21) & 0x7FF) * 0.125f +
                 coreTemperature.Parameters[0].Value;
             }
             ActivateSensor(coreTemperature);
diff --git a/Properties/AssemblyVersion.cs b/Properties/AssemblyVersion.cs
index 221876a..8b0d8bf 100644
--- a/Properties/AssemblyVersion.cs
+++ b/Properties/AssemblyVersion.cs
@@ -10,5 +10,5 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.9.3.0")]
-[assembly: AssemblyInformationalVersion("0.9.3")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.9.3.1")]
+[assembly: AssemblyInformationalVersion("0.9.3.1 Alpha")]
\ No newline at end of file