Merge 'kvm-arm' from https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git (next)

Merged-SHA: c24170ec742d06021ae7f14df9a1885714ab6095

 arch/arm64/include/asm/kvm_arm.h                   |  52 +++------
 arch/arm64/include/asm/kvm_asm.h                   |   2 +
 arch/arm64/include/asm/kvm_emulate.h               |  17 +--
 arch/arm64/include/asm/kvm_host.h                  |   1 +
 arch/arm64/include/asm/kvm_pgtable.h               |   8 +-
 arch/arm64/include/asm/sysreg.h                    |   4 +-
 arch/arm64/kernel/image-vars.h                     |   1 +
 arch/arm64/kvm/arm.c                               |   1 +
 arch/arm64/kvm/at.c                                |   8 +-
 arch/arm64/kvm/config.c                            |  94 ++++++++++++++---
 arch/arm64/kvm/emulate-nested.c                    |  76 ++++++++-----
 arch/arm64/kvm/hyp/entry.S                         |   4 +-
 arch/arm64/kvm/hyp/include/hyp/switch.h            |   2 +-
 arch/arm64/kvm/hyp/nvhe/hyp-main.c                 |   3 +
 arch/arm64/kvm/hyp/nvhe/pkvm.c                     |   1 -
 arch/arm64/kvm/hyp/nvhe/switch.c                   |   2 +-
 arch/arm64/kvm/hyp/nvhe/sys_regs.c                 |  39 +++++--
 arch/arm64/kvm/hyp/pgtable.c                       |  37 +++++--
 arch/arm64/kvm/hyp/vhe/switch.c                    |   2 +-
 arch/arm64/kvm/inject_fault.c                      |  10 +-
 arch/arm64/kvm/mmu.c                               |  12 +--
 arch/arm64/kvm/nested.c                            |  11 +-
 arch/arm64/kvm/sys_regs.c                          |   9 +-
 arch/arm64/kvm/sys_regs.h                          |  10 ++
 arch/arm64/kvm/va_layout.c                         |  28 +++++
 arch/arm64/tools/sysreg                            |  70 ++++++++++--
 tools/testing/selftests/kvm/Makefile.kvm           |   1 +
 tools/testing/selftests/kvm/arm64/idreg-idst.c     | 117 +++++++++++++++++++++
 .../selftests/kvm/include/arm64/processor.h        |   4 +
 tools/testing/selftests/kvm/include/kvm_util.h     |   9 +-
 tools/testing/selftests/kvm/lib/arm64/processor.c  |   9 +-
 tools/testing/selftests/kvm/lib/kvm_util.c         |   2 +-
 tools/testing/selftests/kvm/lib/riscv/processor.c  |   7 +-
 33 files changed, 491 insertions(+), 162 deletions(-)