<sys/platform/x86.h>: Add SGX-KEYS support

Add SGX-KEYS support to <sys/platform/x86.h>.
Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com>

diff --git a/manual/platform.texi b/manual/platform.texi
index 78ee39f65007de36445e46e13b0335d8f03d18eb..4453f6e1f4b0f9168bfbab09448c8305e408ad5b 100644 (file)
--- a/manual/platform.texi
+++ b/manual/platform.texi
@@ -551,6 +551,9 @@ capability.
 @item
 @code{SGX} -- Intel Software Guard Extensions.
 
+@item
+@code{SGX_KEYS} -- Attestation Services for SGX.
+
 @item
 @code{SGX_LC} -- SGX Launch Configuration.
 

diff --git a/sysdeps/x86/bits/platform/x86.h b/sysdeps/x86/bits/platform/x86.h
index e25f1ac53c914c19ba052272dffe1de1df7a51bc..ee5be8190f2283d01c10c5567c2e67f66faced96 100644 (file)
--- a/sysdeps/x86/bits/platform/x86.h
+++ b/sysdeps/x86/bits/platform/x86.h
@@ -201,7 +201,7 @@ enum
        + cpuid_register_index_edx * 8 * sizeof (unsigned int)),
 
   x86_cpu_INDEX_7_EDX_0                = x86_cpu_index_7_edx,
-  x86_cpu_INDEX_7_EDX_1                = x86_cpu_index_7_edx + 1,
+  x86_cpu_SGX_KEYS             = x86_cpu_index_7_edx + 1,
   x86_cpu_AVX512_4VNNIW                = x86_cpu_index_7_edx + 2,
   x86_cpu_AVX512_4FMAPS                = x86_cpu_index_7_edx + 3,
   x86_cpu_FSRM                 = x86_cpu_index_7_edx + 4,

diff --git a/sysdeps/x86/tst-get-cpu-features.c b/sysdeps/x86/tst-get-cpu-features.c
index dcb735ddd6b14c4c6dd10a6b9ee93fd25391095e..1979da2174a655275d365a6dd8478dae48b49b43 100644 (file)
--- a/sysdeps/x86/tst-get-cpu-features.c
+++ b/sysdeps/x86/tst-get-cpu-features.c
@@ -154,6 +154,7 @@ do_test (void)
   CHECK_CPU_FEATURE_PRESENT (ENQCMD);
   CHECK_CPU_FEATURE_PRESENT (SGX_LC);
   CHECK_CPU_FEATURE_PRESENT (PKS);
+  CHECK_CPU_FEATURE_PRESENT (SGX_KEYS);
   CHECK_CPU_FEATURE_PRESENT (AVX512_4VNNIW);
   CHECK_CPU_FEATURE_PRESENT (AVX512_4FMAPS);
   CHECK_CPU_FEATURE_PRESENT (FSRM);