Page MenuHomeFreeBSD
Files F153012343

D56330.id175220.diff
No OneTemporary
Actions

D56330.id175220.diff
View Options

diff --git a/sys/x86/include/cputypes.h b/sys/x86/include/cputypes.h
--- a/sys/x86/include/cputypes.h
+++ b/sys/x86/include/cputypes.h
@@ -45,4 +45,12 @@
#define CPU_VENDOR_CENTAUR CPU_VENDOR_IDT
#define CPU_VENDOR_HYGON 0x1d94 /* Hygon */
+#define CPUID_AMD_ZEN1 0x00
+#define CPUID_AMD_ZEN2 0x01
+#define CPUID_AMD_ZEN3 0x02
+#define CPUID_AMD_ZEN4 0x03
+#define CPUID_AMD_ZEN5 0x04
+#define CPUID_AMD_ZEN6 0x05
+#define CPUID_AMD_UNKNOWN 0xffffffff
+
#endif /* !_X86_CPUTYPES_H_ */
diff --git a/sys/x86/include/x86_var.h b/sys/x86/include/x86_var.h
--- a/sys/x86/include/x86_var.h
+++ b/sys/x86/include/x86_var.h
@@ -132,6 +132,7 @@
void identify_cpu2(void);
void identify_cpu_ext_features(void);
void identify_cpu_fixup_bsp(void);
+u_int ident_zen_cpu(void);
void identify_hypervisor(void);
void initializecpu(void);
void initializecpucache(void);
diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c
--- a/sys/x86/x86/identcpu.c
+++ b/sys/x86/x86/identcpu.c
@@ -2690,3 +2690,49 @@
#endif
return ((1ULL << cpu_maxphyaddr) - 1);
}
+
+const static struct {
+ u_int family;
+ u_int model_min;
+ u_int model_max;
+ u_int generation;
+} zen_idents[] = {
+ { .family = 0x17, .model_min = 0x00, .model_max = 0x2f, .generation = CPU_AMD_ZEN1 },
+ { .family = 0x17, .model_min = 0x50, .model_max = 0x5f, .generation = CPU_AMD_ZEN1 },
+ { .family = 0x17, .model_min = 0x30, .model_max = 0x4f, .generation = CPU_AMD_ZEN2 },
+ { .family = 0x17, .model_min = 0x60, .model_max = 0x7f, .generation = CPU_AMD_ZEN2 },
+ { .family = 0x17, .model_min = 0x90, .model_max = 0x91, .generation = CPU_AMD_ZEN2 },
+ { .family = 0x17, .model_min = 0xa0, .model_max = 0xaf, .generation = CPU_AMD_ZEN2 },
+ { .family = 0x19, .model_min = 0x00, .model_max = 0x0f, .generation = CPU_AMD_ZEN3 },
+ { .family = 0x19, .model_min = 0x20, .model_max = 0x5f, .generation = CPU_AMD_ZEN3 },
+ { .family = 0x19, .model_min = 0x10, .model_max = 0x1f, .generation = CPU_AMD_ZEN4 },
+ { .family = 0x19, .model_min = 0x60, .model_max = 0xaf, .generation = CPU_AMD_ZEN4 },
+ { .family = 0x1a, .model_min = 0x00, .model_max = 0x2f, .generation = CPU_AMD_ZEN5 },
+ { .family = 0x1a, .model_min = 0x40, .model_max = 0x4f, .generation = CPU_AMD_ZEN5 },
+ { .family = 0x1a, .model_min = 0x60, .model_max = 0x7f, .generation = CPU_AMD_ZEN5 },
+ { .family = 0x1a, .model_min = 0x50, .model_max = 0x5f, .generation = CPU_AMD_ZEN6 },
+ { .family = 0x1a, .model_min = 0x80, .model_max = 0xaf, .generation = CPU_AMD_ZEN6 },
+ { .family = 0x1a, .model_min = 0xc0, .model_max = 0xcf, .generation = CPU_AMD_ZEN6 },
+};
+
+u_int
+ident_zen_cpu(void)
+{
+ u_int family = CPUID_TO_FAMILY(cpu_id);
+ u_int model = CPUID_TO_MODEL(cpu_id);
+ int i;
+
+ if (cpu_vendor_id != CPU_VENDOR_AMD)
+ return (CPUID_AMD_UNKNOWN);
+
+ for (i = 0; i < nitems(zen_idents); i++) {
+ if (family != zen_idents[i].family)
+ continue;
+ if (model < zen_idents[i].model_min ||
+ model > zen_idents[i].model_max)
+ continue;
+ return (zen_idents[i].generation);
+ }
+
+ return (CPUID_AMD_UNKNOWN);
+}

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 19, 3:11 PM (13 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31726216
Default Alt Text
D56330.id175220.diff (2 KB)

Event Timeline