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>

diff --cc arch/arm64/include/asm/cpufeature.h
Simple merge

diff --cc arch/arm64/include/asm/kvm_asm.h
Simple merge

diff --cc arch/arm64/include/asm/kvm_host.h
Simple merge

diff --cc arch/arm64/include/asm/sysreg.h
index 2084b22,f84a00f..7640fa2
--- 1/arch/arm64/include/asm/sysreg.h
--- 2/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@@ -847,21 -846,16 +846,24 @@@
  #define ID_AA64MMFR0_ASID_SHIFT               4
  #define ID_AA64MMFR0_PARANGE_SHIFT    0
  
 -#define ID_AA64MMFR0_TGRAN4_NI                0xf
 -#define ID_AA64MMFR0_TGRAN4_SUPPORTED 0x0
 -#define ID_AA64MMFR0_TGRAN64_NI               0xf
 -#define ID_AA64MMFR0_TGRAN64_SUPPORTED        0x0
 -#define ID_AA64MMFR0_TGRAN16_NI               0x0
 -#define ID_AA64MMFR0_TGRAN16_SUPPORTED        0x1
+ #define ID_AA64MMFR0_ASID_8           0x0
+ #define ID_AA64MMFR0_ASID_16          0x2
+ 
 +#define ID_AA64MMFR0_TGRAN4_NI                        0xf
 +#define ID_AA64MMFR0_TGRAN4_SUPPORTED_MIN     0x0
 +#define ID_AA64MMFR0_TGRAN4_SUPPORTED_MAX     0x7
 +#define ID_AA64MMFR0_TGRAN64_NI                       0xf
 +#define ID_AA64MMFR0_TGRAN64_SUPPORTED_MIN    0x0
 +#define ID_AA64MMFR0_TGRAN64_SUPPORTED_MAX    0x7
 +#define ID_AA64MMFR0_TGRAN16_NI                       0x0
 +#define ID_AA64MMFR0_TGRAN16_SUPPORTED_MIN    0x1
 +#define ID_AA64MMFR0_TGRAN16_SUPPORTED_MAX    0xf
 +
 +#define ID_AA64MMFR0_PARANGE_32               0x0
 +#define ID_AA64MMFR0_PARANGE_36               0x1
  #define ID_AA64MMFR0_PARANGE_40               0x2
 +#define ID_AA64MMFR0_PARANGE_42               0x3
 +#define ID_AA64MMFR0_PARANGE_44               0x4
  #define ID_AA64MMFR0_PARANGE_48               0x5
  #define ID_AA64MMFR0_PARANGE_52               0x6
  

diff --cc arch/arm64/kvm/arm.c
Simple merge

diff --cc arch/arm64/kvm/hyp/nvhe/switch.c
Simple merge

diff --cc arch/arm64/kvm/hyp/vhe/switch.c
Simple merge

diff --cc arch/arm64/kvm/sys_regs.c
Simple merge