Merge branch kvm-arm64/pkvm-cleanups-5.17 into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Wed, 15 Dec 2021 14:21:23 +0000 (14:21 +0000)
committerMarc Zyngier <maz@kernel.org>
Wed, 15 Dec 2021 14:21:23 +0000 (14:21 +0000)
commit7b6871f670028532430648a175d9e8e72280172a
tree48b23ca801ff807e94cc1085b6503fb64a824906
parent94b4a6d52173521b63b11516fe963d651dc520a4
parent64a1fbda59f4b14adde7f21cda687e2b9703b7bb
Merge branch kvm-arm64/pkvm-cleanups-5.17 into kvmarm-master/next

* kvm-arm64/pkvm-cleanups-5.17:
  : .
  : pKVM cleanups from Quentin Perret:
  :
  : This series is a collection of various fixes and cleanups for KVM/arm64
  : when running in nVHE protected mode. The first two patches are real
  : fixes/improvements, the following two are minor cleanups, and the last
  : two help satisfy my paranoia so they're certainly optional.
  : .
  KVM: arm64: pkvm: Make kvm_host_owns_hyp_mappings() robust to VHE
  KVM: arm64: pkvm: Stub io map functions
  KVM: arm64: Make __io_map_base static
  KVM: arm64: Make the hyp memory pool static
  KVM: arm64: pkvm: Disable GICv2 support
  KVM: arm64: pkvm: Fix hyp_pool max order

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/hyp/include/nvhe/mm.h
arch/arm64/kvm/hyp/nvhe/mm.c
arch/arm64/kvm/hyp/nvhe/setup.c