summaryrefslogtreecommitdiff
path: root/usr/src/common
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/common
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/common')
-rw-r--r--usr/src/common/elfcap/elfcap.c8
-rw-r--r--usr/src/common/elfcap/elfcap.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/usr/src/common/elfcap/elfcap.c b/usr/src/common/elfcap/elfcap.c
index a5366da1ae..5a8a8cad67 100644
--- a/usr/src/common/elfcap/elfcap.c
+++ b/usr/src/common/elfcap/elfcap.c
@@ -415,6 +415,14 @@ static const elfcap_desc_t hw2_386[ELFCAP_NUM_HW2_386] = {
{ /* 0x04000000 */
AV_386_2_AVX512_VNNI, STRDESC("AV_386_2_AVX512_VNNI"),
STRDESC("AVX512_VNNI"), STRDESC("avx512_vnni")
+ },
+ { /* 0x08000000 */
+ AV_386_2_VPCLMULQDQ, STRDESC("AV_386_2_VPCLMULQDQ"),
+ STRDESC("VPCLMULQDQ"), STRDESC("vpclmulqdq")
+ },
+ { /* 0x10000000 */
+ AV_386_2_VAES, STRDESC("AV_386_2_VAES"),
+ STRDESC("VAES"), STRDESC("vaes")
}
};
diff --git a/usr/src/common/elfcap/elfcap.h b/usr/src/common/elfcap/elfcap.h
index 2a9d64f279..0dd442ee6b 100644
--- a/usr/src/common/elfcap/elfcap.h
+++ b/usr/src/common/elfcap/elfcap.h
@@ -115,7 +115,7 @@ typedef enum {
#define ELFCAP_NUM_SF1 3
#define ELFCAP_NUM_HW1_SPARC 17
#define ELFCAP_NUM_HW1_386 32
-#define ELFCAP_NUM_HW2_386 27
+#define ELFCAP_NUM_HW2_386 29
/*