summaryrefslogtreecommitdiff
path: root/usr/src/common
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@fingolfin.org>2020-09-27 13:30:21 -0700
committerRobert Mustacchi <rm@fingolfin.org>2020-11-02 08:22:45 -0800
commit5edbd2fec7b63b423df5bd21c4b0f7b775123a40 (patch)
tree41e09b27bf4c3503a0340754b81c280532064362 /usr/src/common
parentc4b98ceff2f78fc5bb2f6bbe2e76627f04ef66f5 (diff)
downloadillumos-gate-5edbd2fec7b63b423df5bd21c4b0f7b775123a40.tar.gz
13238 vaes, vpclmulqdq should be plumbed through isainfo
13239 umip, etc. are incorrectly conditioned in cpuid.c Reviewed by: Peter Tribble <peter.tribble@gmail.com> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Dan McDonald <danmcd@joyent.com>
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
/*