Merge branch kvm-arm64/pkvm-fixed-features-prologue into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Fri, 20 Aug 2021 11:23:53 +0000 (12:23 +0100)
committerMarc Zyngier <maz@kernel.org>
Fri, 20 Aug 2021 11:23:53 +0000 (12:23 +0100)
commit7c7b363d62a51eea987ba63fc916ff8d6f89df0e
treebabe5d9c3ab0cffe0bace0336f5b8301c7863384
parentdeb151a58210d8dfb1a7cc1f14fec35b520c38a6
parent411d63d8c64c2f3b0c497fe4658f13b3bca951e2
Merge branch kvm-arm64/pkvm-fixed-features-prologue into kvmarm-master/next

* kvm-arm64/pkvm-fixed-features-prologue:
  : Rework a bunch of common infrastructure as a prologue
  : to Fuad Tabba's protected VM fixed feature series.
  KVM: arm64: Upgrade trace_kvm_arm_set_dreg32() to 64bit
  KVM: arm64: Add config register bit definitions
  KVM: arm64: Add feature register flag definitions
  KVM: arm64: Track value of cptr_el2 in struct kvm_vcpu_arch
  KVM: arm64: Keep mdcr_el2's value as set by __init_el2_debug
  KVM: arm64: Restore mdcr_el2 from vcpu
  KVM: arm64: Refactor sys_regs.h,c for nVHE reuse
  KVM: arm64: Fix names of config register fields
  KVM: arm64: MDCR_EL2 is a 64-bit register
  KVM: arm64: Remove trailing whitespace in comment
  KVM: arm64: placeholder to check if VM is protected

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/kvm_asm.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/include/asm/sysreg.h
arch/arm64/kvm/arm.c
arch/arm64/kvm/hyp/nvhe/switch.c
arch/arm64/kvm/hyp/vhe/switch.c
arch/arm64/kvm/sys_regs.c