Skip to content

Commit 211fced

Browse files
committed
KVM: arm64: nv: Add FEAT_RAS vSError sys regs to table
Prepare to implement RAS for NV by adding the missing EL2 sysregs for the vSError context. Reviewed-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Oliver Upton <[email protected]>
1 parent 77ee70a commit 211fced

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

arch/arm64/include/asm/kvm_host.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,10 @@ enum vcpu_sysreg {
565565

566566
VNCR(POR_EL1), /* Permission Overlay Register 1 (EL1) */
567567

568+
/* FEAT_RAS registers */
569+
VNCR(VDISR_EL2),
570+
VNCR(VSESR_EL2),
571+
568572
VNCR(HFGRTR_EL2),
569573
VNCR(HFGWTR_EL2),
570574
VNCR(HFGITR_EL2),

arch/arm64/include/asm/vncr_mapping.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
#define VNCR_ICH_HCR_EL2 0x4C0
8585
#define VNCR_ICH_VMCR_EL2 0x4C8
8686
#define VNCR_VDISR_EL2 0x500
87+
#define VNCR_VSESR_EL2 0x508
8788
#define VNCR_PMBLIMITR_EL1 0x800
8889
#define VNCR_PMBPTR_EL1 0x810
8990
#define VNCR_PMBSR_EL1 0x820

arch/arm64/kvm/sys_regs.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3344,6 +3344,7 @@ static const struct sys_reg_desc sys_reg_descs[] = {
33443344
EL2_REG(AFSR0_EL2, access_rw, reset_val, 0),
33453345
EL2_REG(AFSR1_EL2, access_rw, reset_val, 0),
33463346
EL2_REG_REDIR(ESR_EL2, reset_val, 0),
3347+
EL2_REG_VNCR(VSESR_EL2, reset_unknown, 0),
33473348
{ SYS_DESC(SYS_FPEXC32_EL2), undef_access, reset_val, FPEXC32_EL2, 0x700 },
33483349

33493350
EL2_REG_REDIR(FAR_EL2, reset_val, 0),
@@ -3372,6 +3373,7 @@ static const struct sys_reg_desc sys_reg_descs[] = {
33723373
EL2_REG(VBAR_EL2, access_rw, reset_val, 0),
33733374
EL2_REG(RVBAR_EL2, access_rw, reset_val, 0),
33743375
{ SYS_DESC(SYS_RMR_EL2), undef_access },
3376+
EL2_REG_VNCR(VDISR_EL2, reset_unknown, 0),
33753377

33763378
EL2_REG_VNCR(ICH_AP0R0_EL2, reset_val, 0),
33773379
EL2_REG_VNCR(ICH_AP0R1_EL2, reset_val, 0),

0 commit comments

Comments
 (0)