git: e549b1bc5373 - stable/12 - amdtemp(4): Add missing Family 17h models

[Alexander Motin]

The branch stable/12 has been updated by mav:

URL: https://cgit.FreeBSD.org/src/commit/?id=e549b1bc537377528bf966fef92f72dd1c1be8d3

commit e549b1bc537377528bf966fef92f72dd1c1be8d3
Author:     Conrad Meyer <cem at FreeBSD.org>
AuthorDate: 2020-12-12 19:43:38 +0000
Commit:     Alexander Motin <mav at FreeBSD.org>
CommitDate: 2021-03-04 15:11:02 +0000

    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>
    
    (cherry picked from commit b499ab877f3d6bf5e2c894edfcfdcf89ce7c79d3)
---
 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 48c4341a67cb..ba7c98bdb278 100644
--- a/sys/dev/amdtemp/amdtemp.c
+++ b/sys/dev/amdtemp/amdtemp.c
@@ -805,11 +805,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;