[src/netbsd-10]: src/usr.sbin/cpuctl/arch Pull up following revision(s) (requ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6b57311b08b1
branches:  netbsd-10
changeset: 373188:6b57311b08b1
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jan 23 12:54:14 2023 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #57):

        usr.sbin/cpuctl/arch/i386.c: revision 1.134
        usr.sbin/cpuctl/arch/i386.c: revision 1.135

Print cpuid 7 sub-leaf 1 %ebx, %edx and sub-leaf 2 %edx.

Add Raptor Lake and Sapphire Rapids.

diffstat:

 usr.sbin/cpuctl/arch/i386.c |  26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diffs (66 lines):

diff -r cfb8bf9dc767 -r 6b57311b08b1 usr.sbin/cpuctl/arch/i386.c
--- a/usr.sbin/cpuctl/arch/i386.c       Mon Jan 23 12:52:17 2023 +0000
+++ b/usr.sbin/cpuctl/arch/i386.c       Mon Jan 23 12:54:14 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i386.c,v 1.133 2022/11/17 15:21:31 msaitoh Exp $       */
+/*     $NetBSD: i386.c,v 1.133.2.1 2023/01/23 12:54:14 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.133 2022/11/17 15:21:31 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.133.2.1 2023/01/23 12:54:14 martin Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -351,7 +351,7 @@
                                [0x8c] = "11th gen Core (Tiger Lake)",
                                [0x8d] = "11th gen Core (Tiger Lake)",
                                [0x8e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake) or Xeon E (Coffee Lake)",
-                               [0x8f] = "future Xeon (Sapphire Rapids)",
+                               [0x8f] = "4th gen Xeon Scalable (Sapphire Rapids)",
                                [0x96] = "Atom x6000E (Elkhart Lake)",
                                [0x97] = "12th gen Core (Alder Lake)",
                                [0x9a] = "12th gen Core (Alder Lake)",
@@ -361,7 +361,9 @@
                                [0xa6] = "10th gen Core (Comet Lake)",
                                [0xa7] = "11th gen Core (Rocket Lake)",
                                [0xa8] = "11th gen Core (Rocket Lake)",
-                               [0xbf] = "12th gen Core (Alder Lake)",
+                               [0xba] = "13th gen Core (Raptor Lake)",
+                               [0xb7] = "13th gen Core (Raptor Lake)",
+                               [0xbf] = "13th gen Core (Raptor Lake)",
                        },
                        "Pentium Pro, II or III",       /* Default */
                        NULL,
@@ -2210,13 +2212,25 @@
        if ((ci->ci_max_cpuid >= 7)
            && ((cpu_vendor == CPUVENDOR_INTEL)
                || (cpu_vendor == CPUVENDOR_AMD))) {
+               unsigned int maxsubleaf;
+
                x86_cpuid(7, descs);
+               maxsubleaf = descs[0];
                aprint_verbose("%s: SEF highest subleaf %08x\n",
-                   cpuname, descs[0]);
-               if (descs[0] >= 1) {
+                   cpuname, maxsubleaf);
+               if (maxsubleaf >= 1) {
                        x86_cpuid2(7, 1, descs);
                        print_bits(cpuname, "SEF-subleaf1-eax",
                            CPUID_SEF1_FLAGS_A, descs[0]);
+                       print_bits(cpuname, "SEF-subleaf1-ebx",
+                           CPUID_SEF1_FLAGS_B, descs[1]);
+                       print_bits(cpuname, "SEF-subleaf1-edx",
+                           CPUID_SEF1_FLAGS_D, descs[3]);
+               }
+               if (maxsubleaf >= 2) {
+                       x86_cpuid2(7, 2, descs);
+                       print_bits(cpuname, "SEF-subleaf2-edx",
+                           CPUID_SEF2_FLAGS_D, descs[3]);
                }
        }