From: David Hows <david@hows.id.au>
Date: Wed, 2 Apr 2025 22:08:09 +0000 (+1100)
Subject: hwmon: (k10temp) Add support for Zen5 Ryzen Desktop
X-Git-Tag: v6.16-rc1~66^2~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c183963fb5fdd849cda66ddf2d93d88d2296a75;p=thirdparty%2Fkernel%2Flinux.git

hwmon: (k10temp) Add support for Zen5 Ryzen Desktop

Add support for retrieving CCD temperatures on Zen5 (Granite Ridge)
Desktop CPUs.

Signed-off-by: David Hows <david@hows.id.au>
Link: https://lore.kernel.org/r/Z-21SQkZpuWiWK06@archibald.hows.id.au
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---

diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index 3685906cc57cd..b73a959e01ccb 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -503,6 +503,13 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 			k10temp_get_ccd_support(data, 12);
 			break;
 		}
+	} else if (boot_cpu_data.x86 == 0x1a) {
+		switch (boot_cpu_data.x86_model) {
+		case 0x40 ... 0x4f:	/* Zen5 Ryzen Desktop */
+			data->ccd_offset = 0x308;
+			k10temp_get_ccd_support(data, 8);
+			break;
+		}
 	}
 
 	for (i = 0; i < ARRAY_SIZE(tctl_offset_table); i++) {