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

<sys/platform/x86.h>: Add RTM_FORCE_ABORT support

Add RTM_FORCE_ABORT 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 4453f6e1f4b..2ab687cbbaf 100644
--- a/manual/platform.texi
+++ b/manual/platform.texi
@@ -539,6 +539,9 @@ capability.
 @item
 @code{RTM_ALWAYS_ABORT} -- Transactions always abort, making RTM unusable.
 
+@item
+@code{RTM_FORCE_ABORT} -- TSX_FORCE_ABORT MSR.
+
 @item
 @code{SDBG} -- IA32_DEBUG_INTERFACE MSR for silicon debug.
 
diff --git a/sysdeps/x86/bits/platform/x86.h b/sysdeps/x86/bits/platform/x86.h
index ee5be8190f2..6d9dd6dacf3 100644
--- a/sysdeps/x86/bits/platform/x86.h
+++ b/sysdeps/x86/bits/platform/x86.h
@@ -213,7 +213,7 @@ enum
   x86_cpu_MD_CLEAR		= x86_cpu_index_7_edx + 10,
   x86_cpu_RTM_ALWAYS_ABORT	= x86_cpu_index_7_edx + 11,
   x86_cpu_INDEX_7_EDX_12	= x86_cpu_index_7_edx + 12,
-  x86_cpu_INDEX_7_EDX_13	= x86_cpu_index_7_edx + 13,
+  x86_cpu_RTM_FORCE_ABORT	= x86_cpu_index_7_edx + 13,
   x86_cpu_SERIALIZE		= x86_cpu_index_7_edx + 14,
   x86_cpu_HYBRID		= x86_cpu_index_7_edx + 15,
   x86_cpu_TSXLDTRK		= x86_cpu_index_7_edx + 16,
diff --git a/sysdeps/x86/tst-get-cpu-features.c b/sysdeps/x86/tst-get-cpu-features.c
index 1979da2174a..8b7e70aee1d 100644
--- a/sysdeps/x86/tst-get-cpu-features.c
+++ b/sysdeps/x86/tst-get-cpu-features.c
@@ -162,6 +162,7 @@ do_test (void)
   CHECK_CPU_FEATURE_PRESENT (AVX512_VP2INTERSECT);
   CHECK_CPU_FEATURE_PRESENT (MD_CLEAR);
   CHECK_CPU_FEATURE_PRESENT (RTM_ALWAYS_ABORT);
+  CHECK_CPU_FEATURE_PRESENT (RTM_FORCE_ABORT);
   CHECK_CPU_FEATURE_PRESENT (SERIALIZE);
   CHECK_CPU_FEATURE_PRESENT (HYBRID);
   CHECK_CPU_FEATURE_PRESENT (TSXLDTRK);