From b499ab877f3d6bf5e2c894edfcfdcf89ce7c79d3 Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cem@FreeBSD.org>
Date: Sat, 12 Dec 2020 19:43:38 +0000
Subject: [PATCH] amdtemp(4): Add missing Family 17h models

Add missing model numbers M20h (Dali, Zen1), M60H (Renoir, Zen2), and
M90H (Van Gogh, Zen2).

Submitted by:	Greg V <greg AT unrelenting.technology>
---
 sys/dev/amdtemp/amdtemp.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c
index 764db4e95b98..21227a47c513 100644
--- a/sys/dev/amdtemp/amdtemp.c
+++ b/sys/dev/amdtemp/amdtemp.c
@@ -811,11 +811,12 @@ amdtemp_probe_ccd_sensors17h(device_t dev, uint32_t model)
 	uint32_t maxreg;
 
 	switch (model) {
-	case 0x00 ... 0x1f: /* Zen1, Zen+ */
+	case 0x00 ... 0x2f: /* Zen1, Zen+ */
 		maxreg = 4;
 		break;
-	case 0x30 ... 0x3f: /* Zen2 TR/EPYC */
-	case 0x70 ... 0x7f: /* Zen2 Ryzen */
+	case 0x30 ... 0x3f: /* Zen2 TR (Castle Peak)/EPYC (Rome) */
+	case 0x60 ... 0x7f: /* Zen2 Ryzen (Renoir APU, Matisse) */
+	case 0x90 ... 0x9f: /* Zen2 Ryzen (Van Gogh APU) */
 		maxreg = 8;
 		_Static_assert((int)NUM_CCDS >= 8, "");
 		break;