summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2021-11-22 17:05:32 +0000
committermartin <martin@NetBSD.org>2021-11-22 17:05:32 +0000
commit1180ae9d37bab6ec67164b2136d2596eaa62423a (patch)
treeccfc61148cff2768b1d245900f67b04f11ec0ff9 /usr.sbin
parentce5289094466aa48fdcfe7ce0b79420d1a225c9b (diff)
Pull up following revision(s) (requested by mrg in ticket #1375):
usr.sbin/cpuctl/arch/i386.c: revision 1.123 sys/arch/x86/x86/cpu_topology.c: revision 1.20 decode SMT parts for AMD family >= 0x17, not just 0x17. now zen3 systems are properly identified by cpu topology for the scheduler and cpuctl identify.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/cpuctl/arch/i386.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/cpuctl/arch/i386.c b/usr.sbin/cpuctl/arch/i386.c
index e07b427501c..b75bdb0ea92 100644
--- a/usr.sbin/cpuctl/arch/i386.c
+++ b/usr.sbin/cpuctl/arch/i386.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.104.2.6 2020/07/10 11:20:29 martin Exp $ */
+/* $NetBSD: i386.c,v 1.104.2.7 2021/11/22 17:05:32 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.104.2.6 2020/07/10 11:20:29 martin Exp $");
+__RCSID("$NetBSD: i386.c,v 1.104.2.7 2021/11/22 17:05:32 martin Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -1935,7 +1935,7 @@ identifycpu_cpuids_amd(struct cpu_info *ci)
}
#endif
- if (cpu_family == 0x17) {
+ if (cpu_family >= 0x17) {
x86_cpuid(0x8000001e, descs);
const u_int threads = ((descs[1] >> 8) & 0xff) + 1;
smt_bits = ilog2(threads);