Commit 5d458cf7 authored by Miguel Luis's avatar Miguel Luis Committed by Junhao He
Browse files

arm64: Add missing _EL12 encodings 

mainline inclusion
from mainline-v6.7-rc1
commit d5cb781b77416a9ed4129960712932dbcf8a9f30
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8EC9K
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d5cb781b77416a9ed4129960712932dbcf8a9f30



--------------------------------

Some _EL12 encodings are missing. Add them.

Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarMiguel Luis <miguel.luis@oracle.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20231023095444.1587322-2-maz@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
parent 77f73ef1

arch/arm64/include/asm/sysreg.h

+11 −0
Original line number Diff line number Diff line
@@ -578,20 +578,31 @@ 
#define SYS_CNTHCTL_EL2			sys_reg(3, 4, 14, 1, 0)



/* 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_MPAM1_EL12			sys_reg(3, 5, 10, 5, 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)

#define SYS_CNTP_CTL_EL02		sys_reg(3, 5, 14, 2, 1)