From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 5 Apr 2023 16:21:30 +0000 (-0700)
Subject: <sys/platform/x86.h>: Add SGX-KEYS support
X-Git-Tag: glibc-2.38~409
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6790a489dda2118729cc2917cc9a9c942e7d2cb;p=thirdparty%2Fglibc.git

<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 78ee39f6500..4453f6e1f4b 100644
--- 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 e25f1ac53c9..ee5be8190f2 100644
--- 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 dcb735ddd6b..1979da2174a 100644
--- 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);