From b01c45bf4a37236de49d15020163c56efb3fb9d3 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:48:52 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: iommu: Fix upper bound of PT walk" This reverts commit 58f8121600276e32e0c91d075f273b836360b27a. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Ib31b14b0c49a427c78a0f316b86eab46771d31d2 --- arch/arm64/kvm/hyp/nvhe/iommu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/iommu.c b/arch/arm64/kvm/hyp/nvhe/iommu.c index 16570c01e88a..0f30563b3d10 100644 --- a/arch/arm64/kvm/hyp/nvhe/iommu.c +++ b/arch/arm64/kvm/hyp/nvhe/iommu.c @@ -174,13 +174,12 @@ static bool is_mmio_range(phys_addr_t base, size_t size) return true; } -static int __snapshot_host_stage2(u64 start, u64 pa_max, u32 level, +static int __snapshot_host_stage2(u64 start, u64 end, u32 level, kvm_pte_t *ptep, enum kvm_pgtable_walk_flags flags, void * const arg) { struct pkvm_iommu_driver * const drv = arg; - u64 end = start + kvm_granule_size(level); enum kvm_pgtable_prot prot; kvm_pte_t pte = *ptep;