lib: arm64: Consolidate register definitions to sysreg.h
Move system register field definitions to sysreg.h, where the opcodes for
system register access are defined, to align ourselves with the Linux
kernel. EL2 support, needed for EFI and nested virtualization testing, will
require additional register and field definions, and having them in the
same place as Linux will make maintenance easier.
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
diff --git a/arm/cstart64.S b/arm/cstart64.S
index 39b0777..fcac9eb 100644
--- a/arm/cstart64.S
+++ b/arm/cstart64.S
@@ -10,10 +10,10 @@
#include <asm/asm-offsets.h>
#include <asm/assembler.h>
#include <asm/ptrace.h>
-#include <asm/processor.h>
#include <asm/page.h>
#include <asm/pgtable-hwdef.h>
#include <asm/thread_info.h>
+#include <asm/sysreg.h>
.macro zero_range, tmp1, tmp2
9998: cmp \tmp1, \tmp2
diff --git a/lib/arm64/asm/arch_gicv3.h b/lib/arm64/asm/arch_gicv3.h
index a7994ec..fdee4de 100644
--- a/lib/arm64/asm/arch_gicv3.h
+++ b/lib/arm64/asm/arch_gicv3.h
@@ -10,12 +10,6 @@
#include <asm/sysreg.h>
-#define ICC_PMR_EL1 sys_reg(3, 0, 4, 6, 0)
-#define ICC_SGI1R_EL1 sys_reg(3, 0, 12, 11, 5)
-#define ICC_IAR1_EL1 sys_reg(3, 0, 12, 12, 0)
-#define ICC_EOIR1_EL1 sys_reg(3, 0, 12, 12, 1)
-#define ICC_GRPEN1_EL1 sys_reg(3, 0, 12, 12, 7)
-
#ifndef __ASSEMBLY__
#include <libcflat.h>
diff --git a/lib/arm64/asm/processor.h b/lib/arm64/asm/processor.h
index 8cdbbcc..1c73ba3 100644
--- a/lib/arm64/asm/processor.h
+++ b/lib/arm64/asm/processor.h
@@ -6,16 +6,6 @@
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
-/* System Control Register (SCTLR_EL1) bits */
-#define SCTLR_EL1_EE (1 << 25)
-#define SCTLR_EL1_WXN (1 << 19)
-#define SCTLR_EL1_I (1 << 12)
-#define SCTLR_EL1_SA0 (1 << 4)
-#define SCTLR_EL1_SA (1 << 3)
-#define SCTLR_EL1_C (1 << 2)
-#define SCTLR_EL1_A (1 << 1)
-#define SCTLR_EL1_M (1 << 0)
-
#ifndef __ASSEMBLY__
#include <asm/ptrace.h>
#include <asm/esr.h>
diff --git a/lib/arm64/asm/sysreg.h b/lib/arm64/asm/sysreg.h
index 378bf7e..9d6b4fc 100644
--- a/lib/arm64/asm/sysreg.h
+++ b/lib/arm64/asm/sysreg.h
@@ -70,4 +70,21 @@
" .endm\n"
);
#endif /* __ASSEMBLY__ */
+
+#define ICC_PMR_EL1 sys_reg(3, 0, 4, 6, 0)
+#define ICC_SGI1R_EL1 sys_reg(3, 0, 12, 11, 5)
+#define ICC_IAR1_EL1 sys_reg(3, 0, 12, 12, 0)
+#define ICC_EOIR1_EL1 sys_reg(3, 0, 12, 12, 1)
+#define ICC_GRPEN1_EL1 sys_reg(3, 0, 12, 12, 7)
+
+/* System Control Register (SCTLR_EL1) bits */
+#define SCTLR_EL1_EE (1 << 25)
+#define SCTLR_EL1_WXN (1 << 19)
+#define SCTLR_EL1_I (1 << 12)
+#define SCTLR_EL1_SA0 (1 << 4)
+#define SCTLR_EL1_SA (1 << 3)
+#define SCTLR_EL1_C (1 << 2)
+#define SCTLR_EL1_A (1 << 1)
+#define SCTLR_EL1_M (1 << 0)
+
#endif /* _ASMARM64_SYSREG_H_ */
