Fix in fan error handling

evga-card.h

@@ -92,6 +92,8 @@ struct card_info {
 	int product_id;						/* EVGA internal product ID, as reported by the iCX3 controller */
 	unsigned int bar0;					/* Address of the card's PCI base address register */
 	void *nvml_device;					/* Pointer to nvmlDevice_t for use in NVML calls */
+	void *vram_addr;					/* Memory mapping for GDDR6 temps */
+	void *hotspot_addr;					/* Memory mapping for hotspot temperature */
 };
 
 struct gpu_pci_info {

gddr6.c

@@ -36,70 +36,69 @@ void init_gddr6(struct card_info *card)
 	card->bar0 = (pci_dev->base_addr[0] & 0xFFFFFFFF);
 
 	pci_cleanup(pacc);
-}
 	
-float get_vram_temp(struct card_info *card)
-{
+	/* Open our memory mappings */
+	card->vram_addr = NULL;
+	card->hotspot_addr = NULL;
+	
 	int fd;
-	float temp = 0.0;
-	
 	if ((fd = open("/dev/mem", O_RDWR | O_SYNC)) == -1)
     {
-        printf("Can't read memory. If you are root, enable kernel parameter iomem=relaxed\n");
-		return 0;
+        printf("Can't read memory for VRAM and Hotspot temperatures. If you are root, enable kernel parameter iomem=relaxed\n");
+		return;
     }
 	
+	unsigned int phys_addr, base_offset;
+	void *map_base;
+	
 	for (int i = 0; i < sizeof(device_offset_info) / sizeof(struct device_offset); i++) {
 		if (card->pci_device_id == device_offset_info[i].device_id){
-			unsigned int phys_addr = (card->bar0 + device_offset_info[i].vram_offset);
-			unsigned int base_offset = phys_addr & ~(PG_SZ-1);
-			void *map_base = mmap(0, PG_SZ, PROT_READ, MAP_SHARED, fd, base_offset);
+			/* Map for VRAM */
+			phys_addr = (card->bar0 + device_offset_info[i].vram_offset);
+			base_offset = phys_addr & ~(PG_SZ-1);
+			map_base = mmap(0, PG_SZ, PROT_READ, MAP_SHARED, fd, base_offset);
 			if(map_base == (void *) -1)
-			{
-				if (fd != -1)
-					close(fd);
-				printf("Can't read memory for VRAM temperature. If you are root, enable kernel parameter iomem=relaxed\n");
-			}
-			void *virt_addr = (char *) map_base + (phys_addr - base_offset);
-			int read_result = *((unsigned int *) virt_addr);
-			temp = ((read_result & 0x00000fff) / 0x20);
-			munmap(map_base, PG_SZ);
+				printf("Can't map memory for VRAM temperature. If you are root, enable kernel parameter iomem=relaxed\n");
+			else
+				card->vram_addr = (void *) map_base + (phys_addr - base_offset);
+			
+			
+			/* Map for hotspot */
+			phys_addr = (card->bar0 + device_offset_info[i].hotspot_offset);
+			base_offset = phys_addr & ~(PG_SZ-1);
+			map_base = mmap(0, PG_SZ, PROT_READ, MAP_SHARED, fd, base_offset);
+			if(map_base == (void *) -1)
+				printf("Can't map memory for Hotspot temperature. If you are root, enable kernel parameter iomem=relaxed\n");
+			else
+				card->hotspot_addr = (void *) map_base + (phys_addr - base_offset);
 		}
 	}
 	
 	close(fd);
+}
+
+float get_vram_temp(struct card_info *card)
+{
+	float temp = 0.0;
+	
+	if(card->vram_addr == NULL)
+		return 0.0;
+
+	int read_result = *((unsigned int *) card->vram_addr);
+	temp = ((read_result & 0x00000fff) / 0x20);
+
 	return temp;
 }
 
 float get_hotspot_temp(struct card_info *card)
 {
-	int fd;
 	float temp = 0.0;
 	
-	if ((fd = open("/dev/mem", O_RDWR | O_SYNC)) == -1)
-    {
-        printf("Can't read memory. If you are root, enable kernel parameter iomem=relaxed\n");
-		return 0;
-    }
+	if(card->hotspot_addr == NULL)
+		return 0.0;
 
-	for (int i = 0; i < sizeof(device_offset_info) / sizeof(struct device_offset); i++) {
-		if (card->pci_device_id == device_offset_info[i].device_id){
-			unsigned int phys_addr = (card->bar0 + device_offset_info[i].hotspot_offset);
-			unsigned int base_offset = phys_addr & ~(PG_SZ-1);
-			void *map_base = mmap(0, PG_SZ, PROT_READ, MAP_SHARED, fd, base_offset);
-			if(map_base == (void *) -1)
-			{
-				if (fd != -1)
-					close(fd);
-				printf("Can't read memory for hotspot. If you are root, enable kernel parameter iomem=relaxed\n");
-			}
-			void *virt_addr = (char *) map_base + (phys_addr - base_offset);
-			int read_result = *((unsigned int *) virt_addr);
-			temp = (read_result >> 8) & 0xff;
-			munmap(map_base, PG_SZ);
-		}
-	}
+	int read_result = *((unsigned int *) card->hotspot_addr);
+	temp = (read_result >> 8) & 0xff;
 
-	close(fd);
 	return temp;
 }

icx3.c

@@ -237,6 +237,6 @@ void set_fan(int fan, char *setting, struct card_info *card)
 	if (fan_readback.fanmode    != fan_control.fanmode ||
 		fan_readback.rpm_offset != fan_control.rpm_offset ||
 		fan_readback.duty       != fan_control.duty)
-		printf("Error setting fan %d on %s\n", fan, card->i2c_fd);
+		printf("Error setting fan %d on %s\n", fan, card->i2c_dev_path);
 }