@@ -19,7 +19,6 @@ use tock_registers::{
1919
2020register_bitfields ! { u64 ,
2121 pub HCR_EL2 [
22- ///
2322 /// Controls the use of instructions related to Pointer Authentication:
2423 ///
2524 /// - In EL0, when HCR_EL2.TGE==0 or HCR_EL2.E2H==0, and the associated SCTLR_EL1.En<N><M>==1.
@@ -37,14 +36,13 @@ register_bitfields! {u64,
3736 EnableTrapPointerAuthInstToEl2 = 0 ,
3837 DisableTrapPointerAuthInstToEl2 = 1
3938 ] ,
40- ///
39+
4140 /// Trap registers holding "key" values for Pointer Authentication. Traps accesses to the
4241 /// following registers from EL1 to EL2, when EL2 is enabled in the current Security state,
4342 /// reported using EC syndrome value 0x18:
4443 ///
4544 /// APIAKeyLo_EL1, APIAKeyHi_EL1, APIBKeyLo_EL1, APIBKeyHi_EL1, APDAKeyLo_EL1,
4645 /// APDAKeyHi_EL1, APDBKeyLo_EL1, APDBKeyHi_EL1, APGAKeyLo_EL1, and APGAKeyHi_EL1.
47- ///
4846 APK OFFSET ( 40 ) NUMBITS ( 1 ) [
4947 EnableTrapPointerAuthKeyRegsToEl2 = 0 ,
5048 DisableTrapPointerAuthKeyRegsToEl2 = 1 ,
@@ -55,8 +53,8 @@ register_bitfields! {u64,
5553 /// if 1: Route synchronous External abort exceptions from EL0 and EL1 to EL2, when EL2 is
5654 /// enabled in the current Security state, if not routed to EL3.
5755 TEA OFFSET ( 37 ) NUMBITS ( 1 ) [
58- DisableTrapSyncExtAborts = 0 ,
59- EnableTrapSyncExtAborts = 1 ,
56+ DisableTrapSyncExtAbortsToEl2 = 0 ,
57+ EnableTrapSyncExtAbortsToEl2 = 1 ,
6058 ] ,
6159
6260 /// EL2 Host. Enables a configuration where a Host Operating System is running in EL2, and
@@ -117,8 +115,8 @@ register_bitfields! {u64,
117115 /// - For further information on the behavior of this bit when E2H is 1, see 'Behavior of
118116 /// HCR_EL2.E2H'.
119117 TGE OFFSET ( 27 ) NUMBITS ( 1 ) [
120- DisableTrapGeneralExceptions = 0 ,
121- EnableTrapGeneralExceptions = 1 ,
118+ DisableTrapGeneralExceptionsToEl2 = 0 ,
119+ EnableTrapGeneralExceptionsToEl2 = 1 ,
122120 ] ,
123121
124122 /// Default Cacheability.
0 commit comments