AArch64: Disable Secure Cycle Counter

[project/bcm63xx/atf.git] / include / lib / el3_runtime / aarch64 / context.h

diff --git a/include/lib/el3_runtime/aarch64/context.h b/include/lib/el3_runtime/aarch64/context.h
index a76a59b78580b01924376fe0a43dd0e66137b103..64fa8a9ea4dbc41ec96f09c9277fe0e7e44e5950 100644 (file)
--- a/include/lib/el3_runtime/aarch64/context.h
+++ b/include/lib/el3_runtime/aarch64/context.h
@@ -59,7 +59,7 @@
 #define CTX_RUNTIME_SP         U(0x10)
 #define CTX_SPSR_EL3           U(0x18)
 #define CTX_ELR_EL3            U(0x20)
-#define CTX_UNUSED             U(0x28)
+#define CTX_PMCR_EL0           U(0x28)
 #define CTX_EL3STATE_END       U(0x30)
 
 /*******************************************************************************
@@ -91,22 +91,21 @@
 #define CTX_AFSR1_EL1          U(0x98)
 #define CTX_CONTEXTIDR_EL1     U(0xa0)
 #define CTX_VBAR_EL1           U(0xa8)
-#define CTX_PMCR_EL0           U(0xb0)
 
 /*
  * If the platform is AArch64-only, there is no need to save and restore these
  * AArch32 registers.
  */
 #if CTX_INCLUDE_AARCH32_REGS
-#define CTX_SPSR_ABT           U(0xc0)  /* Align to the next 16 byte boundary */
-#define CTX_SPSR_UND           U(0xc8)
-#define CTX_SPSR_IRQ           U(0xd0)
-#define CTX_SPSR_FIQ           U(0xd8)
-#define CTX_DACR32_EL2         U(0xe0)
-#define CTX_IFSR32_EL2         U(0xe8)
-#define CTX_AARCH32_END                U(0xf0) /* Align to the next 16 byte boundary */
+#define CTX_SPSR_ABT           U(0xb0) /* Align to the next 16 byte boundary */
+#define CTX_SPSR_UND           U(0xb8)
+#define CTX_SPSR_IRQ           U(0xc0)
+#define CTX_SPSR_FIQ           U(0xc8)
+#define CTX_DACR32_EL2         U(0xd0)
+#define CTX_IFSR32_EL2         U(0xd8)
+#define CTX_AARCH32_END                U(0xe0) /* Align to the next 16 byte boundary */
 #else
-#define CTX_AARCH32_END                U(0xc0)  /* Align to the next 16 byte boundary */
+#define CTX_AARCH32_END                U(0xb0) /* Align to the next 16 byte boundary */
 #endif /* CTX_INCLUDE_AARCH32_REGS */
 
 /*