From 6e0299e6b39f23fda0ac57661dfb0a10cc2c411b Mon Sep 17 00:00:00 2001
From: likey99 <73151797+likey99@users.noreply.github.com>
Date: Fri, 9 Jun 2023 23:05:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Update=20HCR=5FEL2=20reor?=
 =?UTF-8?q?der=20TSC=20and=20TID3=20correctly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/registers/hcr_el2.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/registers/hcr_el2.rs b/src/registers/hcr_el2.rs
index 61a14bf..9b9cedc 100644
--- a/src/registers/hcr_el2.rs
+++ b/src/registers/hcr_el2.rs
@@ -170,14 +170,6 @@ register_bitfields! {u64,
         /// state.
         TIDCP OFFSET(20) NUMBITS(1) [],
 
-        /// Trap ID group 3. Traps EL1 reads of group 3 ID registers to EL2, when EL2 is enabled
-        /// in the current Security state.
-        ///
-        /// 0 This control does not cause any instructions to be trapped.
-        /// 1 The specified EL1 read accesses to ID group 3 registers are trapped to EL2, when EL2
-        /// is enabled in the current Security state.
-        TID3  OFFSET(18) NUMBITS(1) [],
-
         /// Trap SMC instructions. Traps EL1 execution of SMC instructions to EL2, when EL2 is
         /// enabled in the current Security state.
         ///
@@ -216,6 +208,14 @@ register_bitfields! {u64,
             EnableTrapEl1SmcToEl2 = 1,
         ],
 
+        /// Trap ID group 3. Traps EL1 reads of group 3 ID registers to EL2, when EL2 is enabled
+        /// in the current Security state.
+        ///
+        /// 0 This control does not cause any instructions to be trapped.
+        /// 1 The specified EL1 read accesses to ID group 3 registers are trapped to EL2, when EL2
+        /// is enabled in the current Security state.
+        TID3  OFFSET(18) NUMBITS(1) [],
+
         /// Default Cacheability.
         ///
         /// 0 This control has no effect on the Non-secure EL1&0 translation regime.