Merge branch kvm-arm64/feat_idst into kvmarm-master/next

* kvm-arm64/feat_idst:
  : .
  : Add support for FEAT_IDST, allowing ID registers that are not implemented
  : to be reported as a normal trap rather than as an UNDEF exception.
  : .
  KVM: arm64: selftests: Add a test for FEAT_IDST
  KVM: arm64: pkvm: Report optional ID register traps with a 0x18 syndrome
  KVM: arm64: pkvm: Add a generic synchronous exception injection primitive
  KVM: arm64: Force trap of GMID_EL1 when the guest doesn't have MTE
  KVM: arm64: Handle CSSIDR2_EL1 and SMIDR_EL1 in a generic way
  KVM: arm64: Handle FEAT_IDST for sysregs without specific handlers
  KVM: arm64: Add a generic synchronous exception injection primitive
  KVM: arm64: Add trap routing for GMID_EL1
  arm64: Repaint ID_AA64MMFR2_EL1.IDS description

Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --cc arch/arm64/include/asm/kvm_emulate.h
index 4818e5f0cf688974e9c10c1e035b33a07c874b0f,df20d47f0d25699910299cb93148add96e50cf87..5bf3d7e1d92c77a5c0e2cb04af106166a2b7066c
--- 1/arch/arm64/include/asm/kvm_emulate.h
--- 2/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h
@@@ -45,9 -45,9 +45,10 @@@ bool kvm_condition_valid32(const struc
  void kvm_skip_instr32(struct kvm_vcpu *vcpu);
  
  void kvm_inject_undefined(struct kvm_vcpu *vcpu);
+ void kvm_inject_sync(struct kvm_vcpu *vcpu, u64 esr);
  int kvm_inject_serror_esr(struct kvm_vcpu *vcpu, u64 esr);
  int kvm_inject_sea(struct kvm_vcpu *vcpu, bool iabt, u64 addr);
 +int kvm_inject_dabt_excl_atomic(struct kvm_vcpu *vcpu, u64 addr);
  void kvm_inject_size_fault(struct kvm_vcpu *vcpu);
  
  static inline int kvm_inject_sea_dabt(struct kvm_vcpu *vcpu, u64 addr)

diff --cc arch/arm64/kvm/emulate-nested.c
Simple merge

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

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

diff --cc arch/arm64/tools/sysreg
Simple merge