Skip to content

Commit 9f5deac

Browse files
author
Marc Zyngier
committed
KVM: arm64: Add ICH_HCR_EL2 to the vcpu state
As we are about to describe the trap routing for ICH_HCR_EL2, add the register to the vcpu state in its VNCR form, as well as reset Reviewed-by: Oliver Upton <oliver.upton@linux.dev> Link: https://lore.kernel.org/r/20240827152517.3909653-7-maz@kernel.org Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent 5cb57a1 commit 9f5deac

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

arch/arm64/include/asm/kvm_host.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,8 @@ enum vcpu_sysreg {
530530
VNCR(CNTP_CVAL_EL0),
531531
VNCR(CNTP_CTL_EL0),
532532

533+
VNCR(ICH_HCR_EL2),
534+
533535
NR_SYS_REGS /* Nothing after this line! */
534536
};
535537

arch/arm64/kvm/sys_regs.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2797,6 +2797,8 @@ static const struct sys_reg_desc sys_reg_descs[] = {
27972797
EL2_REG(RVBAR_EL2, access_rw, reset_val, 0),
27982798
{ SYS_DESC(SYS_RMR_EL2), trap_undef },
27992799

2800+
EL2_REG_VNCR(ICH_HCR_EL2, reset_val, 0),
2801+
28002802
EL2_REG(CONTEXTIDR_EL2, access_rw, reset_val, 0),
28012803
EL2_REG(TPIDR_EL2, access_rw, reset_val, 0),
28022804

0 commit comments

Comments
 (0)