arm64: Remove duplicated sysreg encodings

A bunch of sysregs are now generated from the sysreg file, so no
need to carry separate definitions.

Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 8908eec48f3135caf3a7270a7c69059b4fd95bd5..690b6ebd118f4f5dbbe582ee54751ee6534b1d00 100644 (file)
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -535,7 +535,6 @@
 #define SYS_VTCR_EL2                   sys_reg(3, 4, 2, 1, 2)
 
 #define SYS_VNCR_EL2                   sys_reg(3, 4, 2, 2, 0)
-#define SYS_HAFGRTR_EL2                        sys_reg(3, 4, 3, 1, 6)
 #define SYS_SPSR_EL2                   sys_reg(3, 4, 4, 0, 0)
 #define SYS_ELR_EL2                    sys_reg(3, 4, 4, 0, 1)
 #define SYS_SP_EL1                     sys_reg(3, 4, 4, 1, 0)
@@ -621,28 +620,18 @@
 
 /* VHE encodings for architectural EL0/1 system registers */
 #define SYS_BRBCR_EL12                 sys_reg(2, 5, 9, 0, 0)
-#define SYS_SCTLR_EL12                 sys_reg(3, 5, 1, 0, 0)
-#define SYS_CPACR_EL12                 sys_reg(3, 5, 1, 0, 2)
-#define SYS_SCTLR2_EL12                        sys_reg(3, 5, 1, 0, 3)
-#define SYS_ZCR_EL12                   sys_reg(3, 5, 1, 2, 0)
-#define SYS_TRFCR_EL12                 sys_reg(3, 5, 1, 2, 1)
-#define SYS_SMCR_EL12                  sys_reg(3, 5, 1, 2, 6)
 #define SYS_TTBR0_EL12                 sys_reg(3, 5, 2, 0, 0)
 #define SYS_TTBR1_EL12                 sys_reg(3, 5, 2, 0, 1)
-#define SYS_TCR_EL12                   sys_reg(3, 5, 2, 0, 2)
-#define SYS_TCR2_EL12                  sys_reg(3, 5, 2, 0, 3)
 #define SYS_SPSR_EL12                  sys_reg(3, 5, 4, 0, 0)
 #define SYS_ELR_EL12                   sys_reg(3, 5, 4, 0, 1)
 #define SYS_AFSR0_EL12                 sys_reg(3, 5, 5, 1, 0)
 #define SYS_AFSR1_EL12                 sys_reg(3, 5, 5, 1, 1)
 #define SYS_ESR_EL12                   sys_reg(3, 5, 5, 2, 0)
 #define SYS_TFSR_EL12                  sys_reg(3, 5, 5, 6, 0)
-#define SYS_FAR_EL12                   sys_reg(3, 5, 6, 0, 0)
 #define SYS_PMSCR_EL12                 sys_reg(3, 5, 9, 9, 0)
 #define SYS_MAIR_EL12                  sys_reg(3, 5, 10, 2, 0)
 #define SYS_AMAIR_EL12                 sys_reg(3, 5, 10, 3, 0)
 #define SYS_VBAR_EL12                  sys_reg(3, 5, 12, 0, 0)
-#define SYS_CONTEXTIDR_EL12            sys_reg(3, 5, 13, 0, 1)
 #define SYS_SCXTNUM_EL12               sys_reg(3, 5, 13, 0, 7)
 #define SYS_CNTKCTL_EL12               sys_reg(3, 5, 14, 1, 0)
 #define SYS_CNTP_TVAL_EL02             sys_reg(3, 5, 14, 2, 0)