changeset 20102:040be0b6e0f3

13212 Add Renoir to amdzen(7D) Reviewed by: C Fraire <cfraire@me.com> Reviewed by: Mike Zeller <mike.zeller@joyent.com> Approved by: Richard Lowe <richlowe@richlowe.net>
author Robert Mustacchi <rm@fingolfin.org>
date Sat, 26 Sep 2020 10:32:30 -0700
parents 1a5588aae48c
children 4bb6be08390f
files usr/src/pkg/manifests/driver-cpu-amd-zen.mf usr/src/uts/intel/io/amdzen/amdzen.c
diffstat 2 files changed, 26 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/pkg/manifests/driver-cpu-amd-zen.mf	Wed Apr 08 21:35:09 2020 -0700
+++ b/usr/src/pkg/manifests/driver-cpu-amd-zen.mf	Sat Sep 26 10:32:30 2020 -0700
@@ -26,6 +26,17 @@
 dir path=usr/share/man
 dir path=usr/share/man/man7d
 driver name=amdzen
+#
+# 1440-1447: f17h m70-7fh df
+# 1448-144f: f17h m60-6fh df
+# 1450: f17h m00-0f nb
+# 1460-1467: f17h m00-0f df
+# 1480: f17h m30-3f/70-7f nb
+# 1490-1497: f17h m30-3f nb
+# 15d0: f17h m10-m2f nb
+# 15e8-15ef: f17h m10-m2f df
+# 1630: f17h m60-6f nb
+#
 driver name=amdzen_stub \
     alias=pci1022,1440,p \
     alias=pci1022,1441,p \
@@ -35,6 +46,14 @@
     alias=pci1022,1445,p \
     alias=pci1022,1446,p \
     alias=pci1022,1447,p \
+    alias=pci1022,1448,p \
+    alias=pci1022,1449,p \
+    alias=pci1022,144a,p \
+    alias=pci1022,144b,p \
+    alias=pci1022,144c,p \
+    alias=pci1022,144d,p \
+    alias=pci1022,144e,p \
+    alias=pci1022,144f,p \
     alias=pci1022,1450,p \
     alias=pci1022,1460,p \
     alias=pci1022,1461,p \
@@ -61,7 +80,8 @@
     alias=pci1022,15ec,p \
     alias=pci1022,15ed,p \
     alias=pci1022,15ee,p \
-    alias=pci1022,15ef,p
+    alias=pci1022,15ef,p \
+    alias=pci1022,1630,p
 file path=kernel/drv/$(ARCH64)/amdzen group=sys
 file path=kernel/drv/$(ARCH64)/amdzen_stub group=sys
 file path=kernel/drv/amdzen.conf group=sys
--- a/usr/src/uts/intel/io/amdzen/amdzen.c	Wed Apr 08 21:35:09 2020 -0700
+++ b/usr/src/uts/intel/io/amdzen/amdzen.c	Sat Sep 26 10:32:30 2020 -0700
@@ -142,10 +142,12 @@
 static const uint16_t amdzen_nb_ids[] = {
 	/* Family 17h Ryzen, Epyc Models 00h-0fh (Zen uarch) */
 	0x1450,
-	/* Family 17h Raven Ridge Models 10h-1fh (Zen uarch) */
+	/* Family 17h Raven Ridge, Kestrel, Dali Models 10h-2fh (Zen uarch) */
 	0x15d0,
-	/* Family 17h Epyc Models 30h-3fh, Matisse 700-7fh (Zen 2 uarch) */
-	0x1480
+	/* Family 17h Epyc Models 30h-3fh, Matisse 70-7fh (Zen 2 uarch) */
+	0x1480,
+	/* Family 17h Renoir Models 60-6fh (Zen 2 uarch) */
+	0x1630
 };
 
 typedef struct {