diff options
| author | Robert Mustacchi <rm@fingolfin.org> | 2021-04-07 09:04:24 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@fingolfin.org> | 2021-04-13 12:52:35 -0700 |
| commit | 15276eb5b5c891978242f14352c27676ed336244 (patch) | |
| tree | 17701fef1fc2c44f7ec13cc316080ac6a71b88d0 /usr | |
| parent | 6dcbfae4aa2c2aab7ebd7174bd2f0232528126b7 (diff) | |
| download | illumos-joyent-15276eb5b5c891978242f14352c27676ed336244.tar.gz | |
13704 add Ice Lake Xeon to PPIN list
13705 add recent Intel models to x86_archext.h
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/uts/i86pc/os/cpuid.c | 3 | ||||
| -rw-r--r-- | usr/src/uts/intel/sys/x86_archext.h | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/usr/src/uts/i86pc/os/cpuid.c b/usr/src/uts/i86pc/os/cpuid.c index 8273ea0554..27058ddcf4 100644 --- a/usr/src/uts/i86pc/os/cpuid.c +++ b/usr/src/uts/i86pc/os/cpuid.c @@ -24,7 +24,7 @@ * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright 2014 Josef "Jeff" Sipek <jeffpc@josefsipek.net> * Copyright 2020 Joyent, Inc. - * Copyright 2020 Oxide Computer Company + * Copyright 2021 Oxide Computer Company */ /* * Copyright (c) 2010, Intel Corporation. @@ -3237,6 +3237,7 @@ cpuid_pass1_ppin(cpu_t *cpu, uchar_t *featureset) case INTC_MODEL_BROADWELL_XEON: case INTC_MODEL_BROADWELL_XEON_D: case INTC_MODEL_SKYLAKE_XEON: + case INTC_MODEL_ICELAKE_XEON: if (!on_trap(&otd, OT_DATA_ACCESS)) { uint64_t value; diff --git a/usr/src/uts/intel/sys/x86_archext.h b/usr/src/uts/intel/sys/x86_archext.h index 241ce2820b..c7de3357db 100644 --- a/usr/src/uts/intel/sys/x86_archext.h +++ b/usr/src/uts/intel/sys/x86_archext.h @@ -32,6 +32,7 @@ * Copyright 2012 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> * Copyright 2014 Josef 'Jeff' Sipek <jeffpc@josefsipek.net> * Copyright 2018 Nexenta Systems, Inc. + * Copyright 2021 Oxide Computer Company */ #ifndef _SYS_X86_ARCHEXT_H @@ -1082,12 +1083,27 @@ extern "C" { #define INTC_MODEL_BROADWELL_XEON_D 0x56 #define INTC_MODEL_SKYLAKE_MOBILE 0x4e +/* + * Note, this model is shared with Cascade Lake and Cooper Lake. + */ #define INTC_MODEL_SKYLAKE_XEON 0x55 #define INTC_MODEL_SKYLAKE_DESKTOP 0x5e +/* + * Note, both Kaby Lake models are shared with Coffee Lake, Whiskey Lake, Amber + * Lake, and some Comet Lake parts. + */ #define INTC_MODEL_KABYLAKE_MOBILE 0x8e #define INTC_MODEL_KABYLAKE_DESKTOP 0x9e +#define INTC_MODEL_ICELAKE_XEON 0x6a +#define INTC_MODEL_ICELAKE_MOBILE 0x7e +#define INTC_MODEL_TIGERLAKE_MOBILE 0x8c + +#define INTC_MODEL_COMETLAKE 0xa5 +#define INTC_MODEL_COMETLAKE_MOBILE 0xa6 +#define INTC_MODEL_ROCKETLAKE 0xa7 + /* * Atom Processors */ |