summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel/sys
diff options
context:
space:
mode:
authorDan McDonald <danmcd@joyent.com>2020-11-02 15:29:29 -0500
committerDan McDonald <danmcd@joyent.com>2020-11-02 15:29:29 -0500
commit8595c378eea49f20a78e6a5e8ff977afc7abfb22 (patch)
tree1c967c761c51d2239ca993788c159faaf339635b /usr/src/uts/intel/sys
parentf587bb227d9a5230d1ec24708c942dcf753f7f2e (diff)
parent059f070059c50b83e8b46b39b4dde67bf2feb1dc (diff)
downloadillumos-joyent-release-20201105.tar.gz
[illumos-gate merge]release-20201105
commit 059f070059c50b83e8b46b39b4dde67bf2feb1dc 13236 Want Zen 3 socket information commit e9abe9d6424a9213df11b3243f6957e6a0b91e48 13235 amdzen(7D) support for Zen 3 commit 5edbd2fec7b63b423df5bd21c4b0f7b775123a40 13238 vaes, vpclmulqdq should be plumbed through isainfo 13239 umip, etc. are incorrectly conditioned in cpuid.c commit c4b98ceff2f78fc5bb2f6bbe2e76627f04ef66f5 13237 Plumb through PCID on AMD
Diffstat (limited to 'usr/src/uts/intel/sys')
-rw-r--r--usr/src/uts/intel/sys/x86_archext.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/uts/intel/sys/x86_archext.h b/usr/src/uts/intel/sys/x86_archext.h
index eed3c5fd4e..b75ab18f5e 100644
--- a/usr/src/uts/intel/sys/x86_archext.h
+++ b/usr/src/uts/intel/sys/x86_archext.h
@@ -735,6 +735,8 @@ extern "C" {
#define X86FSET_TSX_CTRL 97
#define X86FSET_TAA_NO 98
#define X86FSET_PPIN 99
+#define X86FSET_VAES 100
+#define X86FSET_VPCLMULQDQ 101
/*
* Intel Deep C-State invariant TSC in leaf 0x80000007.
@@ -1021,7 +1023,8 @@ extern "C" {
#define X86_SOCKET_SP3R2 _X86_SOCKET_MKVAL(X86_VENDOR_AMD, 0x20)
#define X86_SOCKET_FP5 _X86_SOCKET_MKVAL(X86_VENDOR_AMD, 0x21)
#define X86_SOCKET_FP6 _X86_SOCKET_MKVAL(X86_VENDOR_AMD, 0x22)
-#define X86_NUM_SOCKETS_AMD 0x23
+#define X86_SOCKET_STRX4 _X86_SOCKET_MKVAL(X86_VENDOR_AMD, 0x23)
+#define X86_NUM_SOCKETS_AMD 0x24
/*
@@ -1116,7 +1119,7 @@ extern "C" {
#if defined(_KERNEL) || defined(_KMEMUSER)
-#define NUM_X86_FEATURES 100
+#define NUM_X86_FEATURES 102
extern uchar_t x86_featureset[];
extern void free_x86_featureset(void *featureset);