Fixed broken support for Polaris cards (AMD RX 460/470/480/560/570/580)

Author: dmatora

GPUSensors/RadeonSensors/RadeonSensors.cpp

@@ -103,13 +103,29 @@ bool RadeonSensors::managedStart(IOService *provider)
 //        }
 //    }
 
+    IOMemoryMap * mmio5 = NULL;
+    IOMemoryDescriptor * theDescriptor;
+    IOPhysicalAddress bar = (IOPhysicalAddress)((card.pdev->configRead32(kIOPCIConfigBaseAddress5)) & ~0x3f);
+    theDescriptor = IOMemoryDescriptor::withPhysicalAddress (bar, 0x80000, kIODirectionOutIn);
+    if(theDescriptor != NULL)
+    {
+        mmio5 = theDescriptor->map();
+    }
     card.mmio = card.pdev->mapDeviceMemoryWithIndex(1);
 
     if (!card.mmio || 0 == card.mmio->getPhysicalAddress()) {
         HWSensorsInfoLog("failed to map device memory");
         return false;
     }
 
+	if (card.mmio)	{
+		card.mmio_base = (volatile UInt8 *)card.mmio->getVirtualAddress();
+		HWSensorsInfoLog("mmio_base=0x%llx\n", card.mmio->getPhysicalAddress());
+	}
+	else {
+		HWSensorsInfoLog(" have no mmio\n ");
+		return false;
+	}
     card.family = CHIP_FAMILY_UNKNOW;
     card.int_thermal_type = THERMAL_TYPE_NONE;
 
@@ -350,6 +366,14 @@ bool RadeonSensors::managedStart(IOService *provider)
         }
     }
 
+  if (!card.mmio_base || card.family >= CHIP_FAMILY_HAWAII) {
+    if (mmio5 && mmio5->getPhysicalAddress() != 0) {
+      card.mmio = mmio5;
+      card.mmio_base = (volatile UInt8 *)card.mmio->getVirtualAddress();
+    }
+    HWSensorsInfoLog(" use mmio5 at 0x%llx\n", (unsigned long long)card.mmio_base);
+  }
+
     char key[5];
 
     if (card.get_core_temp) {

GPUSensors/RadeonSensors/radeon.h

@@ -62,6 +62,7 @@ typedef struct {
 struct radeon_device {
     IOPCIDevice         *pdev;
     IOMemoryMap         *mmio;
+    volatile UInt8      *mmio_base;
     UInt32              chip_id;
 	UInt16              family;
 	RADEONCardInfo      info;

GPUSensors/RadeonSensors/radeon_chipinfo_gen.h

@@ -702,4 +702,5 @@ static RADEONCardInfo RADEONCards[] = {
     { 0x67BE, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
     { 0x67EF, CHIP_FAMILY_POLARIS, 0, 0, 0, 0, 0 },
     { 0x67DF, CHIP_FAMILY_POLARIS, 0, 0, 0, 0, 0 },
+    { 0x67FF, CHIP_FAMILY_POLARIS, 0, 0, 0, 0, 0 },
 };

GPUSensors/RadeonSensors/vega.cpp

@@ -18,30 +18,8 @@
 
 int vega_get_temp(struct radeon_device *rdev)
 {
-    // I don't know what I am doing...
-    IOMemoryMap * mmio5 = NULL;
-    IOMemoryDescriptor * theDescriptor;
-    IOPhysicalAddress bar = (IOPhysicalAddress)((rdev->pdev->configRead32(kIOPCIConfigBaseAddress5)) & ~0x3f);
-    
-    theDescriptor = IOMemoryDescriptor::withPhysicalAddress (bar, 0x80000, kIODirectionOutIn);
-    
-    if(theDescriptor != NULL)
-    {
-        mmio5 = theDescriptor->map();
-    }
-    
-    IOMemoryMap * mmio = NULL;
-    volatile UInt8* mmio_base;
-    
-    if (mmio5 && mmio5->getPhysicalAddress() != 0)
-    {
-        mmio = mmio5;
-        mmio_base = (volatile UInt8 *)mmio->getVirtualAddress();
-    }
-    
-    // Finally: temp retrieval
     UInt32 temp, actual_temp = 0;
-    temp = OSReadLittleInt32(((volatile UInt8 *)mmio_base), THM_TCON_CUR_TMP) >> THM_TCON_CUR_TMP__CUR_TEMP__SHIFT;
+    temp = OSReadLittleInt32(rdev->mmio_base, THM_TCON_CUR_TMP) >> THM_TCON_CUR_TMP__CUR_TEMP__SHIFT;
     actual_temp = temp & 0x1ff;
 
     return actual_temp;