Merge branch kvm-arm64/nv-6.8-prefix into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Tue, 19 Dec 2023 10:06:58 +0000 (10:06 +0000)
committerMarc Zyngier <maz@kernel.org>
Tue, 19 Dec 2023 10:06:58 +0000 (10:06 +0000)
commitd016264d0765e57747c927881cb135fa74df1236
tree4133ff0eb9541404a528d4aada55f934f1c694b0
parent53d5486114ae23d36145a1e40d2b9de7a6247c1e
parentfedc612314acfebf506e071bf3a941076aa56d10
Merge branch kvm-arm64/nv-6.8-prefix into kvmarm-master/next

* kvm-arm64/nv-6.8-prefix:
  : .
  : Nested Virtualization support update, focussing on the
  : NV2 support (VNCR mapping and such).
  : .
  KVM: arm64: nv: Handle virtual EL2 registers in vcpu_read/write_sys_reg()
  KVM: arm64: nv: Map VNCR-capable registers to a separate page
  KVM: arm64: nv: Add EL2_REG_VNCR()/EL2_REG_REDIR() sysreg helpers
  KVM: arm64: Introduce a bad_trap() primitive for unexpected trap handling
  KVM: arm64: nv: Add include containing the VNCR_EL2 offsets
  KVM: arm64: nv: Add non-VHE-EL2->EL1 translation helpers
  KVM: arm64: nv: Drop EL12 register traps that are redirected to VNCR
  KVM: arm64: nv: Compute NV view of idregs as a one-off
  KVM: arm64: nv: Hoist vcpu_has_nv() into is_hyp_ctxt()
  arm64: cpufeatures: Restrict NV support to FEAT_NV2

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/include/asm/kvm_emulate.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/kernel/cpufeature.c
arch/arm64/kvm/arm.c
arch/arm64/kvm/sys_regs.c