Sat Jul 10 17:18:05 2021 UTC ()
0x6a and 0x6c are 3rd gen Xeon Scalable (Ice Lake).


(msaitoh)
diff -r1.115 -r1.116 src/usr.sbin/cpuctl/arch/i386.c
cvs diff -r1.115 -r1.116 src/usr.sbin/cpuctl/arch/i386.c (expand / switch to unified diff)

--- src/usr.sbin/cpuctl/arch/i386.c 2020/11/24 00:48:39 1.115
+++ src/usr.sbin/cpuctl/arch/i386.c 2021/07/10 17:18:05 1.116
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: i386.c,v 1.115 2020/11/24 00:48:39 msaitoh Exp $ */ 1/* $NetBSD: i386.c,v 1.116 2021/07/10 17:18:05 msaitoh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. 4 * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Frank van der Linden, and by Jason R. Thorpe. 8 * by Frank van der Linden, and by Jason R. Thorpe.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -47,27 +47,27 @@ @@ -47,27 +47,27 @@
47 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 47 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
48 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 48 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
49 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 49 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
50 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 50 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
51 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 51 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
52 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 52 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
53 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 53 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
54 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 54 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
55 * SUCH DAMAGE. 55 * SUCH DAMAGE.
56 */ 56 */
57 57
58#include <sys/cdefs.h> 58#include <sys/cdefs.h>
59#ifndef lint 59#ifndef lint
60__RCSID("$NetBSD: i386.c,v 1.115 2020/11/24 00:48:39 msaitoh Exp $"); 60__RCSID("$NetBSD: i386.c,v 1.116 2021/07/10 17:18:05 msaitoh Exp $");
61#endif /* not lint */ 61#endif /* not lint */
62 62
63#include <sys/types.h> 63#include <sys/types.h>
64#include <sys/param.h> 64#include <sys/param.h>
65#include <sys/bitops.h> 65#include <sys/bitops.h>
66#include <sys/sysctl.h> 66#include <sys/sysctl.h>
67#include <sys/ioctl.h> 67#include <sys/ioctl.h>
68#include <sys/cpuio.h> 68#include <sys/cpuio.h>
69 69
70#include <errno.h> 70#include <errno.h>
71#include <string.h> 71#include <string.h>
72#include <stdio.h> 72#include <stdio.h>
73#include <stdlib.h> 73#include <stdlib.h>
@@ -334,28 +334,28 @@ const struct cpu_cpuid_nameclass i386_cp @@ -334,28 +334,28 @@ const struct cpu_cpuid_nameclass i386_cp
334 [0x4c] = "Atom X[57]-Z8000 (Airmont)", 334 [0x4c] = "Atom X[57]-Z8000 (Airmont)",
335 [0x4d] = "Atom C2000", 335 [0x4d] = "Atom C2000",
336 [0x4e] = "6th gen Core, Xeon E3-1[25]00 v5 (Skylake)", 336 [0x4e] = "6th gen Core, Xeon E3-1[25]00 v5 (Skylake)",
337 [0x4f] = "Xeon E[57] v4 (Broadwell), Core i7-69xx Extreme", 337 [0x4f] = "Xeon E[57] v4 (Broadwell), Core i7-69xx Extreme",
338 [0x55] = "Xeon Scalable (Skylake, Cascade Lake, Copper Lake)", 338 [0x55] = "Xeon Scalable (Skylake, Cascade Lake, Copper Lake)",
339 [0x56] = "Xeon D-1500 (Broadwell)", 339 [0x56] = "Xeon D-1500 (Broadwell)",
340 [0x57] = "Xeon Phi [357]200 (Knights Landing)", 340 [0x57] = "Xeon Phi [357]200 (Knights Landing)",
341 [0x5a] = "Atom E3500", 341 [0x5a] = "Atom E3500",
342 [0x5c] = "Atom (Goldmont)", 342 [0x5c] = "Atom (Goldmont)",
343 [0x5d] = "Atom X3-C3000 (Silvermont)", 343 [0x5d] = "Atom X3-C3000 (Silvermont)",
344 [0x5e] = "6th gen Core, Xeon E3-1[25]00 v5 (Skylake)", 344 [0x5e] = "6th gen Core, Xeon E3-1[25]00 v5 (Skylake)",
345 [0x5f] = "Atom (Goldmont, Denverton)", 345 [0x5f] = "Atom (Goldmont, Denverton)",
346 [0x66] = "8th gen Core i3 (Cannon Lake)", 346 [0x66] = "8th gen Core i3 (Cannon Lake)",
347 [0x6a] = "Future Xeon (Ice Lake)", 347 [0x6a] = "3rd gen Xeon Scalable (Ice Lake)",
348 [0x6c] = "Future Xeon (Ice Lake)", 348 [0x6c] = "3rd gen Xeon Scalable (Ice Lake)",
349 [0x7a] = "Atom (Goldmont Plus)", 349 [0x7a] = "Atom (Goldmont Plus)",
350 [0x7d] = "10th gen Core (Ice Lake)", 350 [0x7d] = "10th gen Core (Ice Lake)",
351 [0x7e] = "10th gen Core (Ice Lake)", 351 [0x7e] = "10th gen Core (Ice Lake)",
352 [0x85] = "Xeon Phi 7215, 7285, 7295 (Knights Mill)", 352 [0x85] = "Xeon Phi 7215, 7285, 7295 (Knights Mill)",
353 [0x86] = "Atom (Tremont)", 353 [0x86] = "Atom (Tremont)",
354 [0x8c] = "11th gen Core (Tiger Lake)", 354 [0x8c] = "11th gen Core (Tiger Lake)",
355 [0x8d] = "11th gen Core (Tiger Lake)", 355 [0x8d] = "11th gen Core (Tiger Lake)",
356 [0x8e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake) or Xeon E (Coffee Lake)", 356 [0x8e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake) or Xeon E (Coffee Lake)",
357 [0x9e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake) or Xeon E (Coffee Lake)", 357 [0x9e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake) or Xeon E (Coffee Lake)",
358 [0xa5] = "10th gen Core (Comet Lake)", 358 [0xa5] = "10th gen Core (Comet Lake)",
359 [0xa6] = "10th gen Core (Comet Lake)", 359 [0xa6] = "10th gen Core (Comet Lake)",
360 }, 360 },
361 "Pentium Pro, II or III", /* Default */ 361 "Pentium Pro, II or III", /* Default */