arm64/sysreg: Add ICH_VMCR_EL2

Add the ICH_VMCR_EL2 register, which is required for the upcoming
GICv5 KVM support. This register has two different field encodings,
based on if it is used for GICv3 or GICv5-based VMs. The
GICv5-specific field encodings are generated with a FEAT_GCIE prefix.

This register is already described in the GICv3 KVM code
directly. This will be ported across to use the generated encodings as
part of an upcoming change.

Signed-off-by: Sascha Bischoff <sascha.bischoff@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 1c6cdf9d54bba3bbbde7109ac657838f050d70d5..8921b51866d64c71c8b7585cf0da6012a6b04236 100644 (file)
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -4669,6 +4669,27 @@ Field    1       V3
 Field  0       En
 EndSysreg
 
+Sysreg ICH_VMCR_EL2    3       4       12      11      7
+Prefix FEAT_GCIE
+Res0   63:32
+Field  31:27   VPMR
+Res0   26:1
+Field  0       EN
+EndPrefix
+Res0   63:32
+Field  31:24   VPMR
+Field  23:21   VBPR0
+Field  20:18   VBPR1
+Res0   17:10
+Field  9       VEOIM
+Res0   8:5
+Field  4       VCBPR
+Field  3       VFIQEn
+Field  2       VAckCtl
+Field  1       VENG1
+Field  0       VENG0
+EndSysreg
+
 Sysreg CONTEXTIDR_EL2  3       4       13      0       1
 Fields CONTEXTIDR_ELx
 EndSysreg